VSCodium/vscodium
1
1
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2024-11-22 05:42:34 +03:00
Code Issues Projects Releases Wiki Activity

feat(1.95): update patches (#2066)

Browse Source
This commit is contained in:
Baptiste Augrain 2024-10-19 09:18:19 +02:00 committed by GitHub
parent 8386f6057b
commit 9eff6e1bc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
insider.json
View File

@ -1,4 +1,4 @@
{
"tag": "1.95.0",
"commit": "a016ec9b66ffdd3ff0f831768b8e75be008a54e4"
"commit": "c85acdad6b679973c79b01a38afa91448c705c1c"
}

8
patches/crash-reporter.patch
View File

@ -1,10 +1,14 @@
diff --git a/src/main.ts b/src/main.ts
index 62ddd5f..a6fc3c5 100644
index ff9a5e8..6fb7fd2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -461,2 +461,5 @@ function configureCrashReporter(): void {
@@ -467,6 +467,9 @@ function configureCrashReporter(): void {
}
}
}
+ else {
+ return;
+ }
}
// Start crash reporter for all processes

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

@ -1,30 +1,31 @@
diff --git a/src/main.ts b/src/main.ts
index 62ddd5f..90c6cfd 100644
index ff9a5e8..2135d00 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 { configurePortable } from './bootstrap-node.js';
@@ -23,2 +24,3 @@ import { NativeParsedArgs } from './vs/platform/environment/common/argv.js';
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);
@@ -103,2 +105,13 @@ registerListeners();
@@ -112,2 +114,14 @@ registerListeners();
+function resolveUserProduct() {
+ const userProductPath = `file:///${userDataPath}/product.json`;
+ const userProductPath = path.join(userDataPath, 'product.json');
+
+ try {
+ // Assign the product configuration to the global scope
+ const productPath = require(fileURLToPath(userProductPath));
+ globalThis._VSCODE_PRODUCT_JSON = productPath;
+ const productJson = require(userProductPath);
+ // @ts-expect-error
+ globalThis._VSCODE_USER_PRODUCT_JSON = productJson;
+ } catch (ex) {
+ }
+}
+
/**
@@ -174,2 +188,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu
@@ -183,2 +197,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu
process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || '';
+ resolveUserProduct();