Merge pull request #1999 from cdr/update

Update dependencies in package.json
This commit is contained in:
Anmol Sethi 2020-08-27 13:17:18 -04:00 committed by GitHub
commit 864a9e7bd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1577 additions and 1399 deletions

View File

@ -23,6 +23,10 @@ rules:
no-dupe-class-members: off no-dupe-class-members: off
"@typescript-eslint/no-use-before-define": off "@typescript-eslint/no-use-before-define": off
"@typescript-eslint/no-non-null-assertion": 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 eqeqeq: error
import/order: import/order:
[error, { alphabetize: { order: "asc" }, groups: [["builtin", "external", "internal"], "parent", "sibling"] }] [error, { alphabetize: { order: "asc" }, groups: [["builtin", "external", "internal"], "parent", "sibling"] }]

View File

@ -33,30 +33,30 @@
"@types/fs-extra": "^8.0.1", "@types/fs-extra": "^8.0.1",
"@types/http-proxy": "^1.17.4", "@types/http-proxy": "^1.17.4",
"@types/js-yaml": "^3.12.3", "@types/js-yaml": "^3.12.3",
"@types/mocha": "^5.2.7", "@types/mocha": "^8.0.3",
"@types/node": "^12.12.7", "@types/node": "^12.12.7",
"@types/parcel-bundler": "^1.12.1", "@types/parcel-bundler": "^1.12.1",
"@types/pem": "^1.9.5", "@types/pem": "^1.9.5",
"@types/safe-compare": "^1.1.0", "@types/safe-compare": "^1.1.0",
"@types/semver": "^7.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", "doctoc": "^1.4.0",
"eslint": "^6.2.0", "eslint": "^7.7.0",
"eslint-config-prettier": "^6.0.0", "eslint-config-prettier": "^6.0.0",
"eslint-plugin-import": "^2.18.2", "eslint-plugin-import": "^2.18.2",
"eslint-plugin-prettier": "^3.1.0", "eslint-plugin-prettier": "^3.1.0",
"leaked-handles": "^5.2.0", "leaked-handles": "^5.2.0",
"mocha": "^6.2.0", "mocha": "^8.1.2",
"parcel-bundler": "^1.12.4", "parcel-bundler": "^1.12.4",
"prettier": "^2.0.5", "prettier": "^2.0.5",
"stylelint": "^13.0.0", "stylelint": "^13.0.0",
"stylelint-config-recommended": "^3.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": { "resolutions": {
"@types/node": "^12.12.7", "@types/node": "^12.12.7",
@ -66,13 +66,14 @@
"dependencies": { "dependencies": {
"@coder/logger": "1.1.16", "@coder/logger": "1.1.16",
"env-paths": "^2.2.0", "env-paths": "^2.2.0",
"fs-extra": "^8.1.0", "fs-extra": "^9.0.1",
"http-proxy": "^1.18.0", "http-proxy": "^1.18.0",
"httpolyglot": "^0.1.2", "httpolyglot": "^0.1.2",
"js-yaml": "^3.13.1", "js-yaml": "^3.13.1",
"limiter": "^1.1.5", "limiter": "^1.1.5",
"pem": "^1.14.2", "pem": "^1.14.2",
"rotating-file-stream": "^2.1.1", "rotating-file-stream": "^2.1.1",
"safe-buffer": "^5.1.1",
"safe-compare": "^1.1.4", "safe-compare": "^1.1.4",
"semver": "^7.1.3", "semver": "^7.1.3",
"tar": "^6.0.1", "tar": "^6.0.1",

View File

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

View File

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

View File

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

2940
yarn.lock

File diff suppressed because it is too large Load Diff