From ddabf06975e18ecb2de6c7a0981d6dde5ac09886 Mon Sep 17 00:00:00 2001 From: Mark Kercso Date: Thu, 19 Mar 2026 09:30:29 +0000 Subject: [PATCH] Update undici Remove stale overrides --- LICENSE-THIRD-PARTY | 2 +- overrides/LICENSE-THIRD-PARTY | 2 +- .../sagemaker.series/package-lock.json | 8 ++-- .../sagemaker.series/remote/package-lock.json | 7 ++- .../package-lock.json | 8 ++-- .../remote/package-lock.json | 7 ++- .../web-embedded.series/package-lock.json | 8 ++-- .../remote/package-lock.json | 7 ++- .../web-server.series/package-lock.json | 8 ++-- .../remote/package-lock.json | 7 ++- patches/common/build.diff | 37 +++------------ patches/common/finding-overrides.diff | 46 +++++++++++++++++++ patches/sagemaker.series | 1 + patches/web-embedded-with-terminal.series | 1 + patches/web-embedded.series | 1 + patches/web-server.series | 1 + 16 files changed, 86 insertions(+), 65 deletions(-) create mode 100644 patches/common/finding-overrides.diff diff --git a/LICENSE-THIRD-PARTY b/LICENSE-THIRD-PARTY index 2ec75b2..66154d8 100644 --- a/LICENSE-THIRD-PARTY +++ b/LICENSE-THIRD-PARTY @@ -7162,7 +7162,7 @@ PERFORMANCE OF THIS SOFTWARE. ****************************** undici -7.19.0 +7.24.4 MIT License Copyright (c) Matteo Collina and Undici contributors diff --git a/overrides/LICENSE-THIRD-PARTY b/overrides/LICENSE-THIRD-PARTY index 2ec75b2..66154d8 100644 --- a/overrides/LICENSE-THIRD-PARTY +++ b/overrides/LICENSE-THIRD-PARTY @@ -7162,7 +7162,7 @@ PERFORMANCE OF THIS SOFTWARE. ****************************** undici -7.19.0 +7.24.4 MIT License Copyright (c) Matteo Collina and Undici contributors diff --git a/package-lock-overrides/sagemaker.series/package-lock.json b/package-lock-overrides/sagemaker.series/package-lock.json index 049ccea..c5a7188 100644 --- a/package-lock-overrides/sagemaker.series/package-lock.json +++ b/package-lock-overrides/sagemaker.series/package-lock.json @@ -52,7 +52,7 @@ "open": "^10.1.2", "playwright-core": "1.59.0-alpha-2026-02-20", "tas-client": "0.3.1", - "undici": "^7.18.2", + "undici": "^7.24.0", "v8-inspect-profiler": "^0.1.1", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", @@ -20791,9 +20791,9 @@ "dev": true }, "node_modules/undici": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.19.0.tgz", - "integrity": "sha512-Heho1hJD81YChi+uS2RkSjcVO+EQLmLSyUlHyp7Y/wFbxQaGb4WXVKD073JytrjXJVkSZVzoE2MCSOKugFGtOQ==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.4.tgz", + "integrity": "sha512-BM/JzwwaRXxrLdElV2Uo6cTLEjhSb3WXboncJamZ15NgUURmvlXvxa6xkwIOILIjPNo9i8ku136ZvWV0Uly8+w==", "license": "MIT", "engines": { "node": ">=20.18.1" diff --git a/package-lock-overrides/sagemaker.series/remote/package-lock.json b/package-lock-overrides/sagemaker.series/remote/package-lock.json index b18b820..113646b 100644 --- a/package-lock-overrides/sagemaker.series/remote/package-lock.json +++ b/package-lock-overrides/sagemaker.series/remote/package-lock.json @@ -41,7 +41,6 @@ "minimist": "^1.2.8", "node-pty": "^1.2.0-beta.10", "tas-client": "0.3.1", - "undici": "^7.18.2", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "^9.3.2", @@ -1088,9 +1087,9 @@ "license": "MIT" }, "node_modules/undici": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.19.1.tgz", - "integrity": "sha512-Gpq0iNm5M6cQWlyHQv9MV+uOj1jWk7LpkoE5vSp/7zjb4zMdAcUD+VL5y0nH4p9EbUklq00eVIIX/XcDHzu5xg==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.4.tgz", + "integrity": "sha512-BM/JzwwaRXxrLdElV2Uo6cTLEjhSb3WXboncJamZ15NgUURmvlXvxa6xkwIOILIjPNo9i8ku136ZvWV0Uly8+w==", "license": "MIT", "engines": { "node": ">=20.18.1" diff --git a/package-lock-overrides/web-embedded-with-terminal.series/package-lock.json b/package-lock-overrides/web-embedded-with-terminal.series/package-lock.json index e44032c..1bbaeb0 100644 --- a/package-lock-overrides/web-embedded-with-terminal.series/package-lock.json +++ b/package-lock-overrides/web-embedded-with-terminal.series/package-lock.json @@ -51,7 +51,7 @@ "open": "^10.1.2", "playwright-core": "1.59.0-alpha-2026-02-20", "tas-client": "0.3.1", - "undici": "^7.18.2", + "undici": "^7.24.0", "v8-inspect-profiler": "^0.1.1", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", @@ -20754,9 +20754,9 @@ "dev": true }, "node_modules/undici": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.19.0.tgz", - "integrity": "sha512-Heho1hJD81YChi+uS2RkSjcVO+EQLmLSyUlHyp7Y/wFbxQaGb4WXVKD073JytrjXJVkSZVzoE2MCSOKugFGtOQ==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.4.tgz", + "integrity": "sha512-BM/JzwwaRXxrLdElV2Uo6cTLEjhSb3WXboncJamZ15NgUURmvlXvxa6xkwIOILIjPNo9i8ku136ZvWV0Uly8+w==", "license": "MIT", "engines": { "node": ">=20.18.1" diff --git a/package-lock-overrides/web-embedded-with-terminal.series/remote/package-lock.json b/package-lock-overrides/web-embedded-with-terminal.series/remote/package-lock.json index 5f3ff33..3c2c171 100644 --- a/package-lock-overrides/web-embedded-with-terminal.series/remote/package-lock.json +++ b/package-lock-overrides/web-embedded-with-terminal.series/remote/package-lock.json @@ -40,7 +40,6 @@ "minimist": "^1.2.8", "node-pty": "^1.2.0-beta.10", "tas-client": "0.3.1", - "undici": "^7.18.2", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "^9.3.2", @@ -1041,9 +1040,9 @@ "license": "MIT" }, "node_modules/undici": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.19.1.tgz", - "integrity": "sha512-Gpq0iNm5M6cQWlyHQv9MV+uOj1jWk7LpkoE5vSp/7zjb4zMdAcUD+VL5y0nH4p9EbUklq00eVIIX/XcDHzu5xg==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.4.tgz", + "integrity": "sha512-BM/JzwwaRXxrLdElV2Uo6cTLEjhSb3WXboncJamZ15NgUURmvlXvxa6xkwIOILIjPNo9i8ku136ZvWV0Uly8+w==", "license": "MIT", "engines": { "node": ">=20.18.1" diff --git a/package-lock-overrides/web-embedded.series/package-lock.json b/package-lock-overrides/web-embedded.series/package-lock.json index e44032c..1bbaeb0 100644 --- a/package-lock-overrides/web-embedded.series/package-lock.json +++ b/package-lock-overrides/web-embedded.series/package-lock.json @@ -51,7 +51,7 @@ "open": "^10.1.2", "playwright-core": "1.59.0-alpha-2026-02-20", "tas-client": "0.3.1", - "undici": "^7.18.2", + "undici": "^7.24.0", "v8-inspect-profiler": "^0.1.1", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", @@ -20754,9 +20754,9 @@ "dev": true }, "node_modules/undici": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.19.0.tgz", - "integrity": "sha512-Heho1hJD81YChi+uS2RkSjcVO+EQLmLSyUlHyp7Y/wFbxQaGb4WXVKD073JytrjXJVkSZVzoE2MCSOKugFGtOQ==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.4.tgz", + "integrity": "sha512-BM/JzwwaRXxrLdElV2Uo6cTLEjhSb3WXboncJamZ15NgUURmvlXvxa6xkwIOILIjPNo9i8ku136ZvWV0Uly8+w==", "license": "MIT", "engines": { "node": ">=20.18.1" diff --git a/package-lock-overrides/web-embedded.series/remote/package-lock.json b/package-lock-overrides/web-embedded.series/remote/package-lock.json index 5f3ff33..3c2c171 100644 --- a/package-lock-overrides/web-embedded.series/remote/package-lock.json +++ b/package-lock-overrides/web-embedded.series/remote/package-lock.json @@ -40,7 +40,6 @@ "minimist": "^1.2.8", "node-pty": "^1.2.0-beta.10", "tas-client": "0.3.1", - "undici": "^7.18.2", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "^9.3.2", @@ -1041,9 +1040,9 @@ "license": "MIT" }, "node_modules/undici": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.19.1.tgz", - "integrity": "sha512-Gpq0iNm5M6cQWlyHQv9MV+uOj1jWk7LpkoE5vSp/7zjb4zMdAcUD+VL5y0nH4p9EbUklq00eVIIX/XcDHzu5xg==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.4.tgz", + "integrity": "sha512-BM/JzwwaRXxrLdElV2Uo6cTLEjhSb3WXboncJamZ15NgUURmvlXvxa6xkwIOILIjPNo9i8ku136ZvWV0Uly8+w==", "license": "MIT", "engines": { "node": ">=20.18.1" diff --git a/package-lock-overrides/web-server.series/package-lock.json b/package-lock-overrides/web-server.series/package-lock.json index 8f76c95..0365c49 100644 --- a/package-lock-overrides/web-server.series/package-lock.json +++ b/package-lock-overrides/web-server.series/package-lock.json @@ -52,7 +52,7 @@ "open": "^10.1.2", "playwright-core": "1.59.0-alpha-2026-02-20", "tas-client": "0.3.1", - "undici": "^7.18.2", + "undici": "^7.24.0", "v8-inspect-profiler": "^0.1.1", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", @@ -20805,9 +20805,9 @@ "dev": true }, "node_modules/undici": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.19.0.tgz", - "integrity": "sha512-Heho1hJD81YChi+uS2RkSjcVO+EQLmLSyUlHyp7Y/wFbxQaGb4WXVKD073JytrjXJVkSZVzoE2MCSOKugFGtOQ==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.4.tgz", + "integrity": "sha512-BM/JzwwaRXxrLdElV2Uo6cTLEjhSb3WXboncJamZ15NgUURmvlXvxa6xkwIOILIjPNo9i8ku136ZvWV0Uly8+w==", "license": "MIT", "engines": { "node": ">=20.18.1" diff --git a/package-lock-overrides/web-server.series/remote/package-lock.json b/package-lock-overrides/web-server.series/remote/package-lock.json index b18b820..113646b 100644 --- a/package-lock-overrides/web-server.series/remote/package-lock.json +++ b/package-lock-overrides/web-server.series/remote/package-lock.json @@ -41,7 +41,6 @@ "minimist": "^1.2.8", "node-pty": "^1.2.0-beta.10", "tas-client": "0.3.1", - "undici": "^7.18.2", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "^9.3.2", @@ -1088,9 +1087,9 @@ "license": "MIT" }, "node_modules/undici": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.19.1.tgz", - "integrity": "sha512-Gpq0iNm5M6cQWlyHQv9MV+uOj1jWk7LpkoE5vSp/7zjb4zMdAcUD+VL5y0nH4p9EbUklq00eVIIX/XcDHzu5xg==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.4.tgz", + "integrity": "sha512-BM/JzwwaRXxrLdElV2Uo6cTLEjhSb3WXboncJamZ15NgUURmvlXvxa6xkwIOILIjPNo9i8ku136ZvWV0Uly8+w==", "license": "MIT", "engines": { "node": ">=20.18.1" diff --git a/patches/common/build.diff b/patches/common/build.diff index d9e1073..7f66ad7 100644 --- a/patches/common/build.diff +++ b/patches/common/build.diff @@ -26,34 +26,13 @@ Index: code-editor-src/package.json "minimist": "^1.2.8", "native-is-elevated": "0.9.0", "native-keymap": "^3.3.5", -@@ -174,7 +173,7 @@ - "css-loader": "^6.9.1", - "debounce": "^1.0.0", - "deemon": "^1.13.6", -- "electron": "39.6.0", -+ "electron": "40.6.0", - "eslint": "^9.36.0", - "eslint-formatter-compact": "^8.40.0", - "eslint-plugin-header": "3.1.1", -@@ -238,9 +237,19 @@ +@@ -238,9 +237,6 @@ }, "overrides": { "node-gyp-build": "4.8.1", - "kerberos@2.1.1": { - "node-addon-api": "7.1.0" -+ "@types/node-fetch@^2.5.12": { -+ "form-data": "^3.0.4" - }, -+ "@azure/core-http@^2.3.2": { -+ "form-data": "^4.0.4" -+ }, -+ "braces": "^3.0.3", -+ "@vscode/test-web": { -+ "tar-fs": "^3.1.1", -+ "koa": "^3.0.3" -+ }, -+ "postcss": "^8.4.31", -+ "playwright": "^1.55.1", +- }, "serialize-javascript": "^7.0.3" }, "repository": { @@ -61,7 +40,7 @@ Index: code-editor-src/remote/package.json =================================================================== --- code-editor-src.orig/remote/package.json +++ code-editor-src/remote/package.json -@@ -32,10 +32,10 @@ +@@ -32,7 +32,6 @@ "https-proxy-agent": "^7.0.2", "jschardet": "3.1.4", "katex": "^0.16.22", @@ -69,18 +48,14 @@ Index: code-editor-src/remote/package.json "minimist": "^1.2.8", "node-pty": "^1.2.0-beta.10", "tas-client": "0.3.1", -+ "undici": "^7.18.2", - "vscode-oniguruma": "1.7.0", - "vscode-regexpp": "^3.1.0", - "vscode-textmate": "^9.3.2", -@@ -44,8 +44,6 @@ +@@ -44,8 +43,5 @@ }, "overrides": { - "node-gyp-build": "4.8.1", +- "node-gyp-build": "4.8.1", - "kerberos@2.1.1": { - "node-addon-api": "7.1.0" - } -+ "@tootallnate/once": "^3.0.1" ++ "node-gyp-build": "4.8.1" } } Index: code-editor-src/build/lib/mangle/index.ts diff --git a/patches/common/finding-overrides.diff b/patches/common/finding-overrides.diff new file mode 100644 index 0000000..f005230 --- /dev/null +++ b/patches/common/finding-overrides.diff @@ -0,0 +1,46 @@ +Addresses npm dependency updates related to findings via version updates and overrides. + +Index: code-editor-src/package.json +=================================================================== +--- code-editor-src.orig/package.json ++++ code-editor-src/package.json +@@ -121,7 +121,7 @@ + "open": "^10.1.2", + "playwright-core": "1.59.0-alpha-2026-02-20", + "tas-client": "0.3.1", +- "undici": "^7.18.2", ++ "undici": "^7.24.0", + "v8-inspect-profiler": "^0.1.1", + "vscode-oniguruma": "1.7.0", + "vscode-regexpp": "^3.1.0", +@@ -173,7 +173,7 @@ + "css-loader": "^6.9.1", + "debounce": "^1.0.0", + "deemon": "^1.13.6", +- "electron": "39.6.0", ++ "electron": "40.6.0", + "eslint": "^9.36.0", + "eslint-formatter-compact": "^8.40.0", + "eslint-plugin-header": "3.1.1", +@@ -236,6 +236,9 @@ + "yaserver": "^0.4.0" + }, + "overrides": { ++ "braces": "^3.0.3", ++ "postcss": "^8.4.31", ++ "@tootallnate/once": "^3.0.1", + "node-gyp-build": "4.8.1", + "serialize-javascript": "^7.0.3" + }, +Index: code-editor-src/remote/package.json +=================================================================== +--- code-editor-src.orig/remote/package.json ++++ code-editor-src/remote/package.json +@@ -42,6 +42,7 @@ + "yazl": "^2.4.3" + }, + "overrides": { ++ "undici": "^7.24.0", + "node-gyp-build": "4.8.1" + } + } diff --git a/patches/sagemaker.series b/patches/sagemaker.series index 927fa67..a69b7cc 100644 --- a/patches/sagemaker.series +++ b/patches/sagemaker.series @@ -17,6 +17,7 @@ common/proposed-api.diff common/build.diff common/integration.diff common/fix-ts-rootdir-webpack.diff +common/finding-overrides.diff common/fix-chat-debug-editor-visibility.diff web-server/suppress-known-errors-build-integration.diff web-server/local-storage.diff diff --git a/patches/web-embedded-with-terminal.series b/patches/web-embedded-with-terminal.series index f6dd3b3..a3a4648 100644 --- a/patches/web-embedded-with-terminal.series +++ b/patches/web-embedded-with-terminal.series @@ -17,6 +17,7 @@ common/proposed-api.diff common/build.diff common/integration.diff common/fix-ts-rootdir-webpack.diff +common/finding-overrides.diff common/fix-chat-debug-editor-visibility.diff web-embedded/readd-workbench.diff web-embedded/suppress-known-errors-build-integration.diff diff --git a/patches/web-embedded.series b/patches/web-embedded.series index c08d750..eddad32 100644 --- a/patches/web-embedded.series +++ b/patches/web-embedded.series @@ -17,6 +17,7 @@ common/proposed-api.diff common/build.diff common/integration.diff common/fix-ts-rootdir-webpack.diff +common/finding-overrides.diff common/fix-chat-debug-editor-visibility.diff web-embedded/readd-workbench.diff web-embedded/suppress-known-errors-build-integration.diff diff --git a/patches/web-server.series b/patches/web-server.series index 437755b..8530794 100644 --- a/patches/web-server.series +++ b/patches/web-server.series @@ -17,6 +17,7 @@ common/proposed-api.diff common/build.diff common/integration.diff common/fix-ts-rootdir-webpack.diff +common/finding-overrides.diff common/fix-chat-debug-editor-visibility.diff web-server/suppress-known-errors-build-integration.diff web-server/local-storage.diff