Skip to content

[1.2] chore: override undici to ^7.29.0, ip-address to ^10.3.1, brace-expansion build tool to ^5.0.9 #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xyos merged 1 commit into from
Aug 7, 2026
Merged

[1.2] chore: override undici to ^7.29.0, ip-address to ^10.3.1, brace-expansion build tool to ^5.0.9 #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions LICENSE-THIRD-PARTY
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7322,7 +7322,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
******************************

ip-address
10.2.0 <https://github.com/beaugunderson/ip-address>
10.4.0 <https://github.com/beaugunderson/ip-address>
Copyright (C) 2011 by Beau Gunderson

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down Expand Up @@ -9492,7 +9492,7 @@ THE SOFTWARE.
******************************

undici
7.28.0 <https://github.com/nodejs/undici>
7.29.0 <https://github.com/nodejs/undici>
MIT License

Copyright (c) Matteo Collina and Undici contributors
Expand Down
6 changes: 3 additions & 3 deletions build-tools/oss-attribution/oss-attribution-generator/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion build-tools/oss-attribution/oss-attribution-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
},
"overrides": {
"minimatch": "^10.2.3",
"brace-expansion": "^5.0.8"
"brace-expansion": "^5.0.9"
}
}
4 changes: 2 additions & 2 deletions overrides/LICENSE-THIRD-PARTY
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7322,7 +7322,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
******************************

ip-address
10.2.0 <https://github.com/beaugunderson/ip-address>
10.4.0 <https://github.com/beaugunderson/ip-address>
Copyright (C) 2011 by Beau Gunderson

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down Expand Up @@ -9492,7 +9492,7 @@ THE SOFTWARE.
******************************

undici
7.28.0 <https://github.com/nodejs/undici>
7.29.0 <https://github.com/nodejs/undici>
MIT License

Copyright (c) Matteo Collina and Undici contributors
Expand Down
14 changes: 7 additions & 7 deletions package-lock-overrides/sagemaker.series/package-lock.json
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions package-lock-overrides/sagemaker.series/remote/package-lock.json
View file
Open in desktop

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

14 changes: 7 additions & 7 deletions package-lock-overrides/web-embedded-with-terminal.series/package-lock.json
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions package-lock-overrides/web-embedded-with-terminal.series/remote/package-lock.json
View file
Open in desktop

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

14 changes: 7 additions & 7 deletions package-lock-overrides/web-embedded.series/package-lock.json
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions package-lock-overrides/web-embedded.series/remote/package-lock.json
View file
Open in desktop

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

14 changes: 7 additions & 7 deletions package-lock-overrides/web-server.series/package-lock.json
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions package-lock-overrides/web-server.series/remote/package-lock.json
View file
Open in desktop

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

24 changes: 12 additions & 12 deletions patches/common/copilot-restrict-debug-override-urls-to-user-scope.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ Remove when Code-OSS is updated to >= 1.128.1.
@backported: https://github.com/microsoft/vscode/commit/f05bcd1aa29cff28a62fe137b4a16fec9393f31b
@finding-id: CVE-2026-47282 GHSA-wr9x-42j2-jvh3

Index: b/extensions/copilot/src/extension/completions-core/vscode-node/extension/src/config.ts
Index: code-editor-src/extensions/copilot/src/extension/completions-core/vscode-node/extension/src/config.ts
===================================================================
--- a/extensions/copilot/src/extension/completions-core/vscode-node/extension/src/config.ts
+++ b/extensions/copilot/src/extension/completions-core/vscode-node/extension/src/config.ts
--- code-editor-src.orig/extensions/copilot/src/extension/completions-core/vscode-node/extension/src/config.ts
+++ code-editor-src/extensions/copilot/src/extension/completions-core/vscode-node/extension/src/config.ts
@@ -15,7 +15,8 @@ import {
getOptionalConfigDefaultForKey,
ICompletionsConfigProvider,
Expand Down Expand Up @@ -65,10 +65,10 @@ Index: b/extensions/copilot/src/extension/completions-core/vscode-node/extension
// Dumps config settings defined in the extension json
override dumpForTelemetry(): { [key: string]: string } {
return {};
Index: b/extensions/copilot/src/extension/completions-core/vscode-node/lib/src/config.ts
Index: code-editor-src/extensions/copilot/src/extension/completions-core/vscode-node/lib/src/config.ts
===================================================================
--- a/extensions/copilot/src/extension/completions-core/vscode-node/lib/src/config.ts
+++ b/extensions/copilot/src/extension/completions-core/vscode-node/lib/src/config.ts
--- code-editor-src.orig/extensions/copilot/src/extension/completions-core/vscode-node/lib/src/config.ts
+++ code-editor-src/extensions/copilot/src/extension/completions-core/vscode-node/lib/src/config.ts
@@ -75,6 +75,21 @@ export const ConfigKey = {
UseSplitContextPrompt: 'internal.useSplitContextPrompt',
};
Expand All @@ -91,10 +91,10 @@ Index: b/extensions/copilot/src/extension/completions-core/vscode-node/lib/src/c
export type ConfigKeyType = string;

// How to determine where to terminate the completion to the current block.
Index: b/extensions/copilot/src/platform/configuration/common/configurationService.ts
Index: code-editor-src/extensions/copilot/src/platform/configuration/common/configurationService.ts
===================================================================
--- a/extensions/copilot/src/platform/configuration/common/configurationService.ts
+++ b/extensions/copilot/src/platform/configuration/common/configurationService.ts
--- code-editor-src.orig/extensions/copilot/src/platform/configuration/common/configurationService.ts
+++ code-editor-src/extensions/copilot/src/platform/configuration/common/configurationService.ts
@@ -375,6 +375,12 @@ export const enum ConfigType {
export interface ConfigOptions {
readonly oldKey?: string;
Expand All @@ -119,10 +119,10 @@ Index: b/extensions/copilot/src/platform/configuration/common/configurationServi
export const DebugUseNodeFetchFetcher = defineSetting('advanced.debug.useNodeFetchFetcher', ConfigType.Simple, true);
export const DebugUseNodeFetcher = defineSetting('advanced.debug.useNodeFetcher', ConfigType.Simple, false);
export const DebugUseElectronFetcher = defineSetting('advanced.debug.useElectronFetcher', ConfigType.Simple, true);
Index: b/extensions/copilot/src/platform/configuration/vscode/configurationServiceImpl.ts
Index: code-editor-src/extensions/copilot/src/platform/configuration/vscode/configurationServiceImpl.ts
===================================================================
--- a/extensions/copilot/src/platform/configuration/vscode/configurationServiceImpl.ts
+++ b/extensions/copilot/src/platform/configuration/vscode/configurationServiceImpl.ts
--- code-editor-src.orig/extensions/copilot/src/platform/configuration/vscode/configurationServiceImpl.ts
+++ code-editor-src/extensions/copilot/src/platform/configuration/vscode/configurationServiceImpl.ts
@@ -57,7 +57,9 @@ export class ConfigurationServiceImpl ex
const config = scope === undefined ? this.config : vscode.workspace.getConfiguration(CopilotConfigPrefix, scope);

Expand Down
6 changes: 3 additions & 3 deletions patches/common/finding-override-anthropic-sdk.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Remove when upstream Code-OSS updates @anthropic-ai/sdk to >= 0.91.1.
@generator: scripts/patches/apply-override.sh --patch common/finding-override-anthropic-sdk.diff --override 'direct:@anthropic-ai/sdk=^0.91.1'
@override-package: @anthropic-ai/sdk@^0.91.1

Index: b/package.json
Index: code-editor-src/package.json
===================================================================
--- a/package.json
+++ b/package.json
--- code-editor-src.orig/package.json
+++ code-editor-src/package.json
@@ -82,7 +82,7 @@
"install-latest-component-explorer": "npm install @vscode/component-explorer@next @vscode/component-explorer-cli@next && cd build/rspack && npm install @vscode/component-explorer-webpack-plugin@next @vscode/component-explorer@next && cd ../vite && npm install @vscode/component-explorer-vite-plugin@next @vscode/component-explorer@next"
},
Expand Down
10 changes: 5 additions & 5 deletions patches/common/finding-override-axios.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ Remove when upstream Code-OSS updates axios to >= 1.18.0.
@generator: scripts/patches/apply-override.sh --patch common/finding-override-axios.diff --override 'global:axios=^1.18.0'
@override-package: axios@^1.18.0

Index: b/package.json
Index: code-editor-src/package.json
===================================================================
--- a/package.json
+++ b/package.json
--- code-editor-src.orig/package.json
+++ code-editor-src/package.json
@@ -254,7 +254,8 @@
},
"follow-redirects": "^1.16.0",
"uuid": "^14.0.0",
- "ip-address": "^10.1.1"
+ "ip-address": "^10.1.1",
- "ip-address": "^10.3.1"
+ "ip-address": "^10.3.1",
+ "axios": "^1.18.0"
},
"repository": {
Expand Down
Loading