Allow nls in the base worker

build/gulpfile.editor.js

@@ -38,8 +38,11 @@ const editorEntryPoints = [
 		name: 'vs/base/common/worker/simpleWorker',
 		include: ['vs/editor/common/services/editorSimpleWorker'],
 		exclude: ['vs/nls'],
-		prepend: [{ path: 'vs/loader.js' }],
-		append: [{ path: 'vs/base/worker/workerMain' }],
+		prepend: [
+			{ path: 'vs/loader.js' },
+			{ path: 'vs/nls.js', amdModuleId: 'vs/nls' },
+			{ path: 'vs/base/worker/workerMain.js' }
+		],
 		dest: 'vs/base/worker/workerMain.js'
 	}
 ];

src/buildfile.js

@@ -35,9 +35,9 @@ exports.base = [
 		exclude: ['vs/nls'],
 		prepend: [
 			{ path: 'vs/loader.js' },
-			{ path: 'vs/nls.js', amdModuleId: 'vs/nls' }
+			{ path: 'vs/nls.js', amdModuleId: 'vs/nls' },
+			{ path: 'vs/base/worker/workerMain.js' }
 		],
-		append: [{ path: 'vs/base/worker/workerMain' }],
 		dest: 'vs/base/worker/workerMain.js'
 	},
 	{

src/vs/base/common/platform.ts

@@ -2,6 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+import * as nls from 'vs/nls';
 
 const LANGUAGE_DEFAULT = 'en';
 
@@ -90,6 +91,15 @@ if (typeof navigator === 'object' && !isElectronRenderer) {
 		// Get the configuration from requirejs
 		loaderConfiguration = globals.requirejs.s.contexts._.config;
 	}
+
+	// TODO @TylerLeonhardt pull availableLanguages from vs/nls
+	// DO NOT REMOVE.
+	nls.localize({
+		// Prevents the string from being localized.
+		comment: ['{Locked}'],
+		key: 'ensureLoaderPluginIsLoaded'
+	}, 'this ensures the nls loader plugin is loaded before resolving the true locale');
+
 	const configuredLocale = loaderConfiguration?.['vs/nls']?.['availableLanguages']?.['*'] as string | undefined;
 	_locale = configuredLocale || navigator.language;
 

src/vs/base/worker/workerMain.ts

@@ -76,14 +76,18 @@
 		});
 	}
 
-	const loadCode = function (moduleId: string) {
+	function configureAMDLoader() {
+		require.config({
+			baseUrl: monacoBaseUrl,
+			catchError: true,
+			trustedTypesPolicy,
+			amdModulesPattern: /^vs\//
+		});
+	}
+
+	function loadCode(moduleId: string) {
 		loadAMDLoader().then(() => {
-			require.config({
-				baseUrl: monacoBaseUrl,
-				catchError: true,
-				trustedTypesPolicy,
-				amdModulesPattern: /^vs\//
-			});
+			configureAMDLoader();
 			require([moduleId], function (ws) {
 				setTimeout(function () {
 					const messageHandler = ws.create((msg: any, transfer?: Transferable[]) => {
@@ -97,7 +101,14 @@
 				}, 0);
 			});
 		});
-	};
+	}
+
+	// If the loader is already defined, configure it immediately
+	// This helps in the bundled case, where we must load nls files
+	// and they need a correct baseUrl to be loaded.
+	if (typeof (<any>self).define === 'function' && (<any>self).define.amd) {
+		configureAMDLoader();
+	}
 
 	let isFirstMessage = true;
 	const beforeReadyMessages: MessageEvent[] = [];