feat(1.95): update patches (#2055)

This commit is contained in:
Baptiste Augrain
2024-10-13 20:16:48 +02:00
committed by GitHub
parent 0489bd5ca1
commit 7578449a67
15 changed files with 196 additions and 151 deletions

View File

@@ -1,8 +1,8 @@
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index e314794..8248247 100644
index 53ef6f3..7dedc4b 100644
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -437,16 +437,2 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
@@ -401,16 +401,2 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
- if (platform === 'linux' && process.env['VSCODE_NODE_GLIBC'] === '-glibc-2.17') {
- result = es.merge(result,
@@ -20,15 +20,15 @@ index e314794..8248247 100644
-
result = inlineMeta(result, {
diff --git a/remote/package-lock.json b/remote/package-lock.json
index 5872575..a559230 100644
index 290e188..fc8fd04 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -37,3 +37,3 @@
"native-watchdog": "^1.4.1",
- "node-pty": "1.1.0-beta21",
- "node-pty": "^1.1.0-beta22",
+ "node-pty": "1.1.0-beta4",
"tas-client-umd": "0.2.0",
@@ -712,2 +712,8 @@
@@ -703,2 +703,8 @@
},
+ "node_modules/nan": {
+ "version": "2.20.0",
@@ -37,11 +37,11 @@ index 5872575..a559230 100644
+ "license": "MIT"
+ },
"node_modules/napi-build-utils": {
@@ -750,16 +756,9 @@
@@ -745,8 +751,9 @@
"node_modules/node-pty": {
- "version": "1.1.0-beta21",
- "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta21.tgz",
- "integrity": "sha512-FYpnY9g8qMQLTpqyeY9NVli6YfCWwvG6v6gmaDBbPjlc1VMp/+Zivq0SStDrRr1aciGnFCZzpL0BzdMnmbDnAw==",
- "version": "1.1.0-beta22",
- "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta22.tgz",
- "integrity": "sha512-CpT334H2oAIULlENvd9U+VBW4ZL+G3clOnpXYzUIurlPCLnl/9xen/KDHBLRcwhZuWcHxIrsCxR1TDCdVDtr0w==",
+ "version": "1.1.0-beta4",
+ "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta4.tgz",
+ "integrity": "sha512-CgffN9AxVtH4g7vDxtanm2qaR7jw3oet9r+ArzziGiFvmds9SdR3gXkZF0fqZWSxhTHZusJWvsuKvRv+5O2K8A==",
@@ -49,22 +49,14 @@ index 5872575..a559230 100644
+ "license": "MIT",
"dependencies": {
- "node-addon-api": "^7.1.0"
- }
- },
- "node_modules/node-pty/node_modules/node-addon-api": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz",
- "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==",
- "engines": {
- "node": "^16 || ^18 || >= 20"
+ "nan": "^2.17.0"
}
diff --git a/remote/package.json b/remote/package.json
index c107b04..112501b 100644
index e8ea864..08d756d 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -32,3 +32,3 @@
"native-watchdog": "^1.4.1",
- "node-pty": "1.1.0-beta21",
- "node-pty": "^1.1.0-beta22",
+ "node-pty": "1.1.0-beta4",
"tas-client-umd": "0.2.0",