Copy correct Node into release

Still had the old code that copied the system Node, which in the case of
cross-compilation will be the wrong one.  Instead copy the one VS Code
downloads, which should be for the correct platform.

ci/build/build-release.sh

@@ -36,13 +36,6 @@ main() {
   rsync ./lib/vscode/ThirdPartyNotices.txt "$RELEASE_PATH"
 
   if [ "$KEEP_MODULES" = 1 ]; then
-    # Copy Node.  Package managers may shim their own "node" wrapper into the
-    # PATH, so run node and ask it for its true path.
-    local node_path
-    node_path="$(node -p process.execPath)"
-    rsync "$node_path" "$RELEASE_PATH/lib/node"
-    chmod 755 "$RELEASE_PATH/lib/node"
-
     # Copy the code-server launcher.
     mkdir -p "$RELEASE_PATH/bin"
     rsync ./ci/build/code-server.sh "$RELEASE_PATH/bin/code-server"
@@ -108,8 +101,7 @@ bundle_vscode() {
   # npm package so exclude any .gitignore files.
   rsync_opts+=(--exclude .gitignore)
 
-  # Exclude Node as we will add it ourselves for the standalone and will not
-  # need it for the npm package.
+  # Exclude Node since we want to place it in a directory above.
   rsync_opts+=(--exclude /node)
 
   # Exclude Node modules.  Note that these will already only include production
@@ -121,6 +113,11 @@ bundle_vscode() {
 
   rsync "${rsync_opts[@]}" "./lib/vscode-reh-web-$VSCODE_TARGET/" "$VSCODE_OUT_PATH"
 
+  # Copy the Node binary.
+  if [[ $KEEP_MODULES = 1 ]]; then
+    cp "./lib/vscode-reh-web-$VSCODE_TARGET/node" "$RELEASE_PATH/lib"
+  fi
+
   # Merge the package.json for the web/remote server so we can include
   # dependencies, since we want to ship this via NPM.
   jq --slurp '.[0] * .[1]' \

package-lock.json

@@ -14,7 +14,7 @@
         "argon2": "^0.44.0",
         "compression": "^1.7.4",
         "cookie-parser": "^1.4.6",
-        "env-paths": "^4.0.0",
+        "env-paths": "^2.2.1",
         "express": "^5.0.1",
         "http-proxy": "^1.18.1",
         "httpolyglot": "^0.1.2",
@@ -2316,18 +2316,12 @@
       }
     },
     "node_modules/env-paths": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-4.0.0.tgz",
-      "integrity": "sha512-pxP8eL2SwwaTRi/KHYwLYXinDs7gL3jxFcBYmEdYfZmZXbaVDvdppd0XBU8qVz03rDfKZMXg1omHCbsJjZrMsw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
       "license": "MIT",
-      "dependencies": {
-        "is-safe-filename": "^0.1.0"
-      },
       "engines": {
-        "node": ">=20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=6"
       }
     },
     "node_modules/es-abstract": {
@@ -3996,18 +3990,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-safe-filename": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-safe-filename/-/is-safe-filename-0.1.1.tgz",
-      "integrity": "sha512-4SrR7AdnY11LHfDKTZY1u6Ga3RuxZdl3YKWWShO5iyuG5h8QS4GD2tOb04peBJ5I7pXbR+CGBNEhTcwK+FzN3g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-set": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",

package.json

@@ -71,7 +71,7 @@
     "argon2": "^0.44.0",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
-    "env-paths": "^4.0.0",
+    "env-paths": "^2.2.1",
     "express": "^5.0.1",
     "http-proxy": "^1.18.1",
     "httpolyglot": "^0.1.2",