From da03a648c25bc32dbf24c50a26a2badf3ae600a7 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 6 Sep 2022 11:03:27 -0700
Subject: [PATCH] fix(npm): use correct flags and update version for npm
 (#5533)

* fix: update npm-postinstall.sh script

Add --legacy-peer-deps to deal with weird npm issue with vscode
dependencies.

See: https://stackoverflow.com/a/66620869/3015595

* fix: use npm in release-standalone

* chore: update package.json

* chore: bump plugin engine for tests
---
 ci/build/build-standalone-release.sh    | 2 +-
 ci/build/npm-postinstall.sh             | 2 +-
 package.json                            | 2 +-
 test/unit/node/test-plugin/package.json | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/build/build-standalone-release.sh b/ci/build/build-standalone-release.sh
index 1a6b6f95f..be9f0df7f 100755
--- a/ci/build/build-standalone-release.sh
+++ b/ci/build/build-standalone-release.sh
@@ -28,7 +28,7 @@ main() {
   ln -s "./lib/node" "$RELEASE_PATH/node"
 
   pushd "$RELEASE_PATH"
-  yarn --production --frozen-lockfile
+  npm install --unsafe-perm --omit=dev
   popd
 }
 
diff --git a/ci/build/npm-postinstall.sh b/ci/build/npm-postinstall.sh
index bca7f0bd3..8e0e4367d 100755
--- a/ci/build/npm-postinstall.sh
+++ b/ci/build/npm-postinstall.sh
@@ -140,7 +140,7 @@ install_with_yarn_or_npm() {
         echo "yarn.lock file present, running in development mode. use yarn to install code-server!"
         exit 1
       else
-        npm install --omit=dev
+        npm install --unsafe-perm --legacy-peer-deps --omit=dev
       fi
       ;;
     *)
diff --git a/package.json b/package.json
index 1326042c4..f11b685f9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-server",
   "license": "MIT",
-  "version": "4.6.1",
+  "version": "4.6.1-1",
   "description": "Run VS Code on a remote server.",
   "homepage": "https://github.com/coder/code-server",
   "bugs": {
diff --git a/test/unit/node/test-plugin/package.json b/test/unit/node/test-plugin/package.json
index f567a094a..8940ce4a7 100644
--- a/test/unit/node/test-plugin/package.json
+++ b/test/unit/node/test-plugin/package.json
@@ -3,7 +3,7 @@
   "name": "test-plugin",
   "version": "1.0.0",
   "engines": {
-    "code-server": "^4.0.1"
+    "code-server": "^4.6.1-1"
   },
   "main": "out/index.js",
   "devDependencies": {