adopt new vscode-nls-dev, #56792

This commit is contained in:
Johannes Rieken 2018-08-20 10:17:22 +02:00
parent 94e740853d
commit 6e559261f6
3 changed files with 8 additions and 6 deletions

View file

@ -8,6 +8,7 @@ require('events').EventEmitter.defaultMaxListeners = 100;
const gulp = require('gulp');
const path = require('path');
const fs = require('fs');
const tsb = require('gulp-tsb');
const es = require('event-stream');
const filter = require('gulp-filter');
@ -74,6 +75,7 @@ const tasks = compilations.map(function (tsconfigFile) {
tsOptions.base = path.dirname(absolutePath);
const compilation = tsb.create(tsOptions, null, null, err => reporter(err.toString()));
const nlsOption = fs.existsSync(path.join(root, 'extension.webpack.config.js')) ? { keepFilenames: true } : undefined;
return function () {
const input = es.through();
@ -89,7 +91,7 @@ const tasks = compilations.map(function (tsconfigFile) {
.pipe(tsFilter)
.pipe(util.loadSourcemaps())
.pipe(compilation())
.pipe(build ? nlsDev.rewriteLocalizeCalls({ keepFilenames: true }) : es.through())
.pipe(build ? nlsDev.rewriteLocalizeCalls(nlsOption) : es.through())
.pipe(build ? util.stripSourceMappingURL() : es.through())
.pipe(sourcemaps.write('.', {
sourceMappingURL: !build ? null : f => `${baseUrl}/${f.relative}.map`,

View file

@ -125,7 +125,7 @@
"vinyl": "^0.4.5",
"vinyl-fs": "^2.4.3",
"vsce": "1.33.2",
"vscode-nls-dev": "3.1.0",
"vscode-nls-dev": "3.1.1",
"webpack": "^4.16.5",
"webpack-cli": "^3.1.0",
"webpack-stream": "^5.1.1"
@ -142,4 +142,4 @@
"windows-mutex": "^0.2.0",
"windows-process-tree": "0.2.2"
}
}
}

View file

@ -7880,9 +7880,9 @@ vscode-fsevents@0.3.8:
dependencies:
nan "^2.3.0"
vscode-nls-dev@3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/vscode-nls-dev/-/vscode-nls-dev-3.1.0.tgz#afbd6c6291446a9f82cc19b781841ae307fa36c2"
vscode-nls-dev@3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/vscode-nls-dev/-/vscode-nls-dev-3.1.1.tgz#e7fa2e8e641b1579b25779acfda0e5f7c28f1fb9"
dependencies:
clone "^2.1.1"
event-stream "^3.3.4"