From 6b2860b7b07dd2664d3ee62f90823353ae113361 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Fri, 12 Nov 2021 14:39:56 +0100
Subject: [PATCH] Simplify `buildAMD` usages

---
 build/utils.js             | 8 +++++---
 monaco-css/build.js        | 7 ++++---
 monaco-html/build.js       | 7 ++++---
 monaco-json/build.js       | 7 ++++---
 monaco-languages/build.js  | 5 +++--
 monaco-typescript/build.js | 8 +++++---
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/build/utils.js b/build/utils.js
index 1951c95d..ce46a8d7 100644
--- a/build/utils.js
+++ b/build/utils.js
@@ -212,7 +212,8 @@ exports.buildESM = buildESM;
  * @param {{
  *   base: string;
  *   entryPoint: string;
- *   banner: string;
+ *   amdModuleId: string;
+ *   amdDependencies?: string[];
  * }} options
  */
 function buildOneAMD(type, options) {
@@ -227,7 +228,7 @@ function buildOneAMD(type, options) {
 		},
 		globalName: 'moduleExports',
 		banner: {
-			js: `${bundledFileHeader}${options.banner}`
+			js: `${bundledFileHeader}define("${options.amdModuleId}",[${(options.amdDependencies || []).map(dep => (`"${dep}"`)).join(',')}],()=>{`
 		},
 		footer: {
 			js: 'return moduleExports;\n});'
@@ -251,7 +252,8 @@ function buildOneAMD(type, options) {
  * @param {{
  *   base: string;
  *   entryPoint: string;
- *   banner: string;
+ *   amdModuleId: string;
+ *   amdDependencies?: string[];
  * }} options
  */
 function buildAMD(options) {
diff --git a/monaco-css/build.js b/monaco-css/build.js
index b45b93d5..88aa7ee1 100644
--- a/monaco-css/build.js
+++ b/monaco-css/build.js
@@ -26,15 +26,16 @@ buildESM({
 buildAMD({
 	base: 'monaco-css',
 	entryPoint: 'src/monaco.contribution.ts',
-	banner: 'define("vs/language/css/monaco.contribution",["vs/editor/editor.api"],()=>{'
+	amdModuleId: 'vs/language/css/monaco.contribution',
+	amdDependencies: ['vs/editor/editor.api']
 });
 buildAMD({
 	base: 'monaco-css',
 	entryPoint: 'src/cssMode.ts',
-	banner: 'define("vs/language/css/cssMode",["vs/editor/editor.api"],()=>{'
+	amdModuleId: 'vs/language/css/cssMode'
 });
 buildAMD({
 	base: 'monaco-css',
 	entryPoint: 'src/cssWorker.ts',
-	banner: 'define("vs/language/css/cssWorker",[],()=>{'
+	amdModuleId: 'vs/language/css/cssWorker'
 });
diff --git a/monaco-html/build.js b/monaco-html/build.js
index 508d4b4d..fd26f660 100644
--- a/monaco-html/build.js
+++ b/monaco-html/build.js
@@ -26,15 +26,16 @@ buildESM({
 buildAMD({
 	base: 'monaco-html',
 	entryPoint: 'src/monaco.contribution.ts',
-	banner: 'define("vs/language/html/monaco.contribution",["vs/editor/editor.api"],()=>{'
+	amdModuleId: 'vs/language/html/monaco.contribution',
+	amdDependencies: ['vs/editor/editor.api']
 });
 buildAMD({
 	base: 'monaco-html',
 	entryPoint: 'src/htmlMode.ts',
-	banner: 'define("vs/language/html/htmlMode",["vs/editor/editor.api"],()=>{'
+	amdModuleId: 'vs/language/html/htmlMode'
 });
 buildAMD({
 	base: 'monaco-html',
 	entryPoint: 'src/htmlWorker.ts',
-	banner: 'define("vs/language/html/htmlWorker",[],()=>{'
+	amdModuleId: 'vs/language/html/htmlWorker'
 });
diff --git a/monaco-json/build.js b/monaco-json/build.js
index 8731ad82..148d259d 100644
--- a/monaco-json/build.js
+++ b/monaco-json/build.js
@@ -26,15 +26,16 @@ buildESM({
 buildAMD({
 	base: 'monaco-json',
 	entryPoint: 'src/monaco.contribution.ts',
-	banner: 'define("vs/language/json/monaco.contribution",["vs/editor/editor.api"],()=>{'
+	amdModuleId: 'vs/language/json/monaco.contribution',
+	amdDependencies: ['vs/editor/editor.api']
 });
 buildAMD({
 	base: 'monaco-json',
 	entryPoint: 'src/jsonMode.ts',
-	banner: 'define("vs/language/json/jsonMode",["vs/editor/editor.api"],()=>{'
+	amdModuleId: 'vs/language/json/jsonMode'
 });
 buildAMD({
 	base: 'monaco-json',
 	entryPoint: 'src/jsonWorker.ts',
-	banner: 'define("vs/language/json/jsonWorker",[],()=>{'
+	amdModuleId: 'vs/language/json/jsonWorker'
 });
diff --git a/monaco-languages/build.js b/monaco-languages/build.js
index 96dbc2a4..fe1aee6e 100644
--- a/monaco-languages/build.js
+++ b/monaco-languages/build.js
@@ -44,13 +44,14 @@ glob('src/*/*.contribution.ts', { cwd: __dirname }, function (err, files) {
 		buildAMD({
 			base: 'monaco-languages',
 			entryPoint: 'src/monaco.contribution.ts',
-			banner: 'define("vs/basic-languages/monaco.contribution",["vs/editor/editor.api"],()=>{'
+			amdModuleId: 'vs/basic-languages/monaco.contribution',
+			amdDependencies: ['vs/editor/editor.api']
 		});
 		for (const language of languages) {
 			buildAMD({
 				base: 'monaco-languages',
 				entryPoint: `src/${language}/${language}.ts`,
-				banner: `define("vs/basic-languages/${language}/${language}",[],()=>{`
+				amdModuleId: `vs/basic-languages/${language}/${language}`
 			});
 		}
 	}
diff --git a/monaco-typescript/build.js b/monaco-typescript/build.js
index f6572303..fff00847 100644
--- a/monaco-typescript/build.js
+++ b/monaco-typescript/build.js
@@ -31,15 +31,17 @@ buildESM({
 buildAMD({
 	base: 'monaco-typescript',
 	entryPoint: 'src/monaco.contribution.ts',
-	banner: 'define("vs/language/typescript/monaco.contribution",["vs/editor/editor.api"],()=>{'
+	amdModuleId: 'vs/language/typescript/monaco.contribution',
+	amdDependencies: ['vs/editor/editor.api']
 });
 buildAMD({
 	base: 'monaco-typescript',
 	entryPoint: 'src/tsMode.ts',
-	banner: 'define("vs/language/typescript/tsMode",["vs/editor/editor.api"],()=>{'
+	amdModuleId: 'vs/language/typescript/tsMode'
 });
 buildAMD({
 	base: 'monaco-typescript',
 	entryPoint: 'src/tsWorker.ts',
-	banner: 'define("vs/language/typescript/tsWorker",[],()=>{'
+	amdModuleId: 'vs/language/typescript/tsWorker',
+	amdDependencies: []
 });