From 18fa7bc46ae08bf5a88ecbc7117f396ac88500e7 Mon Sep 17 00:00:00 2001 From: Chunqiu Lu Date: Mon, 26 Jan 2026 15:46:25 +0100 Subject: [PATCH 01/24] update sqlite3 (#114) --- LICENSE-THIRD-PARTY | 284 +++++++++++++----- overrides/LICENSE-THIRD-PARTY | 284 +++++++++++++----- .../sagemaker.series/package-lock.json | 113 +------ .../package-lock.json | 113 +------ .../web-embedded.series/package-lock.json | 113 +------ .../web-server.series/package-lock.json | 113 +------ patches/common/build.diff | 9 + 7 files changed, 449 insertions(+), 580 deletions(-) diff --git a/LICENSE-THIRD-PARTY b/LICENSE-THIRD-PARTY index 0dda330..4d94145 100644 --- a/LICENSE-THIRD-PARTY +++ b/LICENSE-THIRD-PARTY @@ -3588,6 +3588,27 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------- +@isaacs/fs-minipass +4.0.1 +The ISC License + +Copyright (c) Isaac Z. Schlueter and Contributors + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +****************************** + @microsoft/1ds-core-js 3.2.13 The MIT License (MIT) @@ -3962,7 +3983,7 @@ THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI ****************************** @vscode/sqlite3 -5.1.8-vscode +5.1.12-vscode Copyright (c) MapBox All rights reserved. @@ -4476,22 +4497,70 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL ****************************** chownr -2.0.0 -The ISC License +3.0.0 +All packages under `src/` are licensed according to the terms in +their respective `LICENSE` or `LICENSE.md` files. -Copyright (c) Isaac Z. Schlueter and Contributors +The remainder of this project is licensed under the Blue Oak +Model License, as follows: -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. +----- -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# Blue Oak Model License + +Version 1.0.0 + +## Purpose + +This license gives everyone as much permission to work with +this software as possible, while protecting contributors +from liability. + +## Acceptance + +In order to receive this license, you must agree to its +rules. The rules of this license are both obligations +under that agreement and conditions to your license. +You must not do anything with this software that triggers +a rule that you cannot or will not follow. + +## Copyright + +Each contributor licenses you to do everything with this +software that would otherwise infringe that contributor's +copyright in it. + +## Notices + +You must ensure that everyone who gets a copy of +any part of this software from you, with or without +changes, also gets the text of this license or a link to +. + +## Excuse + +If anyone notifies you in writing that you have not +complied with [Notices](#notices), you can keep your +license by taking all practical steps to comply within 30 +days after the notice. If you do not do so, your license +ends immediately. + +## Patent + +Each contributor licenses you to do everything with this +software that would otherwise infringe any patent claims +they can license or become able to license. + +## Reliability + +No contributor can revoke this license. + +## No Liability + +***As far as the law allows, this software comes as is, +without any warranty or condition, and no contributor +will be liable to anyone for any damages related to this +software or this license, under any kind of legal claim.*** ****************************** @@ -5026,27 +5095,6 @@ OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHE ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -****************************** - -fs-minipass -2.1.0 -The ISC License - -Copyright (c) Isaac Z. Schlueter and Contributors - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - ****************************** get-system-fonts @@ -6000,28 +6048,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************** minipass -3.3.6 -The ISC License - -Copyright (c) 2017-2022 npm, Inc., Isaac Z. Schlueter, and Contributors - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - -****************************** - -minipass -5.0.0 +7.1.2 The ISC License Copyright (c) 2017-2023 npm, Inc., Isaac Z. Schlueter, and Contributors @@ -6042,14 +6069,14 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ****************************** minizlib -2.1.2 +3.1.0 Minizlib was created by Isaac Z. Schlueter. It is a derivative work of the Node.js project. """ -Copyright Isaac Z. Schlueter and Contributors -Copyright Node.js contributors. All rights reserved. -Copyright Joyent, Inc. and other Node contributors. All rights reserved. +Copyright (c) 2017-2023 Isaac Z. Schlueter and Contributors +Copyright (c) 2017-2023 Node.js contributors. All rights reserved. +Copyright (c) 2017-2023 Joyent, Inc. and other Node contributors. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -6596,22 +6623,62 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ****************************** tar -6.2.1 -The ISC License +7.5.6 +# Blue Oak Model License -Copyright (c) Isaac Z. Schlueter and Contributors +Version 1.0.0 -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. +## Purpose -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +This license gives everyone as much permission to work with +this software as possible, while protecting contributors +from liability. + +## Acceptance + +In order to receive this license, you must agree to its +rules. The rules of this license are both obligations +under that agreement and conditions to your license. +You must not do anything with this software that triggers +a rule that you cannot or will not follow. + +## Copyright + +Each contributor licenses you to do everything with this +software that would otherwise infringe that contributor's +copyright in it. + +## Notices + +You must ensure that everyone who gets a copy of +any part of this software from you, with or without +changes, also gets the text of this license or a link to +. + +## Excuse + +If anyone notifies you in writing that you have not +complied with [Notices](#notices), you can keep your +license by taking all practical steps to comply within 30 +days after the notice. If you do not do so, your license +ends immediately. + +## Patent + +Each contributor licenses you to do everything with this +software that would otherwise infringe any patent claims +they can license or become able to license. + +## Reliability + +No contributor can revoke this license. + +## No Liability + +***As far as the law allows, this software comes as is, +without any warranty or condition, and no contributor +will be liable to anyone for any damages related to this +software or this license, under any kind of legal claim.*** ****************************** @@ -6967,6 +7034,75 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +****************************** + +yallist +5.0.0 +All packages under `src/` are licensed according to the terms in +their respective `LICENSE` or `LICENSE.md` files. + +The remainder of this project is licensed under the Blue Oak +Model License, as follows: + +----- + +# Blue Oak Model License + +Version 1.0.0 + +## Purpose + +This license gives everyone as much permission to work with +this software as possible, while protecting contributors +from liability. + +## Acceptance + +In order to receive this license, you must agree to its +rules. The rules of this license are both obligations +under that agreement and conditions to your license. +You must not do anything with this software that triggers +a rule that you cannot or will not follow. + +## Copyright + +Each contributor licenses you to do everything with this +software that would otherwise infringe that contributor's +copyright in it. + +## Notices + +You must ensure that everyone who gets a copy of +any part of this software from you, with or without +changes, also gets the text of this license or a link to +. + +## Excuse + +If anyone notifies you in writing that you have not +complied with [Notices](#notices), you can keep your +license by taking all practical steps to comply within 30 +days after the notice. If you do not do so, your license +ends immediately. + +## Patent + +Each contributor licenses you to do everything with this +software that would otherwise infringe any patent claims +they can license or become able to license. + +## Reliability + +No contributor can revoke this license. + +## No Liability + +***As far as the law allows, this software comes as is, +without any warranty or condition, and no contributor +will be liable to anyone for any damages related to this +software or this license, under any kind of legal claim.*** + + ****************************** yauzl diff --git a/overrides/LICENSE-THIRD-PARTY b/overrides/LICENSE-THIRD-PARTY index 0dda330..4d94145 100644 --- a/overrides/LICENSE-THIRD-PARTY +++ b/overrides/LICENSE-THIRD-PARTY @@ -3588,6 +3588,27 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------- +@isaacs/fs-minipass +4.0.1 +The ISC License + +Copyright (c) Isaac Z. Schlueter and Contributors + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +****************************** + @microsoft/1ds-core-js 3.2.13 The MIT License (MIT) @@ -3962,7 +3983,7 @@ THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI ****************************** @vscode/sqlite3 -5.1.8-vscode +5.1.12-vscode Copyright (c) MapBox All rights reserved. @@ -4476,22 +4497,70 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL ****************************** chownr -2.0.0 -The ISC License +3.0.0 +All packages under `src/` are licensed according to the terms in +their respective `LICENSE` or `LICENSE.md` files. -Copyright (c) Isaac Z. Schlueter and Contributors +The remainder of this project is licensed under the Blue Oak +Model License, as follows: -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. +----- -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# Blue Oak Model License + +Version 1.0.0 + +## Purpose + +This license gives everyone as much permission to work with +this software as possible, while protecting contributors +from liability. + +## Acceptance + +In order to receive this license, you must agree to its +rules. The rules of this license are both obligations +under that agreement and conditions to your license. +You must not do anything with this software that triggers +a rule that you cannot or will not follow. + +## Copyright + +Each contributor licenses you to do everything with this +software that would otherwise infringe that contributor's +copyright in it. + +## Notices + +You must ensure that everyone who gets a copy of +any part of this software from you, with or without +changes, also gets the text of this license or a link to +. + +## Excuse + +If anyone notifies you in writing that you have not +complied with [Notices](#notices), you can keep your +license by taking all practical steps to comply within 30 +days after the notice. If you do not do so, your license +ends immediately. + +## Patent + +Each contributor licenses you to do everything with this +software that would otherwise infringe any patent claims +they can license or become able to license. + +## Reliability + +No contributor can revoke this license. + +## No Liability + +***As far as the law allows, this software comes as is, +without any warranty or condition, and no contributor +will be liable to anyone for any damages related to this +software or this license, under any kind of legal claim.*** ****************************** @@ -5026,27 +5095,6 @@ OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHE ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -****************************** - -fs-minipass -2.1.0 -The ISC License - -Copyright (c) Isaac Z. Schlueter and Contributors - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - ****************************** get-system-fonts @@ -6000,28 +6048,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************** minipass -3.3.6 -The ISC License - -Copyright (c) 2017-2022 npm, Inc., Isaac Z. Schlueter, and Contributors - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - -****************************** - -minipass -5.0.0 +7.1.2 The ISC License Copyright (c) 2017-2023 npm, Inc., Isaac Z. Schlueter, and Contributors @@ -6042,14 +6069,14 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ****************************** minizlib -2.1.2 +3.1.0 Minizlib was created by Isaac Z. Schlueter. It is a derivative work of the Node.js project. """ -Copyright Isaac Z. Schlueter and Contributors -Copyright Node.js contributors. All rights reserved. -Copyright Joyent, Inc. and other Node contributors. All rights reserved. +Copyright (c) 2017-2023 Isaac Z. Schlueter and Contributors +Copyright (c) 2017-2023 Node.js contributors. All rights reserved. +Copyright (c) 2017-2023 Joyent, Inc. and other Node contributors. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -6596,22 +6623,62 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ****************************** tar -6.2.1 -The ISC License +7.5.6 +# Blue Oak Model License -Copyright (c) Isaac Z. Schlueter and Contributors +Version 1.0.0 -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. +## Purpose -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +This license gives everyone as much permission to work with +this software as possible, while protecting contributors +from liability. + +## Acceptance + +In order to receive this license, you must agree to its +rules. The rules of this license are both obligations +under that agreement and conditions to your license. +You must not do anything with this software that triggers +a rule that you cannot or will not follow. + +## Copyright + +Each contributor licenses you to do everything with this +software that would otherwise infringe that contributor's +copyright in it. + +## Notices + +You must ensure that everyone who gets a copy of +any part of this software from you, with or without +changes, also gets the text of this license or a link to +. + +## Excuse + +If anyone notifies you in writing that you have not +complied with [Notices](#notices), you can keep your +license by taking all practical steps to comply within 30 +days after the notice. If you do not do so, your license +ends immediately. + +## Patent + +Each contributor licenses you to do everything with this +software that would otherwise infringe any patent claims +they can license or become able to license. + +## Reliability + +No contributor can revoke this license. + +## No Liability + +***As far as the law allows, this software comes as is, +without any warranty or condition, and no contributor +will be liable to anyone for any damages related to this +software or this license, under any kind of legal claim.*** ****************************** @@ -6967,6 +7034,75 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +****************************** + +yallist +5.0.0 +All packages under `src/` are licensed according to the terms in +their respective `LICENSE` or `LICENSE.md` files. + +The remainder of this project is licensed under the Blue Oak +Model License, as follows: + +----- + +# Blue Oak Model License + +Version 1.0.0 + +## Purpose + +This license gives everyone as much permission to work with +this software as possible, while protecting contributors +from liability. + +## Acceptance + +In order to receive this license, you must agree to its +rules. The rules of this license are both obligations +under that agreement and conditions to your license. +You must not do anything with this software that triggers +a rule that you cannot or will not follow. + +## Copyright + +Each contributor licenses you to do everything with this +software that would otherwise infringe that contributor's +copyright in it. + +## Notices + +You must ensure that everyone who gets a copy of +any part of this software from you, with or without +changes, also gets the text of this license or a link to +. + +## Excuse + +If anyone notifies you in writing that you have not +complied with [Notices](#notices), you can keep your +license by taking all practical steps to comply within 30 +days after the notice. If you do not do so, your license +ends immediately. + +## Patent + +Each contributor licenses you to do everything with this +software that would otherwise infringe any patent claims +they can license or become able to license. + +## Reliability + +No contributor can revoke this license. + +## No Liability + +***As far as the law allows, this software comes as is, +without any warranty or condition, and no contributor +will be liable to anyone for any damages related to this +software or this license, under any kind of legal claim.*** + + ****************************** yauzl diff --git a/package-lock-overrides/sagemaker.series/package-lock.json b/package-lock-overrides/sagemaker.series/package-lock.json index 9a165ed..8061506 100644 --- a/package-lock-overrides/sagemaker.series/package-lock.json +++ b/package-lock-overrides/sagemaker.series/package-lock.json @@ -20,7 +20,7 @@ "@vscode/proxy-agent": "^0.32.0", "@vscode/ripgrep": "^1.15.11", "@vscode/spdlog": "^0.15.2", - "@vscode/sqlite3": "5.1.8-vscode", + "@vscode/sqlite3": "5.1.12-vscode", "@vscode/sudo-prompt": "9.3.1", "@vscode/tree-sitter-wasm": "^0.1.4", "@vscode/vscode-languagedetection": "1.0.21", @@ -1226,7 +1226,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", - "dev": true, "license": "ISC", "dependencies": { "minipass": "^7.0.4" @@ -2752,57 +2751,14 @@ } }, "node_modules/@vscode/sqlite3": { - "version": "5.1.8-vscode", - "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.8-vscode.tgz", - "integrity": "sha512-9Ku18yZej1kxS7mh6dhCWxkCof043HljcLIdq+RRJr65QdOeAqPOUJ2i6qXRL63l1Kd72uXV/zLA2SBwhfgiOw==", + "version": "5.1.12-vscode", + "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.12-vscode.tgz", + "integrity": "sha512-WLTftbMtK3Ni0s+q46qtKJ2CFtA3YrS5N4GcrETDCxqNTQAvk1LlYlG3RwGE6vZLcUqPt3TCHobijYeNUhEQ9Q==", "hasInstallScript": true, "license": "BSD-3-Clause", "dependencies": { "node-addon-api": "^8.2.0", - "tar": "^6.1.11" - } - }, - "node_modules/@vscode/sqlite3/node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/@vscode/sqlite3/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/@vscode/sqlite3/node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "license": "MIT", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@vscode/sqlite3/node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" + "tar": "^7.5.4" } }, "node_modules/@vscode/sqlite3/node_modules/node-addon-api": { @@ -2814,30 +2770,6 @@ "node": "^18 || ^20 || >= 21" } }, - "node_modules/@vscode/sqlite3/node_modules/tar": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me", - "license": "ISC", - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@vscode/sqlite3/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" - }, "node_modules/@vscode/sudo-prompt": { "version": "9.3.1", "resolved": "https://registry.npmjs.org/@vscode/sudo-prompt/-/sudo-prompt-9.3.1.tgz", @@ -4521,7 +4453,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", - "dev": true, "license": "BlueOak-1.0.0", "engines": { "node": ">=18" @@ -7229,36 +7160,6 @@ "node": ">=14.14" } }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs-minipass/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/fs-minipass/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" - }, "node_modules/fs-mkdirp-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", @@ -11413,7 +11314,6 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -11423,7 +11323,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", - "dev": true, "license": "MIT", "dependencies": { "minipass": "^7.1.2" @@ -15403,7 +15302,6 @@ "version": "7.5.6", "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.6.tgz", "integrity": "sha512-xqUeu2JAIJpXyvskvU3uvQW8PAmHrtXp2KDuMJwQqW8Sqq0CaZBAQ+dKS3RBXVhU4wC5NjAdKrmh84241gO9cA==", - "dev": true, "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", @@ -15458,7 +15356,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", - "dev": true, "license": "BlueOak-1.0.0", "engines": { "node": ">=18" 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 9d95df0..a5e5c90 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 @@ -20,7 +20,7 @@ "@vscode/proxy-agent": "^0.32.0", "@vscode/ripgrep": "^1.15.11", "@vscode/spdlog": "^0.15.2", - "@vscode/sqlite3": "5.1.8-vscode", + "@vscode/sqlite3": "5.1.12-vscode", "@vscode/sudo-prompt": "9.3.1", "@vscode/tree-sitter-wasm": "^0.1.4", "@vscode/vscode-languagedetection": "1.0.21", @@ -1224,7 +1224,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", - "dev": true, "license": "ISC", "dependencies": { "minipass": "^7.0.4" @@ -2740,57 +2739,14 @@ } }, "node_modules/@vscode/sqlite3": { - "version": "5.1.8-vscode", - "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.8-vscode.tgz", - "integrity": "sha512-9Ku18yZej1kxS7mh6dhCWxkCof043HljcLIdq+RRJr65QdOeAqPOUJ2i6qXRL63l1Kd72uXV/zLA2SBwhfgiOw==", + "version": "5.1.12-vscode", + "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.12-vscode.tgz", + "integrity": "sha512-WLTftbMtK3Ni0s+q46qtKJ2CFtA3YrS5N4GcrETDCxqNTQAvk1LlYlG3RwGE6vZLcUqPt3TCHobijYeNUhEQ9Q==", "hasInstallScript": true, "license": "BSD-3-Clause", "dependencies": { "node-addon-api": "^8.2.0", - "tar": "^6.1.11" - } - }, - "node_modules/@vscode/sqlite3/node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/@vscode/sqlite3/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/@vscode/sqlite3/node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "license": "MIT", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@vscode/sqlite3/node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" + "tar": "^7.5.4" } }, "node_modules/@vscode/sqlite3/node_modules/node-addon-api": { @@ -2802,30 +2758,6 @@ "node": "^18 || ^20 || >= 21" } }, - "node_modules/@vscode/sqlite3/node_modules/tar": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me", - "license": "ISC", - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@vscode/sqlite3/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" - }, "node_modules/@vscode/sudo-prompt": { "version": "9.3.1", "resolved": "https://registry.npmjs.org/@vscode/sudo-prompt/-/sudo-prompt-9.3.1.tgz", @@ -4522,7 +4454,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", - "dev": true, "license": "BlueOak-1.0.0", "engines": { "node": ">=18" @@ -7207,36 +7138,6 @@ "node": ">=14.14" } }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs-minipass/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/fs-minipass/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" - }, "node_modules/fs-mkdirp-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", @@ -11377,7 +11278,6 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -11387,7 +11287,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", - "dev": true, "license": "MIT", "dependencies": { "minipass": "^7.1.2" @@ -15369,7 +15268,6 @@ "version": "7.5.6", "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.6.tgz", "integrity": "sha512-xqUeu2JAIJpXyvskvU3uvQW8PAmHrtXp2KDuMJwQqW8Sqq0CaZBAQ+dKS3RBXVhU4wC5NjAdKrmh84241gO9cA==", - "dev": true, "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", @@ -15424,7 +15322,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", - "dev": true, "license": "BlueOak-1.0.0", "engines": { "node": ">=18" diff --git a/package-lock-overrides/web-embedded.series/package-lock.json b/package-lock-overrides/web-embedded.series/package-lock.json index 9d95df0..a5e5c90 100644 --- a/package-lock-overrides/web-embedded.series/package-lock.json +++ b/package-lock-overrides/web-embedded.series/package-lock.json @@ -20,7 +20,7 @@ "@vscode/proxy-agent": "^0.32.0", "@vscode/ripgrep": "^1.15.11", "@vscode/spdlog": "^0.15.2", - "@vscode/sqlite3": "5.1.8-vscode", + "@vscode/sqlite3": "5.1.12-vscode", "@vscode/sudo-prompt": "9.3.1", "@vscode/tree-sitter-wasm": "^0.1.4", "@vscode/vscode-languagedetection": "1.0.21", @@ -1224,7 +1224,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", - "dev": true, "license": "ISC", "dependencies": { "minipass": "^7.0.4" @@ -2740,57 +2739,14 @@ } }, "node_modules/@vscode/sqlite3": { - "version": "5.1.8-vscode", - "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.8-vscode.tgz", - "integrity": "sha512-9Ku18yZej1kxS7mh6dhCWxkCof043HljcLIdq+RRJr65QdOeAqPOUJ2i6qXRL63l1Kd72uXV/zLA2SBwhfgiOw==", + "version": "5.1.12-vscode", + "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.12-vscode.tgz", + "integrity": "sha512-WLTftbMtK3Ni0s+q46qtKJ2CFtA3YrS5N4GcrETDCxqNTQAvk1LlYlG3RwGE6vZLcUqPt3TCHobijYeNUhEQ9Q==", "hasInstallScript": true, "license": "BSD-3-Clause", "dependencies": { "node-addon-api": "^8.2.0", - "tar": "^6.1.11" - } - }, - "node_modules/@vscode/sqlite3/node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/@vscode/sqlite3/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/@vscode/sqlite3/node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "license": "MIT", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@vscode/sqlite3/node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" + "tar": "^7.5.4" } }, "node_modules/@vscode/sqlite3/node_modules/node-addon-api": { @@ -2802,30 +2758,6 @@ "node": "^18 || ^20 || >= 21" } }, - "node_modules/@vscode/sqlite3/node_modules/tar": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me", - "license": "ISC", - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@vscode/sqlite3/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" - }, "node_modules/@vscode/sudo-prompt": { "version": "9.3.1", "resolved": "https://registry.npmjs.org/@vscode/sudo-prompt/-/sudo-prompt-9.3.1.tgz", @@ -4522,7 +4454,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", - "dev": true, "license": "BlueOak-1.0.0", "engines": { "node": ">=18" @@ -7207,36 +7138,6 @@ "node": ">=14.14" } }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs-minipass/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/fs-minipass/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" - }, "node_modules/fs-mkdirp-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", @@ -11377,7 +11278,6 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -11387,7 +11287,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", - "dev": true, "license": "MIT", "dependencies": { "minipass": "^7.1.2" @@ -15369,7 +15268,6 @@ "version": "7.5.6", "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.6.tgz", "integrity": "sha512-xqUeu2JAIJpXyvskvU3uvQW8PAmHrtXp2KDuMJwQqW8Sqq0CaZBAQ+dKS3RBXVhU4wC5NjAdKrmh84241gO9cA==", - "dev": true, "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", @@ -15424,7 +15322,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", - "dev": true, "license": "BlueOak-1.0.0", "engines": { "node": ">=18" diff --git a/package-lock-overrides/web-server.series/package-lock.json b/package-lock-overrides/web-server.series/package-lock.json index d7a888f..405b3a8 100644 --- a/package-lock-overrides/web-server.series/package-lock.json +++ b/package-lock-overrides/web-server.series/package-lock.json @@ -20,7 +20,7 @@ "@vscode/proxy-agent": "^0.32.0", "@vscode/ripgrep": "^1.15.11", "@vscode/spdlog": "^0.15.2", - "@vscode/sqlite3": "5.1.8-vscode", + "@vscode/sqlite3": "5.1.12-vscode", "@vscode/sudo-prompt": "9.3.1", "@vscode/tree-sitter-wasm": "^0.1.4", "@vscode/vscode-languagedetection": "1.0.21", @@ -1226,7 +1226,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", - "dev": true, "license": "ISC", "dependencies": { "minipass": "^7.0.4" @@ -2752,57 +2751,14 @@ } }, "node_modules/@vscode/sqlite3": { - "version": "5.1.8-vscode", - "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.8-vscode.tgz", - "integrity": "sha512-9Ku18yZej1kxS7mh6dhCWxkCof043HljcLIdq+RRJr65QdOeAqPOUJ2i6qXRL63l1Kd72uXV/zLA2SBwhfgiOw==", + "version": "5.1.12-vscode", + "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.12-vscode.tgz", + "integrity": "sha512-WLTftbMtK3Ni0s+q46qtKJ2CFtA3YrS5N4GcrETDCxqNTQAvk1LlYlG3RwGE6vZLcUqPt3TCHobijYeNUhEQ9Q==", "hasInstallScript": true, "license": "BSD-3-Clause", "dependencies": { "node-addon-api": "^8.2.0", - "tar": "^6.1.11" - } - }, - "node_modules/@vscode/sqlite3/node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/@vscode/sqlite3/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/@vscode/sqlite3/node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "license": "MIT", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@vscode/sqlite3/node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" + "tar": "^7.5.4" } }, "node_modules/@vscode/sqlite3/node_modules/node-addon-api": { @@ -2814,30 +2770,6 @@ "node": "^18 || ^20 || >= 21" } }, - "node_modules/@vscode/sqlite3/node_modules/tar": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me", - "license": "ISC", - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@vscode/sqlite3/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" - }, "node_modules/@vscode/sudo-prompt": { "version": "9.3.1", "resolved": "https://registry.npmjs.org/@vscode/sudo-prompt/-/sudo-prompt-9.3.1.tgz", @@ -4534,7 +4466,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", - "dev": true, "license": "BlueOak-1.0.0", "engines": { "node": ">=18" @@ -7245,36 +7176,6 @@ "node": ">=14.14" } }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs-minipass/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/fs-minipass/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" - }, "node_modules/fs-mkdirp-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", @@ -11429,7 +11330,6 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -11439,7 +11339,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", - "dev": true, "license": "MIT", "dependencies": { "minipass": "^7.1.2" @@ -15420,7 +15319,6 @@ "version": "7.5.6", "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.6.tgz", "integrity": "sha512-xqUeu2JAIJpXyvskvU3uvQW8PAmHrtXp2KDuMJwQqW8Sqq0CaZBAQ+dKS3RBXVhU4wC5NjAdKrmh84241gO9cA==", - "dev": true, "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", @@ -15475,7 +15373,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", - "dev": true, "license": "BlueOak-1.0.0", "engines": { "node": ">=18" diff --git a/patches/common/build.diff b/patches/common/build.diff index bc97ddb..6bc844a 100644 --- a/patches/common/build.diff +++ b/patches/common/build.diff @@ -2,6 +2,15 @@ Index: code-editor-src/package.json =================================================================== --- code-editor-src.orig/package.json +++ code-editor-src/package.json +@@ -79,7 +79,7 @@ + "@vscode/proxy-agent": "^0.32.0", + "@vscode/ripgrep": "^1.15.11", + "@vscode/spdlog": "^0.15.2", +- "@vscode/sqlite3": "5.1.8-vscode", ++ "@vscode/sqlite3": "5.1.12-vscode", + "@vscode/sudo-prompt": "9.3.1", + "@vscode/tree-sitter-wasm": "^0.1.4", + "@vscode/vscode-languagedetection": "1.0.21", @@ -99,7 +99,6 @@ "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.2", From a27387d00ea270b35439f05350fcc63fea4c088d Mon Sep 17 00:00:00 2001 From: Chunqiu Lu Date: Mon, 26 Jan 2026 16:40:07 +0100 Subject: [PATCH 02/24] update vscode/proxy-agent (#115) --- LICENSE-THIRD-PARTY | 2 +- overrides/LICENSE-THIRD-PARTY | 2 +- .../sagemaker.series/package-lock.json | 11 +++++++---- .../package-lock.json | 11 +++++++---- .../web-embedded.series/package-lock.json | 11 +++++++---- .../web-server.series/package-lock.json | 11 +++++++---- patches/common/build.diff | 8 ++++++-- 7 files changed, 36 insertions(+), 20 deletions(-) diff --git a/LICENSE-THIRD-PARTY b/LICENSE-THIRD-PARTY index 4d94145..776e982 100644 --- a/LICENSE-THIRD-PARTY +++ b/LICENSE-THIRD-PARTY @@ -3907,7 +3907,7 @@ SOFTWARE. ****************************** @vscode/proxy-agent -0.32.0 +0.37.0 MIT License Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net> diff --git a/overrides/LICENSE-THIRD-PARTY b/overrides/LICENSE-THIRD-PARTY index 4d94145..776e982 100644 --- a/overrides/LICENSE-THIRD-PARTY +++ b/overrides/LICENSE-THIRD-PARTY @@ -3907,7 +3907,7 @@ SOFTWARE. ****************************** @vscode/proxy-agent -0.32.0 +0.37.0 MIT License Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net> diff --git a/package-lock-overrides/sagemaker.series/package-lock.json b/package-lock-overrides/sagemaker.series/package-lock.json index 8061506..8174e10 100644 --- a/package-lock-overrides/sagemaker.series/package-lock.json +++ b/package-lock-overrides/sagemaker.series/package-lock.json @@ -17,7 +17,7 @@ "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/policy-watcher": "^1.3.2", - "@vscode/proxy-agent": "^0.32.0", + "@vscode/proxy-agent": "^0.37.0", "@vscode/ripgrep": "^1.15.11", "@vscode/spdlog": "^0.15.2", "@vscode/sqlite3": "5.1.12-vscode", @@ -2700,9 +2700,9 @@ } }, "node_modules/@vscode/proxy-agent": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.32.0.tgz", - "integrity": "sha512-n6h2+WVMJ3ByfGUakDbBNpR25J2JpLQabofiTKHIcLpXfxhT5TQSEH4OcjesZZfqw1zDpd7oBgcgqToWIiaBrQ==", + "version": "0.37.0", + "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.37.0.tgz", + "integrity": "sha512-FDBc/3qf7fLMp4fmdRBav2dy3UZ/Vao4PN6a5IeTYvcgh9erd9HfOcVoU3ogy2uwCii6vZNvmEeF9+gr64spVQ==", "license": "MIT", "dependencies": { "@tootallnate/once": "^3.0.0", @@ -2713,6 +2713,9 @@ "socks-proxy-agent": "^8.0.1", "undici": "^7.2.0" }, + "engines": { + "node": ">=22.15.0" + }, "optionalDependencies": { "@vscode/windows-ca-certs": "^0.3.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 a5e5c90..b539032 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 @@ -17,7 +17,7 @@ "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/policy-watcher": "^1.3.2", - "@vscode/proxy-agent": "^0.32.0", + "@vscode/proxy-agent": "^0.37.0", "@vscode/ripgrep": "^1.15.11", "@vscode/spdlog": "^0.15.2", "@vscode/sqlite3": "5.1.12-vscode", @@ -2688,9 +2688,9 @@ } }, "node_modules/@vscode/proxy-agent": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.32.0.tgz", - "integrity": "sha512-n6h2+WVMJ3ByfGUakDbBNpR25J2JpLQabofiTKHIcLpXfxhT5TQSEH4OcjesZZfqw1zDpd7oBgcgqToWIiaBrQ==", + "version": "0.37.0", + "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.37.0.tgz", + "integrity": "sha512-FDBc/3qf7fLMp4fmdRBav2dy3UZ/Vao4PN6a5IeTYvcgh9erd9HfOcVoU3ogy2uwCii6vZNvmEeF9+gr64spVQ==", "license": "MIT", "dependencies": { "@tootallnate/once": "^3.0.0", @@ -2701,6 +2701,9 @@ "socks-proxy-agent": "^8.0.1", "undici": "^7.2.0" }, + "engines": { + "node": ">=22.15.0" + }, "optionalDependencies": { "@vscode/windows-ca-certs": "^0.3.1" } diff --git a/package-lock-overrides/web-embedded.series/package-lock.json b/package-lock-overrides/web-embedded.series/package-lock.json index a5e5c90..b539032 100644 --- a/package-lock-overrides/web-embedded.series/package-lock.json +++ b/package-lock-overrides/web-embedded.series/package-lock.json @@ -17,7 +17,7 @@ "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/policy-watcher": "^1.3.2", - "@vscode/proxy-agent": "^0.32.0", + "@vscode/proxy-agent": "^0.37.0", "@vscode/ripgrep": "^1.15.11", "@vscode/spdlog": "^0.15.2", "@vscode/sqlite3": "5.1.12-vscode", @@ -2688,9 +2688,9 @@ } }, "node_modules/@vscode/proxy-agent": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.32.0.tgz", - "integrity": "sha512-n6h2+WVMJ3ByfGUakDbBNpR25J2JpLQabofiTKHIcLpXfxhT5TQSEH4OcjesZZfqw1zDpd7oBgcgqToWIiaBrQ==", + "version": "0.37.0", + "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.37.0.tgz", + "integrity": "sha512-FDBc/3qf7fLMp4fmdRBav2dy3UZ/Vao4PN6a5IeTYvcgh9erd9HfOcVoU3ogy2uwCii6vZNvmEeF9+gr64spVQ==", "license": "MIT", "dependencies": { "@tootallnate/once": "^3.0.0", @@ -2701,6 +2701,9 @@ "socks-proxy-agent": "^8.0.1", "undici": "^7.2.0" }, + "engines": { + "node": ">=22.15.0" + }, "optionalDependencies": { "@vscode/windows-ca-certs": "^0.3.1" } diff --git a/package-lock-overrides/web-server.series/package-lock.json b/package-lock-overrides/web-server.series/package-lock.json index 405b3a8..6c7c8f4 100644 --- a/package-lock-overrides/web-server.series/package-lock.json +++ b/package-lock-overrides/web-server.series/package-lock.json @@ -17,7 +17,7 @@ "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/policy-watcher": "^1.3.2", - "@vscode/proxy-agent": "^0.32.0", + "@vscode/proxy-agent": "^0.37.0", "@vscode/ripgrep": "^1.15.11", "@vscode/spdlog": "^0.15.2", "@vscode/sqlite3": "5.1.12-vscode", @@ -2700,9 +2700,9 @@ } }, "node_modules/@vscode/proxy-agent": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.32.0.tgz", - "integrity": "sha512-n6h2+WVMJ3ByfGUakDbBNpR25J2JpLQabofiTKHIcLpXfxhT5TQSEH4OcjesZZfqw1zDpd7oBgcgqToWIiaBrQ==", + "version": "0.37.0", + "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.37.0.tgz", + "integrity": "sha512-FDBc/3qf7fLMp4fmdRBav2dy3UZ/Vao4PN6a5IeTYvcgh9erd9HfOcVoU3ogy2uwCii6vZNvmEeF9+gr64spVQ==", "license": "MIT", "dependencies": { "@tootallnate/once": "^3.0.0", @@ -2713,6 +2713,9 @@ "socks-proxy-agent": "^8.0.1", "undici": "^7.2.0" }, + "engines": { + "node": ">=22.15.0" + }, "optionalDependencies": { "@vscode/windows-ca-certs": "^0.3.1" } diff --git a/patches/common/build.diff b/patches/common/build.diff index 6bc844a..d7591dc 100644 --- a/patches/common/build.diff +++ b/patches/common/build.diff @@ -2,8 +2,12 @@ Index: code-editor-src/package.json =================================================================== --- code-editor-src.orig/package.json +++ code-editor-src/package.json -@@ -79,7 +79,7 @@ - "@vscode/proxy-agent": "^0.32.0", +@@ -76,10 +76,10 @@ + "@vscode/deviceid": "^0.1.1", + "@vscode/iconv-lite-umd": "0.7.0", + "@vscode/policy-watcher": "^1.3.2", +- "@vscode/proxy-agent": "^0.32.0", ++ "@vscode/proxy-agent": "^0.37.0", "@vscode/ripgrep": "^1.15.11", "@vscode/spdlog": "^0.15.2", - "@vscode/sqlite3": "5.1.8-vscode", From 2adb9d21429c30fb1998b180130b9590a73a17b9 Mon Sep 17 00:00:00 2001 From: Chunqiu Lu Date: Tue, 27 Jan 2026 12:00:45 +0100 Subject: [PATCH 03/24] adopt vscode/proxy-agent (#116) --- .../sagemaker.series/remote/package-lock.json | 11 +- .../remote/package-lock.json | 11 +- .../remote/package-lock.json | 11 +- .../remote/package-lock.json | 11 +- patches/common/adopt-new-proxy-agent.diff | 158 ++++++++++++++++++ patches/common/build.diff | 9 + patches/sagemaker.series | 1 + patches/web-embedded-with-terminal.series | 1 + patches/web-embedded.series | 1 + patches/web-server.series | 1 + 10 files changed, 199 insertions(+), 16 deletions(-) create mode 100644 patches/common/adopt-new-proxy-agent.diff diff --git a/package-lock-overrides/sagemaker.series/remote/package-lock.json b/package-lock-overrides/sagemaker.series/remote/package-lock.json index f753940..5d85f6d 100644 --- a/package-lock-overrides/sagemaker.series/remote/package-lock.json +++ b/package-lock-overrides/sagemaker.series/remote/package-lock.json @@ -13,7 +13,7 @@ "@parcel/watcher": "2.5.1", "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/proxy-agent": "^0.32.0", + "@vscode/proxy-agent": "^0.37.0", "@vscode/ripgrep": "^1.15.11", "@vscode/spdlog": "^0.15.2", "@vscode/tree-sitter-wasm": "^0.1.4", @@ -419,9 +419,9 @@ "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==" }, "node_modules/@vscode/proxy-agent": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.32.0.tgz", - "integrity": "sha512-n6h2+WVMJ3ByfGUakDbBNpR25J2JpLQabofiTKHIcLpXfxhT5TQSEH4OcjesZZfqw1zDpd7oBgcgqToWIiaBrQ==", + "version": "0.37.0", + "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.37.0.tgz", + "integrity": "sha512-FDBc/3qf7fLMp4fmdRBav2dy3UZ/Vao4PN6a5IeTYvcgh9erd9HfOcVoU3ogy2uwCii6vZNvmEeF9+gr64spVQ==", "license": "MIT", "dependencies": { "@tootallnate/once": "^3.0.0", @@ -432,6 +432,9 @@ "socks-proxy-agent": "^8.0.1", "undici": "^7.2.0" }, + "engines": { + "node": ">=22.15.0" + }, "optionalDependencies": { "@vscode/windows-ca-certs": "^0.3.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 1da942f..b66b777 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 @@ -13,7 +13,7 @@ "@parcel/watcher": "2.5.1", "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/proxy-agent": "^0.32.0", + "@vscode/proxy-agent": "^0.37.0", "@vscode/ripgrep": "^1.15.11", "@vscode/spdlog": "^0.15.2", "@vscode/tree-sitter-wasm": "^0.1.4", @@ -418,9 +418,9 @@ "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==" }, "node_modules/@vscode/proxy-agent": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.32.0.tgz", - "integrity": "sha512-n6h2+WVMJ3ByfGUakDbBNpR25J2JpLQabofiTKHIcLpXfxhT5TQSEH4OcjesZZfqw1zDpd7oBgcgqToWIiaBrQ==", + "version": "0.37.0", + "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.37.0.tgz", + "integrity": "sha512-FDBc/3qf7fLMp4fmdRBav2dy3UZ/Vao4PN6a5IeTYvcgh9erd9HfOcVoU3ogy2uwCii6vZNvmEeF9+gr64spVQ==", "license": "MIT", "dependencies": { "@tootallnate/once": "^3.0.0", @@ -431,6 +431,9 @@ "socks-proxy-agent": "^8.0.1", "undici": "^7.2.0" }, + "engines": { + "node": ">=22.15.0" + }, "optionalDependencies": { "@vscode/windows-ca-certs": "^0.3.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 1da942f..b66b777 100644 --- a/package-lock-overrides/web-embedded.series/remote/package-lock.json +++ b/package-lock-overrides/web-embedded.series/remote/package-lock.json @@ -13,7 +13,7 @@ "@parcel/watcher": "2.5.1", "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/proxy-agent": "^0.32.0", + "@vscode/proxy-agent": "^0.37.0", "@vscode/ripgrep": "^1.15.11", "@vscode/spdlog": "^0.15.2", "@vscode/tree-sitter-wasm": "^0.1.4", @@ -418,9 +418,9 @@ "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==" }, "node_modules/@vscode/proxy-agent": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.32.0.tgz", - "integrity": "sha512-n6h2+WVMJ3ByfGUakDbBNpR25J2JpLQabofiTKHIcLpXfxhT5TQSEH4OcjesZZfqw1zDpd7oBgcgqToWIiaBrQ==", + "version": "0.37.0", + "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.37.0.tgz", + "integrity": "sha512-FDBc/3qf7fLMp4fmdRBav2dy3UZ/Vao4PN6a5IeTYvcgh9erd9HfOcVoU3ogy2uwCii6vZNvmEeF9+gr64spVQ==", "license": "MIT", "dependencies": { "@tootallnate/once": "^3.0.0", @@ -431,6 +431,9 @@ "socks-proxy-agent": "^8.0.1", "undici": "^7.2.0" }, + "engines": { + "node": ">=22.15.0" + }, "optionalDependencies": { "@vscode/windows-ca-certs": "^0.3.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 f753940..5d85f6d 100644 --- a/package-lock-overrides/web-server.series/remote/package-lock.json +++ b/package-lock-overrides/web-server.series/remote/package-lock.json @@ -13,7 +13,7 @@ "@parcel/watcher": "2.5.1", "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/proxy-agent": "^0.32.0", + "@vscode/proxy-agent": "^0.37.0", "@vscode/ripgrep": "^1.15.11", "@vscode/spdlog": "^0.15.2", "@vscode/tree-sitter-wasm": "^0.1.4", @@ -419,9 +419,9 @@ "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==" }, "node_modules/@vscode/proxy-agent": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.32.0.tgz", - "integrity": "sha512-n6h2+WVMJ3ByfGUakDbBNpR25J2JpLQabofiTKHIcLpXfxhT5TQSEH4OcjesZZfqw1zDpd7oBgcgqToWIiaBrQ==", + "version": "0.37.0", + "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.37.0.tgz", + "integrity": "sha512-FDBc/3qf7fLMp4fmdRBav2dy3UZ/Vao4PN6a5IeTYvcgh9erd9HfOcVoU3ogy2uwCii6vZNvmEeF9+gr64spVQ==", "license": "MIT", "dependencies": { "@tootallnate/once": "^3.0.0", @@ -432,6 +432,9 @@ "socks-proxy-agent": "^8.0.1", "undici": "^7.2.0" }, + "engines": { + "node": ">=22.15.0" + }, "optionalDependencies": { "@vscode/windows-ca-certs": "^0.3.1" } diff --git a/patches/common/adopt-new-proxy-agent.diff b/patches/common/adopt-new-proxy-agent.diff new file mode 100644 index 0000000..ea5e571 --- /dev/null +++ b/patches/common/adopt-new-proxy-agent.diff @@ -0,0 +1,158 @@ +Index: third-party-src/src/bootstrap-fork.ts +=================================================================== +--- third-party-src.orig/src/bootstrap-fork.ts ++++ third-party-src/src/bootstrap-fork.ts +@@ -123,7 +123,7 @@ function pipeLoggingToParent(): void { + + Object.defineProperty(stream, 'write', { + set: () => { }, +- get: () => (chunk: string | Buffer | Uint8Array, encoding: BufferEncoding | undefined, callback: ((err?: Error | undefined) => void) | undefined) => { ++ get: () => (chunk: string | Buffer | Uint8Array, encoding: BufferEncoding | undefined, callback: ((err?: Error | null) => void) | undefined) => { + buf += chunk.toString(encoding); + const eol = buf.length > MAX_STREAM_BUFFER_LENGTH ? buf.length : buf.lastIndexOf('\n'); + if (eol !== -1) { +Index: third-party-src/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts +=================================================================== +--- third-party-src.orig/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts ++++ third-party-src/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts +@@ -120,6 +120,7 @@ flakySuite('Native Modules (all platforms)', () => { + const proxyAgent = await import('@vscode/proxy-agent'); + // This call will load `@vscode/proxy-agent` which is a native module that we want to test on Windows + const windowsCerts = await proxyAgent.loadSystemCertificates({ ++ loadSystemCertificatesFromNode: () => undefined, + log: { + trace: () => { }, + debug: () => { }, +Index: third-party-src/src/vs/platform/request/common/request.ts +=================================================================== +--- third-party-src.orig/src/vs/platform/request/common/request.ts ++++ third-party-src/src/vs/platform/request/common/request.ts +@@ -146,8 +146,10 @@ export const USER_LOCAL_AND_REMOTE_SETTINGS = [ + 'http.proxyAuthorization', + 'http.proxySupport', + 'http.systemCertificates', ++ 'http.systemCertificatesNode', + 'http.experimental.systemCertificatesV2', + 'http.fetchAdditionalSupport', ++ 'http.experimental.networkInterfaceCheckInterval', + ]; + + let proxyConfiguration: IConfigurationNode[] = []; +@@ -249,6 +251,13 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault = + markdownDescription: localize('systemCertificates', "Controls whether CA certificates should be loaded from the OS. On Windows and macOS, a reload of the window is required after turning this off. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.", '`#http.useLocalProxyConfiguration#`'), + restricted: true + }, ++ 'http.systemCertificatesNode': { ++ type: 'boolean', ++ tags: ['experimental'], ++ default: false, ++ markdownDescription: localize('systemCertificatesNode', "Controls whether system certificates should be loaded using Node.js built-in support. Reload the window after changing this setting. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.", '`#http.useLocalProxyConfiguration#`'), ++ restricted: true ++ }, + 'http.experimental.systemCertificatesV2': { + type: 'boolean', + tags: ['experimental'], +@@ -261,6 +270,14 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault = + default: true, + markdownDescription: localize('fetchAdditionalSupport', "Controls whether Node.js' fetch implementation should be extended with additional support. Currently proxy support ({1}) and system certificates ({2}) are added when the corresponding settings are enabled. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.", '`#http.useLocalProxyConfiguration#`', '`#http.proxySupport#`', '`#http.systemCertificates#`'), + restricted: true ++ }, ++ 'http.experimental.networkInterfaceCheckInterval': { ++ type: 'number', ++ default: 300, ++ minimum: -1, ++ tags: ['experimental'], ++ markdownDescription: localize('networkInterfaceCheckInterval', "Controls the interval in seconds for checking network interface changes to invalidate the proxy cache. Set to -1 to disable. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.", '`#http.useLocalProxyConfiguration#`'), ++ restricted: true + } + } + } +Index: third-party-src/src/vs/platform/request/node/requestService.ts +=================================================================== +--- third-party-src.orig/src/vs/platform/request/node/requestService.ts ++++ third-party-src/src/vs/platform/request/node/requestService.ts +@@ -119,15 +119,18 @@ export class RequestService extends AbstractRequestService implements IRequestSe + + async loadCertificates(): Promise { + const proxyAgent = await import('@vscode/proxy-agent'); +- return proxyAgent.loadSystemCertificates({ log: this.logService }); ++ return proxyAgent.loadSystemCertificates({ ++ loadSystemCertificatesFromNode: () => this.getConfigValue('http.systemCertificatesNode', false), ++ log: this.logService, ++ }); + } + +- private getConfigValue(key: string): T | undefined { ++ private getConfigValue(key: string, fallback?: T): T | undefined { + if (this.machine === 'remote') { + return this.configurationService.getValue(key); + } + const values = this.configurationService.inspect(key); +- return values.userLocalValue || values.defaultValue; ++ return values.userLocalValue ?? values.defaultValue ?? fallback; + } + } + +Index: third-party-src/src/vs/workbench/api/node/extHostConsoleForwarder.ts +=================================================================== +--- third-party-src.orig/src/vs/workbench/api/node/extHostConsoleForwarder.ts ++++ third-party-src/src/vs/workbench/api/node/extHostConsoleForwarder.ts +@@ -47,7 +47,7 @@ export class ExtHostConsoleForwarder extends AbstractExtHostConsoleForwarder { + + Object.defineProperty(stream, 'write', { + set: () => { }, +- get: () => (chunk: Uint8Array | string, encoding?: BufferEncoding, callback?: (err?: Error) => void) => { ++ get: () => (chunk: Uint8Array | string, encoding?: BufferEncoding, callback?: (err?: Error | null) => void) => { + if (!this._isMakingConsoleCall) { + buf += (chunk as any).toString(encoding); + const eol = buf.length > MAX_STREAM_BUFFER_LENGTH ? buf.length : buf.lastIndexOf('\n'); +Index: third-party-src/src/vs/workbench/api/node/proxyResolver.ts +=================================================================== +--- third-party-src.orig/src/vs/workbench/api/node/proxyResolver.ts ++++ third-party-src/src/vs/workbench/api/node/proxyResolver.ts +@@ -53,6 +53,7 @@ export function connectProxyResolver( + isAdditionalFetchSupportEnabled: () => getExtHostConfigValue(configProvider, isRemote, 'http.fetchAdditionalSupport', true), + addCertificatesV1: () => certSettingV1(configProvider, isRemote), + addCertificatesV2: () => certSettingV2(configProvider, isRemote), ++ loadSystemCertificatesFromNode: () => getExtHostConfigValue(configProvider, isRemote, 'http.systemCertificatesNode', false), + log: extHostLogService, + getLogLevel: () => { + const level = extHostLogService.getLevel(); +@@ -72,16 +73,31 @@ export function connectProxyResolver( + }, + proxyResolveTelemetry: () => { }, + isUseHostProxyEnabled, ++ getNetworkInterfaceCheckInterval: () => { ++ const intervalSeconds = getExtHostConfigValue(configProvider, isRemote, 'http.experimental.networkInterfaceCheckInterval', 300); ++ return intervalSeconds * 1000; ++ }, + loadAdditionalCertificates: async () => { ++ const useNodeSystemCerts = getExtHostConfigValue(configProvider, isRemote, 'http.systemCertificatesNode', false); + const promises: Promise[] = []; +- if (initData.remote.isRemote) { +- promises.push(loadSystemCertificates({ log: extHostLogService })); ++ if (isRemote) { ++ promises.push(loadSystemCertificates({ ++ loadSystemCertificatesFromNode: () => useNodeSystemCerts, ++ log: extHostLogService, ++ })); + } + if (loadLocalCertificates) { +- extHostLogService.trace('ProxyResolver#loadAdditionalCertificates: Loading certificates from main process'); +- const certs = extHostWorkspace.loadCertificates(); // Loading from main process to share cache. +- certs.then(certs => extHostLogService.trace('ProxyResolver#loadAdditionalCertificates: Loaded certificates from main process', certs.length)); +- promises.push(certs); ++ if (!isRemote && useNodeSystemCerts) { ++ promises.push(loadSystemCertificates({ ++ loadSystemCertificatesFromNode: () => useNodeSystemCerts, ++ log: extHostLogService, ++ })); ++ } else { ++ extHostLogService.trace('ProxyResolver#loadAdditionalCertificates: Loading certificates from main process'); ++ const certs = extHostWorkspace.loadCertificates(); // Loading from main process to share cache. ++ certs.then(certs => extHostLogService.trace('ProxyResolver#loadAdditionalCertificates: Loaded certificates from main process', certs.length)); ++ promises.push(certs); ++ } + } + // Using https.globalAgent because it is shared with proxy.test.ts and mutable. + if (initData.environment.extensionTestsLocationURI && (https.globalAgent as any).testCertificates?.length) { diff --git a/patches/common/build.diff b/patches/common/build.diff index d7591dc..3ff535c 100644 --- a/patches/common/build.diff +++ b/patches/common/build.diff @@ -86,6 +86,15 @@ Index: code-editor-src/remote/package.json =================================================================== --- code-editor-src.orig/remote/package.json +++ code-editor-src/remote/package.json +@@ -8,7 +8,7 @@ + "@parcel/watcher": "2.5.1", + "@vscode/deviceid": "^0.1.1", + "@vscode/iconv-lite-umd": "0.7.0", +- "@vscode/proxy-agent": "^0.32.0", ++ "@vscode/proxy-agent": "^0.37.0", + "@vscode/ripgrep": "^1.15.11", + "@vscode/spdlog": "^0.15.2", + "@vscode/tree-sitter-wasm": "^0.1.4", @@ -29,7 +29,6 @@ "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.2", diff --git a/patches/sagemaker.series b/patches/sagemaker.series index ffb18d8..e55003b 100644 --- a/patches/sagemaker.series +++ b/patches/sagemaker.series @@ -17,6 +17,7 @@ common/proposed-api.diff common/build.diff common/integration.diff common/replace-gulp-untar.diff +common/adopt-new-proxy-agent.diff web-server/suppress-known-errors-build-integration.diff web-server/local-storage.diff web-server/base-path.diff diff --git a/patches/web-embedded-with-terminal.series b/patches/web-embedded-with-terminal.series index ea071df..365f30a 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/replace-gulp-untar.diff +common/adopt-new-proxy-agent.diff web-embedded/readd-workbench.diff web-embedded/suppress-known-errors-build-integration.diff web-embedded/disable-built-in-walkthroughs-from-c.diff diff --git a/patches/web-embedded.series b/patches/web-embedded.series index 03f4015..d2c641b 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/replace-gulp-untar.diff +common/adopt-new-proxy-agent.diff web-embedded/readd-workbench.diff web-embedded/suppress-known-errors-build-integration.diff web-embedded/disable-built-in-walkthroughs-from-c.diff diff --git a/patches/web-server.series b/patches/web-server.series index a9393f8..5eba39b 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/replace-gulp-untar.diff +common/adopt-new-proxy-agent.diff web-server/suppress-known-errors-build-integration.diff web-server/local-storage.diff web-server/base-path.diff From 8aa556067f1f02f9e14eb7b8872b5c7bb67c714d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 26 Jan 2026 13:33:33 +0000 Subject: [PATCH 04/24] Update VS Code submodule to 1.108.2 --- third-party-src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third-party-src b/third-party-src index 2901c5a..c9d7799 160000 --- a/third-party-src +++ b/third-party-src @@ -1 +1 @@ -Subproject commit 2901c5ac6db8a986a5666c3af51ff804d05af0d4 +Subproject commit c9d77990917f3102ada88be140d28b038d1dd7c7 From 18fc224cf3b18ada40163749721b9e7c648b5045 Mon Sep 17 00:00:00 2001 From: Feiyang Liu Date: Mon, 26 Jan 2026 10:21:54 +0100 Subject: [PATCH 05/24] Rebase patches common to all targets --- patches/common/allow-unused-vars.diff | 13 - patches/common/build.diff | 77 +--- patches/common/disable-telemetry-service.diff | 32 +- patches/common/installer.diff | 168 ++------ patches/common/integration.diff | 49 +-- .../preapplied/remove-unsafe-headers.diff | 54 +-- patches/common/remove-builtin-extensions.diff | 8 +- .../common/remove-cloud-changes-feature.diff | 6 +- patches/common/replace-gulp-untar.diff | 402 ++++++------------ patches/common/trusted-domains.diff | 13 +- 10 files changed, 253 insertions(+), 569 deletions(-) diff --git a/patches/common/allow-unused-vars.diff b/patches/common/allow-unused-vars.diff index 7ed1681..8ef8a04 100644 --- a/patches/common/allow-unused-vars.diff +++ b/patches/common/allow-unused-vars.diff @@ -11,19 +11,6 @@ Index: third-party-src/src/tsconfig.base.json "noUncheckedSideEffectImports": true, "allowUnreachableCode": false, "strict": true, -Index: third-party-src/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts -=================================================================== ---- third-party-src.orig/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts -+++ third-party-src/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts -@@ -30,7 +30,7 @@ export interface IEndpointDetails { - export class PreferencesSearchService extends Disposable implements IPreferencesSearchService { - declare readonly _serviceBrand: undefined; - -- // @ts-expect-error disable remote search for now, ref https://github.com/microsoft/vscode/issues/172411 -+ // @ts-ignore disable remote search for now, ref https://github.com/microsoft/vscode/issues/172411 - private _installedExtensions: Promise; - private _remoteSearchProvider: IRemoteSearchProvider | undefined; - private _aiSearchProvider: IAiSearchProvider | undefined; Index: third-party-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts =================================================================== --- third-party-src.orig/src/vs/workbench/contrib/remote/browser/tunnelView.ts diff --git a/patches/common/build.diff b/patches/common/build.diff index 3ff535c..e37f028 100644 --- a/patches/common/build.diff +++ b/patches/common/build.diff @@ -19,46 +19,12 @@ Index: code-editor-src/package.json "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.2", "jschardet": "3.1.4", + "katex": "^0.16.22", - "kerberos": "2.1.1", - "minimist": "^1.2.6", - "native-is-elevated": "0.7.0", + "minimist": "^1.2.8", + "native-is-elevated": "0.8.0", "native-keymap": "^3.3.5", -@@ -107,6 +106,7 @@ - "node-pty": "^1.1.0-beta33", - "open": "^8.4.2", - "tas-client-umd": "0.2.0", -+ "undici": "^7.18.2", - "v8-inspect-profiler": "^0.1.1", - "vscode-oniguruma": "1.7.0", - "vscode-regexpp": "^3.1.0", -@@ -115,7 +115,7 @@ - "yazl": "^2.4.3" - }, - "devDependencies": { -- "@playwright/test": "^1.52.0", -+ "@playwright/test": "^1.55.1", - "@stylistic/eslint-plugin-ts": "^2.8.0", - "@types/cookie": "^0.3.3", - "@types/debug": "^4.1.5", -@@ -142,7 +142,7 @@ - "@vscode/telemetry-extractor": "^1.10.2", - "@vscode/test-cli": "^0.0.6", - "@vscode/test-electron": "^2.4.0", -- "@vscode/test-web": "^0.0.62", -+ "@vscode/test-web": "^0.0.72", - "@vscode/v8-heap-parser": "^0.1.0", - "@vscode/vscode-perf": "^0.0.19", - "@webgpu/types": "^0.1.44", -@@ -154,7 +154,7 @@ - "css-loader": "^6.9.1", - "debounce": "^1.0.0", - "deemon": "^1.13.4", -- "electron": "35.5.1", -+ "electron": "40.0.0", - "eslint": "^9.11.1", - "eslint-formatter-compact": "^8.40.0", - "eslint-plugin-header": "3.1.1", -@@ -221,9 +221,20 @@ +@@ -225,9 +224,20 @@ }, "overrides": { "node-gyp-build": "4.8.1", @@ -99,31 +65,30 @@ Index: code-editor-src/remote/package.json "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.2", "jschardet": "3.1.4", + "katex": "^0.16.22", - "kerberos": "2.1.1", - "minimist": "^1.2.6", + "minimist": "^1.2.8", "native-watchdog": "^1.4.1", - "node-pty": "^1.1.0-beta33", -Index: code-editor-src/build/lib/mangle/index.js -=================================================================== ---- code-editor-src.orig/build/lib/mangle/index.js -+++ code-editor-src/build/lib/mangle/index.js -@@ -354,7 +354,7 @@ class Mangler { - this.log = log; - this.config = config; - this.renameWorkerPool = workerpool_1.default.pool(path_1.default.join(__dirname, 'renameWorker.js'), { -- maxWorkers: 4, -+ maxWorkers: 3, - minWorkers: 'max' - }); - } + "node-pty": "^1.1.0-beta43", +@@ -42,9 +41,6 @@ + "yazl": "^2.4.3" + }, + "overrides": { +- "node-gyp-build": "4.8.1", +- "kerberos@2.1.1": { +- "node-addon-api": "7.1.0" +- } ++ "node-gyp-build": "4.8.1" + } + } Index: code-editor-src/build/lib/mangle/index.ts =================================================================== --- code-editor-src.orig/build/lib/mangle/index.ts +++ code-editor-src/build/lib/mangle/index.ts -@@ -407,7 +407,7 @@ export class Mangler { - ) { +@@ -430,7 +430,7 @@ export class Mangler { + this.config = config; - this.renameWorkerPool = workerpool.pool(path.join(__dirname, 'renameWorker.js'), { + this.renameWorkerPool = workerpool.pool(path.join(import.meta.dirname, 'renameWorker.ts'), { - maxWorkers: 4, + maxWorkers: 3, minWorkers: 'max' diff --git a/patches/common/disable-telemetry-service.diff b/patches/common/disable-telemetry-service.diff index 5f53e5f..2d1e96c 100644 --- a/patches/common/disable-telemetry-service.diff +++ b/patches/common/disable-telemetry-service.diff @@ -6,7 +6,7 @@ Index: third-party-src/src/vs/platform/telemetry/common/telemetryService.ts =================================================================== --- third-party-src.orig/src/vs/platform/telemetry/common/telemetryService.ts +++ third-party-src/src/vs/platform/telemetry/common/telemetryService.ts -@@ -209,7 +209,7 @@ configurationRegistry.registerConfigurat +@@ -274,7 +274,7 @@ configurationRegistry.registerConfigurat 'properties': { [TELEMETRY_SETTING_ID]: { 'type': 'string', @@ -15,7 +15,7 @@ Index: third-party-src/src/vs/platform/telemetry/common/telemetryService.ts 'enumDescriptions': [ localize('telemetry.telemetryLevel.default', "Sends usage data, errors, and crash reports."), localize('telemetry.telemetryLevel.error', "Sends general error telemetry and crash reports."), -@@ -217,7 +217,7 @@ configurationRegistry.registerConfigurat +@@ -282,7 +282,7 @@ configurationRegistry.registerConfigurat localize('telemetry.telemetryLevel.off', "Disables all product telemetry.") ], 'markdownDescription': getTelemetryLevelSettingDescription(), @@ -24,7 +24,7 @@ Index: third-party-src/src/vs/platform/telemetry/common/telemetryService.ts 'restricted': true, 'scope': ConfigurationScope.APPLICATION, 'tags': ['usesOnlineServices', 'telemetry'], -@@ -243,7 +243,7 @@ configurationRegistry.registerConfigurat +@@ -334,7 +334,7 @@ configurationRegistry.registerConfigurat !product.privacyStatementUrl ? localize('telemetry.enableTelemetry', "Enable diagnostic data to be collected. This helps us to better understand how {0} is performing and where improvements need to be made.", product.nameLong) : localize('telemetry.enableTelemetryMd', "Enable diagnostic data to be collected. This helps us to better understand how {0} is performing and where improvements need to be made. [Read more]({1}) about what we collect and our privacy statement.", product.nameLong, product.privacyStatementUrl), @@ -33,19 +33,6 @@ Index: third-party-src/src/vs/platform/telemetry/common/telemetryService.ts 'restricted': true, 'markdownDeprecationMessage': localize('enableTelemetryDeprecated', "If this setting is false, no telemetry will be sent regardless of the new setting's value. Deprecated in favor of the {0} setting.", `\`#${TELEMETRY_SETTING_ID}#\``), 'scope': ConfigurationScope.APPLICATION, -Index: third-party-src/src/vs/workbench/electron-sandbox/desktop.contribution.ts -=================================================================== ---- third-party-src.orig/src/vs/workbench/electron-sandbox/desktop.contribution.ts -+++ third-party-src/src/vs/workbench/electron-sandbox/desktop.contribution.ts -@@ -322,7 +322,7 @@ import { registerWorkbenchContribution2, - 'telemetry.enableCrashReporter': { - 'type': 'boolean', - 'description': localize('telemetry.enableCrashReporting', "Enable crash reports to be collected. This helps us improve stability. \nThis option requires restart to take effect."), -- 'default': true, -+ 'default': false, - 'tags': ['usesOnlineServices', 'telemetry'], - 'markdownDeprecationMessage': localize('enableCrashReporterDeprecated', "If this setting is false, no telemetry will be sent regardless of the new setting's value. Deprecated due to being combined into the {0} setting.", `\`#${TELEMETRY_SETTING_ID}#\``), - } Index: third-party-src/src/vs/platform/telemetry/common/1dsAppender.ts =================================================================== --- third-party-src.orig/src/vs/platform/telemetry/common/1dsAppender.ts @@ -61,3 +48,16 @@ Index: third-party-src/src/vs/platform/telemetry/common/1dsAppender.ts async function getClient(instrumentationKey: string, addInternalFlag?: boolean, xhrOverride?: IXHROverride): Promise { // eslint-disable-next-line local/code-amd-node-module +Index: third-party-src/src/vs/workbench/electron-browser/desktop.contribution.ts +=================================================================== +--- third-party-src.orig/src/vs/workbench/electron-browser/desktop.contribution.ts ++++ third-party-src/src/vs/workbench/electron-browser/desktop.contribution.ts +@@ -340,7 +340,7 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL + 'telemetry.enableCrashReporter': { + 'type': 'boolean', + 'description': localize('telemetry.enableCrashReporting', "Enable crash reports to be collected. This helps us improve stability. \nThis option requires restart to take effect."), +- 'default': true, ++ 'default': false, + 'tags': ['usesOnlineServices', 'telemetry'], + 'markdownDeprecationMessage': localize('enableCrashReporterDeprecated', "If this setting is false, no telemetry will be sent regardless of the new setting's value. Deprecated due to being combined into the {0} setting.", `\`#${TELEMETRY_SETTING_ID}#\``), + } diff --git a/patches/common/installer.diff b/patches/common/installer.diff index 2902598..7f24db8 100644 --- a/patches/common/installer.diff +++ b/patches/common/installer.diff @@ -1,16 +1,27 @@ -Index: third-party-src/build/gulpfile.reh.js +Index: third-party-src/build/lib/getVersion.ts +=================================================================== +--- third-party-src.orig/build/lib/getVersion.ts ++++ third-party-src/build/lib/getVersion.ts +@@ -12,5 +12,5 @@ export function getVersion(root: string) + version = git.getVersion(root); + } + +- return version; ++ return version || "unknown"; + } +Index: third-party-src/build/gulpfile.reh.ts =================================================================== ---- third-party-src.orig/build/gulpfile.reh.js -+++ third-party-src/build/gulpfile.reh.js -@@ -32,6 +32,7 @@ const { vscodeWebResourceIncludes, creat - const cp = require('child_process'); - const log = require('fancy-log'); - const buildfile = require('./buildfile'); -+const through = require("through2"); +--- third-party-src.orig/build/gulpfile.reh.ts ++++ third-party-src/build/gulpfile.reh.ts +@@ -33,6 +33,7 @@ import log from 'fancy-log'; + import buildfile from './buildfile.ts'; + import { fetchUrls, fetchGithub } from './lib/fetch.ts'; + import jsonEditor from 'gulp-json-editor'; ++import through from 'through2'; + - const REPO_ROOT = path.dirname(__dirname); - const commit = getVersion(REPO_ROOT); -@@ -194,6 +195,15 @@ function nodejs(platform, arch) { + const REPO_ROOT = path.dirname(import.meta.dirname); +@@ -197,6 +198,15 @@ function nodejs(platform: string, arch: arch = 'x64'; } @@ -26,16 +37,16 @@ Index: third-party-src/build/gulpfile.reh.js log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from ${product.nodejsRepository}...`); const glibcPrefix = process.env['VSCODE_NODE_GLIBC'] ?? ''; -@@ -248,7 +258,7 @@ function nodejs(platform, arch) { +@@ -251,7 +261,7 @@ function nodejs(platform: string, arch: } } --function packageTask(type, platform, arch, sourceFolderName, destinationFolderName) { -+function packageTask(type, platform, arch, sourceFolderName, destinationFolderName, isSlim=false) { +-function packageTask(type: string, platform: string, arch: string, sourceFolderName: string, destinationFolderName: string) { ++function packageTask(type: string, platform: string, arch: string, sourceFolderName: string, destinationFolderName: string, isSlim = false) { const destination = path.join(BUILD_ROOT, destinationFolderName); return () => { -@@ -326,6 +336,7 @@ function packageTask(type, platform, arc +@@ -328,6 +338,7 @@ function packageTask(type: string, platf })); const license = gulp.src(['remote/LICENSE'], { base: 'remote', allowEmpty: true }); @@ -43,7 +54,7 @@ Index: third-party-src/build/gulpfile.reh.js const jsFilter = util.filter(data => !data.isDirectory() && /\.js$/.test(data.path)); -@@ -341,7 +352,10 @@ function packageTask(type, platform, arc +@@ -343,7 +354,10 @@ function packageTask(type: string, platf .pipe(jsFilter.restore); const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`; @@ -53,9 +64,9 @@ Index: third-party-src/build/gulpfile.reh.js + emptyTask.end(); + const node = isSlim ? emptyTask : gulp.src(`${nodePath}/**`, { base: nodePath, dot: true }); - let web = []; + let web: NodeJS.ReadWriteStream[] = []; if (type === 'reh-web') { -@@ -357,6 +371,7 @@ function packageTask(type, platform, arc +@@ -359,6 +373,7 @@ function packageTask(type: string, platf packageJsonStream, productJsonStream, license, @@ -63,32 +74,32 @@ Index: third-party-src/build/gulpfile.reh.js sources, deps, node, -@@ -383,20 +398,24 @@ function packageTask(type, platform, arc +@@ -385,20 +400,24 @@ function packageTask(type: string, platf .pipe(rename(`bin/${product.serverApplicationName}.cmd`)), ); } else if (platform === 'linux' || platform === 'alpine' || platform === 'darwin') { -+ const nodePath = isSlim ? 'node' : "$ROOT/node"; ++ const nodePathStr = isSlim ? 'node' : '"$ROOT/node"'; result = es.merge(result, gulp.src(`resources/server/bin/remote-cli/${platform === 'darwin' ? 'code-darwin.sh' : 'code-linux.sh'}`, { base: '.' }) .pipe(replace('@@VERSION@@', version)) - .pipe(replace('@@COMMIT@@', commit)) + .pipe(replace('@@COMMIT@@', commit || '')) .pipe(replace('@@APPNAME@@', product.applicationName)) -+ .pipe(replace('"$ROOT/node"', nodePath)) ++ .pipe(replace('"$ROOT/node"', nodePathStr)) .pipe(rename(`bin/remote-cli/${product.applicationName}`)) .pipe(util.setExecutableBit()), gulp.src(`resources/server/bin/helpers/${platform === 'darwin' ? 'browser-darwin.sh' : 'browser-linux.sh'}`, { base: '.' }) .pipe(replace('@@VERSION@@', version)) - .pipe(replace('@@COMMIT@@', commit)) + .pipe(replace('@@COMMIT@@', commit || '')) .pipe(replace('@@APPNAME@@', product.applicationName)) -+ .pipe(replace('"$ROOT/node"', nodePath)) ++ .pipe(replace('"$ROOT/node"', nodePathStr)) .pipe(rename(`bin/helpers/browser.sh`)) .pipe(util.setExecutableBit()), gulp.src(`resources/server/bin/${platform === 'darwin' ? 'code-server-darwin.sh' : 'code-server-linux.sh'}`, { base: '.' }) -+ .pipe(replace('"$ROOT/node"', nodePath)) ++ .pipe(replace('"$ROOT/node"', nodePathStr)) .pipe(rename(`bin/${product.serverApplicationName}`)) .pipe(util.setExecutableBit()) ); -@@ -463,6 +482,13 @@ function tweakProductForServerWeb(produc +@@ -465,6 +484,13 @@ function tweakProductForServerWeb(produc ['', 'min'].forEach(minified => { const sourceFolderName = `out-vscode-${type}${dashed(minified)}`; const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`; @@ -102,108 +113,3 @@ Index: third-party-src/build/gulpfile.reh.js const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( compileNativeExtensionsBuildTask, -Index: third-party-src/build/npm/postinstall.js -=================================================================== ---- third-party-src.orig/build/npm/postinstall.js -+++ third-party-src/build/npm/postinstall.js -@@ -170,5 +170,3 @@ for (let dir of dirs) { - npmInstall(dir, opts); - } - --cp.execSync('git config pull.rebase merges'); --cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs'); -Index: third-party-src/build/lib/compilation.js -=================================================================== ---- third-party-src.orig/build/lib/compilation.js -+++ third-party-src/build/lib/compilation.js -@@ -149,7 +149,7 @@ function compileTask(src, out, build, op - } - // mangle: TypeScript to TypeScript - let mangleStream = event_stream_1.default.through(); -- if (build && !options.disableMangle) { -+ if (build && !options.disableMangle && !process.env.DISABLE_MANGLE) { - let ts2tsMangler = new index_1.Mangler(compile.projectPath, (...data) => (0, fancy_log_1.default)(ansi_colors_1.default.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true }); - const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState'])); - mangleStream = event_stream_1.default.through(async function write(data) { -Index: third-party-src/build/lib/dependencies.js -=================================================================== ---- third-party-src.orig/build/lib/dependencies.js -+++ third-party-src/build/lib/dependencies.js -@@ -24,13 +24,14 @@ function getNpmProductionDependencies(fo - if (/ELSPROBLEMS/.test(match[0])) { - continue; - } -- else if (/invalid: xterm/.test(match[0])) { -+ else if (/(invalid|extraneous|missing):/.test(match[0])) { - continue; - } - else if (/A complete log of this run/.test(match[0])) { -- continue; -+ break; - } - else { -+ console.log(match[0]); - throw err; - } - } -Index: third-party-src/build/gulpfile.extensions.js -=================================================================== ---- third-party-src.orig/build/gulpfile.extensions.js -+++ third-party-src/build/gulpfile.extensions.js -@@ -102,7 +102,7 @@ const tasks = compilations.map(function - headerOut = relativeDirname.substr(index + 1) + '/out'; - } - -- function createPipeline(build, emitError, transpileOnly) { -+ function createPipeline(build, emitError, transpileOnly = true) { // transpile to avoid spurious type errors - const tsb = require('./lib/tsb'); - const sourcemaps = require('gulp-sourcemaps'); - -Index: third-party-src/build/lib/optimize.js -=================================================================== ---- third-party-src.orig/build/lib/optimize.js -+++ third-party-src/build/lib/optimize.js -@@ -144,6 +144,7 @@ function bundleESMTask(opts) { - outdir: path_1.default.join(REPO_ROOT_PATH, opts.src), - write: false, // enables res.outputFiles - metafile: true, // enables res.metafile -+ treeShaking: true, - // minify: NOT enabled because we have a separate minify task that takes care of the TSLib banner as well - }).then(res => { - for (const file of res.outputFiles) { -Index: third-party-src/build/lib/optimize.ts -=================================================================== ---- third-party-src.orig/build/lib/optimize.ts -+++ third-party-src/build/lib/optimize.ts -@@ -145,6 +145,7 @@ function bundleESMTask(opts: IBundleESMT - outdir: path.join(REPO_ROOT_PATH, opts.src), - write: false, // enables res.outputFiles - metafile: true, // enables res.metafile -+ treeShaking: true, - // minify: NOT enabled because we have a separate minify task that takes care of the TSLib banner as well - }).then(res => { - for (const file of res.outputFiles) { -Index: third-party-src/build/lib/getVersion.js -=================================================================== ---- third-party-src.orig/build/lib/getVersion.js -+++ third-party-src/build/lib/getVersion.js -@@ -44,6 +44,6 @@ function getVersion(root) { - if (!version || !/^[0-9a-f]{40}$/i.test(version.trim())) { - version = git.getVersion(root); - } -- return version; -+ return version || "unknown"; - } - //# sourceMappingURL=getVersion.js.map -\ No newline at end of file -Index: third-party-src/build/lib/getVersion.ts -=================================================================== ---- third-party-src.orig/build/lib/getVersion.ts -+++ third-party-src/build/lib/getVersion.ts -@@ -12,5 +12,5 @@ export function getVersion(root: string) - version = git.getVersion(root); - } - -- return version; -+ return version || "unknown"; - } diff --git a/patches/common/integration.diff b/patches/common/integration.diff index 33ab8af..1b2f225 100644 --- a/patches/common/integration.diff +++ b/patches/common/integration.diff @@ -47,7 +47,7 @@ Index: third-party-src/src/vs/base/common/product.ts =================================================================== --- third-party-src.orig/src/vs/base/common/product.ts +++ third-party-src/src/vs/base/common/product.ts -@@ -60,6 +60,7 @@ export interface IProductConfiguration { +@@ -69,6 +69,7 @@ export interface IProductConfiguration { readonly date?: string; readonly quality?: string; readonly commit?: string; @@ -55,30 +55,14 @@ Index: third-party-src/src/vs/base/common/product.ts readonly nameShort: string; readonly nameLong: string; -Index: third-party-src/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts -=================================================================== ---- third-party-src.orig/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts -+++ third-party-src/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts -@@ -79,9 +79,9 @@ export class BrowserDialogHandler extend - async about(): Promise { - const detailString = (useAgo: boolean): string => { - return localize('aboutDetail', -- "Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}", -+ "Code Editor Version: {0}\nCode - OSS Version: {1}\nDate: {2}\nBrowser: {3}", -+ this.productService.codeEditorVersion || 'Unknown', - this.productService.version || 'Unknown', -- this.productService.commit || 'Unknown', - this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(new Date(this.productService.date), true) + ')' : ''}` : 'Unknown', - navigator.userAgent - ); Index: third-party-src/src/vs/platform/product/common/product.ts =================================================================== --- third-party-src.orig/src/vs/platform/product/common/product.ts +++ third-party-src/src/vs/platform/product/common/product.ts -@@ -61,8 +61,8 @@ else { +@@ -62,8 +62,8 @@ else { if (Object.keys(product).length === 0) { Object.assign(product, { - version: '1.95.0-dev', + version: '1.104.0-dev', - nameShort: 'Code - OSS Dev', - nameLong: 'Code - OSS Dev', + nameShort: 'Code Editor', @@ -86,16 +70,19 @@ Index: third-party-src/src/vs/platform/product/common/product.ts applicationName: 'code-oss', dataFolderName: '.vscode-oss', urlProtocol: 'code-oss', -Index: third-party-src/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts +Index: third-party-src/src/vs/platform/dialogs/browser/dialog.ts =================================================================== ---- third-party-src.orig/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts -+++ third-party-src/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts -@@ -134,7 +134,7 @@ export interface IUtilityProcessCrashEve - /** - * The reason of the utility process crash. - */ -- readonly reason: 'clean-exit' | 'abnormal-exit' | 'killed' | 'crashed' | 'oom' | 'launch-failed' | 'integrity-failure'; -+ readonly reason: 'clean-exit' | 'abnormal-exit' | 'killed' | 'crashed' | 'oom' | 'launch-failed' | 'integrity-failure' | 'memory-eviction'; - } - - export interface IUtilityProcessInfo { +--- third-party-src.orig/src/vs/platform/dialogs/browser/dialog.ts ++++ third-party-src/src/vs/platform/dialogs/browser/dialog.ts +@@ -46,9 +46,9 @@ export function createWorkbenchDialogOpt + export function createBrowserAboutDialogDetails(productService: IProductService): { title: string; details: string; detailsToCopy: string } { + const detailString = (useAgo: boolean): string => { + return localize('aboutDetail', +- "Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}", ++ "Code Editor Version: {0}\nCode - OSS Version: {1}\nDate: {2}\nBrowser: {3}", ++ productService.codeEditorVersion || 'Unknown', + productService.version || 'Unknown', +- productService.commit || 'Unknown', + productService.date ? `${productService.date}${useAgo ? ' (' + fromNow(new Date(productService.date), true) + ')' : ''}` : 'Unknown', + navigator.userAgent + ); diff --git a/patches/common/preapplied/remove-unsafe-headers.diff b/patches/common/preapplied/remove-unsafe-headers.diff index b3e45f2..17ff9bb 100644 --- a/patches/common/preapplied/remove-unsafe-headers.diff +++ b/patches/common/preapplied/remove-unsafe-headers.diff @@ -1,29 +1,3 @@ -Index: third-party-src/src/vs/code/electron-sandbox/workbench/workbench-dev.html -=================================================================== ---- third-party-src.orig/src/vs/code/electron-sandbox/workbench/workbench-dev.html -+++ third-party-src/src/vs/code/electron-sandbox/workbench/workbench-dev.html -@@ -26,7 +26,7 @@ - ; - script-src - 'self' -- 'unsafe-eval' -+ 'wasm-unsafe-eval' - blob: - 'nonce-0c6a828f1297' - ; -Index: third-party-src/src/vs/code/electron-sandbox/workbench/workbench.html -=================================================================== ---- third-party-src.orig/src/vs/code/electron-sandbox/workbench/workbench.html -+++ third-party-src/src/vs/code/electron-sandbox/workbench/workbench.html -@@ -26,7 +26,7 @@ - ; - script-src - 'self' -- 'unsafe-eval' -+ 'wasm-unsafe-eval' - blob: - ; - style-src Index: third-party-src/src/vs/server/node/webClientServer.ts =================================================================== --- third-party-src.orig/src/vs/server/node/webClientServer.ts @@ -41,7 +15,7 @@ Index: third-party-src/src/vs/workbench/contrib/notebook/browser/view/renderers/ =================================================================== --- third-party-src.orig/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts +++ third-party-src/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts -@@ -319,7 +319,7 @@ export class BackLayerWebView extends Themable { +@@ -320,7 +320,7 @@ export class BackLayerWebView +Index: third-party-src/src/vs/code/electron-browser/workbench/workbench-dev.html +=================================================================== +--- third-party-src.orig/src/vs/code/electron-browser/workbench/workbench-dev.html ++++ third-party-src/src/vs/code/electron-browser/workbench/workbench-dev.html +@@ -26,7 +26,7 @@ + ; + script-src + 'self' +- 'unsafe-eval' ++ 'wasm-unsafe-eval' + blob: + 'nonce-0c6a828f1297' + ; +Index: third-party-src/src/vs/code/electron-browser/workbench/workbench.html +=================================================================== +--- third-party-src.orig/src/vs/code/electron-browser/workbench/workbench.html ++++ third-party-src/src/vs/code/electron-browser/workbench/workbench.html +@@ -26,7 +26,7 @@ + ; + script-src + 'self' +- 'unsafe-eval' ++ 'wasm-unsafe-eval' + blob: + ; + style-src diff --git a/patches/common/remove-builtin-extensions.diff b/patches/common/remove-builtin-extensions.diff index 290d4c3..6c7f71a 100644 --- a/patches/common/remove-builtin-extensions.diff +++ b/patches/common/remove-builtin-extensions.diff @@ -24,8 +24,8 @@ Index: third-party-src/product.json - }, - { - "name": "ms-vscode.js-debug", -- "version": "1.100.1", -- "sha256": "8c2218df3422d45b95e96d9d28cdc4aa4426a2799aaaedd862d3f60ecab03844", +- "version": "1.105.0", +- "sha256": "0c45b90342e8aafd4ff2963b4006de64208ca58c2fd01fea7a710fe61dcfd12a", - "repo": "https://github.com/microsoft/vscode-js-debug", - "metadata": { - "id": "25629058-ddac-4e17-abba-74678e126c5d", @@ -55,5 +55,5 @@ Index: third-party-src/product.json - } - } ], - "linkProtectionTrustedDomains": [ - "https://docs.aws.amazon.com", + "defaultChatAgent": { + "extensionId": "GitHub.copilot", diff --git a/patches/common/remove-cloud-changes-feature.diff b/patches/common/remove-cloud-changes-feature.diff index ab3a509..dc86ca5 100644 --- a/patches/common/remove-cloud-changes-feature.diff +++ b/patches/common/remove-cloud-changes-feature.diff @@ -2,13 +2,13 @@ Index: third-party-src/src/vs/workbench/workbench.common.main.ts =================================================================== --- third-party-src.orig/src/vs/workbench/workbench.common.main.ts +++ third-party-src/src/vs/workbench/workbench.common.main.ts -@@ -368,9 +368,6 @@ import './contrib/userDataSync/browser/u +@@ -379,9 +379,6 @@ import './contrib/userDataSync/browser/u // User Data Profiles import './contrib/userDataProfile/browser/userDataProfile.contribution.js'; -// Continue Edit Session -import './contrib/editSessions/browser/editSessions.contribution.js'; - - // Code Actions - import './contrib/codeActions/browser/codeActions.contribution.js'; + // Remote Coding Agents + import './contrib/remoteCodingAgents/browser/remoteCodingAgents.contribution.js'; diff --git a/patches/common/replace-gulp-untar.diff b/patches/common/replace-gulp-untar.diff index 93b28ce..da8ee8f 100644 --- a/patches/common/replace-gulp-untar.diff +++ b/patches/common/replace-gulp-untar.diff @@ -1,303 +1,78 @@ -Index: third-party-src/build/gulpfile.cli.js -=================================================================== ---- third-party-src.orig/build/gulpfile.cli.js -+++ third-party-src/build/gulpfile.cli.js -@@ -16,7 +16,7 @@ const { promises: fs, existsSync, mkdirS - - const task = require('./lib/task'); - const watcher = require('./lib/watch'); --const { debounce } = require('./lib/util'); -+const util = require('./lib/util'); - const createReporter = require('./lib/reporter').createReporter; - - const root = 'cli'; -@@ -110,7 +110,6 @@ const compileFromSources = (callback) => - }; - - const acquireBuiltOpenSSL = (callback) => { -- const untar = require('gulp-untar'); - const gunzip = require('gulp-gunzip'); - const dir = path.join(tmpdir(), 'vscode-openssl-download'); - mkdirSync(dir, { recursive: true }); -@@ -123,7 +122,7 @@ const acquireBuiltOpenSSL = (callback) = - - gulp.src('*.tgz', { cwd: dir }) - .pipe(gunzip()) -- .pipe(untar()) -+ .pipe(util.untar()) - .pipe(gulp.dest(`${root}/openssl`)) - .on('error', callback) - .on('end', () => { -@@ -177,7 +176,7 @@ const compileCliTask = task.define('comp - const watchCliTask = task.define('watch-cli', () => { - warnIfRustNotInstalled(); - return watcher(`${src}/**`, { read: false }) -- .pipe(debounce(compileCliTask)); -+ .pipe(util.debounce(compileCliTask)); - }); - - gulp.task(compileCliTask); -Index: third-party-src/build/gulpfile.reh.js -=================================================================== ---- third-party-src.orig/build/gulpfile.reh.js -+++ third-party-src/build/gulpfile.reh.js -@@ -186,7 +186,7 @@ if (defaultNodeTask) { - - function nodejs(platform, arch) { - const { fetchUrls, fetchGithub } = require('./lib/fetch'); -- const untar = require('gulp-untar'); -+ const untar = util.untar; - - if (arch === 'armhf') { - arch = 'armv7l'; -Index: third-party-src/build/lib/util.js -=================================================================== ---- third-party-src.orig/build/lib/util.js -+++ third-party-src/build/lib/util.js -@@ -3,10 +3,44 @@ - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -+ if (k2 === undefined) k2 = k; -+ var desc = Object.getOwnPropertyDescriptor(m, k); -+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -+ desc = { enumerable: true, get: function() { return m[k]; } }; -+ } -+ Object.defineProperty(o, k2, desc); -+}) : (function(o, m, k, k2) { -+ if (k2 === undefined) k2 = k; -+ o[k2] = m[k]; -+})); -+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -+ Object.defineProperty(o, "default", { enumerable: true, value: v }); -+}) : function(o, v) { -+ o["default"] = v; -+}); -+var __importStar = (this && this.__importStar) || (function () { -+ var ownKeys = function(o) { -+ ownKeys = Object.getOwnPropertyNames || function (o) { -+ var ar = []; -+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -+ return ar; -+ }; -+ return ownKeys(o); -+ }; -+ return function (mod) { -+ if (mod && mod.__esModule) return mod; -+ var result = {}; -+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -+ __setModuleDefault(result, mod); -+ return result; -+ }; -+})(); - var __importDefault = (this && this.__importDefault) || function (mod) { - return (mod && mod.__esModule) ? mod : { "default": mod }; - }; - Object.defineProperty(exports, "__esModule", { value: true }); -+exports.VinylStat = void 0; - exports.incremental = incremental; - exports.debounce = debounce; - exports.fixWin32DirectoryPermissions = fixWin32DirectoryPermissions; -@@ -26,6 +60,7 @@ exports.rebase = rebase; - exports.filter = filter; - exports.streamToPromise = streamToPromise; - exports.getElectronVersion = getElectronVersion; -+exports.untar = untar; - const event_stream_1 = __importDefault(require("event-stream")); - const debounce_1 = __importDefault(require("debounce")); - const gulp_filter_1 = __importDefault(require("gulp-filter")); -@@ -33,8 +68,10 @@ const gulp_rename_1 = __importDefault(re - const path_1 = __importDefault(require("path")); - const fs_1 = __importDefault(require("fs")); - const rimraf_1 = __importDefault(require("rimraf")); -+const vinyl_1 = __importDefault(require("vinyl")); - const url_1 = require("url"); - const ternary_stream_1 = __importDefault(require("ternary-stream")); -+const tar = __importStar(require("tar")); - const root = path_1.default.dirname(path_1.default.dirname(__dirname)); - const NoCancellationToken = { isCancellationRequested: () => false }; - function incremental(streamProvider, initial, supportsCancellation) { -@@ -311,4 +348,85 @@ function getElectronVersion() { - const msBuildId = /^ms_build_id="(.*)"$/m.exec(npmrc)[1]; - return { electronVersion, msBuildId }; - } -+class VinylStat { -+ dev; -+ ino; -+ mode; -+ nlink; -+ uid; -+ gid; -+ rdev; -+ size; -+ blksize; -+ blocks; -+ atimeMs; -+ mtimeMs; -+ ctimeMs; -+ birthtimeMs; -+ atime; -+ mtime; -+ ctime; -+ birthtime; -+ constructor(stat) { -+ this.dev = stat.dev ?? 0; -+ this.ino = stat.ino ?? 0; -+ this.mode = stat.mode ?? 0; -+ this.nlink = stat.nlink ?? 0; -+ this.uid = stat.uid ?? 0; -+ this.gid = stat.gid ?? 0; -+ this.rdev = stat.rdev ?? 0; -+ this.size = stat.size ?? 0; -+ this.blksize = stat.blksize ?? 0; -+ this.blocks = stat.blocks ?? 0; -+ this.atimeMs = stat.atimeMs ?? 0; -+ this.mtimeMs = stat.mtimeMs ?? 0; -+ this.ctimeMs = stat.ctimeMs ?? 0; -+ this.birthtimeMs = stat.birthtimeMs ?? 0; -+ this.atime = stat.atime ?? new Date(0); -+ this.mtime = stat.mtime ?? new Date(0); -+ this.ctime = stat.ctime ?? new Date(0); -+ this.birthtime = stat.birthtime ?? new Date(0); -+ } -+ isFile() { return true; } -+ isDirectory() { return false; } -+ isBlockDevice() { return false; } -+ isCharacterDevice() { return false; } -+ isSymbolicLink() { return false; } -+ isFIFO() { return false; } -+ isSocket() { return false; } -+} -+exports.VinylStat = VinylStat; -+function untar() { -+ return event_stream_1.default.through(function (f) { -+ if (!f.contents || !Buffer.isBuffer(f.contents)) { -+ this.emit('error', new Error('Expected file with Buffer contents')); -+ return; -+ } -+ const self = this; -+ const parser = new tar.Parser(); -+ parser.on('entry', (entry) => { -+ if (entry.type === 'File') { -+ const chunks = []; -+ entry.on('data', (chunk) => chunks.push(chunk)); -+ entry.on('end', () => { -+ const file = new vinyl_1.default({ -+ path: entry.path, -+ contents: Buffer.concat(chunks), -+ stat: new VinylStat({ -+ mode: entry.mode, -+ mtime: entry.mtime, -+ size: entry.size -+ }) -+ }); -+ self.emit('data', file); -+ }); -+ } -+ else { -+ entry.resume(); -+ } -+ }); -+ parser.on('error', (err) => self.emit('error', err)); -+ parser.end(f.contents); -+ }); -+} - //# sourceMappingURL=util.js.map -\ No newline at end of file Index: third-party-src/build/lib/util.ts =================================================================== --- third-party-src.orig/build/lib/util.ts +++ third-party-src/build/lib/util.ts -@@ -11,10 +11,12 @@ import path from 'path'; - import fs from 'fs'; - import _rimraf from 'rimraf'; - import VinylFile from 'vinyl'; --import { ThroughStream } from 'through'; -+import through from 'through'; +@@ -15,6 +15,8 @@ import through from 'through'; import sm from 'source-map'; import { pathToFileURL } from 'url'; import ternaryStream from 'ternary-stream'; +import type { Transform } from 'stream'; +import * as tar from 'tar'; - const root = path.dirname(path.dirname(__dirname)); - -@@ -351,7 +353,7 @@ export function rebase(count: number): N - } - - export interface FilterStream extends NodeJS.ReadWriteStream { -- restore: ThroughStream; -+ restore: through.ThroughStream; - } + const root = path.dirname(path.dirname(import.meta.dirname)); - export function filter(fn: (data: any) => boolean): FilterStream { -@@ -380,3 +382,90 @@ export function getElectronVersion(): Re - const msBuildId = /^ms_build_id="(.*)"$/m.exec(npmrc)![1]; +@@ -379,53 +381,38 @@ export function getElectronVersion(): Re return { electronVersion, msBuildId }; } -+ -+export class VinylStat implements fs.Stats { -+ -+ readonly dev: number; -+ readonly ino: number; -+ readonly mode: number; -+ readonly nlink: number; -+ readonly uid: number; -+ readonly gid: number; -+ readonly rdev: number; -+ readonly size: number; -+ readonly blksize: number; -+ readonly blocks: number; -+ readonly atimeMs: number; -+ readonly mtimeMs: number; -+ readonly ctimeMs: number; -+ readonly birthtimeMs: number; -+ readonly atime: Date; -+ readonly mtime: Date; -+ readonly ctime: Date; -+ readonly birthtime: Date; -+ -+ constructor(stat: Partial) { -+ this.dev = stat.dev ?? 0; -+ this.ino = stat.ino ?? 0; -+ this.mode = stat.mode ?? 0; -+ this.nlink = stat.nlink ?? 0; -+ this.uid = stat.uid ?? 0; -+ this.gid = stat.gid ?? 0; -+ this.rdev = stat.rdev ?? 0; -+ this.size = stat.size ?? 0; -+ this.blksize = stat.blksize ?? 0; -+ this.blocks = stat.blocks ?? 0; -+ this.atimeMs = stat.atimeMs ?? 0; -+ this.mtimeMs = stat.mtimeMs ?? 0; -+ this.ctimeMs = stat.ctimeMs ?? 0; -+ this.birthtimeMs = stat.birthtimeMs ?? 0; -+ this.atime = stat.atime ?? new Date(0); -+ this.mtime = stat.mtime ?? new Date(0); -+ this.ctime = stat.ctime ?? new Date(0); -+ this.birthtime = stat.birthtime ?? new Date(0); -+ } -+ -+ isFile(): boolean { return true; } -+ isDirectory(): boolean { return false; } -+ isBlockDevice(): boolean { return false; } -+ isCharacterDevice(): boolean { return false; } -+ isSymbolicLink(): boolean { return false; } -+ isFIFO(): boolean { return false; } -+ isSocket(): boolean { return false; } -+} -+ + +-export class VinylStat implements fs.Stats { +export function untar(): Transform { + return es.through(function (this: through.ThroughStream, f: VinylFile) { + if (!f.contents || !Buffer.isBuffer(f.contents)) { + this.emit('error', new Error('Expected file with Buffer contents')); + return; + } -+ + +- readonly dev: number; +- readonly ino: number; +- readonly mode: number; +- readonly nlink: number; +- readonly uid: number; +- readonly gid: number; +- readonly rdev: number; +- readonly size: number; +- readonly blksize: number; +- readonly blocks: number; +- readonly atimeMs: number; +- readonly mtimeMs: number; +- readonly ctimeMs: number; +- readonly birthtimeMs: number; +- readonly atime: Date; +- readonly mtime: Date; +- readonly ctime: Date; +- readonly birthtime: Date; +- +- constructor(stat: Partial) { +- this.dev = stat.dev ?? 0; +- this.ino = stat.ino ?? 0; +- this.mode = stat.mode ?? 0; +- this.nlink = stat.nlink ?? 0; +- this.uid = stat.uid ?? 0; +- this.gid = stat.gid ?? 0; +- this.rdev = stat.rdev ?? 0; +- this.size = stat.size ?? 0; +- this.blksize = stat.blksize ?? 0; +- this.blocks = stat.blocks ?? 0; +- this.atimeMs = stat.atimeMs ?? 0; +- this.mtimeMs = stat.mtimeMs ?? 0; +- this.ctimeMs = stat.ctimeMs ?? 0; +- this.birthtimeMs = stat.birthtimeMs ?? 0; +- this.atime = stat.atime ?? new Date(0); +- this.mtime = stat.mtime ?? new Date(0); +- this.ctime = stat.ctime ?? new Date(0); +- this.birthtime = stat.birthtime ?? new Date(0); +- } + const self = this; + const parser = new tar.Parser(); -+ + +- isFile(): boolean { return true; } +- isDirectory(): boolean { return false; } +- isBlockDevice(): boolean { return false; } +- isCharacterDevice(): boolean { return false; } +- isSymbolicLink(): boolean { return false; } +- isFIFO(): boolean { return false; } +- isSocket(): boolean { return false; } +-} + parser.on('entry', (entry: tar.ReadEntry) => { + if (entry.type === 'File') { + const chunks: Buffer[] = []; @@ -328,7 +103,7 @@ Index: third-party-src/package.json =================================================================== --- third-party-src.orig/package.json +++ third-party-src/package.json -@@ -178,7 +178,6 @@ +@@ -182,7 +182,6 @@ "gulp-replace": "^0.5.4", "gulp-sourcemaps": "^3.0.0", "gulp-svgmin": "^4.1.0", @@ -336,11 +111,74 @@ Index: third-party-src/package.json "husky": "^0.13.1", "innosetup": "^6.4.1", "istanbul-lib-coverage": "^3.2.0", -@@ -206,6 +205,7 @@ +@@ -209,6 +208,7 @@ "source-map": "0.6.1", "source-map-support": "^0.3.2", "style-loader": "^3.3.2", + "tar": "^7.5.4", "ts-loader": "^9.5.1", - "ts-node": "^10.9.1", "tsec": "0.2.7", + "tslib": "^2.6.3", +Index: third-party-src/build/gulpfile.cli.ts +=================================================================== +--- third-party-src.orig/build/gulpfile.cli.ts ++++ third-party-src/build/gulpfile.cli.ts +@@ -13,9 +13,8 @@ import { tmpdir } from 'os'; + import { existsSync, mkdirSync, rmSync } from 'fs'; + import * as task from './lib/task.ts'; + import watcher from './lib/watch/index.ts'; +-import { debounce } from './lib/util.ts'; ++import * as util from './lib/util.ts'; + import { createReporter } from './lib/reporter.ts'; +-import untar from 'gulp-untar'; + import gunzip from 'gulp-gunzip'; + + const root = 'cli'; +@@ -88,7 +87,7 @@ const acquireBuiltOpenSSL = (callback: ( + + gulp.src('*.tgz', { cwd: dir }) + .pipe(gunzip()) +- .pipe(untar()) ++ .pipe(util.untar()) + .pipe(gulp.dest(`${root}/openssl`)) + .on('error', callback) + .on('end', () => { +@@ -141,7 +140,7 @@ const compileCliTask = task.define('comp + const watchCliTask = task.define('watch-cli', () => { + warnIfRustNotInstalled(); + return watcher(`${src}/**`, { read: false }) +- .pipe(debounce(compileCliTask as task.StreamTask)); ++ .pipe(util.debounce(compileCliTask as task.StreamTask)); + }); + + gulp.task(compileCliTask); +Index: third-party-src/build/gulpfile.reh.ts +=================================================================== +--- third-party-src.orig/build/gulpfile.reh.ts ++++ third-party-src/build/gulpfile.reh.ts +@@ -21,7 +21,7 @@ import vfs from 'vinyl-fs'; + import packageJson from '../package.json' with { type: 'json' }; + import flatmap from 'gulp-flatmap'; + import gunzip from 'gulp-gunzip'; +-import untar from 'gulp-untar'; ++ + import File from 'vinyl'; + import * as fs from 'fs'; + import glob from 'glob'; +@@ -236,14 +236,14 @@ function nodejs(platform: string, arch: + return (product.nodejsRepository !== 'https://nodejs.org' ? + fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: expectedName!, checksumSha256 }) : + fetchUrls(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org', checksumSha256 }) +- ).pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar()))) ++ ).pipe(flatmap(stream => stream.pipe(gunzip()).pipe(util.untar()))) + .pipe(filter('**/node')) + .pipe(util.setExecutableBit('**')) + .pipe(rename('node')); + case 'alpine': + return product.nodejsRepository !== 'https://nodejs.org' ? + fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: expectedName!, checksumSha256 }) +- .pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar()))) ++ .pipe(flatmap(stream => stream.pipe(gunzip()).pipe(util.untar()))) + .pipe(filter('**/node')) + .pipe(util.setExecutableBit('**')) + .pipe(rename('node')) diff --git a/patches/common/trusted-domains.diff b/patches/common/trusted-domains.diff index 7830b4b..a7d31bb 100644 --- a/patches/common/trusted-domains.diff +++ b/patches/common/trusted-domains.diff @@ -92,11 +92,12 @@ Index: third-party-src/product.json =================================================================== --- third-party-src.orig/product.json +++ third-party-src/product.json -@@ -82,5 +82,16 @@ - "publisherDisplayName": "Microsoft" - } - } -+ ], +@@ -150,5 +150,16 @@ + "github-enterprise": [ + "GitHub.copilot-chat" + ] +- } ++ }, + "linkProtectionTrustedDomains": [ + "https://docs.aws.amazon.com", + "https://docs.amazonaws.cn", @@ -107,5 +108,5 @@ Index: third-party-src/product.json + "https://console.amazonaws.cn", + "https://aws.amazon.com", + "https://*.amazon.com" - ] ++ ] } From cf0f74be9ce04756d17ba84028a28b1a2f45ebbb Mon Sep 17 00:00:00 2001 From: Feiyang Liu Date: Mon, 26 Jan 2026 10:29:07 +0100 Subject: [PATCH 06/24] Rebase patches for target code-editor-server --- patches/web-server/display-language.diff | 96 ++++++++----------- patches/web-server/marketplace.diff | 30 +++--- patches/web-server/proxy-uri.diff | 45 ++++----- ...ppress-known-errors-build-integration.diff | 26 ++--- 4 files changed, 93 insertions(+), 104 deletions(-) diff --git a/patches/web-server/display-language.diff b/patches/web-server/display-language.diff index 5a247cb..e3589a5 100644 --- a/patches/web-server/display-language.diff +++ b/patches/web-server/display-language.diff @@ -14,16 +14,16 @@ Index: third-party-src/src/vs/server/node/serverServices.ts +++ third-party-src/src/vs/server/node/serverServices.ts @@ -11,7 +11,7 @@ import * as path from '../../base/common import { IURITransformer } from '../../base/common/uriIpc.js'; - import { getMachineId, getSqmMachineId, getdevDeviceId } from '../../base/node/id.js'; + import { getMachineId, getSqmMachineId, getDevDeviceId } from '../../base/node/id.js'; import { Promises } from '../../base/node/pfs.js'; -import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, StaticRouter } from '../../base/parts/ipc/common/ipc.js'; +import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, ProxyChannel, StaticRouter } from '../../base/parts/ipc/common/ipc.js'; import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js'; import { IConfigurationService } from '../../platform/configuration/common/configuration.js'; import { ConfigurationService } from '../../platform/configuration/common/configurationService.js'; -@@ -241,6 +241,9 @@ export async function setupServerService - const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)); - socketServer.registerChannel('extensions', channel); +@@ -258,6 +258,9 @@ export async function setupServerService + + socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority))); + const languagePackChannel = ProxyChannel.fromService(accessor.get(ILanguagePackService), disposables); + socketServer.registerChannel('languagePacks', languagePackChannel); @@ -35,7 +35,7 @@ Index: third-party-src/src/vs/platform/environment/common/environmentService.ts =================================================================== --- third-party-src.orig/src/vs/platform/environment/common/environmentService.ts +++ third-party-src/src/vs/platform/environment/common/environmentService.ts -@@ -101,7 +101,7 @@ export abstract class AbstractNativeEnvi +@@ -98,7 +98,7 @@ export abstract class AbstractNativeEnvi return URI.file(join(vscodePortable, 'argv.json')); } @@ -218,15 +218,15 @@ Index: third-party-src/src/vs/server/node/serverEnvironmentService.ts =================================================================== --- third-party-src.orig/src/vs/server/node/serverEnvironmentService.ts +++ third-party-src/src/vs/server/node/serverEnvironmentService.ts -@@ -13,6 +13,7 @@ import { memoize } from '../../base/comm - import { URI } from '../../base/common/uri.js'; +@@ -16,6 +16,7 @@ import { join } from '../../base/common/ + import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js'; export const serverOptions: OptionDescriptions> = { + 'locale': { type: 'string' }, /* ----- server setup ----- */ -@@ -98,6 +99,7 @@ export const serverOptions: OptionDescri +@@ -104,6 +105,7 @@ export const serverOptions: OptionDescri }; export interface ServerParsedArgs { @@ -272,35 +272,11 @@ Index: third-party-src/src/vs/platform/languagePacks/browser/languagePacks.ts + return this.languagePackService.getInstalledLanguages(); } } -Index: third-party-src/src/vs/workbench/services/localization/electron-sandbox/localeService.ts -=================================================================== ---- third-party-src.orig/src/vs/workbench/services/localization/electron-sandbox/localeService.ts -+++ third-party-src/src/vs/workbench/services/localization/electron-sandbox/localeService.ts -@@ -51,7 +51,8 @@ class NativeLocaleService implements ILo - @IProductService private readonly productService: IProductService - ) { } - -- private async validateLocaleFile(): Promise { -+ // Make public just so we do not have to patch all the unused code out. -+ public async validateLocaleFile(): Promise { - try { - const content = await this.textFileService.read(this.environmentService.argvResource, { encoding: 'utf8' }); - -@@ -78,9 +79,6 @@ class NativeLocaleService implements ILo - } - - private async writeLocaleValue(locale: string | undefined): Promise { -- if (!(await this.validateLocaleFile())) { -- return false; -- } - await this.jsonEditingService.write(this.environmentService.argvResource, [{ path: ['locale'], value: locale }], true); - return true; - } Index: third-party-src/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts =================================================================== --- third-party-src.orig/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts +++ third-party-src/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts -@@ -475,9 +475,6 @@ export class InstallAction extends Exten +@@ -474,9 +474,6 @@ export class InstallAction extends Exten if (this.extension.isBuiltin) { return; } @@ -310,7 +286,7 @@ Index: third-party-src/src/vs/workbench/contrib/extensions/browser/extensionsAct if (this.extension.state !== ExtensionState.Uninstalled) { return; } -@@ -782,7 +779,7 @@ export abstract class InstallInOtherServ +@@ -781,7 +778,7 @@ export abstract class InstallInOtherServ } if (isLanguagePackExtension(this.extension.local.manifest)) { @@ -319,7 +295,7 @@ Index: third-party-src/src/vs/workbench/contrib/extensions/browser/extensionsAct } // Prefers to run on UI -@@ -2073,17 +2070,6 @@ export class SetLanguageAction extends E +@@ -2072,17 +2069,6 @@ export class SetLanguageAction extends E update(): void { this.enabled = false; this.class = SetLanguageAction.DisabledClass; @@ -337,7 +313,7 @@ Index: third-party-src/src/vs/workbench/contrib/extensions/browser/extensionsAct } override async run(): Promise { -@@ -2100,7 +2086,6 @@ export class ClearLanguageAction extends +@@ -2099,7 +2085,6 @@ export class ClearLanguageAction extends private static readonly DisabledClass = `${this.EnabledClass} disabled`; constructor( @@ -345,7 +321,7 @@ Index: third-party-src/src/vs/workbench/contrib/extensions/browser/extensionsAct @ILocaleService private readonly localeService: ILocaleService, ) { super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false); -@@ -2110,17 +2095,6 @@ export class ClearLanguageAction extends +@@ -2109,17 +2094,6 @@ export class ClearLanguageAction extends update(): void { this.enabled = false; this.class = ClearLanguageAction.DisabledClass; @@ -363,28 +339,16 @@ Index: third-party-src/src/vs/workbench/contrib/extensions/browser/extensionsAct } override async run(): Promise { -Index: third-party-src/build/gulpfile.reh.js -=================================================================== ---- third-party-src.orig/build/gulpfile.reh.js -+++ third-party-src/build/gulpfile.reh.js -@@ -59,6 +59,7 @@ const serverResourceIncludes = [ - - // NLS - 'out-build/nls.messages.json', -+ 'out-build/nls.keys.json', // Required to generate translations. - - // Process monitor - 'out-build/vs/base/node/cpuUsage.sh', Index: third-party-src/src/vs/workbench/workbench.web.main.internal.ts =================================================================== --- third-party-src.orig/src/vs/workbench/workbench.web.main.internal.ts +++ third-party-src/src/vs/workbench/workbench.web.main.internal.ts -@@ -53,7 +53,7 @@ import './services/dialogs/browser/fileD +@@ -54,7 +54,7 @@ import './services/dialogs/browser/fileD import './services/host/browser/browserHostService.js'; import './services/lifecycle/browser/lifecycleService.js'; import './services/clipboard/browser/clipboardService.js'; -import './services/localization/browser/localeService.js'; -+import './services/localization/electron-sandbox/localeService.js'; ++import './services/localization/electron-browser/localeService.js'; import './services/path/browser/pathService.js'; import './services/themes/browser/browserHostColorSchemeService.js'; import './services/encryption/browser/encryptionService.js'; @@ -392,7 +356,7 @@ Index: third-party-src/src/vs/workbench/contrib/localization/common/localization =================================================================== --- third-party-src.orig/src/vs/workbench/contrib/localization/common/localizationsActions.ts +++ third-party-src/src/vs/workbench/contrib/localization/common/localizationsActions.ts -@@ -12,6 +12,7 @@ import { ServicesAccessor } from '../../ +@@ -11,6 +11,7 @@ import { ServicesAccessor } from '../../ import { ILanguagePackItem, ILanguagePackService } from '../../../../platform/languagePacks/common/languagePacks.js'; import { ILocaleService } from '../../../services/localization/common/locale.js'; import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js'; @@ -400,7 +364,7 @@ Index: third-party-src/src/vs/workbench/contrib/localization/common/localization export class ConfigureDisplayLanguageAction extends Action2 { public static readonly ID = 'workbench.action.configureLocale'; -@@ -37,6 +38,16 @@ export class ConfigureDisplayLanguageAct +@@ -36,6 +37,16 @@ export class ConfigureDisplayLanguageAct const installedLanguages = await languagePackService.getInstalledLanguages(); @@ -416,4 +380,28 @@ Index: third-party-src/src/vs/workbench/contrib/localization/common/localization + const disposables = new DisposableStore(); const qp = disposables.add(quickInputService.createQuickPick({ useSeparators: true })); - qp.matchOnDescription = true; \ No newline at end of file + qp.matchOnDescription = true; +Index: third-party-src/src/vs/workbench/services/localization/electron-browser/localeService.ts +=================================================================== +--- third-party-src.orig/src/vs/workbench/services/localization/electron-browser/localeService.ts ++++ third-party-src/src/vs/workbench/services/localization/electron-browser/localeService.ts +@@ -51,7 +51,8 @@ class NativeLocaleService implements ILo + @IProductService private readonly productService: IProductService + ) { } + +- private async validateLocaleFile(): Promise { ++ // Make public just so we do not have to patch all the unused code out. ++ public async validateLocaleFile(): Promise { + try { + const content = await this.textFileService.read(this.environmentService.argvResource, { encoding: 'utf8' }); + +@@ -78,9 +79,6 @@ class NativeLocaleService implements ILo + } + + private async writeLocaleValue(locale: string | undefined): Promise { +- if (!(await this.validateLocaleFile())) { +- return false; +- } + await this.jsonEditingService.write(this.environmentService.argvResource, [{ path: ['locale'], value: locale }], true); + return true; + } diff --git a/patches/web-server/marketplace.diff b/patches/web-server/marketplace.diff index d648119..67f0bf8 100644 --- a/patches/web-server/marketplace.diff +++ b/patches/web-server/marketplace.diff @@ -48,7 +48,7 @@ Index: third-party-src/src/vs/platform/extensionManagement/common/extensionGalle =================================================================== --- third-party-src.orig/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.ts +++ third-party-src/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.ts -@@ -46,7 +46,7 @@ export class ExtensionGalleryManifestSer +@@ -47,7 +47,7 @@ export class ExtensionGalleryManifestSer type: ExtensionGalleryResourceType.ExtensionQueryService }, { @@ -57,7 +57,7 @@ Index: third-party-src/src/vs/platform/extensionManagement/common/extensionGalle type: ExtensionGalleryResourceType.ExtensionLatestVersionUri }, { -Index: sagemaker-code-editor/vscode/src/vs/platform/product/common/product.ts +Index: third-party-src/src/vs/platform/product/common/product.ts =================================================================== --- third-party-src.orig/src/vs/platform/product/common/product.ts +++ third-party-src/src/vs/platform/product/common/product.ts @@ -80,32 +80,32 @@ Index: third-party-src/src/vs/workbench/contrib/extensions/browser/extensionsVie =================================================================== --- third-party-src.orig/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts +++ third-party-src/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts -@@ -70,6 +70,8 @@ import { ILocalizedString } from '../../../../pla - import { IExtensionGalleryManifest, IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js'; +@@ -70,6 +70,8 @@ import { IExtensionGalleryManifest, IExt import { URI } from '../../../../base/common/uri.js'; - import { IMcpGalleryService } from '../../../../platform/mcp/common/mcpManagement.js'; + import { DEFAULT_ACCOUNT_SIGN_IN_COMMAND } from '../../../services/accounts/common/defaultAccount.js'; + import { IHoverService } from '../../../../platform/hover/browser/hover.js'; +import { IProductService } from '../../../../platform/product/common/productService.js'; +import { memoize } from '../../../../base/common/decorators.js'; export const ExtensionsSortByContext = new RawContextKey('extensionsSortByValue', ''); export const SearchMarketplaceExtensionsContext = new RawContextKey('searchMarketplaceExtensions', false); -@@ -93,7 +93,6 @@ const SortByUpdateDateContext = new RawC - const REMOTE_CATEGORY: ILocalizedString = localize2({ key: 'remote', comment: ['Remote as in remote machine'] }, "Remote"); +@@ -97,7 +99,6 @@ interface IExtensionsViewletState { + } export class ExtensionsViewletViewsContribution extends Disposable implements IWorkbenchContribution { - private readonly container: ViewContainer; constructor( -@@ -528,6 +528,7 @@ export class ExtensionsViewPaneContainer +@@ -561,6 +562,7 @@ export class ExtensionsViewPaneContainer @IExtensionService extensionService: IExtensionService, @IViewDescriptorService viewDescriptorService: IViewDescriptorService, @IPreferencesService private readonly preferencesService: IPreferencesService, + @IProductService private readonly productService: IProductService, @ICommandService private readonly commandService: ICommandService, - @IMcpGalleryService private readonly mcpGalleryService: IMcpGalleryService, @ILogService logService: ILogService, -@@ -569,6 +571,15 @@ export class ExtensionsViewPaneContainer + @IHoverService private readonly hoverService: IHoverService, +@@ -602,6 +604,15 @@ export class ExtensionsViewPaneContainer }); } @@ -121,13 +121,13 @@ Index: third-party-src/src/vs/workbench/contrib/extensions/browser/extensionsVie get searchValue(): string | undefined { return this.searchBox?.getValue(); } -@@ -583,8 +594,7 @@ export class ExtensionsViewPaneContainer - hide(overlay); - - this.header = append(this.root, $('.header')); +@@ -616,8 +627,7 @@ export class ExtensionsViewPaneContainer + hide(overlay); + + this.header = append(this.root, $('.header')); - const placeholder = localize('searchExtensions', "Search Extensions in Marketplace"); - + const placeholder = localize('searchExtensions', 'Search extensions in {0}', this.extensionsGalleryHostname); const searchValue = this.searchViewletState['query.value'] ? this.searchViewletState['query.value'] : ''; - const searchContainer = append(this.header, $('.extensions-search-container')); \ No newline at end of file + const searchContainer = append(this.header, $('.extensions-search-container')); diff --git a/patches/web-server/proxy-uri.diff b/patches/web-server/proxy-uri.diff index eff5801..ea7818c 100644 --- a/patches/web-server/proxy-uri.diff +++ b/patches/web-server/proxy-uri.diff @@ -2,15 +2,15 @@ Index: third-party-src/package.json =================================================================== --- third-party-src.orig/package.json +++ third-party-src/package.json -@@ -96,6 +96,7 @@ - "@xterm/addon-webgl": "^0.19.0-beta.107", - "@xterm/headless": "^5.6.0-beta.107", - "@xterm/xterm": "^5.6.0-beta.107", +@@ -99,6 +99,7 @@ + "@xterm/addon-webgl": "^0.20.0-beta.101", + "@xterm/headless": "^6.1.0-beta.91", + "@xterm/xterm": "^6.1.0-beta.91", + "http-proxy": "^1.18.1", "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.2", "jschardet": "3.1.4", -@@ -121,6 +122,7 @@ +@@ -125,6 +126,7 @@ "@types/debug": "^4.1.5", "@types/eslint": "^9.6.1", "@types/gulp-svgmin": "^1.2.1", @@ -23,8 +23,8 @@ Index: third-party-src/remote/package.json --- third-party-src.orig/remote/package.json +++ third-party-src/remote/package.json @@ -26,6 +26,7 @@ - "@xterm/headless": "^5.6.0-beta.107", - "@xterm/xterm": "^5.6.0-beta.107", + "@xterm/headless": "^6.1.0-beta.91", + "@xterm/xterm": "^6.1.0-beta.91", "cookie": "^0.7.0", + "http-proxy": "^1.18.1", "http-proxy-agent": "^7.0.0", @@ -34,7 +34,7 @@ Index: third-party-src/src/vs/code/browser/workbench/workbench.ts =================================================================== --- third-party-src.orig/src/vs/code/browser/workbench/workbench.ts +++ third-party-src/src/vs/code/browser/workbench/workbench.ts -@@ -21,6 +21,7 @@ import type { IWorkbenchConstructionOpti +@@ -22,6 +22,7 @@ import type { IWorkbenchConstructionOpti import { AuthenticationSessionInfo } from '../../../workbench/services/authentication/browser/authenticationService.js'; import type { IURLCallbackProvider } from '../../../workbench/services/url/browser/urlService.js'; import { create } from '../../../workbench/workbench.web.main.internal.js'; @@ -42,7 +42,7 @@ Index: third-party-src/src/vs/code/browser/workbench/workbench.ts interface ISecretStorageCrypto { seal(data: string): Promise; -@@ -629,6 +630,20 @@ function readCookie(name: string): strin +@@ -635,6 +636,20 @@ function readCookie(name: string): strin settingsSyncOptions: config.settingsSyncOptions ? { enabled: config.settingsSyncOptions.enabled, } : undefined, workspaceProvider: WorkspaceProvider.create(config), urlCallbackProvider: new LocalStorageURLCallbackProvider(config.callbackRoute), @@ -264,18 +264,18 @@ Index: third-party-src/src/vs/server/node/remoteExtensionHostAgentServer.ts +import { ProxyServer } from './proxyServer.js'; + - import * as crypto from 'crypto'; import * as fs from 'fs'; - import * as http from 'http'; -@@ -64,6 +66,7 @@ class RemoteExtensionHostAgentServer ext + import type * as http from 'http'; + import * as net from 'net'; +@@ -63,6 +65,7 @@ class RemoteExtensionHostAgentServer ext private readonly _managementConnections: { [reconnectionToken: string]: ManagementConnection }; private readonly _allReconnectionTokens: Set; private readonly _webClientServer: WebClientServer | null; + private readonly _proxyServer: ProxyServer | null; private readonly _webEndpointOriginChecker: WebEndpointOriginChecker; + private readonly _reconnectionGraceTime: number; - private readonly _serverBasePath: string | undefined; -@@ -99,12 +102,24 @@ class RemoteExtensionHostAgentServer ext +@@ -99,6 +102,11 @@ class RemoteExtensionHostAgentServer ext ? this._instantiationService.createInstance(WebClientServer, this._connectionToken, serverBasePath ?? '/', this._serverProductPath) : null ); @@ -285,8 +285,9 @@ Index: third-party-src/src/vs/server/node/remoteExtensionHostAgentServer.ts + : null + ); this._logService.info(`Extension host agent started.`); + this._reconnectionGraceTime = this._environmentService.reconnectionGraceTime; - this._waitThenShutdown(true); +@@ -106,6 +114,13 @@ class RemoteExtensionHostAgentServer ext } public async handleRequest(req: http.IncomingMessage, res: http.ServerResponse): Promise { @@ -300,7 +301,7 @@ Index: third-party-src/src/vs/server/node/remoteExtensionHostAgentServer.ts // Only serve GET requests if (req.method !== 'GET') { return serveError(req, res, 405, `Unsupported method ${req.method}`); -@@ -133,7 +148,6 @@ class RemoteExtensionHostAgentServer ext +@@ -134,7 +149,6 @@ class RemoteExtensionHostAgentServer ext // Custom health check endpoint if (pathname === '/healthz') { res.writeHead(200, { 'Content-Type': 'application/json' }); @@ -308,7 +309,7 @@ Index: third-party-src/src/vs/server/node/remoteExtensionHostAgentServer.ts return void res.end(JSON.stringify({ hasActiveConnections })); } -@@ -198,12 +212,17 @@ class RemoteExtensionHostAgentServer ext +@@ -199,12 +213,17 @@ class RemoteExtensionHostAgentServer ext return void res.end('Not found'); } @@ -327,7 +328,7 @@ Index: third-party-src/src/vs/server/node/remoteExtensionHostAgentServer.ts const query = url.parse(req.url, true).query; if (typeof query.reconnectionToken === 'string') { reconnectionToken = query.reconnectionToken; -@@ -541,6 +560,8 @@ class RemoteExtensionHostAgentServer ext +@@ -500,6 +519,8 @@ class RemoteExtensionHostAgentServer ext return this._rejectWebSocketConnection(logPrefix, protocol, `Unknown initial data received`); } @@ -336,7 +337,7 @@ Index: third-party-src/src/vs/server/node/remoteExtensionHostAgentServer.ts } private async _createTunnel(protocol: PersistentProtocol, tunnelStartParams: ITunnelConnectionStartParams): Promise { -@@ -673,7 +694,7 @@ export interface IServerAPI { +@@ -632,7 +653,7 @@ export interface IServerAPI { /** * Do not remove!!. Called from server-main.js */ @@ -349,7 +350,7 @@ Index: third-party-src/src/server-main.ts =================================================================== --- third-party-src.orig/src/server-main.ts +++ third-party-src/src/server-main.ts -@@ -96,14 +96,14 @@ if (shouldSpawnCli) { +@@ -93,14 +93,14 @@ if (shouldSpawnCli) { const remoteExtensionHostAgentServer = await getRemoteExtensionHostAgentServer(); return remoteExtensionHostAgentServer.handleRequest(req, res); }); @@ -360,7 +361,7 @@ Index: third-party-src/src/server-main.ts perf.mark('code/server/firstWebSocket'); } const remoteExtensionHostAgentServer = await getRemoteExtensionHostAgentServer(); - // @ts-ignore + // @ts-expect-error - return remoteExtensionHostAgentServer.handleUpgrade(req, socket); + return remoteExtensionHostAgentServer.handleUpgrade(req, socket, head); }); @@ -621,7 +622,7 @@ Index: third-party-src/src/vs/workbench/services/remote/common/tunnelModel.ts =================================================================== --- third-party-src.orig/src/vs/workbench/services/remote/common/tunnelModel.ts +++ third-party-src/src/vs/workbench/services/remote/common/tunnelModel.ts -@@ -558,13 +558,7 @@ export class TunnelModel extends Disposa +@@ -557,13 +557,7 @@ export class TunnelModel extends Disposa } private async addStorageKeyPostfix(prefix: string): Promise { diff --git a/patches/web-server/suppress-known-errors-build-integration.diff b/patches/web-server/suppress-known-errors-build-integration.diff index 90d92aa..795b60a 100644 --- a/patches/web-server/suppress-known-errors-build-integration.diff +++ b/patches/web-server/suppress-known-errors-build-integration.diff @@ -1,16 +1,3 @@ -Index: third-party-src/build/gulpfile.reh.js -=================================================================== ---- third-party-src.orig/build/gulpfile.reh.js -+++ third-party-src/build/gulpfile.reh.js -@@ -78,6 +78,8 @@ const serverResourceIncludes = [ - 'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration-login.zsh', - 'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish', - -+ // Error handler -+ 'out-build/vs/editor/common/errors/suppressedErrors.js' - ]; - - const serverResourceExcludes = [ Index: third-party-src/src/vs/code/browser/workbench/workbench.html =================================================================== --- third-party-src.orig/src/vs/code/browser/workbench/workbench.html @@ -85,3 +72,16 @@ Index: third-party-src/src/vs/code/browser/workbench/workbench-dev.html