Merge pull request #1999 from cdr/update

Update dependencies in package.json

.eslintrc.yaml

@@ -23,6 +23,10 @@ rules:
   no-dupe-class-members: off
   "@typescript-eslint/no-use-before-define": off
   "@typescript-eslint/no-non-null-assertion": off
+  "@typescript-eslint/ban-types": off
+  "@typescript-eslint/no-var-requires": off
+  "@typescript-eslint/explicit-module-boundary-types": off
+  "@typescript-eslint/no-explicit-any": off
   eqeqeq: error
   import/order:
     [error, { alphabetize: { order: "asc" }, groups: [["builtin", "external", "internal"], "parent", "sibling"] }]

package.json

@@ -33,30 +33,30 @@
     "@types/fs-extra": "^8.0.1",
     "@types/http-proxy": "^1.17.4",
     "@types/js-yaml": "^3.12.3",
-    "@types/mocha": "^5.2.7",
+    "@types/mocha": "^8.0.3",
     "@types/node": "^12.12.7",
     "@types/parcel-bundler": "^1.12.1",
     "@types/pem": "^1.9.5",
     "@types/safe-compare": "^1.1.0",
     "@types/semver": "^7.1.0",
-    "@types/tar-fs": "^1.16.2",
+    "@types/tar-fs": "^2.0.0",
-    "@types/tar-stream": "^1.6.1",
+    "@types/tar-stream": "^2.1.0",
-    "@types/ws": "^6.0.4",
+    "@types/ws": "^7.2.6",
-    "@typescript-eslint/eslint-plugin": "^2.0.0",
+    "@typescript-eslint/eslint-plugin": "^3.10.1",
-    "@typescript-eslint/parser": "^2.0.0",
+    "@typescript-eslint/parser": "^3.10.1",
     "doctoc": "^1.4.0",
-    "eslint": "^6.2.0",
+    "eslint": "^7.7.0",
     "eslint-config-prettier": "^6.0.0",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-prettier": "^3.1.0",
     "leaked-handles": "^5.2.0",
-    "mocha": "^6.2.0",
+    "mocha": "^8.1.2",
     "parcel-bundler": "^1.12.4",
     "prettier": "^2.0.5",
     "stylelint": "^13.0.0",
     "stylelint-config-recommended": "^3.0.0",
-    "ts-node": "^8.4.1",
+    "ts-node": "^9.0.0",
-    "typescript": "3.7.2"
+    "typescript": "4.0.2"
   },
   "resolutions": {
     "@types/node": "^12.12.7",
@@ -66,13 +66,14 @@
   "dependencies": {
     "@coder/logger": "1.1.16",
     "env-paths": "^2.2.0",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "^9.0.1",
     "http-proxy": "^1.18.0",
     "httpolyglot": "^0.1.2",
     "js-yaml": "^3.13.1",
     "limiter": "^1.1.5",
     "pem": "^1.14.2",
     "rotating-file-stream": "^2.1.1",
+    "safe-buffer": "^5.1.1",
     "safe-compare": "^1.1.4",
     "semver": "^7.1.3",
     "tar": "^6.0.1",

src/browser/pages/error.html

@@ -21,9 +21,7 @@
     <div class="center-container">
       <div class="error-display">
         <h2 class="header">{{ERROR_HEADER}}</h2>
-        <div class="body">
+        <div class="body">{{ERROR_BODY}}</div>
-          {{ERROR_BODY}}
-        </div>
         <div class="links">
           <a class="link" href="{{BASE}}{{TO}}">go home</a>
         </div>

src/node/cli.ts

@@ -365,6 +365,9 @@ export async function readConfigFile(configPath?: string): Promise<Args> {
   const config = yaml.safeLoad(configFile.toString(), {
     filename: configPath,
   })
+  if (!config || typeof config === "string") {
+    throw new Error(`invalid config: ${config}`)
+  }
 
   // We convert the config file into a set of flags.
   // This is a temporary measure until we add a proper CLI library.

src/node/entry.ts

@@ -170,7 +170,7 @@ async function entry(): Promise<void> {
         CODE_SERVER_PARENT_PID: process.pid.toString(),
       },
     })
-    vscode.once("message", (message) => {
+    vscode.once("message", (message: any) => {
       logger.debug("Got message from VS Code", field("message", message))
       if (message.type !== "ready") {
         logger.error("Unexpected response waiting for ready response")