github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-23 00:28:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update dependency axios to v0.22.0 (#8483)

Browse Source 
* Update dependency axios to v0.22.0

* Fix shared type

* Use any type in axios

* Adjust for axios type breaking change

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
This commit is contained in:
renovate[bot]
2021-10-01 12:41:18 -04:00
committed by GitHub
parent 46f00d6202
commit b8d4a24958
8 changed files with 117 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/package.json
View File

@@ -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",

2
app/package.json
View File

@@ -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",

120
package-lock.json generated
View File

@@ -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",

2
package.json
View File

@@ -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",

2
packages/sdk/package.json
View File

@@ -43,7 +43,7 @@
"author": "Rijk van Zanten <rijkvanzanten@me.com>",
"license": "MIT",
"dependencies": {
"axios": "^0.21.1"
"axios": "^0.22.0"
},
"devDependencies": {
"@rollup/plugin-commonjs": "20.0.0",

4
packages/sdk/src/base/transport/axios-transport.ts
View File

@@ -114,7 +114,7 @@ export class AxiosTransport implements ITransport {
}
}
const response = await this.axios.request(config);
const response = await this.axios.request<any>(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<T>(err as AxiosError, {
raw: err.response?.data,

4
packages/sdk/tests/base/transport/axios.test.ts
View File

@@ -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;
});

8
packages/shared/src/composables/use-items.ts
View File

@@ -181,7 +181,7 @@ export function useItems(collection: Ref<string | null>, query: Query, fetchOnIn
fieldsToFetch = fieldsToFetch.filter((field) => field.startsWith('$') === false);
try {
const response = await api.get(endpoint.value, {
const response = await api.get<any>(endpoint.value, {
params: {
limit: limit.value,
fields: fieldsToFetch,
@@ -231,7 +231,7 @@ export function useItems(collection: Ref<string | null>, query: Query, fetchOnIn
async function getItemCount() {
if (!primaryKeyField.value || !endpoint.value) return;
const response = await api.get(endpoint.value, {
const response = await api.get<any>(endpoint.value, {
params: {
limit: 0,
fields: primaryKeyField.value.field,
@@ -241,8 +241,8 @@ export function useItems(collection: Ref<string | null>, 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() {