Merge pull request #130773 from microsoft/alex/improve-bundles

Improve bundles

src/buildfile.js

@@ -3,9 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-function entrypoint(name) {
-	return [{ name: name, include: [], exclude: ['vs/css', 'vs/nls'] }];
-}
+const { createModuleDescription, createEditorWorkerModuleDescription } = require('./vs/base/buildfile');
 
 exports.base = [{
 	name: 'vs/base/common/worker/simpleWorker',
@@ -15,19 +13,19 @@ exports.base = [{
 	dest: 'vs/base/worker/workerMain.js'
 }];
 
-exports.workerExtensionHost = [entrypoint('vs/workbench/services/extensions/worker/extensionHostWorker')];
-exports.workerNotebook = [entrypoint('vs/workbench/contrib/notebook/common/services/notebookSimpleWorker')];
-exports.workerLanguageDetection = [entrypoint('vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker')];
+exports.workerExtensionHost = [createEditorWorkerModuleDescription('vs/workbench/services/extensions/worker/extensionHostWorker')];
+exports.workerNotebook = [createEditorWorkerModuleDescription('vs/workbench/contrib/notebook/common/services/notebookSimpleWorker')];
+exports.workerLanguageDetection = [createEditorWorkerModuleDescription('vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker')];
 
 exports.workbenchDesktop = require('./vs/workbench/buildfile.desktop').collectModules();
 exports.workbenchWeb = require('./vs/workbench/buildfile.web').collectModules();
 
 exports.keyboardMaps = [
-	entrypoint('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux'),
-	entrypoint('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.darwin'),
-	entrypoint('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.win')
+	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux'),
+	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.darwin'),
+	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.win')
 ];
 
 exports.code = require('./vs/code/buildfile').collectModules();
 
-exports.entrypoint = entrypoint;
+exports.entrypoint = createModuleDescription;

src/vs/base/buildfile.js

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+/**
+ * @param {string} name
+ * @param {string[]} exclude
+ */
+function createModuleDescription(name, exclude) {
+
+	let excludes = ['vs/css', 'vs/nls'];
+	if (Array.isArray(exclude) && exclude.length > 0) {
+		excludes = excludes.concat(exclude);
+	}
+
+	return {
+		name: name,
+		include: [],
+		exclude: excludes
+	};
+}
+
+/**
+ * @param {string} name
+ */
+function createEditorWorkerModuleDescription(name) {
+	return createModuleDescription(name, ['vs/base/common/worker/simpleWorker', 'vs/editor/common/services/editorSimpleWorker']);
+}
+
+exports.createModuleDescription = createModuleDescription;
+exports.createEditorWorkerModuleDescription = createEditorWorkerModuleDescription;

src/vs/code/buildfile.js

@@ -4,27 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-function createModuleDescription(name, exclude) {
-	const result = {};
-
-	let excludes = ['vs/css', 'vs/nls'];
-	result.name = name;
-	if (Array.isArray(exclude) && exclude.length > 0) {
-		excludes = excludes.concat(exclude);
-	}
-	result.exclude = excludes;
-
-	return result;
-}
+const { createModuleDescription } = require('../base/buildfile');
 
 exports.collectModules = function () {
 	return [
-		createModuleDescription('vs/code/electron-main/main', []),
-		createModuleDescription('vs/code/node/cli', []),
+		createModuleDescription('vs/code/electron-main/main'),
+		createModuleDescription('vs/code/node/cli'),
 		createModuleDescription('vs/code/node/cliProcessMain', ['vs/code/node/cli']),
-		createModuleDescription('vs/code/electron-sandbox/issue/issueReporterMain', []),
-		createModuleDescription('vs/code/electron-browser/sharedProcess/sharedProcessMain', []),
-		createModuleDescription('vs/platform/driver/node/driver', []),
-		createModuleDescription('vs/code/electron-sandbox/processExplorer/processExplorerMain', [])
+		createModuleDescription('vs/code/electron-sandbox/issue/issueReporterMain'),
+		createModuleDescription('vs/code/electron-browser/sharedProcess/sharedProcessMain'),
+		createModuleDescription('vs/platform/driver/node/driver'),
+		createModuleDescription('vs/code/electron-sandbox/processExplorer/processExplorerMain')
 	];
 };

src/vs/workbench/buildfile.desktop.js

@@ -4,32 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-function createModuleDescription(name, exclude) {
-	const result = {};
-
-	let excludes = ['vs/css', 'vs/nls'];
-	result.name = name;
-	if (Array.isArray(exclude) && exclude.length > 0) {
-		excludes = excludes.concat(exclude);
-	}
-	result.exclude = excludes;
-
-	return result;
-}
+const { createModuleDescription, createEditorWorkerModuleDescription } = require('../base/buildfile');
 
 exports.collectModules = function () {
 	return [
-		createModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer', ['vs/base/common/worker/simpleWorker', 'vs/editor/common/services/editorSimpleWorker']),
+		createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer'),
 
-		createModuleDescription('vs/workbench/contrib/debug/node/telemetryApp', []),
+		createModuleDescription('vs/workbench/contrib/debug/node/telemetryApp'),
 
-		createModuleDescription('vs/workbench/services/search/node/searchApp', []),
+		createModuleDescription('vs/workbench/services/search/node/searchApp'),
 
-		createModuleDescription('vs/platform/files/node/watcher/unix/watcherApp', []),
-		createModuleDescription('vs/platform/files/node/watcher/nsfw/watcherApp', []),
+		createModuleDescription('vs/platform/files/node/watcher/unix/watcherApp'),
+		createModuleDescription('vs/platform/files/node/watcher/nsfw/watcherApp'),
 
-		createModuleDescription('vs/platform/terminal/node/ptyHostMain', []),
+		createModuleDescription('vs/platform/terminal/node/ptyHostMain'),
 
-		createModuleDescription('vs/workbench/services/extensions/node/extensionHostProcess', []),
+		createModuleDescription('vs/workbench/services/extensions/node/extensionHostProcess'),
 	];
 };

src/vs/workbench/buildfile.web.js

@@ -4,22 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-function createModuleDescription(name, exclude) {
-	const result = {};
-
-	let excludes = ['vs/css', 'vs/nls'];
-	result.name = name;
-	if (Array.isArray(exclude) && exclude.length > 0) {
-		excludes = excludes.concat(exclude);
-	}
-	result.exclude = excludes;
-
-	return result;
-}
+const { createModuleDescription, createEditorWorkerModuleDescription } = require('../base/buildfile');
 
 exports.collectModules = function () {
 	return [
-		createModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer', ['vs/base/common/worker/simpleWorker', 'vs/editor/common/services/editorSimpleWorker']),
+		createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer'),
 		createModuleDescription('vs/code/browser/workbench/workbench', ['vs/workbench/workbench.web.api']),
 	];
 };