From 9995d1282404a3f47a1be7e2f7817158a6fd6a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= Date: Mon, 18 Jan 2021 15:02:55 +0100 Subject: [PATCH] missing build output --- build/lib/builtInExtensions.js | 7 +++++++ build/lib/extensions.js | 13 ++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js index 54db11e0c46..9b8bcc9e000 100644 --- a/build/lib/builtInExtensions.js +++ b/build/lib/builtInExtensions.js @@ -56,6 +56,13 @@ function syncMarketplaceExtension(extension) { .on('end', () => log(ansiColors.blue('[marketplace]'), extension.name, ansiColors.green('✔︎'))); } function syncExtension(extension, controlState) { + if (extension.platforms) { + const platforms = new Set(extension.platforms); + if (!platforms.has(process.platform)) { + log(ansiColors.gray('[skip]'), `${extension.name}@${extension.version}: Platform '${process.platform}' not supported: [${extension.platforms}]`, ansiColors.green('✔︎')); + return es.readArray([]); + } + } switch (controlState) { case 'disabled': log(ansiColors.blue('[disabled]'), ansiColors.gray(extension.name)); diff --git a/build/lib/extensions.js b/build/lib/extensions.js index d0d3f88efc5..6e23f471f15 100644 --- a/build/lib/extensions.js +++ b/build/lib/extensions.js @@ -194,16 +194,19 @@ function fromMarketplace(extensionName, version, metadata) { exports.fromMarketplace = fromMarketplace; const excludedExtensions = [ 'vscode-api-tests', - 'vscode-colorize-tests', 'vscode-test-resolver', 'ms-vscode.node-debug', 'ms-vscode.node-debug2', 'vscode-notebook-tests', 'vscode-custom-editor-tests', ]; -const marketplaceWebExtensions = [ - 'ms-vscode.references-view' -]; +const marketplaceWebExtensionsExclude = new Set([ + 'ms-vscode.node-debug', + 'ms-vscode.node-debug2', + 'ms-vscode.js-debug-companion', + 'ms-vscode.js-debug', + 'ms-vscode.vscode-js-profile-table' +]); const productJson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')); const builtInExtensions = productJson.builtInExtensions || []; const webBuiltInExtensions = productJson.webBuiltInExtensions || []; @@ -246,7 +249,7 @@ function packageLocalExtensionsStream(forWeb) { exports.packageLocalExtensionsStream = packageLocalExtensionsStream; function packageMarketplaceExtensionsStream(forWeb) { const marketplaceExtensionsDescriptions = [ - ...builtInExtensions.filter(({ name }) => (forWeb ? marketplaceWebExtensions.indexOf(name) >= 0 : true)), + ...builtInExtensions.filter(({ name }) => (forWeb ? !marketplaceWebExtensionsExclude.has(name) : true)), ...(forWeb ? webBuiltInExtensions : []) ]; const marketplaceExtensionsStream = minifyExtensionResources(es.merge(...marketplaceExtensionsDescriptions