diff --git a/api/package.json b/api/package.json index 6c5ce4c33f..b3a27dd53e 100644 --- a/api/package.json +++ b/api/package.json @@ -87,7 +87,7 @@ "async": "^3.2.0", "async-mutex": "^0.3.1", "atob": "^2.1.2", - "axios": "^0.21.0", + "axios": "^0.22.0", "busboy": "^0.3.1", "camelcase": "^6.2.0", "chalk": "^4.1.1", diff --git a/app/package.json b/app/package.json index 836bf36818..bbef949520 100644 --- a/app/package.json +++ b/app/package.json @@ -69,7 +69,7 @@ "@vue/cli-service": "4.5.13", "@vue/compiler-sfc": "3.2.19", "apexcharts": "3.28.3", - "axios": "0.21.4", + "axios": "0.22.0", "base-64": "1.0.0", "codemirror": "5.63.1", "copyfiles": "2.4.1", diff --git a/package-lock.json b/package-lock.json index 08e8778f17..4303ab9784 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@types/supertest": "2.0.11", "@typescript-eslint/eslint-plugin": "4.32.0", "@typescript-eslint/parser": "4.32.0", - "axios": "0.21.4", + "axios": "0.22.0", "dockerode": "3.3.1", "eslint": "7.32.0", "eslint-config-prettier": "8.3.0", @@ -77,7 +77,7 @@ "async": "^3.2.0", "async-mutex": "^0.3.1", "atob": "^2.1.2", - "axios": "^0.21.0", + "axios": "^0.22.0", "busboy": "^0.3.1", "camelcase": "^6.2.0", "chalk": "^4.1.1", @@ -360,7 +360,7 @@ "@vue/cli-service": "4.5.13", "@vue/compiler-sfc": "3.2.19", "apexcharts": "3.28.3", - "axios": "0.21.4", + "axios": "0.22.0", "base-64": "1.0.0", "codemirror": "5.63.1", "copyfiles": "2.4.1", @@ -1108,6 +1108,15 @@ "keytar": "^7.3.0" } }, + "node_modules/@azure/identity/node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "devOptional": true, + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, "node_modules/@azure/identity/node_modules/tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -1200,6 +1209,15 @@ "uuid": "^8.3.0" } }, + "node_modules/@azure/msal-node/node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "devOptional": true, + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, "node_modules/@azure/msal-node/node_modules/uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", @@ -11979,6 +11997,14 @@ "ramda": "^0.25.0" } }, + "node_modules/apisauce/node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, "node_modules/apollo-link": { "version": "1.2.14", "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.14.tgz", @@ -12679,11 +12705,11 @@ } }, "node_modules/axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.22.0.tgz", + "integrity": "sha512-Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w==", "dependencies": { - "follow-redirects": "^1.14.0" + "follow-redirects": "^1.14.4" } }, "node_modules/axobject-query": { @@ -15301,6 +15327,15 @@ "node": ">=6" } }, + "node_modules/contentful-management/node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "peer": true, + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, "node_modules/contentful-management/node_modules/type-fest": { "version": "0.21.3", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", @@ -22725,6 +22760,15 @@ "postcss": "^8.1.0" } }, + "node_modules/gatsby/node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "peer": true, + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, "node_modules/gatsby/node_modules/cacheable-lookup": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", @@ -50400,7 +50444,7 @@ "version": "9.0.0-rc.95", "license": "MIT", "dependencies": { - "axios": "^0.21.1" + "axios": "^0.22.0" }, "devDependencies": { "@rollup/plugin-commonjs": "20.0.0", @@ -50928,6 +50972,15 @@ "uuid": "^8.3.0" }, "dependencies": { + "axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "devOptional": true, + "requires": { + "follow-redirects": "^1.14.0" + } + }, "tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -51011,6 +51064,15 @@ "uuid": "^8.3.0" }, "dependencies": { + "axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "devOptional": true, + "requires": { + "follow-redirects": "^1.14.0" + } + }, "uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", @@ -52392,7 +52454,7 @@ "@vue/cli-service": "4.5.13", "@vue/compiler-sfc": "3.2.19", "apexcharts": "3.28.3", - "axios": "0.21.4", + "axios": "0.22.0", "base-64": "1.0.0", "codemirror": "5.63.1", "copyfiles": "2.4.1", @@ -52928,7 +52990,7 @@ "@rollup/plugin-node-resolve": "13.0.5", "@types/jest": "27.0.2", "argon2": "0.28.2", - "axios": "^0.21.1", + "axios": "^0.22.0", "dotenv": "10.0.0", "jest": "27.2.4", "jest-environment-jsdom": "27.2.4", @@ -60394,6 +60456,16 @@ "requires": { "axios": "^0.21.1", "ramda": "^0.25.0" + }, + "dependencies": { + "axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "requires": { + "follow-redirects": "^1.14.0" + } + } } }, "apollo-link": { @@ -60970,11 +61042,11 @@ "peer": true }, "axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.22.0.tgz", + "integrity": "sha512-Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w==", "requires": { - "follow-redirects": "^1.14.0" + "follow-redirects": "^1.14.4" } }, "axobject-query": { @@ -63050,6 +63122,15 @@ "type-fest": "^0.21.3" }, "dependencies": { + "axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "peer": true, + "requires": { + "follow-redirects": "^1.14.0" + } + }, "type-fest": { "version": "0.21.3", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", @@ -64826,7 +64907,7 @@ "async": "^3.2.0", "async-mutex": "^0.3.1", "atob": "^2.1.2", - "axios": "^0.21.0", + "axios": "^0.22.0", "busboy": "^0.3.1", "camelcase": "^6.2.0", "chalk": "^4.1.1", @@ -68210,6 +68291,15 @@ "postcss-value-parser": "^4.1.0" } }, + "axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "peer": true, + "requires": { + "follow-redirects": "^1.14.0" + } + }, "cacheable-lookup": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", diff --git a/package.json b/package.json index 663105d24c..9bce9c28d9 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@types/supertest": "2.0.11", "@typescript-eslint/eslint-plugin": "4.32.0", "@typescript-eslint/parser": "4.32.0", - "axios": "0.21.4", + "axios": "0.22.0", "dockerode": "3.3.1", "eslint": "7.32.0", "eslint-config-prettier": "8.3.0", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index da5f726f69..e1f474d069 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -43,7 +43,7 @@ "author": "Rijk van Zanten ", "license": "MIT", "dependencies": { - "axios": "^0.21.1" + "axios": "^0.22.0" }, "devDependencies": { "@rollup/plugin-commonjs": "20.0.0", diff --git a/packages/sdk/src/base/transport/axios-transport.ts b/packages/sdk/src/base/transport/axios-transport.ts index f5e205d2f4..bf653a7143 100644 --- a/packages/sdk/src/base/transport/axios-transport.ts +++ b/packages/sdk/src/base/transport/axios-transport.ts @@ -114,7 +114,7 @@ export class AxiosTransport implements ITransport { } } - const response = await this.axios.request(config); + const response = await this.axios.request(config); const responseData = response.data; const content = { @@ -138,7 +138,7 @@ export class AxiosTransport implements ITransport { } if (axios.isAxiosError(err)) { - const data = err.response?.data; + const data = err.response?.data as any; throw new TransportError(err as AxiosError, { raw: err.response?.data, diff --git a/packages/sdk/tests/base/transport/axios.test.ts b/packages/sdk/tests/base/transport/axios.test.ts index 3d14c0a52c..fbe66e7e18 100644 --- a/packages/sdk/tests/base/transport/axios.test.ts +++ b/packages/sdk/tests/base/transport/axios.test.ts @@ -204,7 +204,7 @@ describe('axios transport', function () { expect(response1.headers['x-new-header-value']).toBe(''); const interceptor1 = transport.requests.intercept((config) => { - config.headers['x-new-header'] = 'Testing'; + config.headers!['x-new-header'] = 'Testing'; return config; }); @@ -230,7 +230,7 @@ describe('axios transport', function () { expect(response1.data).toBe('original data'); const interceptor1 = transport.responses.intercept((response) => { - response.data = { data: 'injected data' }; + (response.data as any) = { data: 'injected data' }; return response; }); diff --git a/packages/shared/src/composables/use-items.ts b/packages/shared/src/composables/use-items.ts index e75c14a8cc..162d7b47ac 100644 --- a/packages/shared/src/composables/use-items.ts +++ b/packages/shared/src/composables/use-items.ts @@ -181,7 +181,7 @@ export function useItems(collection: Ref, query: Query, fetchOnIn fieldsToFetch = fieldsToFetch.filter((field) => field.startsWith('$') === false); try { - const response = await api.get(endpoint.value, { + const response = await api.get(endpoint.value, { params: { limit: limit.value, fields: fieldsToFetch, @@ -231,7 +231,7 @@ export function useItems(collection: Ref, query: Query, fetchOnIn async function getItemCount() { if (!primaryKeyField.value || !endpoint.value) return; - const response = await api.get(endpoint.value, { + const response = await api.get(endpoint.value, { params: { limit: 0, fields: primaryKeyField.value.field, @@ -241,8 +241,8 @@ export function useItems(collection: Ref, query: Query, fetchOnIn }, }); - totalCount.value = response.data.meta.total_count; - itemCount.value = response.data.meta.filter_count; + totalCount.value = response.data.meta!.total_count!; + itemCount.value = response.data.meta!.filter_count!; } function reset() {