Merge pull request #1931 from cdr/rimraf

Fix package step

ci/build/npm-postinstall.sh

@@ -35,8 +35,7 @@ vscode_yarn() {
   cd lib/vscode
   yarn --production --frozen-lockfile
   cd extensions
-  # Cannot use --production here. The postinstall here uses a dev dependency.
+  yarn --production --frozen-lockfile
-  yarn --frozen-lockfile
 }
 
 main "$@"

ci/dev/vscode.patch

@@ -217,6 +217,40 @@ index 0000000000..88b720ceee
 +	util.rimraf("out-vscode-min"),
 +	common.minifyTask("out-vscode")
 +));
+diff --git a/extensions/package.json b/extensions/package.json
+index 7c668c9744..0778f4f7db 100644
+--- a/extensions/package.json
++++ b/extensions/package.json
+@@ -2,13 +2,14 @@
+   "name": "vscode-extensions",
+   "version": "0.0.1",
+   "description": "Dependencies shared by all extensions",
++  "dependencies_comment": "Move rimraf to dependencies because it is used in the postinstall script.",
+   "dependencies": {
++    "rimraf": "^3.0.2",
+     "typescript": "3.9.6"
+   },
+   "scripts": {
+     "postinstall": "node ./postinstall"
+   },
+   "devDependencies": {
+-    "rimraf": "^3.0.2"
+   }
+ }
+diff --git a/extensions/postinstall.js b/extensions/postinstall.js
+index da4fa3e9d0..50f3e1144f 100644
+--- a/extensions/postinstall.js
++++ b/extensions/postinstall.js
+@@ -24,6 +24,9 @@ function processRoot() {
+ 			rimraf.sync(filePath);
+ 		}
+ 	}
++
++	// Delete .bin so it doesn't contain broken symlinks that trip up nfpm.
++	rimraf.sync(path.join(__dirname, 'node_modules', '.bin'));
+ }
+ 
+ function processLib() {
 diff --git a/package.json b/package.json
 index 86e3d5140d..2e52256e49 100644
 --- a/package.json