From cdde5c3bb1ef2ccf07da6b01ffd7a352b80f998f Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Thu, 6 Aug 2020 20:53:36 +0200 Subject: [PATCH] Also download `webBuiltInExtensions` when running from source --- build/lib/builtInExtensions.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js index 64cb4deee29..f86414211ec 100644 --- a/build/lib/builtInExtensions.js +++ b/build/lib/builtInExtensions.js @@ -18,7 +18,9 @@ const fancyLog = require('fancy-log'); const ansiColors = require('ansi-colors'); const root = path.dirname(path.dirname(__dirname)); -const builtInExtensions = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions; +const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')); +const builtInExtensions = productjson.builtInExtensions; +const webBuiltInExtensions = productjson.webBuiltInExtensions; const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json'); const ENABLE_LOGGING = !process.env['VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE']; @@ -107,7 +109,7 @@ exports.getBuiltInExtensions = function getBuiltInExtensions() { const control = readControlFile(); const streams = []; - for (const extension of builtInExtensions) { + for (const extension of [...builtInExtensions, ...webBuiltInExtensions]) { let controlState = control[extension.name] || 'marketplace'; control[extension.name] = controlState; -- GitLab