timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-25 04:10:15 +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

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

@@ -1,16 +1,17 @@
diff --git a/src/main.ts b/src/main.ts
index fdc424e..46b014b 100644
index 1600666..eb6eee9 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,2 +8,3 @@ import * as fs from 'original-fs';
import * as os from 'os';
+import { createRequire } from 'node:module';
import { performance } from 'perf_hooks';
@@ -24,2 +25,3 @@ import { NativeParsedArgs } from './vs/platform/environment/common/argv.js';
const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
@@ -22,2 +23,4 @@ import { NativeParsedArgs } from './vs/platform/environment/common/argv.js';
@@ -112,2 +114,14 @@ registerListeners();
+const require = createRequire(import.meta.url);
+
perf.mark('code/didStartMain');
@@ -109,2 +112,14 @@ registerListeners();
+function resolveUserProduct() {
+ 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 || '';
+ resolveUserProduct();
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
+++ b/src/vs/platform/product/common/product.ts
@@ -31,2 +31,36 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {