+
+
+
+* [Submit bugs and feature requests](https://github.com/microsoft/vscode/issues) and help us verify as they are checked in
+* Review [source code changes](https://github.com/microsoft/vscode/pulls)
+* Review the [documentation](https://github.com/microsoft/vscode-docs) and make pull requests for anything from typos to new content
## Contributing
+
If you are interested in fixing issues and contributing directly to the code base,
-please see the document [How to Contribute](https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Contribute), which covers the following:
+please see the document [How to Contribute](https://github.com/Microsoft/vscode/wiki/How-to-Contribute), which covers the following:
-* [How to build and run from source](https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Contribute#Build-and-Run-From-Source)
-* [The development workflow, including debugging and running tests](https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Contribute#development-workflow)
-* [Submitting pull requests](https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Contribute#pull-requests)
+* [How to build and run from source](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#build-and-run-from-source)
+* [The development workflow, including debugging and running tests](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#development-workflow)
+* [Coding Guidelines](https://github.com/Microsoft/vscode/wiki/Coding-Guidelines)
+* [Submitting pull requests](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#pull-requests)
+* [Contributing to translations](https://aka.ms/vscodeloc)
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
+Please see also our [Code of Conduct](CODE_OF_CONDUCT.md).
-## Privacy Statement
-The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement) describes the privacy statement of this software.
+## Feedback
+
+* Ask a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/vscode).
+* Request a new feature on [GitHub](CONTRIBUTING.md).
+* Vote for [popular feature requests](https://github.com/Microsoft/vscode/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc).
+* File a bug in [GitHub Issues](https://github.com/Microsoft/vscode/issues).
+* [Tweet](https://twitter.com/code) us with other feedback.
+
+## Related Projects
+Many of the core components and extensions to Code live in their own repositories on GitHub. For example, the [node debug adapter](https://github.com/microsoft/vscode-node-debug) and the [mono debug adapter](https://github.com/microsoft/vscode-mono-debug).
+
+For a complete list, please see the [Related Projects](https://github.com/Microsoft/vscode/wiki/Related-Projects) page on our wiki.
## License
Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the [Source EULA](LICENSE.txt).
+Licensed under the [MIT](LICENSE.txt) License.
diff --git a/appveyor.yml b/appveyor.yml
index 5c5c23c776..d9471f2a8f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,19 +3,17 @@ environment:
VSCODE_BUILD_VERBOSE: true
cache:
- - '%APPDATA%\npm-cache'
+ - '%LOCALAPPDATA%\Yarn\cache'
install:
- - ps: Install-Product node 7.9.0 x64
- - npm install -g npm@4 --silent
+ - ps: Install-Product node 8.9.1 x64
build_script:
- - .\scripts\npm.bat install
+ - yarn
- .\node_modules\.bin\gulp electron
- npm run compile
test_script:
- node --version
- - npm --version
- .\scripts\test.bat
- .\scripts\test-integration.bat
diff --git a/build/dependencies.js b/build/dependencies.js
new file mode 100644
index 0000000000..43c415d488
--- /dev/null
+++ b/build/dependencies.js
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+const path = require('path');
+const parseSemver = require('parse-semver');
+const cp = require('child_process');
+const _ = require('underscore');
+
+function asYarnDependency(prefix, tree) {
+ let parseResult;
+
+ try {
+ parseResult = parseSemver(tree.name);
+ } catch (err) {
+ err.message += `: ${tree.name}`;
+ console.warn(`Could not parse semver: ${tree.name}`);
+ return null;
+ }
+
+ // not an actual dependency in disk
+ if (parseResult.version !== parseResult.range) {
+ return null;
+ }
+
+ const name = parseResult.name;
+ const version = parseResult.version;
+ const dependencyPath = path.join(prefix, name);
+ const children = [];
+
+ for (const child of (tree.children || [])) {
+ const dep = asYarnDependency(path.join(prefix, name, 'node_modules'), child);
+
+ if (dep) {
+ children.push(dep);
+ }
+ }
+
+ return { name, version, path: dependencyPath, children };
+}
+
+function getYarnProductionDependencies(cwd) {
+ const raw = cp.execSync('yarn list --json', { cwd, encoding: 'utf8', env: { ...process.env, NODE_ENV: 'production' }, stdio: [null, null, 'ignore'] });
+ const match = /^{"type":"tree".*$/m.exec(raw);
+
+ if (!match || match.length !== 1) {
+ throw new Error('Could not parse result of `yarn list --json`');
+ }
+
+ const trees = JSON.parse(match[0]).data.trees;
+
+ return trees
+ .map(tree => asYarnDependency(path.join(cwd, 'node_modules'), tree))
+ .filter(dep => !!dep);
+}
+
+function getProductionDependencies(cwd) {
+ const result = [];
+ const deps = getYarnProductionDependencies(cwd);
+ const flatten = dep => { result.push({ name: dep.name, version: dep.version, path: dep.path }); dep.children.forEach(flatten); };
+ deps.forEach(flatten);
+
+ return _.uniq(result);
+}
+
+module.exports.getProductionDependencies = getProductionDependencies;
+
+if (require.main === module) {
+ const root = path.dirname(__dirname);
+ console.log(JSON.stringify(getProductionDependencies(root), null, ' '));
+}
diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js
index 5911bf0ec3..16b5982894 100644
--- a/build/gulpfile.extensions.js
+++ b/build/gulpfile.extensions.js
@@ -62,6 +62,8 @@ const tasks = compilations.map(function (tsconfigFile) {
const reporter = createReporter();
tsOptions.inlineSources = !!build;
+ tsOptions.base = path.dirname(absolutePath);
+
const compilation = tsb.create(tsOptions, null, null, err => reporter(err.toString()));
return function () {
diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js
index aa6f705c70..a6a2cdd5e9 100644
--- a/build/gulpfile.hygiene.js
+++ b/build/gulpfile.hygiene.js
@@ -37,6 +37,7 @@ const eolFilter = [
'!ThirdPartyNotices.txt',
'!LICENSE.txt',
'!extensions/**/out/**',
+ '!test/smoke/out/**',
'!**/node_modules/**',
'!**/fixtures/**',
'!**/*.{svg,exe,png,bmp,scpt,bat,cmd,cur,ttf,woff,eot}',
@@ -56,6 +57,7 @@ const indentationFilter = [
'!**/*.template',
'!**/*.yaml',
'!**/*.yml',
+ '!**/yarn.lock',
'!**/lib/**',
'!extensions/**/*.d.ts',
'!src/typings/**/*.d.ts',
@@ -63,11 +65,11 @@ const indentationFilter = [
'!**/*.d.ts.recipe',
'!test/assert.js',
'!**/package.json',
- '!**/npm-shrinkwrap.json',
'!**/octicons/**',
'!**/vs/base/common/marked/raw.marked.js',
'!**/vs/base/common/winjs.base.raw.js',
'!**/vs/base/node/terminateProcess.sh',
+ '!**/vs/base/node/ps-win.ps1',
'!**/vs/nls.js',
'!**/vs/css.js',
'!**/vs/loader.js',
@@ -122,7 +124,8 @@ const tslintFilter = [
'!**/node_modules/**',
'!extensions/typescript/test/colorize-fixtures/**',
'!extensions/vscode-api-tests/testWorkspace/**',
- '!extensions/**/*.test.ts'
+ '!extensions/**/*.test.ts',
+ '!extensions/html/server/lib/jquery.d.ts'
];
const copyrightHeader = [
@@ -132,17 +135,6 @@ const copyrightHeader = [
' *--------------------------------------------------------------------------------------------*/'
].join('\n');
-function reportFailures(failures) {
- failures.forEach(failure => {
- const name = failure.name || failure.fileName;
- const position = failure.startPosition;
- const line = position.lineAndCharacter ? position.lineAndCharacter.line : position.line;
- const character = position.lineAndCharacter ? position.lineAndCharacter.character : position.character;
-
- console.error(`${name}:${line + 1}:${character + 1}:${failure.failure}`);
- });
-}
-
gulp.task('eslint', () => {
return vfs.src(all, { base: '.', follow: true, allowEmpty: true })
.pipe(filter(eslintFilter))
@@ -152,12 +144,12 @@ gulp.task('eslint', () => {
});
gulp.task('tslint', () => {
- const options = { summarizeFailureOutput: true };
+ const options = { emitError: false };
return vfs.src(all, { base: '.', follow: true, allowEmpty: true })
.pipe(filter(tslintFilter))
.pipe(gulptslint({ rulesDirectory: 'build/lib/tslint' }))
- .pipe(gulptslint.report(reportFailures, options));
+ .pipe(gulptslint.report(options));
});
const hygiene = exports.hygiene = (some, options) => {
@@ -219,6 +211,17 @@ const hygiene = exports.hygiene = (some, options) => {
});
});
+ function reportFailures(failures) {
+ failures.forEach(failure => {
+ const name = failure.name || failure.fileName;
+ const position = failure.startPosition;
+ const line = position.lineAndCharacter ? position.lineAndCharacter.line : position.line;
+ const character = position.lineAndCharacter ? position.lineAndCharacter.character : position.character;
+
+ // console.error(`${name}:${line + 1}:${character + 1}:${failure.failure}`);
+ });
+ }
+
const tsl = es.through(function (file) {
const configuration = tslint.Configuration.findConfiguration(null, '.');
const options = { formatter: 'json', rulesDirectory: 'build/lib/tslint' };
@@ -227,9 +230,9 @@ const hygiene = exports.hygiene = (some, options) => {
linter.lint(file.relative, contents, configuration.results);
const result = linter.getResult();
- if (result.failureCount > 0) {
+ if (result.failures.length > 0) {
reportFailures(result.failures);
- errorCount += result.failureCount;
+ errorCount += result.failures.length;
}
this.emit('data', file);
@@ -254,20 +257,20 @@ const hygiene = exports.hygiene = (some, options) => {
const javascript = result
.pipe(filter(eslintFilter))
.pipe(gulpeslint('src/.eslintrc'))
- .pipe(gulpeslint.formatEach('compact'));
+ .pipe(gulpeslint.formatEach('compact'))
// {{SQL CARBON EDIT}}
// .pipe(gulpeslint.failAfterError());
- return es.merge(typescript, javascript)
- .pipe(es.through(null, function () {
- // {{SQL CARBON EDIT}}
- // if (errorCount > 0) {
- // this.emit('error', 'Hygiene failed with ' + errorCount + ' errors. Check \'build/gulpfile.hygiene.js\'.');
- // } else {
- // this.emit('end');
- // }
- this.emit('end');
- }));
+ return es.merge(typescript, javascript)
+ .pipe(es.through(null, function () {
+ // {{SQL CARBON EDIT}}
+ // if (errorCount > 0) {
+ // this.emit('error', 'Hygiene failed with ' + errorCount + ' errors. Check \'build/gulpfile.hygiene.js\'.');
+ // } else {
+ // this.emit('end');
+ // }
+ this.emit('end');
+ }));
};
gulp.task('hygiene', () => hygiene(''));
@@ -303,11 +306,13 @@ if (require.main === module) {
.split(/\r?\n/)
.filter(l => !!l);
- hygiene(some, { skipEOL: skipEOL }).on('error', err => {
- console.error();
- console.error(err);
- process.exit(1);
- });
+ if (some.length > 0) {
+ hygiene(some, { skipEOL: skipEOL }).on('error', err => {
+ console.error();
+ console.error(err);
+ process.exit(1);
+ });
+ }
});
});
}
diff --git a/build/gulpfile.mixin.js b/build/gulpfile.mixin.js
index 5df471c6ea..6aff18e9a1 100644
--- a/build/gulpfile.mixin.js
+++ b/build/gulpfile.mixin.js
@@ -6,27 +6,64 @@
'use strict';
const gulp = require('gulp');
-const jeditor = require('gulp-json-editor');
+const json = require('gulp-json-editor');
+const buffer = require('gulp-buffer');
+const filter = require('gulp-filter');
+const es = require('event-stream');
+const util = require('./lib/util');
+const remote = require('gulp-remote-src');
+const zip = require('gulp-vinyl-zip');
+const assign = require('object-assign');
+const pkg = require('../package.json');
gulp.task('mixin', function () {
- const updateUrl = process.env['SQLOPS_UPDATEURL'];
- if (!updateUrl) {
- console.log('Missing SQLOPS_UPDATEURL, skipping mixin');
+ const repo = process.env['VSCODE_MIXIN_REPO'];
+
+ if (!repo) {
+ console.log('Missing VSCODE_MIXIN_REPO, skipping mixin');
return;
}
const quality = process.env['VSCODE_QUALITY'];
+
if (!quality) {
console.log('Missing VSCODE_QUALITY, skipping mixin');
return;
}
- let newValues = {
- "updateUrl": updateUrl,
- "quality": quality
- };
+ const url = `https://github.com/${repo}/archive/${pkg.distro}.zip`;
+ const opts = { base: url };
+ const username = process.env['VSCODE_MIXIN_USERNAME'];
+ const password = process.env['VSCODE_MIXIN_PASSWORD'];
- return gulp.src('./product.json')
- .pipe(jeditor(newValues))
+ if (username || password) {
+ opts.auth = { user: username || '', pass: password || '' };
+ }
+
+ console.log('Mixing in sources from \'' + url + '\':');
+
+ let all = remote('', opts)
+ .pipe(zip.src())
+ .pipe(filter(function (f) { return !f.isDirectory(); }))
+ .pipe(util.rebase(1));
+
+ if (quality) {
+ const productJsonFilter = filter('product.json', { restore: true });
+ const mixin = all
+ .pipe(filter(['quality/' + quality + '/**']))
+ .pipe(util.rebase(2))
+ .pipe(productJsonFilter)
+ .pipe(buffer())
+ .pipe(json(o => assign({}, require('../product.json'), o)))
+ .pipe(productJsonFilter.restore);
+
+ all = es.merge(mixin);
+ }
+
+ return all
+ .pipe(es.mapSync(function (f) {
+ console.log(f.relative);
+ return f;
+ }))
.pipe(gulp.dest('.'));
});
\ No newline at end of file
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index d9213c26d2..95cc2636db 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -29,18 +29,15 @@ const root = path.dirname(__dirname);
const commit = util.getVersion(root);
const packageJson = require('../package.json');
const product = require('../product.json');
-const shrinkwrap = require('../npm-shrinkwrap.json');
const crypto = require('crypto');
const i18n = require('./lib/i18n');
-var del = require('del');
-
// {{SQL CARBON EDIT}}
const serviceInstaller = require('extensions-modules/lib/languageservice/serviceInstallerUtil');
const glob = require('glob');
+const deps = require('./dependencies');
+const getElectronVersion = require('./lib/electron').getElectronVersion;
-const productDependencies = Object.keys(product.dependencies || {});
-const dependencies = Object.keys(shrinkwrap.dependencies)
- .concat(productDependencies); // additional dependencies from our product configuration
+const productionDependencies = deps.getProductionDependencies(path.dirname(__dirname));
const baseModules = Object.keys(process.binding('natives')).filter(n => !/^_|\//.test(n));
// {{SQL CARBON EDIT}}
const nodeModules = [
@@ -50,14 +47,15 @@ const nodeModules = [
'rxjs/Subject',
'rxjs/Observer',
'ng2-charts/ng2-charts']
- .concat(dependencies)
+ .concat(Object.keys(product.dependencies || {}))
+ .concat(_.uniq(productionDependencies.map(d => d.name)))
.concat(baseModules);
// Build
const builtInExtensions = [
- { name: 'ms-vscode.node-debug', version: '1.18.3' },
- { name: 'ms-vscode.node-debug2', version: '1.18.5' }
+ { name: 'ms-vscode.node-debug', version: '1.19.8' },
+ { name: 'ms-vscode.node-debug2', version: '1.19.4' }
];
const excludedExtensions = [
@@ -79,8 +77,8 @@ const vscodeResources = [
'out-build/bootstrap-amd.js',
'out-build/paths.js',
'out-build/vs/**/*.{svg,png,cur,html}',
- 'out-build/vs/base/node/startupTimers.js',
- 'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh}',
+ 'out-build/vs/base/common/performance.js',
+ 'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,ps-win.ps1}',
'out-build/vs/base/browser/ui/octiconLabel/octicons/**',
'out-build/vs/workbench/browser/media/*-theme.css',
'out-build/vs/workbench/electron-browser/bootstrap/**',
@@ -154,10 +152,10 @@ gulp.task('minify-vscode', ['clean-minified-vscode', 'optimize-index-js'], commo
const darwinCreditsTemplate = product.darwinCredits && _.template(fs.readFileSync(path.join(root, product.darwinCredits), 'utf8'));
const config = {
- version: packageJson.electronVersion,
+ version: getElectronVersion(),
productAppName: product.nameLong,
companyName: 'Microsoft Corporation',
- copyright: 'Copyright (C) 2018 Microsoft. All rights reserved',
+ copyright: 'Copyright (C) 2017 Microsoft. All rights reserved',
darwinIcon: 'resources/darwin/code.icns',
darwinBundleIdentifier: product.darwinBundleIdentifier,
darwinApplicationCategoryType: 'public.app-category.developer-tools',
@@ -167,7 +165,7 @@ const config = {
name: product.nameLong + ' document',
role: 'Editor',
ostypes: ["TEXT", "utxt", "TUTX", "****"],
- // {{SQL CARBON EDIT}}
+ // {{SQL CARBON EDIT}}
extensions: ["csv", "json", "sqlplan", "sql", "xml"],
iconFile: 'resources/darwin/code_file.icns'
}],
@@ -318,8 +316,10 @@ function packageTask(platform, arch, opts) {
// {{SQL CARBON EDIT}}
const dataApi = gulp.src('src/vs/data.d.ts').pipe(rename('out/sql/data.d.ts'));
- const depsSrc = _.flatten(dependencies
- .map(function (d) { return ['node_modules/' + d + '/**', '!node_modules/' + d + '/**/{test,tests}/**']; }));
+ const depsSrc = [
+ ..._.flatten(productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`])),
+ ..._.flatten(Object.keys(product.dependencies || {}).map(d => [`node_modules/${d}/**`, `!node_modules/${d}/**/{test,tests}/**`]))
+ ];
const deps = gulp.src(depsSrc, { base: '.', dot: true })
.pipe(filter(['**', '!**/package-lock.json']))
@@ -328,11 +328,11 @@ function packageTask(platform, arch, opts) {
.pipe(util.cleanNodeModule('windows-mutex', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node']))
.pipe(util.cleanNodeModule('native-watchdog', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
+ .pipe(util.cleanNodeModule('spdlog', ['binding.gyp', 'build/**', 'deps/**', 'src/**', 'test/**'], ['**/*.node']))
.pipe(util.cleanNodeModule('jschardet', ['dist/**']))
.pipe(util.cleanNodeModule('windows-foreground-love', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
.pipe(util.cleanNodeModule('windows-process-tree', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
.pipe(util.cleanNodeModule('gc-signals', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node', 'src/index.js']))
- .pipe(util.cleanNodeModule('v8-profiler', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node', 'src/index.js']))
.pipe(util.cleanNodeModule('keytar', ['binding.gyp', 'build/**', 'src/**', 'script/**', 'node_modules/**'], ['**/*.node']))
.pipe(util.cleanNodeModule('node-pty', ['binding.gyp', 'build/**', 'src/**', 'tools/**'], ['build/Release/**']))
.pipe(util.cleanNodeModule('nsfw', ['binding.gyp', 'build/**', 'src/**', 'openpa/**', 'includes/**'], ['**/*.node', '**/*.a']))
@@ -487,7 +487,7 @@ gulp.task('upload-vscode-sourcemaps', ['minify-vscode'], () => {
const allConfigDetailsPath = path.join(os.tmpdir(), 'configuration.json');
gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () => {
const branch = process.env.BUILD_SOURCEBRANCH;
- if (!branch.endsWith('/master') && !branch.indexOf('/release/') >= 0) {
+ if (!branch.endsWith('/master') && branch.indexOf('/release/') < 0) {
console.log(`Only runs on master and release branches, not ${branch}`);
return;
}
diff --git a/build/lib/electron.js b/build/lib/electron.js
new file mode 100644
index 0000000000..f7f2084bf8
--- /dev/null
+++ b/build/lib/electron.js
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const root = path.dirname(path.dirname(__dirname));
+
+function getElectronVersion() {
+ const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
+ const target = /^target "(.*)"$/m.exec(yarnrc)[1];
+
+ return target;
+}
+
+module.exports.getElectronVersion = getElectronVersion;
+
+// returns 0 if the right version of electron is in .build/electron
+if (require.main === module) {
+ const version = getElectronVersion();
+ const versionFile = path.join(root, '.build', 'electron', 'version');
+ const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `v${version}`;
+
+ process.exit(isUpToDate ? 0 : 1);
+}
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
index 4ac26e3252..8ea68b63c5 100644
--- a/build/lib/extensions.js
+++ b/build/lib/extensions.js
@@ -20,7 +20,7 @@ var vsce = require("vsce");
var File = require("vinyl");
function fromLocal(extensionPath) {
var result = es.through();
- vsce.listFiles({ cwd: extensionPath })
+ vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn })
.then(function (fileNames) {
var files = fileNames
.map(function (fileName) { return path.join(extensionPath, fileName); })
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
index e96002dad1..399d146864 100644
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -22,7 +22,7 @@ import * as File from 'vinyl';
export function fromLocal(extensionPath: string): Stream {
const result = es.through();
- vsce.listFiles({ cwd: extensionPath })
+ vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn })
.then(fileNames => {
const files = fileNames
.map(fileName => path.join(extensionPath, fileName))
diff --git a/build/lib/i18n.js b/build/lib/i18n.js
index fabfd153e4..62686b83fe 100644
--- a/build/lib/i18n.js
+++ b/build/lib/i18n.js
@@ -141,7 +141,7 @@ var XLF = /** @class */ (function () {
};
XLF.prototype.addStringItem = function (item) {
if (!item.id || !item.message) {
- throw new Error('No item ID or value specified.');
+ throw new Error("No item ID or value specified: " + JSON.stringify(item));
}
this.appendNewLine("${hljs.highlight(lang, str, true).value}