From bb95f3aa407498eacf4f907fe5482fedcd37fcb6 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Tue, 7 Jul 2020 23:30:27 +0200
Subject: [PATCH] Adopt loader's `amdModulesPattern` option

---
 build/gulpfile.vscode.js | 13 +------------
 build/lib/optimize.js    |  4 ++--
 build/lib/optimize.ts    |  4 ++--
 src/bootstrap-window.js  |  2 +-
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 4b46a5d856c..bbb7e60e699 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -37,11 +37,6 @@ const { compileBuildTask } = require('./gulpfile.compile');
 const { compileExtensionsBuildTask } = require('./gulpfile.extensions');
 
 const productionDependencies = deps.getProductionDependencies(path.dirname(__dirname));
-const baseModules = Object.keys(process.binding('natives')).filter(n => !/^_|\//.test(n));
-const nodeModules = ['electron', 'original-fs']
-	.concat(Object.keys(product.dependencies || {}))
-	.concat(_.uniq(productionDependencies.map(d => d.name)))
-	.concat(baseModules);
 
 // Build
 const vscodeEntryPoints = _.flatten([
@@ -94,7 +89,7 @@ const optimizeVSCodeTask = task.define('optimize-vscode', task.series(
 		src: 'out-build',
 		entryPoints: vscodeEntryPoints,
 		resources: vscodeResources,
-		loaderConfig: common.loaderConfig(nodeModules),
+		loaderConfig: common.loaderConfig(),
 		out: 'out-vscode',
 		bundleInfo: undefined
 	})
@@ -105,12 +100,6 @@ const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${
 const minifyVSCodeTask = task.define('minify-vscode', task.series(
 	optimizeVSCodeTask,
 	util.rimraf('out-vscode-min'),
-	() => {
-		const fullpath = path.join(process.cwd(), 'out-vscode/bootstrap-window.js');
-		const contents = fs.readFileSync(fullpath).toString();
-		const newContents = contents.replace('[/*BUILD->INSERT_NODE_MODULES*/]', JSON.stringify(nodeModules));
-		fs.writeFileSync(fullpath, newContents);
-	},
 	common.minifyTask('out-vscode', `${sourceMappingURLBase}/core`)
 ));
 gulp.task(minifyVSCodeTask);
diff --git a/build/lib/optimize.js b/build/lib/optimize.js
index 5098a093f9e..5015f76649b 100644
--- a/build/lib/optimize.js
+++ b/build/lib/optimize.js
@@ -28,13 +28,13 @@ const REPO_ROOT_PATH = path.join(__dirname, '../..');
 function log(prefix, message) {
     fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
 }
-function loaderConfig(emptyPaths) {
+function loaderConfig() {
     const result = {
         paths: {
             'vs': 'out-build/vs',
             'vscode': 'empty:'
         },
-        nodeModules: emptyPaths || []
+        amdModulesPattern: /^vs\//
     };
     result['vs/css'] = { inlineResources: true };
     return result;
diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts
index 973b843aa59..1fd00c15cb9 100644
--- a/build/lib/optimize.ts
+++ b/build/lib/optimize.ts
@@ -32,13 +32,13 @@ function log(prefix: string, message: string): void {
 	fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
 }
 
-export function loaderConfig(emptyPaths?: string[]) {
+export function loaderConfig() {
 	const result: any = {
 		paths: {
 			'vs': 'out-build/vs',
 			'vscode': 'empty:'
 		},
-		nodeModules: emptyPaths || []
+		amdModulesPattern: /^vs\//
 	};
 
 	result['vs/css'] = { inlineResources: true };
diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js
index cc33a013971..a417c1deb58 100644
--- a/src/bootstrap-window.js
+++ b/src/bootstrap-window.js
@@ -87,7 +87,7 @@
 		const loaderConfig = {
 			baseUrl: `${bootstrap.uriFromPath(configuration.appRoot)}/out`,
 			'vs/nls': nlsConfig,
-			nodeModules: [/*BUILD->INSERT_NODE_MODULES*/]
+			amdModulesPattern: /^vs\//,
 		};
 
 		// cached data config