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

fix(reh): use compatible node-pty [skip ci]

Browse Source
This commit is contained in:
Baptiste Augrain 2024-02-08 15:53:32 +01:00
parent 1588f9cabf
commit 96f53366b7
3 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
patches/helper/settings.patch
View File

@ -1,8 +1,8 @@
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7ae8bce..724b9ad 100644
index 99e495a..996044a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,5 +9,5 @@
@@ -10,5 +10,5 @@
"cli/target": true,
- "build/**/*.js": {
- "when": "$(basename).ts"
@ -11,14 +11,27 @@ index 7ae8bce..724b9ad 100644
+ // "when": "$(basename).ts"
+ // }
},
@@ -81,3 +81,3 @@
@@ -59,2 +59,3 @@
"build/npm/*.js": true,
+ "build/**/*.js": true,
"build/*.js": true
@@ -108,3 +109,3 @@
"gulp.autoDetect": "off",
- "files.insertFinalNewline": true,
+ // "files.insertFinalNewline": true,
"[plaintext]": {
@@ -91,4 +91,4 @@
"[javascript]": {
@@ -114,3 +115,3 @@
"editor.defaultFormatter": "vscode.typescript-language-features",
- "editor.formatOnSave": true
+ // "editor.formatOnSave": true
},
@@ -118,3 +119,3 @@
"editor.defaultFormatter": "vscode.typescript-language-features",
- "editor.formatOnSave": true
+ // "editor.formatOnSave": true
},
@@ -122,3 +123,3 @@
"editor.defaultFormatter": "rust-lang.rust-analyzer",
- "editor.formatOnSave": true,
+ // "editor.formatOnSave": true,
},

33
patches/linux/remove-reh-check.patch → patches/linux/reh-node16.patch
View File

@ -13,6 +13,39 @@ index df18cf0..7f485a0 100644
- }
-
return result.pipe(vfs.dest(destination));
diff --git a/remote/.yarnrc b/remote/.yarnrc
index adbe2d2..dfc3bd7 100644
--- a/remote/.yarnrc
+++ b/remote/.yarnrc
@@ -1,3 +1,3 @@
disturl "https://nodejs.org/dist"
-target "18.17.1"
+target "16.20.2"
ms_build_id "252256"
diff --git a/remote/package.json b/remote/package.json
index b1fbc7b..87716c0 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -31,3 +31,3 @@
"native-watchdog": "^1.4.1",
- "node-pty": "1.1.0-beta5",
+ "node-pty": "1.1.0-beta4",
"tas-client-umd": "0.1.8",
diff --git a/remote/yarn.lock b/remote/yarn.lock
index bb20531..8f7c051 100644
--- a/remote/yarn.lock
+++ b/remote/yarn.lock
@@ -433,6 +433,6 @@ node-gyp-build@^4.3.0:
-node-pty@1.1.0-beta5:
- version "1.1.0-beta5"
- resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta5.tgz#364386b7058a93070234064f13164ec1ef914993"
- integrity sha512-j3QdgFHnLY0JWxztrvM3g67RaQLOGvytv+C6mFu0PqD+JILlzqfwuoyqRqVxdZZjoOTUXPfSRj1qPVCaCH+eOw==
+node-pty@1.1.0-beta4:
+ version "1.1.0-beta4"
+ resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta4.tgz#ee74d909c9f422ffc7f675e1092529673f8906ec"
+ integrity sha512-CgffN9AxVtH4g7vDxtanm2qaR7jw3oet9r+ArzziGiFvmds9SdR3gXkZF0fqZWSxhTHZusJWvsuKvRv+5O2K8A==
dependencies:
diff --git a/resources/server/bin/code-server-linux.sh b/resources/server/bin/code-server-linux.sh
index e3d96bd..3df32df 100644
--- a/resources/server/bin/code-server-linux.sh

9
patches/linux/use-node16.patch
View File

@ -14,12 +14,3 @@ index 40ca42e..3276167 100644
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/remote/.yarnrc b/remote/.yarnrc
index adbe2d2..dfc3bd7 100644
--- a/remote/.yarnrc
+++ b/remote/.yarnrc
@@ -1,3 +1,3 @@
disturl "https://nodejs.org/dist"
-target "18.17.1"
+target "16.20.2"
ms_build_id "252256"