add TEST_RESOLVER_USE_SERVER_FROM_SOURCES (#80254)

* remove unused deps

* use TEST_RESOLVER_USE_SERVER_FROM_SOURCES
This commit is contained in:
Benjamin Pasero 2019-09-03 11:25:50 +02:00 committed by GitHub
parent 9647d0e66b
commit 7c4afcf360
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 714 deletions

View file

@ -85,7 +85,7 @@ export function activate(context: vscode.ExtensionContext) {
env['VSCODE_AGENT_FOLDER'] = remoteDataDir;
outputChannel.appendLine(`Using data folder at ${remoteDataDir}`);
if (!commit) { // dev mode
if (!commit || env['TEST_RESOLVER_USE_SERVER_FROM_SOURCES']) { // dev mode
const vscodePath = path.resolve(path.join(context.extensionPath, '..', '..'));
const serverCommandPath = path.join(vscodePath, 'resources', 'server', 'bin-dev', serverCommand);
extHostProcess = cp.spawn(serverCommandPath, commandArgs, { env, cwd: vscodePath });

View file

@ -76,8 +76,6 @@
"cson-parser": "^1.3.3",
"debounce": "^1.0.0",
"documentdb": "^1.5.1",
"electron-mksnapshot": "~2.0.0",
"eslint": "^4.18.2",
"event-stream": "3.3.4",
"express": "^4.13.1",
"fancy-log": "^1.3.3",
@ -103,7 +101,6 @@
"gulp-tslint": "^8.1.3",
"gulp-untar": "^0.0.7",
"gulp-vinyl-zip": "^2.1.2",
"husky": "^0.13.1",
"innosetup": "5.6.1",
"is": "^3.1.0",
"istanbul-lib-coverage": "^2.0.5",
@ -119,7 +116,6 @@
"mkdirp": "^0.5.0",
"mocha": "^2.2.5",
"mocha-junit-reporter": "^1.17.0",
"opn": "^5.4.0",
"optimist": "0.3.5",
"p-all": "^1.0.0",
"pump": "^1.0.1",
@ -140,7 +136,6 @@
"vscode-debugprotocol": "1.36.0",
"vscode-nls-dev": "^3.3.1",
"webpack": "^4.16.5",
"webpack-cli": "^3.1.0",
"webpack-stream": "^5.1.1"
},
"repository": {

725
yarn.lock

File diff suppressed because it is too large Load diff