Merge branch 'main' into jsjoeio/upgrade-vscode-1.54

package.json

@@ -25,7 +25,7 @@
     "_____": "",
     "fmt": "./ci/dev/fmt.sh",
     "lint": "./ci/dev/lint.sh",
-    "test": "./ci/dev/test.sh",
+    "test": "echo 'Run yarn test:unit or yarn test:e2e' && exit 1",
     "ci": "./ci/dev/ci.sh",
     "watch": "VSCODE_IPC_HOOK_CLI= NODE_OPTIONS=--max_old_space_size=32384 ts-node ./ci/dev/watch.ts",
     "icons": "./ci/dev/gen_icons.sh",
@@ -38,7 +38,6 @@
     "@types/compression": "^1.7.0",
     "@types/cookie-parser": "^1.4.2",
     "@types/express": "^4.17.8",
-    "@types/fs-extra": "^8.0.1",
     "@types/http-proxy": "^1.17.4",
     "@types/js-yaml": "^3.12.3",
     "@types/node": "^12.12.7",
@@ -63,9 +62,10 @@
     "istanbul-badges-readme": "^1.2.0",
     "leaked-handles": "^5.2.0",
     "parcel-bundler": "^1.12.4",
-    "prettier": "^2.0.5",
+    "prettier": "^2.2.1",
+    "prettier-plugin-sh": "^0.6.0",
     "stylelint": "^13.0.0",
-    "stylelint-config-recommended": "^3.0.0",
+    "stylelint-config-recommended": "^4.0.0",
     "ts-node": "^9.0.0",
     "typescript": "^4.1.3",
     "wtfnode": "^0.8.4"
@@ -73,8 +73,7 @@
   "resolutions": {
     "@types/node": "^12.12.7",
     "safe-buffer": "^5.1.1",
-    "vfile-message": "^2.0.2",
-    "node-forge": "^0.10.0"
+    "vfile-message": "^2.0.2"
   },
   "dependencies": {
     "@coder/logger": "1.1.16",
@@ -83,7 +82,6 @@
     "cookie-parser": "^1.4.5",
     "env-paths": "^2.2.0",
     "express": "^5.0.0-alpha.8",
-    "fs-extra": "^9.0.1",
     "http-proxy": "^1.18.0",
     "httpolyglot": "^0.1.2",
     "js-yaml": "^3.13.1",
@@ -98,8 +96,8 @@
     "safe-compare": "^1.1.4",
     "semver": "^7.1.3",
     "split2": "^3.2.2",
-    "tar": "^6.0.1",
     "tar-fs": "^2.0.0",
+    "tar-stream": "^2.2.0",
     "ws": "^7.2.0",
     "xdg-basedir": "^4.0.0",
     "yarn": "^1.22.4"