Exported modules reorganization

build/amd/src/editor.main.ts

@@ -25,37 +25,37 @@ self.MonacoEnvironment = {
 			return new Worker(
 				getWorkerBootstrapUrl(
 					/// @ts-ignore
-					new URL('../../../src/language/json/json.worker.ts?worker', import.meta.url)
+					new URL('../../../src/languages/features/json/json.worker.ts?worker', import.meta.url)
 				)
 			);
 		}
 		if (label === 'css' || label === 'scss' || label === 'less') {
 			return new Worker(
 				getWorkerBootstrapUrl(
 					/// @ts-ignore
-					new URL('../../../src/language/css/css.worker.ts?worker', import.meta.url)
+					new URL('../../../src/languages/features/css/css.worker.ts?worker', import.meta.url)
 				)
 			);
 		}
 		if (label === 'html' || label === 'handlebars' || label === 'razor') {
 			return new Worker(
 				getWorkerBootstrapUrl(
 					/// @ts-ignore
-					new URL('../../../src/language/html/html.worker.ts?worker', import.meta.url)
+					new URL('../../../src/languages/features/html/html.worker.ts?worker', import.meta.url)
 				)
 			);
 		}
 		if (label === 'typescript' || label === 'javascript') {
 			return new Worker(
 				getWorkerBootstrapUrl(
 					/// @ts-ignore
-					new URL('../../../src/language/typescript/ts.worker.ts?worker', import.meta.url)
+					new URL('../../../src/languages/features/typescript/ts.worker.ts?worker', import.meta.url)
 				)
 			);
 		}
 		return new Worker(
 			/// @ts-ignore
-			getWorkerBootstrapUrl(new URL('../../../src/editor/editor.worker.ts?worker', import.meta.url))
+			getWorkerBootstrapUrl(new URL('../../../src/deprecated/editor/editor.worker.ts?worker', import.meta.url))
 		);
 	}
 };
@@ -81,11 +81,18 @@ function getWorkerBootstrapUrl(workerScriptUrl: string | URL) {
 }
 
 import 'vs/nls.messages-loader!';
-import * as monaco from '../../../src/editor/editor.main';
-export * from '../../../src/editor/editor.main';
+import * as monaco from '../../../src/index';
+export * from '../../../src/index';
 
 globalThis.monaco = monaco;
 
+const lang = monaco.languages as any;
+lang.css = monaco.css;
+lang.html = monaco.html;
+lang.typescript = monaco.typescript;
+lang.json = monaco.json;
+
+
 const styleSheetUrl = require.toUrl('vs/editor/editor.main.css');
 
 const link = document.createElement('link');

build/amd/src/nls.messages-loader.js

@@ -1,9 +1,9 @@
-export function load(name, req, load, config) {
+export function load(_name, req, load, config) {
 	const requestedLanguage = config['vs/nls']?.availableLanguages?.['*'];
 	if (!requestedLanguage || requestedLanguage === 'en') {
 		load({});
 	} else {
-		req([`vs/nls.messages.${requestedLanguage}`], () => {
+		req([`vs/nls/lang/${requestedLanguage}`], () => {
 			load({});
 		});
 	}

build/amd/vite.config.mjs

@@ -1,9 +1,9 @@
 import { readFileSync } from 'node:fs';
-import { dirname, resolve } from 'node:path';
+import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { defineConfig } from 'vite';
 import { urlToEsmPlugin } from './plugin';
-import { getNlsEntryPoints } from '../shared.mjs';
+import { getAdditionalEntryPoints, getAdditionalFiles, mapModuleId, root } from '../shared.mjs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
@@ -18,32 +18,18 @@ export default defineConfig(async (args) => {
 			lib: {
 				cssFileName: 'editor/editor.main',
 				entry: {
-					...getNlsEntryPoints(),
+					...getAdditionalEntryPoints(),
 					'nls.messages-loader': resolve(__dirname, 'src/nls.messages-loader.js'),
 					'editor/editor.main': resolve(__dirname, 'src/editor.main.ts'),
-					'basic-languages/monaco.contribution': resolve(
-						__dirname,
-						'../../src/basic-languages/monaco.contribution.ts'
-					),
-					'language/css/monaco.contribution': resolve(
-						__dirname,
-						'../../src/language/css/monaco.contribution.ts'
-					),
-					'language/html/monaco.contribution': resolve(
-						__dirname,
-						'../../src/language/html/monaco.contribution.ts'
-					),
-					'language/json/monaco.contribution': resolve(
-						__dirname,
-						'../../src/language/json/monaco.contribution.ts'
-					),
-					'language/typescript/monaco.contribution': resolve(
-						__dirname,
-						'../../src/language/typescript/monaco.contribution.ts'
-					)
 				},
 				name: 'monaco-editor',
-				fileName: (_format, entryName) => entryName + '.js',
+				fileName: (_format, entryName) => {
+					const m = mapModuleId(join(root, entryName), '.js');
+					if (m !== undefined) {
+						return m;
+					}
+					return entryName + '.js';
+				},
 				formats: ['amd']
 			},
 			outDir: resolve(
@@ -76,6 +62,18 @@ export default defineConfig(async (args) => {
 					});
 				}
 			},
+			{
+				name: 'emit-additional-files',
+				generateBundle() {
+					for (const file of getAdditionalFiles()) {
+						this.emitFile({
+							type: 'asset',
+							fileName: file.pathFromRoot,
+							source: 'value' in file.source ? file.source.value : readFileSync(file.source.absolutePath)
+						});
+					}
+				}
+			},
 			urlToEsmPlugin()
 		]
 	};

build/check-samples.ts

@@ -12,9 +12,9 @@ checkEveryMonacoLanguageHasASample();
 
 function checkEveryMonacoLanguageHasASample() {
 	let languages = glob
-		.sync('src/basic-languages/*/*.contribution.ts', { cwd: REPO_ROOT })
+		.sync('src/languages/definitions/*/register.ts', { cwd: REPO_ROOT })
 		.map((f) => path.dirname(f))
-		.map((f) => f.substring('src/basic-languages/'.length));
+		.map((f) => f.substring('src/languages/definitions/'.length));
 	languages.push('css');
 	languages.push('html');
 	languages.push('json');

build/esm/rollup-types.config.mjs

@@ -9,26 +9,30 @@ import nodeResolve from '@rollup/plugin-node-resolve';
 import { join } from 'path';
 import { defineConfig } from 'rollup';
 import { dts } from "rollup-plugin-dts";
-import { dtsDeprecationWarning, mapModuleId } from '../shared.mjs';
+import { dtsDeprecationWarning, getAdditionalEntryPoints, mapModuleId } from '../shared.mjs';
 
 const root = join(import.meta.dirname, '../../');
 
 export default defineConfig({
 	input: {
-		entry: join(root, './src/editor/editor.main.ts'),
-		editorApi: join(root, './src/editor/editor.api.ts'),
+		entry: join(root, './src/index.ts'),
+		...getAdditionalEntryPoints(true, false),
 	},
 	output: {
 		dir: join(root, './out/monaco-editor/esm'),
 		format: 'es',
-		preserveModules: false,
+		preserveModules: true,
 		entryFileNames: function (chunkInfo) {
 			const moduleId = chunkInfo.facadeModuleId;
 			if (moduleId) {
 				const m = mapModuleId(moduleId, '.d.ts');
+				console.log(moduleId + ' => ' + m);
 				if (m !== undefined) {
+
 					return m;
 				}
+			} else {
+				console.warn('NO MODULE ID for chunkInfo', chunkInfo);
 			}
 			return '[name].d.ts';
 		},

build/esm/rollup.config.mjs

@@ -13,7 +13,7 @@ import del from 'rollup-plugin-delete';
 import keepCssImports from './rollup-plugin-keep-css-imports/dist/index.mjs';
 import nodeResolve from '@rollup/plugin-node-resolve';
 import { urlToEsmPlugin } from './rollup-url-to-module-plugin/index.mjs';
-import { getNlsEntryPoints, mapModuleId } from '../shared.mjs';
+import { getAdditionalEntryPoints, getAdditionalFiles, mapModuleId } from '../shared.mjs';
 import { readFileSync } from 'fs';
 
 
@@ -22,12 +22,8 @@ const outDir = join(root, './out/monaco-editor/esm');
 
 export default defineConfig({
 	input: {
-		entry: join(root, './src/editor/editor.main.ts'),
-		editorAll: join(root, './src/editor/editor.all.ts'),
-		edcoreMain: join(root, './src/editor/edcore.main.ts'),
-		editorApi: join(root, './src/editor/editor.api.ts'),
-		editorWorker: join(root, './src/editor/editor.worker.ts'),
-		...getNlsEntryPoints(),
+		entry: join(root, './src/index.ts'),
+		...getAdditionalEntryPoints(true),
 	},
 
 	output: {
@@ -45,20 +41,28 @@ export default defineConfig({
 			return '[name].js';
 		},
 		preserveModules: true,
+		hoistTransitiveImports: false,
 	},
 
 
 	plugins: [
 		del({ targets: outDir, force: true }),
 
 		{
-			name: 'copy-codicon-font',
+			name: 'emit-additional-files',
 			generateBundle() {
 				this.emitFile({
 					type: 'asset',
 					fileName: 'vs/base/browser/ui/codicons/codicon/codicon.ttf',
 					source: readFileSync(join(root, 'node_modules/monaco-editor-core/esm/vs/base/browser/ui/codicons/codicon/codicon.ttf'))
 				});
+				for (const file of getAdditionalFiles()) {
+					this.emitFile({
+						type: 'asset',
+						fileName: file.pathFromRoot,
+						source: 'value' in file.source ? file.source.value : readFileSync(file.source.absolutePath)
+					});
+				}
 			}
 		},