From 3a2644a2bc8259294f97f7004aad2ca69046f9bf Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Thu, 20 Feb 2020 18:36:38 -0500 Subject: [PATCH] Fix vscode.sh --- ci/vscode.sh | 8 +++++++- doc/CONTRIBUTING.md | 3 --- src/node/cli.ts | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ci/vscode.sh b/ci/vscode.sh index ffacd812..f8091ab3 100755 --- a/ci/vscode.sh +++ b/ci/vscode.sh @@ -13,7 +13,13 @@ main() { yarn vscode:patch &> /dev/null || true # Install VS Code dependencies. - (cd lib/vscode && yarn) + # The second yarn is required as for whatever reason, we get + # NODE_MODULE_VERSION mismatch errors without it. + ( + cd lib/vscode + yarn + yarn --ignore-scripts + ) } main "$@" diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md index 0200a080..79411027 100644 --- a/doc/CONTRIBUTING.md +++ b/doc/CONTRIBUTING.md @@ -12,9 +12,6 @@ yarn watch # Visit http://localhost:8080 once completed. Any changes made to the source will be live reloaded. -If you run into issues about a different version of Node being used, try running -`npm rebuild` in the VS Code directory. - If changes are made to the patch and you've built previously you must manually reset VS Code then run `yarn vscode:patch`. diff --git a/src/node/cli.ts b/src/node/cli.ts index 028a28a6..7b01486a 100644 --- a/src/node/cli.ts +++ b/src/node/cli.ts @@ -35,6 +35,7 @@ export interface Args extends VsArgs { readonly "list-extensions"?: boolean readonly "install-extension"?: string[] readonly "uninstall-extension"?: string[] + readonly locale?: string readonly _: string[] }