From 66b4e080264e7d39bd0a6da3c0e6ecf6272d3a3f Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Fri, 10 May 2019 09:57:13 -0700 Subject: [PATCH] produce the vsix files during windows build (#5454) * vsix packages * update path --- build/lib/extensions.js | 5 ++++- build/lib/extensions.ts | 11 +++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build/lib/extensions.js b/build/lib/extensions.js index a0ffd32d10..0841026f4f 100644 --- a/build/lib/extensions.js +++ b/build/lib/extensions.js @@ -40,8 +40,11 @@ function packageBuiltInExtensions() { .filter(({ name }) => excludedExtensions.indexOf(name) === -1) .filter(({ name }) => builtInExtensions.every(b => b.name !== name)) .filter(({ name }) => sqlBuiltInExtensions.indexOf(name) >= 0); + const visxDirectory = path.join(path.dirname(root), 'vsix'); + fs.mkdirSync(visxDirectory); sqlBuiltInLocalExtensionDescriptions.forEach(element => { - const packagePath = path.join(path.dirname(root), element.name + '.vsix'); + let pkgJson = JSON.parse(fs.readFileSync(path.join(element.path, 'package.json'), { encoding: 'utf8' })); + const packagePath = path.join(visxDirectory, `${pkgJson.name}-${pkgJson.version}.vsix`); console.info('Creating vsix for ' + element.path + ' result:' + packagePath); vsce.createVSIX({ cwd: element.path, diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts index ca9b44e785..3a37899068 100644 --- a/build/lib/extensions.ts +++ b/build/lib/extensions.ts @@ -43,8 +43,11 @@ export function packageBuiltInExtensions() { .filter(({ name }) => excludedExtensions.indexOf(name) === -1) .filter(({ name }) => builtInExtensions.every(b => b.name !== name)) .filter(({ name }) => sqlBuiltInExtensions.indexOf(name) >= 0); + const visxDirectory = path.join(path.dirname(root), 'vsix'); + fs.mkdirSync(visxDirectory); sqlBuiltInLocalExtensionDescriptions.forEach(element => { - const packagePath = path.join(path.dirname(root), element.name + '.vsix'); + let pkgJson = JSON.parse(fs.readFileSync(path.join(element.path, 'package.json'), { encoding: 'utf8' })); + const packagePath = path.join(visxDirectory, `${pkgJson.name}-${pkgJson.version}.vsix`); console.info('Creating vsix for ' + element.path + ' result:' + packagePath); vsce.createVSIX({ cwd: element.path, @@ -365,9 +368,9 @@ export function packageExtensionsStream(optsIn?: IPackageExtensionsOptions): Nod ]; const localExtensionDependencies = () => gulp.src(extensionDepsSrc, { base: '.', dot: true }) - .pipe(filter(['**', '!**/package-lock.json'])) - .pipe(util2.cleanNodeModule('account-provider-azure', ['node_modules/date-utils/doc/**', 'node_modules/adal_node/node_modules/**'], undefined)) - .pipe(util2.cleanNodeModule('typescript', ['**/**'], undefined)); + .pipe(filter(['**', '!**/package-lock.json'])) + .pipe(util2.cleanNodeModule('account-provider-azure', ['node_modules/date-utils/doc/**', 'node_modules/adal_node/node_modules/**'], undefined)) + .pipe(util2.cleanNodeModule('typescript', ['**/**'], undefined)); // Original code commented out here // const localExtensionDependencies = () => gulp.src('extensions/node_modules/**', { base: '.' });