diff --git a/e2e/package.json b/e2e/package.json index 829505ef..9c76e953 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -19,7 +19,7 @@ "@nahkies/typescript-express-runtime": "workspace:*", "@nahkies/typescript-fetch-runtime": "workspace:*", "@nahkies/typescript-koa-runtime": "workspace:*", - "axios": "1.13.2", + "axios": "1.13.5", "express": "^5.1.0", "koa": "^3.1.1", "zod": "^3.25.74" diff --git a/integration-tests/typescript-axios/package.json b/integration-tests/typescript-axios/package.json index 05ae5ee3..0eac7049 100644 --- a/integration-tests/typescript-axios/package.json +++ b/integration-tests/typescript-axios/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@nahkies/typescript-axios-runtime": "workspace:*", - "axios": "1.13.2", + "axios": "1.13.5", "dotenv": "^17.2.3", "tslib": "^2.8.1" }, diff --git a/packages/typescript-axios-runtime/package.json b/packages/typescript-axios-runtime/package.json index 2dd8ccc8..d2971782 100644 --- a/packages/typescript-axios-runtime/package.json +++ b/packages/typescript-axios-runtime/package.json @@ -33,11 +33,11 @@ "tslib": "^2.8.1" }, "peerDependencies": { - "axios": "^1.6.8 <1.13.3" + "axios": "^1.13.5 <1.13.6" }, "devDependencies": { "@jest/globals": "^30.2.0", - "axios": "1.13.2", + "axios": "1.13.5", "jest": "^30.2.0", "typescript": "^5.9.3" }, diff --git a/patches/axios.patch b/patches/axios.patch new file mode 100644 index 00000000..e0efc096 --- /dev/null +++ b/patches/axios.patch @@ -0,0 +1,13 @@ +diff --git a/index.d.cts b/index.d.cts +index 7a4eff949961ec02504ddf91f67874e567e1ee49..a32064ec7a0f3b09a021ad5fbfd0f3bd1c10033e 100644 +--- a/index.d.cts ++++ b/index.d.cts +@@ -417,7 +417,7 @@ declare namespace axios { + httpAgent?: any; + httpsAgent?: any; + proxy?: AxiosProxyConfig | false; +- cancelToken?: CancelToken; ++ cancelToken?: CancelToken | undefined; + decompress?: boolean; + transitional?: TransitionalOptions; + signal?: GenericAbortSignal; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0b620f13..b80c2b57 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,6 +10,11 @@ overrides: '@isaacs/brace-expansion': 5.0.1 tar: 7.5.7 +patchedDependencies: + axios: + hash: 6560630882dbcc0975f9cafc909783b277056e2ec142062ecf5b9c3c6aa4bfb1 + path: patches/axios.patch + importers: .: @@ -102,8 +107,8 @@ importers: specifier: workspace:* version: link:../packages/typescript-koa-runtime axios: - specifier: 1.13.2 - version: 1.13.2 + specifier: 1.13.5 + version: 1.13.5(patch_hash=6560630882dbcc0975f9cafc909783b277056e2ec142062ecf5b9c3c6aa4bfb1) express: specifier: ^5.1.0 version: 5.2.1 @@ -185,8 +190,8 @@ importers: specifier: workspace:* version: link:../../packages/typescript-axios-runtime axios: - specifier: 1.13.2 - version: 1.13.2 + specifier: 1.13.5 + version: 1.13.5(patch_hash=6560630882dbcc0975f9cafc909783b277056e2ec142062ecf5b9c3c6aa4bfb1) dotenv: specifier: ^17.2.3 version: 17.2.3 @@ -462,8 +467,8 @@ importers: specifier: ^30.2.0 version: 30.2.0 axios: - specifier: 1.13.2 - version: 1.13.2 + specifier: 1.13.5 + version: 1.13.5(patch_hash=6560630882dbcc0975f9cafc909783b277056e2ec142062ecf5b9c3c6aa4bfb1) jest: specifier: ^30.2.0 version: 30.2.0(@types/node@22.16.5) @@ -3757,8 +3762,8 @@ packages: asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} - axios@1.13.2: - resolution: {integrity: sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==} + axios@1.13.5: + resolution: {integrity: sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==} babel-jest@30.2.0: resolution: {integrity: sha512-0YiBEOxWqKkSQWL9nNGGEgndoeL0ZpWrbLMNL5u/Kaxrli3Eaxlt3ZtIDktEvXt4L/R9r3ODr2zKwGM/2BjxVw==} @@ -10954,7 +10959,7 @@ snapshots: asynckit@0.4.0: {} - axios@1.13.2: + axios@1.13.5(patch_hash=6560630882dbcc0975f9cafc909783b277056e2ec142062ecf5b9c3c6aa4bfb1): dependencies: follow-redirects: 1.15.11 form-data: 4.0.5 @@ -14498,7 +14503,7 @@ snapshots: '@yarnpkg/lockfile': 1.1.0 '@yarnpkg/parsers': 3.0.2 '@zkochan/js-yaml': 0.0.7 - axios: 1.13.2 + axios: 1.13.5(patch_hash=6560630882dbcc0975f9cafc909783b277056e2ec142062ecf5b9c3c6aa4bfb1) chalk: 4.1.2 cli-cursor: 3.1.0 cli-spinners: 2.6.1 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 7f27cd4a..1343fba8 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -3,18 +3,9 @@ packages: - integration-tests/* - e2e -minimumReleaseAge: 10080 # 7 days in minutes - -minimumReleaseAgeExclude: - # Renovate security update: lodash@4.17.23 - - lodash@4.17.23 - - '@isaacs/brace-expansion@5.0.1' - -nodeOptions: "${NODE_OPTIONS:- } --experimental-vm-modules" - dedupeInjectedDeps: true -linkWorkspacePackages: deep +gitChecks: false ignoredBuiltDependencies: - '@parcel/watcher' @@ -26,11 +17,25 @@ ignoredBuiltDependencies: - sharp - unrs-resolver +linkWorkspacePackages: deep + +minimumReleaseAge: 10080 + +minimumReleaseAgeExclude: + - lodash@4.17.23 + - '@isaacs/brace-expansion@5.0.1' + - axios@1.13.5 + +nodeOptions: ${NODE_OPTIONS:- } --experimental-vm-modules + overrides: - '@types/node': 22.16.5 - 'zod@4.1.11': '4.1.13' '@isaacs/brace-expansion': 5.0.1 + '@types/node': 22.16.5 tar: 7.5.7 + zod@4.1.11: 4.1.13 + +patchedDependencies: + axios: patches/axios.patch preferWorkspacePackages: true @@ -39,6 +44,3 @@ publicHoistPattern: - '@azure-tools/*' - '@types/node' - '@biomejs/biome' - -# GH actions doesn't checkout the branch -gitChecks: false