diff --git a/build/lib/extensions.js b/build/lib/extensions.js index 44ba5f71ee..96f19f0556 100644 --- a/build/lib/extensions.js +++ b/build/lib/extensions.js @@ -189,9 +189,11 @@ const excludedExtensions = [ 'integration-tests' ]; // {{SQL CARBON EDIT}} -const sqlBuiltInExtensions = [ - // Add SQL built-in extensions here. - // the extension will be excluded from SQLOps package and will have separate vsix packages +const sqlExtensions = [ + // This is the list of SQL extensions which the source code is included in this repository, but + // they get packaged separately. Adding extension name here, will make the build to create + // a separate vsix package for the extension and the extension will be excluded from the main package. + // Any extension not included here, will be installed by default. 'admin-tool-ext-win', 'agent', 'import', @@ -214,7 +216,7 @@ function packageLocalExtensionsStream() { }) .filter(({ name }) => excludedExtensions.indexOf(name) === -1) .filter(({ name }) => builtInExtensions.every(b => b.name !== name)) - .filter(({ name }) => sqlBuiltInExtensions.indexOf(name) === -1); // {{SQL CARBON EDIT}} add aditional filter + .filter(({ name }) => sqlExtensions.indexOf(name) === -1); // {{SQL CARBON EDIT}} Remove SQL Extensions with separate package const nodeModules = gulp.src('extensions/node_modules/**', { base: '.' }); const localExtensions = localExtensionDescriptions.map(extension => { return fromLocal(extension.path) @@ -234,7 +236,9 @@ function packageMarketplaceExtensionsStream() { } exports.packageMarketplaceExtensionsStream = packageMarketplaceExtensionsStream; const vfs = require("vinyl-fs"); -function packageBuiltInExtensions() { +function packageSQLExtensions() { + // Create package for local SQL extensions + // const sqlBuiltInLocalExtensionDescriptions = glob.sync('extensions/*/package.json') .map(manifestPath => { const extensionPath = path.dirname(path.join(root, manifestPath)); @@ -243,7 +247,7 @@ function packageBuiltInExtensions() { }) .filter(({ name }) => excludedExtensions.indexOf(name) === -1) .filter(({ name }) => builtInExtensions.every(b => b.name !== name)) - .filter(({ name }) => sqlBuiltInExtensions.indexOf(name) >= 0); + .filter(({ name }) => sqlExtensions.indexOf(name) >= 0); const visxDirectory = path.join(path.dirname(root), 'vsix'); try { if (!fs.existsSync(visxDirectory)) { @@ -265,7 +269,7 @@ function packageBuiltInExtensions() { }); }); } -exports.packageBuiltInExtensions = packageBuiltInExtensions; +exports.packageSQLExtensions = packageSQLExtensions; function packageExtensionTask(extensionName, platform, arch) { var destination = path.join(path.dirname(root), 'azuredatastudio') + (platform ? '-' + platform : '') + (arch ? '-' + arch : ''); if (platform === 'darwin') {