diff --git a/apps/api/package.json b/apps/api/package.json index aa154d68a..78d490394 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -36,7 +36,7 @@ "ajv-formats": "^2.1.1", "ajv-keywords": "^5.1.0", "async-mutex": "^0.4.0", - "axios": "1.4.0", + "axios": "1.6.2", "bcryptjs": "^2.4.3", "body-parser": "^1.20.0", "class-transformer": "^0.5.1", diff --git a/apps/queue-manager/package.json b/apps/queue-manager/package.json index 9d9c4111e..373b0e466 100644 --- a/apps/queue-manager/package.json +++ b/apps/queue-manager/package.json @@ -18,7 +18,7 @@ "dependencies": { "@impler/dal": "^0.12.1", "@impler/shared": "^0.12.1", - "axios": "^0.26.1", + "axios": "1.6.2", "dotenv": "^16.0.2", "envalid": "^7.3.1" }, diff --git a/apps/widget/craco.config.js b/apps/widget/craco.config.js index 25f498e2f..b38e9b7e3 100644 --- a/apps/widget/craco.config.js +++ b/apps/widget/craco.config.js @@ -11,5 +11,26 @@ module.exports = { '@hooks': path.resolve(__dirname, './src/hooks'), '@amplitude': path.resolve(__dirname, './src/util/amplitude/index.ts'), }, + configure: (config) => { + const fileLoaderRule = getFileLoaderRule(config.module.rules); + if (!fileLoaderRule) { + throw new Error('File loader not found'); + } + fileLoaderRule.exclude.push(/\.cjs$/); + return config; + }, }, }; + +function getFileLoaderRule(rules) { + for (const rule of rules) { + if ('oneOf' in rule) { + const found = getFileLoaderRule(rule.oneOf); + if (found) { + return found; + } + } else if (rule.test === undefined && rule.type === 'asset/resource') { + return rule; + } + } +} \ No newline at end of file diff --git a/apps/widget/package.json b/apps/widget/package.json index 982ded1d1..3a00994cf 100644 --- a/apps/widget/package.json +++ b/apps/widget/package.json @@ -51,7 +51,7 @@ "@storybook/addon-essentials": "^6.5.13", "@storybook/react": "^6.5.13", "@tanstack/react-query": "^4.14.5", - "axios": "^0.26.1", + "axios": "1.6.2", "bootstrap": "4.6.0", "cross-env": "^7.0.3", "file-saver": "^2.0.5", diff --git a/libs/shared/package.json b/libs/shared/package.json index fb6a5fa0e..bf054b136 100644 --- a/libs/shared/package.json +++ b/libs/shared/package.json @@ -31,7 +31,7 @@ "@aws-sdk/client-s3": "^3.185.0", "@aws-sdk/lib-storage": "^3.360.0", "@aws-sdk/s3-request-presigner": "^3.276.0", - "axios": "^0.26.1" + "axios": "1.6.2" }, "lint-staged": { "*.{js,jsx,ts,tsx}": ["prettier --ignore-path .eslintignore --write"], diff --git a/libs/shared/src/services/http-client/api.client.ts b/libs/shared/src/services/http-client/api.client.ts index 2f4f13209..d2dc85808 100644 --- a/libs/shared/src/services/http-client/api.client.ts +++ b/libs/shared/src/services/http-client/api.client.ts @@ -1,4 +1,4 @@ -import axios, { AxiosInstance, AxiosRequestHeaders } from 'axios'; +import axios, { AxiosInstance } from 'axios'; import { ACCESS_KEY_NAME } from '../../config'; export interface IParamObject { @@ -32,7 +32,12 @@ export class HttpClient { return this.callWrapper(this.axiosClient.get.bind(this, url, { params })); } - async post(url: string, body = {}, headers: AxiosRequestHeaders = {}, responseType?: XMLHttpRequestResponseType) { + async post( + url: string, + body = {}, + headers: Record = {}, + responseType?: XMLHttpRequestResponseType + ) { return this.callWrapper(this.axiosClient.post.bind(this, url, body, { headers, responseType })); } diff --git a/packages/client/package.json b/packages/client/package.json index aac635f07..82b2b71ae 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -38,7 +38,7 @@ }, "dependencies": { "@impler/shared": "^0.12.1", - "axios": "^0.26.1" + "axios": "1.6.2" }, "engines": { "node": ">=10" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5bf7d2dc9..e84e430b0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -97,7 +97,7 @@ importers: ajv-formats: ^2.1.1 ajv-keywords: ^5.1.0 async-mutex: ^0.4.0 - axios: 1.4.0 + axios: 1.6.2 bcryptjs: ^2.4.3 body-parser: ^1.20.0 chai: ^4.3.7 @@ -148,7 +148,7 @@ importers: ajv-formats: 2.1.1_ajv@8.12.0 ajv-keywords: 5.1.0_ajv@8.12.0 async-mutex: 0.4.0 - axios: 1.4.0 + axios: 1.6.2 bcryptjs: 2.4.3 body-parser: 1.20.0 class-transformer: 0.5.1 @@ -252,7 +252,7 @@ importers: '@impler/dal': ^0.12.1 '@impler/shared': ^0.12.1 '@types/node': ^18.7.18 - axios: ^0.26.1 + axios: 1.6.2 dotenv: ^16.0.2 envalid: ^7.3.1 nodemon: ^2.0.20 @@ -262,7 +262,7 @@ importers: dependencies: '@impler/dal': link:../../libs/dal '@impler/shared': link:../../libs/shared - axios: 0.26.1 + axios: 1.6.2 dotenv: 16.0.2 envalid: 7.3.1 devDependencies: @@ -375,7 +375,7 @@ importers: '@types/react': ^18.0.21 '@types/react-datepicker': ^4.19.1 '@types/react-dom': ^18.0.6 - axios: ^0.26.1 + axios: 1.6.2 bootstrap: 4.6.0 cross-env: ^7.0.3 file-saver: ^2.0.5 @@ -409,7 +409,7 @@ importers: '@storybook/addon-essentials': 6.5.13_h3kjzxhrg7chui2aozsm5rx24m '@storybook/react': 6.5.13_p3valoa7nqeq4bwwutk2eqkd44 '@tanstack/react-query': 4.14.5_biqbaboplfbrettd7655fr4n2y - axios: 0.26.1 + axios: 1.6.2 bootstrap: 4.6.0_v43dgvb72xgm2jgaq7rwaicqhe cross-env: 7.0.3 file-saver: 2.0.5 @@ -511,14 +511,14 @@ importers: '@aws-sdk/lib-storage': ^3.360.0 '@aws-sdk/s3-request-presigner': ^3.276.0 '@types/node': ^18.7.18 - axios: ^0.26.1 + axios: 1.6.2 rimraf: ^3.0.2 typescript: ^4.8.3 dependencies: '@aws-sdk/client-s3': 3.185.0 '@aws-sdk/lib-storage': 3.360.0_yd4soj2kzbul4wewetdbicdryy '@aws-sdk/s3-request-presigner': 3.276.0 - axios: 0.26.1 + axios: 1.6.2 devDependencies: '@types/node': 18.7.18 rimraf: 3.0.2 @@ -528,13 +528,13 @@ importers: specifiers: '@impler/shared': ^0.12.1 '@types/node': ^18.11.9 - axios: ^0.26.1 + axios: 1.6.2 rimraf: ^3.0.2 typedoc: ^0.23.20 typescript: 4.8.4 dependencies: '@impler/shared': link:../../libs/shared - axios: 0.26.1 + axios: 1.6.2 devDependencies: '@types/node': 18.11.9 rimraf: 3.0.2 @@ -8385,7 +8385,7 @@ packages: schema-utils: 3.1.1 source-map: 0.7.4 webpack: 5.74.0 - webpack-dev-server: 4.11.1_webpack@5.74.0 + webpack-dev-server: 4.11.1_webpack@5.82.1 dev: false /@popperjs/core/2.11.8: @@ -12267,26 +12267,6 @@ packages: - supports-color dev: false - /@typescript-eslint/parser/5.38.0_tbtvr3a5zwdiktqy4vlmx63mqq: - resolution: {integrity: sha512-/F63giJGLDr0ms1Cr8utDAxP2SPiglaD6V+pCOcG35P2jCqdfR7uuEhz1GIC3oy4hkUF8xA1XSXmd9hOh/a5EA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/scope-manager': 5.38.0 - '@typescript-eslint/types': 5.38.0 - '@typescript-eslint/typescript-estree': 5.38.0_typescript@4.9.5 - debug: 4.3.4 - eslint: 8.39.0 - typescript: 4.9.5 - transitivePeerDependencies: - - supports-color - dev: false - /@typescript-eslint/parser/5.47.0_id2eilsndvzhjjktb64trvy3gu: resolution: {integrity: sha512-udPU4ckK+R1JWCGdQC4Qa27NtBg7w020ffHqGyAK8pAgOVuNw7YaKXGChk+udh+iiGIJf6/E/0xhVXyPAbsczw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -12498,27 +12478,6 @@ packages: - supports-color dev: false - /@typescript-eslint/typescript-estree/5.38.0_typescript@4.9.5: - resolution: {integrity: sha512-6P0RuphkR+UuV7Avv7MU3hFoWaGcrgOdi8eTe1NwhMp2/GjUJoODBTRWzlHpZh6lFOaPmSvgxGlROa0Sg5Zbyg==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/types': 5.38.0 - '@typescript-eslint/visitor-keys': 5.38.0 - debug: 4.3.4 - globby: 11.1.0 - is-glob: 4.0.3 - semver: 7.3.7 - tsutils: 3.21.0_typescript@4.9.5 - typescript: 4.9.5 - transitivePeerDependencies: - - supports-color - dev: false - /@typescript-eslint/typescript-estree/5.40.1_typescript@4.8.3: resolution: {integrity: sha512-5QTP/nW5+60jBcEPfXy/EZL01qrl9GZtbgDZtDPlfW5zj/zjNrdI2B5zMUHmOsfvOr2cWqwVdWjobCiHcedmQA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -13791,14 +13750,6 @@ packages: - debug dev: true - /axios/0.26.1: - resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==} - dependencies: - follow-redirects: 1.15.2 - transitivePeerDependencies: - - debug - dev: false - /axios/1.2.3: resolution: {integrity: sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==} dependencies: @@ -13809,8 +13760,8 @@ packages: - debug dev: true - /axios/1.4.0: - resolution: {integrity: sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==} + /axios/1.6.2: + resolution: {integrity: sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==} dependencies: follow-redirects: 1.15.2 form-data: 4.0.0 @@ -13859,7 +13810,7 @@ packages: '@babel/core': 7.20.12 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 - '@types/babel__core': 7.20.0 + '@types/babel__core': 7.1.19 babel-plugin-istanbul: 6.1.1 babel-preset-jest: 27.5.1_@babel+core@7.20.12 chalk: 4.1.2 @@ -14738,7 +14689,7 @@ packages: mississippi: 3.0.0 mkdirp: 0.5.6 move-concurrently: 1.0.1 - promise-inflight: 1.0.1 + promise-inflight: 1.0.1_bluebird@3.7.2 rimraf: 2.7.1 ssri: 6.0.2 unique-filename: 1.1.1 @@ -17306,7 +17257,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.38.0_tbtvr3a5zwdiktqy4vlmx63mqq + '@typescript-eslint/parser': 5.38.0_4dirkvzbubjt3dbig7qyeclnqm debug: 3.2.7 eslint: 8.39.0 eslint-import-resolver-node: 0.3.6 @@ -17461,7 +17412,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.38.0_tbtvr3a5zwdiktqy4vlmx63mqq + '@typescript-eslint/parser': 5.38.0_4dirkvzbubjt3dbig7qyeclnqm array-includes: 3.1.5 array.prototype.flat: 1.3.0 debug: 2.6.9 @@ -25578,6 +25529,16 @@ packages: bluebird: optional: true + /promise-inflight/1.0.1_bluebird@3.7.2: + resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==} + peerDependencies: + bluebird: '*' + peerDependenciesMeta: + bluebird: + optional: true + dependencies: + bluebird: 3.7.2 + /promise-retry/2.0.1: resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==} engines: {node: '>=10'} @@ -29886,7 +29847,7 @@ packages: spdy: 4.0.2 webpack: 5.74.0 webpack-dev-middleware: 5.3.3_webpack@5.74.0 - ws: 8.9.0 + ws: 8.13.0 transitivePeerDependencies: - bufferutil - debug