Skip to content

fix(patches): rebase 9 patches for VS Code 1.132.0 #38

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
sbs44 merged 3 commits into from
Aug 8, 2026
Merged

fix(patches): rebase 9 patches for VS Code 1.132.0 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4571972
fix(patches): rebase 9 patches for VS Code 1.132.0
sbs44 Aug 8, 2026
3a20ef7
fix(patches): resolve 10 tsgo errors in 51-ext-copilot-remove-it ports
sbs44 Aug 8, 2026
d185f53
chore: bump .nvmrc to 24.18.0 for VS Code 1.132.0
sbs44 Aug 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.15.0
24.18.0
1,583 changes: 454 additions & 1,129 deletions patches/00-brand-remove-branding.patch
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions patches/00-build-download-extensions-from-gh.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
diff --git a/build/lib/builtInExtensions.ts b/build/lib/builtInExtensions.ts
index d52567b..fe5b988 100644
index de687da4..2436a1fc 100644
--- a/build/lib/builtInExtensions.ts
+++ b/build/lib/builtInExtensions.ts
@@ -75,4 +75,2 @@ function getExtensionDownloadStream(extension: IExtensionDefinition) {
input = ext.fromVsix(path.join(root, extension.vsix), extension);
@@ -95,4 +95,2 @@ function getExtensionDownloadStream(extension: IExtensionDefinition) {
input = ext.fromGithub(extension, { asset, latest: isInsiders() });
- } else if (productjson.extensionsGallery?.serviceUrl) {
- input = ext.fromMarketplace(productjson.extensionsGallery.serviceUrl, extension);
} else {
122 changes: 24 additions & 98 deletions patches/00-copilot-fix-action-condition.patch
View file
Open in desktop

Large diffs are not rendered by default.

74 changes: 31 additions & 43 deletions patches/00-vsce-use-custom-lib.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/build/.moduleignore b/build/.moduleignore
index f83624f8..00779f06 100644
index ed8de136..6149b1ac 100644
--- a/build/.moduleignore
+++ b/build/.moduleignore
@@ -82,7 +82,7 @@ native-is-elevated/deps/**
@@ -86,7 +86,7 @@ native-is-elevated/deps/**

-@vscode/vsce-sign/**
-!@vscode/vsce-sign/src/main.d.ts
Expand All @@ -16,38 +16,38 @@ index f83624f8..00779f06 100644
+!@vscodium/vsce-sign/bin/**

diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
index 080d97f3..180177c5 100644
index 66514015..3323376d 100644
--- a/build/gulpfile.vscode.ts
+++ b/build/gulpfile.vscode.ts
@@ -460,3 +460,3 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
@@ -410,3 +410,3 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
'**/*.wasm',
- '**/@vscode/vsce-sign/bin/*',
+ '**/@vscodium/vsce-sign/bin/*',
], [
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
index a25395c9..d87ff9aa 100644
index 6a54fbe9..842f0e62 100644
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -126,3 +126,3 @@ export function typeCheckExtensionStream(extensionPath: string, forWeb: boolean)
@@ -128,3 +128,3 @@ export function typeCheckExtensionStream(extensionPath: string, forWeb: boolean)
function fromLocalNormal(extensionPath: string): Stream {
- const vsce = require('@vscode/vsce') as typeof import('@vscode/vsce');
+ const vsce = require('@vscodium/vsce') as typeof import('@vscodium/vsce');
const result = es.through();
@@ -148,3 +148,3 @@ function fromLocalNormal(extensionPath: string): Stream {
@@ -150,3 +150,3 @@ function fromLocalNormal(extensionPath: string): Stream {
function fromLocalEsbuild(extensionPath: string, esbuildConfigFileName: string): Stream {
- const vsce = require('@vscode/vsce') as typeof import('@vscode/vsce');
+ const vsce = require('@vscodium/vsce') as typeof import('@vscodium/vsce');
const result = es.through();
diff --git a/build/package-lock.json b/build/package-lock.json
index 92f3b6a4..420464b0 100644
index e9178ced..1b8d8a0b 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -51,3 +51,3 @@
"@vscode/ripgrep-universal": "^1.18.0",
- "@vscode/vsce": "3.6.1",
+ "@vscodium/vsce": "3.6.1-258428",
"ansi-colors": "^3.2.3",
@@ -1941,6 +1941,45 @@
@@ -1928,6 +1928,32 @@
},
- "node_modules/@vscode/vsce": {
- "version": "3.6.1",
Expand All @@ -63,19 +63,6 @@ index 92f3b6a4..420464b0 100644
+ "node": "18 || 20 || >=22"
+ }
+ },
+ "node_modules/@vscode/vsce/node_modules/brace-expansion": {
+ "version": "5.0.5",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+ "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
+ "extraneous": true,
+ "license": "MIT",
+ "dependencies": {
+ "balanced-match": "^4.0.2"
+ },
+ "engines": {
+ "node": "18 || 20 || >=22"
+ }
+ },
+ "node_modules/@vscode/vsce/node_modules/glob/node_modules/minimatch": {
+ "version": "10.2.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
Expand All @@ -97,11 +84,11 @@ index 92f3b6a4..420464b0 100644
+ "resolved": "https://registry.npmjs.org/@vscodium/vsce/-/vsce-3.6.1-258428.tgz",
+ "integrity": "sha512-B2uys5YU5MGNmzQPHsMsRXxzlQvZanhxE8Sfkd4Sr/LBN9BaV5yhMCppV7jyLUOQajj9K3YZThLqUYm4CCBy3A==",
"dev": true,
@@ -1953,3 +1992,2 @@
@@ -1940,3 +1966,2 @@
"@secretlint/secretlint-rule-preset-recommend": "^10.1.2",
- "@vscode/vsce-sign": "^2.0.0",
"azure-devops-node-api": "^12.5.0",
@@ -1988,148 +2026,3 @@
@@ -1975,148 +2000,3 @@
},
- "node_modules/@vscode/vsce-sign": {
- "version": "2.0.7",
Expand Down Expand Up @@ -251,74 +238,75 @@ index 92f3b6a4..420464b0 100644
- "node_modules/@vscode/vsce/node_modules/ansi-styles": {
+ "node_modules/@vscodium/vsce/node_modules/ansi-styles": {
"version": "4.3.0",
@@ -2149,3 +2042,3 @@
@@ -2136,3 +2016,3 @@
},
- "node_modules/@vscode/vsce/node_modules/balanced-match": {
+ "node_modules/@vscodium/vsce/node_modules/balanced-match": {
"version": "4.0.4",
@@ -2159,3 +2052,3 @@
@@ -2146,3 +2026,3 @@
},
- "node_modules/@vscode/vsce/node_modules/brace-expansion": {
+ "node_modules/@vscodium/vsce/node_modules/brace-expansion": {
"version": "5.0.6",
@@ -2172,3 +2065,3 @@
"version": "5.0.7",
@@ -2159,3 +2039,3 @@
},
- "node_modules/@vscode/vsce/node_modules/chalk": {
+ "node_modules/@vscodium/vsce/node_modules/chalk": {
"version": "4.1.2",
@@ -2189,3 +2082,3 @@
@@ -2176,3 +2056,3 @@
},
- "node_modules/@vscode/vsce/node_modules/color-convert": {
+ "node_modules/@vscodium/vsce/node_modules/color-convert": {
"version": "2.0.1",
@@ -2202,3 +2095,3 @@
@@ -2189,3 +2069,3 @@
},
- "node_modules/@vscode/vsce/node_modules/color-name": {
+ "node_modules/@vscodium/vsce/node_modules/color-name": {
"version": "1.1.4",
@@ -2209,3 +2102,3 @@
@@ -2196,3 +2076,3 @@
},
- "node_modules/@vscode/vsce/node_modules/glob": {
+ "node_modules/@vscodium/vsce/node_modules/glob": {
"version": "11.1.0",
@@ -2233,3 +2126,3 @@
@@ -2220,3 +2100,3 @@
},
- "node_modules/@vscode/vsce/node_modules/glob/node_modules/minimatch": {
+ "node_modules/@vscodium/vsce/node_modules/glob/node_modules/minimatch": {
"version": "10.2.4",
@@ -2249,3 +2142,3 @@
@@ -2236,3 +2116,3 @@
},
- "node_modules/@vscode/vsce/node_modules/has-flag": {
+ "node_modules/@vscodium/vsce/node_modules/has-flag": {
"version": "4.0.0",
@@ -2259,3 +2152,3 @@
@@ -2246,3 +2126,3 @@
},
- "node_modules/@vscode/vsce/node_modules/jsonc-parser": {
+ "node_modules/@vscodium/vsce/node_modules/jsonc-parser": {
"version": "3.3.1",
@@ -2263,9 +2156,11 @@
@@ -2250,9 +2130,11 @@
"integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
- },
- "node_modules/@vscode/vsce/node_modules/semver": {
- "version": "7.6.3",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
- "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
"dev": true,
+ "license": "MIT"
+ },
+ "node_modules/@vscodium/vsce/node_modules/semver": {
+ "version": "7.7.3",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+ "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
"dev": true,
+ "dev": true,
+ "license": "ISC",
"bin": {
@@ -2277,3 +2172,3 @@
@@ -2264,3 +2146,3 @@
},
- "node_modules/@vscode/vsce/node_modules/supports-color": {
+ "node_modules/@vscodium/vsce/node_modules/supports-color": {
"version": "7.2.0",
@@ -2290,12 +2185,2 @@
@@ -2277,12 +2159,2 @@
},
- "node_modules/@vscode/vsce/node_modules/yazl": {
- "version": "2.5.1",
Expand All @@ -331,7 +319,7 @@ index 92f3b6a4..420464b0 100644
- }
- },
"node_modules/@xmldom/xmldom": {
@@ -7022,2 +6907,12 @@
@@ -7077,2 +6949,12 @@
},
+ "node_modules/yazl": {
+ "version": "2.5.1",
Expand All @@ -345,7 +333,7 @@ index 92f3b6a4..420464b0 100644
+ },
"node_modules/yocto-queue": {
diff --git a/build/package.json b/build/package.json
index 4746ea2f..49867df9 100644
index 84db71fd..ecb927d9 100644
--- a/build/package.json
+++ b/build/package.json
@@ -45,3 +45,3 @@
Expand Down
Loading
Loading