Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/typescript-axios/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/typescript-axios-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
13 changes: 13 additions & 0 deletions patches/axios.patch
Original file line number Diff line number Diff line change
@@ -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;
25 changes: 15 additions & 10 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 17 additions & 15 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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

Expand All @@ -39,6 +44,3 @@ publicHoistPattern:
- '@azure-tools/*'
- '@types/node'
- '@biomejs/biome'

# GH actions doesn't checkout the branch
gitChecks: false