diff --git a/ci/dev/lint.sh b/ci/dev/lint.sh index df6ce5981..82506b327 100755 --- a/ci/dev/lint.sh +++ b/ci/dev/lint.sh @@ -14,7 +14,7 @@ main() { cd lib/vscode # Run this periodically in vanilla VS code to make sure we don't add any more warnings. - yarn eslint --max-warnings=3 + yarn -s eslint --max-warnings=3 cd "$OLDPWD" } diff --git a/ci/dev/vscode.patch b/ci/dev/vscode.patch index 35821becb..378b0e333 100644 --- a/ci/dev/vscode.patch +++ b/ci/dev/vscode.patch @@ -1,3 +1,13 @@ +diff --git a/.eslintignore b/.eslintignore +index b2c4a5b6efa856968bbb62c56113004ddb3929e6..035aec8f6a8b0ea8fc6d3d836d160da54aac2fdb 100644 +--- a/.eslintignore ++++ b/.eslintignore +@@ -14,3 +14,5 @@ + **/extensions/**/build/** + **/extensions/markdown-language-features/media/** + **/extensions/typescript-basics/test/colorize-fixtures/** ++# This is a code-server code symlink. ++src/vs/base/node/proxy_agent.ts diff --git a/.eslintrc.json b/.eslintrc.json index 055bc22f8e48e7dee559b83ac56c12a54c6ad544..14c026c04a7df5ac94bea2856e3a7a513c213775 100644 --- a/.eslintrc.json diff --git a/src/node/entry.ts b/src/node/entry.ts index 9761e82ad..4e9a6a9ff 100644 --- a/src/node/entry.ts +++ b/src/node/entry.ts @@ -17,10 +17,10 @@ import { } from "./cli" import { coderCloudBind } from "./coder_cloud" import { commit, version } from "./constants" +import * as proxyAgent from "./proxy_agent" import { register } from "./routes" import { humanPath, isFile, open } from "./util" import { isChild, wrapper } from "./wrapper" -import * as proxyAgent from "./proxy_agent" export const runVsCodeCli = (args: DefaultedArgs): void => { logger.debug("forking vs code cli...") diff --git a/src/node/proxy_agent.ts b/src/node/proxy_agent.ts index 38ecfa45a..9e287e1af 100644 --- a/src/node/proxy_agent.ts +++ b/src/node/proxy_agent.ts @@ -1,6 +1,6 @@ import { logger } from "@coder/logger" -import * as proxyagent from "proxy-agent" import * as http from "http" +import * as proxyagent from "proxy-agent" /** * This file does not have anything to do with the code-server proxy.