Skip to content
This repository has been archived by the owner on Oct 29, 2023. It is now read-only.

Commit

Permalink
Merge pull request #267 from data-provider/chore-axios-dep
Browse files Browse the repository at this point in the history
Update axios dependency
  • Loading branch information
javierbrea authored Dec 8, 2022
2 parents 80a296e + 2398ee2 commit 320abf8
Show file tree
Hide file tree
Showing 10 changed files with 1,579 additions and 1,158 deletions.
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
"graph": "nx graph"
},
"devDependencies": {
"@babel/core": "7.18.13",
"@babel/eslint-parser": "7.18.9",
"@babel/core": "7.20.5",
"@babel/eslint-parser": "7.19.1",
"@babel/plugin-syntax-flow": "7.18.6",
"@babel/plugin-transform-react-jsx": "7.18.10",
"@babel/preset-env": "7.18.10",
"@babel/plugin-transform-react-jsx": "7.19.0",
"@babel/preset-env": "7.20.2",
"@babel/preset-react": "7.18.6",
"@babel/preset-typescript": "7.18.6",
"@cypress/webpack-preprocessor": "5.12.2",
"@cypress/webpack-preprocessor": "5.15.6",
"@mocks-server/admin-api-paths": "3.0.1",
"@mocks-server/main": "3.11.0",
"@nrwl/cli": "13.8.3",
Expand All @@ -42,57 +42,57 @@
"@rollup/plugin-commonjs": "22.0.2",
"@rollup/plugin-json": "4.1.0",
"@rollup/plugin-node-resolve": "13.3.0",
"@stryker-mutator/core": "6.1.2",
"@stryker-mutator/jest-runner": "6.1.2",
"@testing-library/cypress": "8.0.3",
"@stryker-mutator/core": "6.3.0",
"@stryker-mutator/jest-runner": "6.3.0",
"@testing-library/cypress": "8.0.7",
"@testing-library/jest-dom": "5.16.5",
"@testing-library/react": "12.1.5",
"@typescript-eslint/parser": "5.36.0",
"babel-jest": "27.5.1",
"babel-loader": "8.2.5",
"babel-plugin-module-resolver": "4.1.0",
"babel-polyfill": "6.26.0",
"commander": "9.4.0",
"commander": "9.4.1",
"cross-env": "7.0.3",
"cross-fetch": "3.1.5",
"cross-spawn": "7.0.3",
"cypress": "9.7.0",
"cypress-fail-fast": "3.4.1",
"cypress-fail-fast": "6.0.0",
"deepmerge": "4.2.2",
"eslint": "8.23.0",
"eslint": "8.29.0",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-prettier": "4.2.1",
"fs-extra": "10.1.0",
"fs-extra": "11.1.0",
"handlebars": "4.7.7",
"husky": "8.0.1",
"husky": "8.0.2",
"is-ci": "3.0.1",
"is-promise": "4.0.0",
"jest": "27.5.1",
"json-server": "0.17.0",
"lint-staged": "13.0.3",
"lodash": "4.17.21",
"prettier": "2.7.1",
"prettier": "2.8.1",
"prop-types": "15.8.1",
"react": "18.2.0",
"react-app-rewired": "2.2.1",
"react-dom": "18.2.0",
"react-redux": "8.0.2",
"react-redux": "8.0.5",
"react-scripts": "5.0.1",
"react-test-renderer": "18.2.0",
"redux": "4.2.0",
"regenerator-runtime": "0.13.9",
"regenerator-runtime": "0.13.11",
"request": "2.88.2",
"request-promise": "4.2.6",
"rollup": "2.78.1",
"rollup-plugin-terser": "7.0.2",
"serve": "14.0.1",
"sinon": "14.0.0",
"start-server-and-test": "1.14.0",
"serve": "14.1.2",
"sinon": "15.0.0",
"start-server-and-test": "1.15.1",
"strip-ansi": "6.0.0",
"tree-kill": "1.2.2",
"typescript": "4.8.2",
"typescript": "4.9.4",
"wait-on": "6.0.1",
"webpack": "5.74.0"
"webpack": "5.75.0"
},
"lint-staged": {
"packages/**/*.js": "eslint",
Expand Down
5 changes: 0 additions & 5 deletions packages/axios/.babelrc

This file was deleted.

6 changes: 6 additions & 0 deletions packages/axios/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Removed
### BREAKING CHANGES

## [5.0.2] - 2022-12-08

### Changed
- chore(deps): Update axios-retry to 1.2.1
- chore(deps): Update query-string to 7.1.3

## [5.0.1] - 2022-08-30

### Changed
Expand Down
3 changes: 3 additions & 0 deletions packages/axios/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
presets: [["@babel/preset-env"]],
};
9 changes: 2 additions & 7 deletions packages/axios/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,8 @@ module.exports = {

// The glob patterns Jest uses to detect test files
testMatch: ["<rootDir>/test/**/?(*.)+(spec|test).js?(x)"],
// testMatch: ["<rootDir>/test/methods.spec.js"],

transform: {
".js$": "babel-jest",
},

setupFiles: ["<rootDir>/jest.init.js"],
// testMatch: ["<rootDir>/test/selectors.spec.js"],
transformIgnorePatterns: ["<rootDir>/node_modules/.pnpm/(?!(axios)@)", "\\.pnp\\.[^\\/]+$"],

testSequencer: "<rootDir>/jest.testSequencer.js",
};
1 change: 0 additions & 1 deletion packages/axios/jest.init.js

This file was deleted.

6 changes: 3 additions & 3 deletions packages/axios/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@data-provider/axios",
"version": "5.0.1",
"version": "5.0.2",
"description": "REST API Data Provider origin addon using Axios",
"keywords": [
"data-provider",
Expand Down Expand Up @@ -50,10 +50,10 @@
"@data-provider/core": "4.x"
},
"dependencies": {
"axios": "0.27.2",
"axios": "1.2.1",
"axios-retry": "3.3.1",
"path-to-regexp": "6.2.1",
"query-string": "7.1.1"
"query-string": "7.1.3"
},
"devDependencies": {
"@data-provider/core": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion packages/axios/sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sonar.organization=data-provider
sonar.projectKey=data-provider_core_axios
sonar.projectName=axios
sonar.projectVersion=5.0.1
sonar.projectVersion=5.0.2

sonar.javascript.file.suffixes=.js
sonar.sourceEncoding=UTF-8
Expand Down
4 changes: 2 additions & 2 deletions packages/axios/test/Axios.mock.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ Unless required by applicable law or agreed to in writing, software distributed

const sinon = require("sinon");

jest.mock("axios-retry");
const axios = require("axios").default;

const axios = require("axios");
jest.mock("axios-retry");

const Mock = class Mock {
constructor() {
Expand Down
Loading

0 comments on commit 320abf8

Please sign in to comment.