Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update dependency axios to v1.3.3 #2733

Merged
merged 4 commits into from
Feb 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@azure/storage-blob": "^12.11.0",
"@godaddy/terminus": "^4.10.2",
"@google-cloud/storage": "^6.2.3",
"@nestjs/axios": "0.1.1",
"@nestjs/axios": "~2.0.0",
"@nestjs/common": "9.0.2",
"@nestjs/core": "9.0.2",
"@nestjs/graphql": "10.2.0",
Expand Down Expand Up @@ -80,7 +80,7 @@
"@sentry/tracing": "^7.12.1",
"@types/handlebars": "^4.1.0",
"agenda": "^4.2.1",
"axios": "^0.24.0",
"axios": "^1.3.3",
"bcrypt": "^5.0.0",
"body-parser": "^1.20.0",
"bull": "^4.2.1",
Expand Down
4 changes: 2 additions & 2 deletions apps/api/src/app/subscribers/e2e/update-preference.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe('Update Subscribers preferences - /subscribers/:subscriberId/preference
} catch (error) {
expect(error.toJSON()).to.have.include({
status: 400,
name: 'Error',
name: 'AxiosError',
message: 'Request failed with status code 400',
});
}
Expand All @@ -55,7 +55,7 @@ describe('Update Subscribers preferences - /subscribers/:subscriberId/preference
} catch (error) {
expect(error.toJSON()).to.have.include({
status: 400,
name: 'Error',
name: 'AxiosError',
message: 'Request failed with status code 400',
});
}
Expand Down
1 change: 0 additions & 1 deletion apps/inbound-mail/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"dependencies": {
"@novu/shared": "^0.11.0",
"@sentry/node": "^7.12.1",
"axios": "^0.24.0",
"bluebird": "^2.9.30",
"bullmq": "^3.5.8",
"dotenv": "^8.6.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"ace-builds": "^1.4.12",
"antd": "^4.10.0",
"autoprefixer": "^9.8.6",
"axios": "^0.21.1",
"axios": "^1.3.3",
"babel-plugin-import": "^1.13.3",
"chart.js": "^3.7.1",
"customize-cra": "^1.0.0",
Expand Down
3 changes: 2 additions & 1 deletion apps/web/src/store/useAuthController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,12 @@ export function useAuthController() {
enabled: Boolean(isLoggedIn && axios.defaults.headers.common.Authorization),
});

const authorization = axios.defaults.headers.common.Authorization as string;
const { data: organizations } = useQuery<IOrganizationEntity[]>(['/v1/organizations'], getOrganizations, {
enabled: Boolean(
isLoggedIn &&
axios.defaults.headers.common.Authorization &&
jwtDecode<IJwtPayload>(axios.defaults.headers.common.Authorization?.split(' ')[1])?.organizationId
jwtDecode<IJwtPayload>(authorization?.split(' ')[1])?.organizationId
),
});

Expand Down
3 changes: 1 addition & 2 deletions apps/webhook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
},
"dependencies": {
"@godaddy/terminus": "^4.3.1",
"@nestjs/axios": "0.1.0",
"@nestjs/common": "^9.2.1",
"@nestjs/core": "^9.2.1",
"@nestjs/platform-express": "^9.2.1",
Expand All @@ -34,7 +33,7 @@
"@novu/stateless": "^0.11.0",
"@novu/testing": "^0.11.0",
"@sentry/node": "^6.3.3",
"axios": "^0.24.0",
"axios": "^1.3.3",
"bull": "^4.4.0",
"bullmq": "^3.5.8",
"class-transformer": "^0.5.1",
Expand Down
1 change: 0 additions & 1 deletion apps/widget/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"antd": "^4.10.0",
"axios": "^0.21.1",
"babel-plugin-import": "^1.13.3",
"chroma-js": "^2.4.2",
"eslint-plugin-cypress": "^2.12.1",
Expand Down
2 changes: 1 addition & 1 deletion libs/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"dist/"
],
"dependencies": {
"axios": "^0.26.1",
"axios": "^1.3.3",
"class-transformer": "0.5.1",
"class-validator": "0.14.0",
"mixpanel": "^0.17.0"
Expand Down
2 changes: 1 addition & 1 deletion libs/testing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@novu/shared": "^0.11.0",
"JSONStream": "^1.3.5",
"async": "^3.2.0",
"axios": "0.25.0",
"axios": "^1.3.3",
"bcrypt": "~5.0.0",
"bullmq": "^3.5.6",
"class-transformer": "0.5.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"dependencies": {
"@novu/shared": "^0.11.0",
"analytics-node": "^6.2.0",
"axios": "^0.25.0",
"axios": "^1.3.3",
"chalk": "4.1.2",
"commander": "^9.0.0",
"configstore": "^5.0.0",
Expand Down
3 changes: 1 addition & 2 deletions packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
"node": ">=10"
},
"dependencies": {
"@novu/shared": "^0.11.0",
"axios": "^0.26.1"
"@novu/shared": "^0.11.0"
},
"devDependencies": {
"@types/jest": "27.5.2",
Expand Down
5 changes: 0 additions & 5 deletions packages/node/jest.config.js

This file was deleted.

9 changes: 8 additions & 1 deletion packages/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
},
"dependencies": {
"@novu/shared": "^0.11.0",
"axios": "^0.26.1",
"handlebars": "^4.7.7",
"lodash.get": "^4.4.2",
"lodash.merge": "^4.6.2"
Expand All @@ -55,6 +54,7 @@
"@types/lodash.get": "^4.4.6",
"@types/lodash.merge": "^4.6.6",
"@types/node": "^14.6.0",
"axios": "^1.3.3",
"codecov": "^3.5.0",
"cz-conventional-changelog": "^3.3.0",
"jest": "^27.0.6",
Expand All @@ -75,6 +75,13 @@
"LICENSE",
"README.md"
],
"jest": {
"preset": "ts-jest",
"testEnvironment": "node",
"moduleNameMapper": {
"axios": "axios/dist/node/axios.cjs"
}
},
Comment on lines +78 to +84
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jest v27 and Axios latest version have a conflict as Jest is not importing the CJS version of Axios

"prettier": {
"singleQuote": true
},
Expand Down
2 changes: 1 addition & 1 deletion packages/notification-center/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"@rollup/plugin-babel": "^6.0.3",
"@tanstack/react-query": "^4.20.4",
"acorn-jsx": "^5.3.2",
"axios": "^0.26.1",
"axios": "^1.3.3",
"chroma-js": "^2.4.2",
"date-fns": "^2.29.1",
"lodash.clonedeep": "^4.5.0",
Expand Down
1 change: 0 additions & 1 deletion packages/stateless/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"node": ">=10"
},
"dependencies": {
"axios": "^0.26.1",
"handlebars": "^4.7.7",
"lodash.get": "^4.4.2",
"lodash.merge": "^4.6.2"
Expand Down
Loading