From 124511e7be0e4a77263b93934de50f8bedf2c3c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vesa=20Poikaj=C3=A4rvi?= Date: Tue, 19 Oct 2021 08:55:39 +0300 Subject: [PATCH] [typescript-axios] Update to Axios 0.23.0 (#10626) * [typescript-axios] Update Axios to 0.23.0 BREAKING CHANGE: Axios 0.23.0 has a breaking TypeScript defintion change which is incompatible with older versions of Axios. * [typescript-axios] Update samples * [typescript-axios] Use default binding for config to support older versions With 2 generics arguments and leaving the AxiosRequestConfig arguments to it's default the generated code can work both with 0.23.0 and older versions --- .../src/main/resources/typescript-axios/common.mustache | 6 +++--- .../typescript-axios/builds/composed-schemas/common.ts | 6 +++--- .../petstore/typescript-axios/builds/default/common.ts | 6 +++--- .../petstore/typescript-axios/builds/es6-target/common.ts | 6 +++--- .../typescript-axios/builds/test-petstore/common.ts | 6 +++--- .../typescript-axios/builds/with-complex-headers/common.ts | 6 +++--- .../common.ts | 6 +++--- .../typescript-axios/builds/with-interfaces/common.ts | 6 +++--- .../with-npm-version-and-separate-models-and-api/common.ts | 6 +++--- .../typescript-axios/builds/with-npm-version/common.ts | 6 +++--- .../builds/with-single-request-parameters/common.ts | 6 +++--- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache index 510e675d33a..7a057e3e443 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache @@ -4,7 +4,7 @@ import { Configuration } from "./configuration"; import { RequiredError, RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import { AxiosInstance, AxiosResponse } from 'axios'; /** * @@ -120,8 +120,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/common.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/common.ts index 63d2263b528..b156f3e26e9 100644 --- a/samples/client/petstore/typescript-axios/builds/composed-schemas/common.ts +++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/common.ts @@ -15,7 +15,7 @@ import { Configuration } from "./configuration"; import { RequiredError, RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import { AxiosInstance, AxiosResponse } from 'axios'; /** * @@ -131,8 +131,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/samples/client/petstore/typescript-axios/builds/default/common.ts b/samples/client/petstore/typescript-axios/builds/default/common.ts index e59126f5c01..1b1d3a4b7ae 100644 --- a/samples/client/petstore/typescript-axios/builds/default/common.ts +++ b/samples/client/petstore/typescript-axios/builds/default/common.ts @@ -15,7 +15,7 @@ import { Configuration } from "./configuration"; import { RequiredError, RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import { AxiosInstance, AxiosResponse } from 'axios'; /** * @@ -131,8 +131,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/common.ts b/samples/client/petstore/typescript-axios/builds/es6-target/common.ts index e59126f5c01..1b1d3a4b7ae 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/common.ts +++ b/samples/client/petstore/typescript-axios/builds/es6-target/common.ts @@ -15,7 +15,7 @@ import { Configuration } from "./configuration"; import { RequiredError, RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import { AxiosInstance, AxiosResponse } from 'axios'; /** * @@ -131,8 +131,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/common.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/common.ts index d74e541f401..350af25683b 100644 --- a/samples/client/petstore/typescript-axios/builds/test-petstore/common.ts +++ b/samples/client/petstore/typescript-axios/builds/test-petstore/common.ts @@ -15,7 +15,7 @@ import { Configuration } from "./configuration"; import { RequiredError, RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import { AxiosInstance, AxiosResponse } from 'axios'; /** * @@ -131,8 +131,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/common.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/common.ts index e59126f5c01..1b1d3a4b7ae 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/common.ts +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/common.ts @@ -15,7 +15,7 @@ import { Configuration } from "./configuration"; import { RequiredError, RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import { AxiosInstance, AxiosResponse } from 'axios'; /** * @@ -131,8 +131,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/common.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/common.ts index d74e541f401..350af25683b 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/common.ts +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/common.ts @@ -15,7 +15,7 @@ import { Configuration } from "./configuration"; import { RequiredError, RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import { AxiosInstance, AxiosResponse } from 'axios'; /** * @@ -131,8 +131,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/common.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/common.ts index e59126f5c01..1b1d3a4b7ae 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/common.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/common.ts @@ -15,7 +15,7 @@ import { Configuration } from "./configuration"; import { RequiredError, RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import { AxiosInstance, AxiosResponse } from 'axios'; /** * @@ -131,8 +131,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/common.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/common.ts index e59126f5c01..1b1d3a4b7ae 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/common.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/common.ts @@ -15,7 +15,7 @@ import { Configuration } from "./configuration"; import { RequiredError, RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import { AxiosInstance, AxiosResponse } from 'axios'; /** * @@ -131,8 +131,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/common.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/common.ts index e59126f5c01..1b1d3a4b7ae 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/common.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/common.ts @@ -15,7 +15,7 @@ import { Configuration } from "./configuration"; import { RequiredError, RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import { AxiosInstance, AxiosResponse } from 'axios'; /** * @@ -131,8 +131,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/common.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/common.ts index e59126f5c01..1b1d3a4b7ae 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/common.ts +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/common.ts @@ -15,7 +15,7 @@ import { Configuration } from "./configuration"; import { RequiredError, RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import { AxiosInstance, AxiosResponse } from 'axios'; /** * @@ -131,8 +131,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; }