timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-11 16:27:18 +10:00
Code Issues Packages Projects Releases Wiki Activity

feat(1.104): update patches (#2448)

Browse Source
This commit is contained in:
Baptiste Augrain
2025-08-09 11:47:10 +02:00
committed by GitHub
parent 9ffd0a3632
commit 3f44e3f4a3
5 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/linux/fix-reh-bootstrap.patch
View File

@@ -1,25 +1,23 @@
diff --git a/src/bootstrap-esm.ts b/src/bootstrap-esm.ts diff --git a/src/bootstrap-esm.ts b/src/bootstrap-esm.ts
index f2cf101..d974f65 100644 index 188a25a..12b262d 100644
--- a/src/bootstrap-esm.ts --- a/src/bootstrap-esm.ts
+++ b/src/bootstrap-esm.ts +++ b/src/bootstrap-esm.ts
@@ -8,3 +8,3 @@ import * as fs from 'fs'; @@ -6,3 +6,3 @@
import { fileURLToPath } from 'url'; import * as fs from 'fs';
-import { createRequire, register } from 'node:module'; -import { createRequire, register } from 'node:module';
+import * as Module from 'node:module'; +import * as Module from 'node:module';
import { product, pkg } from './bootstrap-meta.js'; import { product, pkg } from './bootstrap-meta.js';
@@ -14,3 +14,4 @@ import { INLSConfiguration } from './vs/nls.js'; @@ -12,6 +12,7 @@ import { INLSConfiguration } from './vs/nls.js';
-const require = createRequire(import.meta.url); -const require = createRequire(import.meta.url);
+// @ts-ignore
+const require = Module.createRequire(import.meta.url); +const require = Module.createRequire(import.meta.url);
const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -18,3 +19,4 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
// Install a hook to module resolution to map 'fs' to 'original-fs' // Install a hook to module resolution to map 'fs' to 'original-fs'
-if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) { -if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
+// @ts-ignore +// @ts-ignore
+if (Module.register && (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron'])) { +if (Module.register && (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron'])) {
const jsCode = ` const jsCode = `
@@ -33,3 +35,4 @@ if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) { @@ -30,3 +31,4 @@ if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
}`; }`;
- register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url); - register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url);
+ // @ts-ignore + // @ts-ignore

15
patches/merge-user-product.patch
View File

@@ -1,16 +1,17 @@
diff --git a/src/main.ts b/src/main.ts diff --git a/src/main.ts b/src/main.ts
index fdc424e..46b014b 100644 index 1600666..eb6eee9 100644
--- a/src/main.ts --- a/src/main.ts
+++ b/src/main.ts +++ b/src/main.ts
@@ -8,2 +8,3 @@ import * as fs from 'original-fs'; @@ -8,2 +8,3 @@ import * as fs from 'original-fs';
import * as os from 'os'; import * as os from 'os';
+import { createRequire } from 'node:module'; +import { createRequire } from 'node:module';
import { performance } from 'perf_hooks'; import { performance } from 'perf_hooks';
@@ -24,2 +25,3 @@ import { NativeParsedArgs } from './vs/platform/environment/common/argv.js'; @@ -22,2 +23,4 @@ import { NativeParsedArgs } from './vs/platform/environment/common/argv.js';
const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
@@ -112,2 +114,14 @@ registerListeners(); +const require = createRequire(import.meta.url);
+
perf.mark('code/didStartMain');
@@ -109,2 +112,14 @@ registerListeners();
+function resolveUserProduct() { +function resolveUserProduct() {
+ const userProductPath = path.join(userDataPath, 'product.json'); + const userProductPath = path.join(userDataPath, 'product.json');
@@ -25,12 +26,12 @@ index fdc424e..46b014b 100644
+} +}
+ +
/** /**
@@ -208,2 +222,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu @@ -205,2 +220,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu
process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || ''; process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || '';
+ resolveUserProduct(); + resolveUserProduct();
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
index d27cdce..d758c5e 100644 index a299f02..cca9de6 100644
--- a/src/vs/platform/product/common/product.ts --- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts +++ b/src/vs/platform/product/common/product.ts
@@ -31,2 +31,36 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) { @@ -31,2 +31,36 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {

0
patches/osx/fix-codesign.patch → patches/osx/fix-codesign.patch.no
View File

9
product.json
View File

@@ -357,9 +357,6 @@
"chatReferenceBinaryData", "chatReferenceBinaryData",
"codeActionAI" "codeActionAI"
], ],
"lramos15.model-playground": [
"chatProvider"
],
"ms-autodev.vscode-autodev": [ "ms-autodev.vscode-autodev": [
"chatParticipantAdditions" "chatParticipantAdditions"
], ],
@@ -370,6 +367,12 @@
"vscjava.vscode-java-upgrade": [ "vscjava.vscode-java-upgrade": [
"chatParticipantAdditions" "chatParticipantAdditions"
], ],
"FoundryLocal.foundry-local-chat": [
"chatProvider"
],
"Microsoft.foundry-local-chat": [
"chatProvider"
],
"jeanp413.open-remote-ssh": [ "jeanp413.open-remote-ssh": [
"resolvers", "resolvers",
"tunnels", "tunnels",

4
upstream/insider.json
View File

@@ -1,4 +1,4 @@
{ {
"tag": "1.103.0", "tag": "1.104.0",
"commit": "e3550cfac4b63ca4eafca7b601f0d2885817fd1f" "commit": "2c749892adf66679e282a1b27ae526cf995d6f0c"
} }