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

fix(linux): remove unnecessary hook for reh (#2050)

Browse Source
This commit is contained in:
Baptiste Augrain
2024-10-08 16:11:46 +02:00
committed by GitHub
parent 18ec65a491
commit 826c2fab92
3 changed files with 26 additions and 2379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2351
patches/linux/client/node16.patch.no
View File

File diff suppressed because it is too large Load Diff

26
patches/linux/fix-reh-bootstrap.patch Normal file
View File

@@ -0,0 +1,26 @@
diff --git a/src/bootstrap-amd.js b/src/bootstrap-amd.js
index 9c8daf5..297e106 100644
--- a/src/bootstrap-amd.js
+++ b/src/bootstrap-amd.js
@@ -17,3 +17,3 @@ import * as fs from 'fs';
import { fileURLToPath } from 'url';
-import { createRequire, register } from 'node:module';
+import * as Module from 'node:module';
import { product, pkg } from './bootstrap-meta.js';
@@ -23,3 +23,3 @@ import * as performance from './vs/base/common/performance.js';
/** @ts-ignore */
-const require = createRequire(import.meta.url);
+const require = Module.createRequire(import.meta.url);
/** @type any */
@@ -29,3 +29,4 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
// Install a hook to module resolution to map 'fs' to 'original-fs'
-if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
+// @ts-ignore
+if (Module.register && (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron'])) {
const jsCode = `
@@ -44,3 +45,4 @@ if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
}`;
- register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url);
+ // @ts-ignore
+ Module.register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url);
}

28
patches/linux/node16.patch.no
View File

@@ -1,28 +0,0 @@
diff --git a/build/lib/fetch.js b/build/lib/fetch.js
index 2fed63b..9a9f013 100644
--- a/build/lib/fetch.js
+++ b/build/lib/fetch.js
@@ -15,2 +15,3 @@ const crypto = require("crypto");
const through2 = require("through2");
+const fetch = require("node-fetch");
function fetchUrls(urls, options) {
diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
index feca7d3..b4f6540 100644
--- a/build/linux/debian/install-sysroot.js
+++ b/build/linux/debian/install-sysroot.js
@@ -15,2 +15,3 @@ const crypto_1 = require("crypto");
const ansiColors = require("ansi-colors");
+const fetch = require("node-fetch");
// Based on https://source.chromium.org/chromium/chromium/src/+/main:build/linux/sysroot_scripts/install-sysroot.py.
diff --git a/yarn.lock b/yarn.lock
index 2f4c572..6b65370 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6458,2 +6458,7 @@ liftoff@^3.1.0:
+lilconfig@^2.0.5:
+ version "2.1.0"
+ resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
+ integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
+
lilconfig@^3.0.0: