From 6f6f43c46e22e3e03f9ce6ab71b39eb2d8c06f01 Mon Sep 17 00:00:00 2001 From: Joaquin Coromina <75667013+bjoaquinc@users.noreply.github.com> Date: Mon, 10 Feb 2025 19:46:32 +0700 Subject: [PATCH] Fixed compilation for void-reh bug by updating package.json in remote and changed destination folder to say void --- build/gulpfile.reh.js | 2 +- remote/package-lock.json | 6 ++++++ remote/package.json | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js index e3147945f..4c6841ce6 100644 --- a/build/gulpfile.reh.js +++ b/build/gulpfile.reh.js @@ -516,7 +516,7 @@ function tweakProductForServerWeb(product) { ['', 'min'].forEach(minified => { const sourceFolderName = `out-vscode-${type}${dashed(minified)}`; - const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`; + const destinationFolderName = `void-${type}${dashed(platform)}${dashed(arch)}`; const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( gulp.task(`node-${platform}-${arch}`), diff --git a/remote/package-lock.json b/remote/package-lock.json index 0d0df3125..617682af9 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -38,6 +38,7 @@ "native-watchdog": "^1.4.1", "node-pty": "1.1.0-beta21", "tas-client-umd": "0.2.0", + "tslib": "^2.8.1", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "9.1.0", @@ -1035,6 +1036,11 @@ "node": ">=8.0" } }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" + }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", diff --git a/remote/package.json b/remote/package.json index cf913ad28..e3475d33e 100644 --- a/remote/package.json +++ b/remote/package.json @@ -33,6 +33,7 @@ "native-watchdog": "^1.4.1", "node-pty": "1.1.0-beta21", "tas-client-umd": "0.2.0", + "tslib": "^2.8.1", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "9.1.0",