0.47.x

build/gulpfile.editor.js

@@ -78,7 +78,7 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => {
 			apiusages,
 			extrausages
 		],
-		shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
+		shakeLevel: 0, // 0-Files, 1-InnerFile, 2-ClassMembers
 		importIgnorePattern: /(^vs\/css!)/,
 		destRoot: path.join(root, 'out-editor-src'),
 		redirects: []
@@ -88,6 +88,8 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => {
 // Disable mangling for the editor, as it complicates debugging & quite a few users rely on private/protected fields.
 const compileEditorAMDTask = task.define('compile-editor-amd', compilation.compileTask('out-editor-src', 'out-editor-build', true, { disableMangle: true }));
 
+const compileEditorESMTaskPipeline = task.define('compile-editor-esm', compilation.compileTask('out-editor-esm', 'out-monaco-editor-core/esm', true, { disableMangle: true, transformConstEnum: 1 }));
+
 const optimizeEditorAMDTask = task.define('optimize-editor-amd', optimize.optimizeTask(
 	{
 		out: 'out-editor',
@@ -120,8 +122,11 @@ const createESMSourcesAndResourcesTask = task.define('extract-editor-esm', () =>
 		ignores: [
 			'inlineEntryPoint:0.ts',
 			'inlineEntryPoint:1.ts',
+			'inlineEntryPoint.0.ts',
+			'inlineEntryPoint.1.ts',
 			'vs/loader.js',
 			'vs/base/worker/workerMain.ts',
+			'vs/nls.ts',
 		],
 		renames: {
 			'vs/nls.mock.ts': 'vs/nls.ts'
@@ -332,7 +337,7 @@ const finalEditorResourcesTask = task.define('final-editor-resources', () => {
 		// version.txt
 		gulp.src('build/monaco/version.txt')
 			.pipe(es.through(function (data) {
-				data.contents = Buffer.from(`monaco-editor-core: https://github.com/microsoft/vscode/tree/${sha1}`);
+				data.contents = Buffer.from(`monaco-editor-core: https://github.com/opensumi/monaco-editor-core/tree/${sha1}`);
 				this.emit('data', data);
 			}))
 			.pipe(gulp.dest('out-monaco-editor-core')),
@@ -408,12 +413,13 @@ gulp.task('editor-distro',
 			task.series(
 				compileEditorAMDTask,
 				optimizeEditorAMDTask,
-				minifyEditorAMDTask
+				// disable minify
+				// minifyEditorAMDTask
 			),
 			task.series(
 				createESMSourcesAndResourcesTask,
-				compileEditorESMTask,
-				appendJSToESMImportsTask
+				compileEditorESMTaskPipeline,
+				appendJSToESMImportsTask,
 			)
 		),
 		finalEditorResourcesTask

build/hygiene.js

@@ -130,6 +130,10 @@ function hygiene(some, linting = true) {
 					const original = result.src.replace(/\r\n/gm, '\n');
 					const formatted = result.dest.replace(/\r\n/gm, '\n');
 
+					if (process.env.WRITE_FAIL) {
+						fs.writeFileSync(file.path, formatted, 'utf8');
+					}
+
 					if (original !== formatted) {
 						console.error(
 							`File not formatted. Run the 'Format Document' command to fix it:`,
@@ -173,8 +177,8 @@ function hygiene(some, linting = true) {
 		.pipe(unicodeFilterStream.restore)
 		.pipe(filter(indentationFilter))
 		.pipe(indentation)
-		.pipe(filter(copyrightFilter))
-		.pipe(copyrights);
+		.pipe(filter(copyrightFilter));
+		// .pipe(copyrights);
 
 	const streams = [
 		result.pipe(filter(tsFormattingFilter)).pipe(formatting)

build/lib/compilation.ts

@@ -48,6 +48,7 @@ function createCompile(src: string, build: boolean, emitError: boolean, transpil
 
 	const projectPath = path.join(__dirname, '../../', src, 'tsconfig.json');
 	const overrideOptions = { ...getTypeScriptCompilerOptions(src), inlineSources: Boolean(build) };
+
 	if (!build) {
 		overrideOptions.inlineSourceMap = true;
 	}
@@ -114,7 +115,7 @@ export function transpileTask(src: string, out: string, swc: boolean): task.Stre
 	return task;
 }
 
-export function compileTask(src: string, out: string, build: boolean, options: { disableMangle?: boolean } = {}): task.StreamTask {
+export function compileTask(src: string, out: string, build: boolean, options: { disableMangle?: boolean; transformConstEnum?: boolean } = {}): task.StreamTask {
 
 	const task = () => {
 
@@ -156,6 +157,7 @@ export function compileTask(src: string, out: string, build: boolean, options: {
 			.pipe(mangleStream)
 			.pipe(generator.stream)
 			.pipe(compile())
+			.pipe(options?.transformConstEnum ? transformConstEnum() : es.through())
 			.pipe(gulp.dest(out));
 	};
 
@@ -340,3 +342,12 @@ export const watchApiProposalNamesTask = task.define('watch-api-proposal-names',
 		.pipe(util.debounce(task))
 		.pipe(gulp.dest('src'));
 });
+
+function transformConstEnum() {
+	return es.map((file: File, cb: any) => {
+		if (/\.ts$/.test(file.path)) {
+			file.contents = Buffer.from(file.contents.toString().replace(/const enum/g, 'enum'));
+		}
+		cb(null, file);
+	});
+}

build/lib/i18n.ts

@@ -20,6 +20,10 @@ function log(message: any, ...rest: any[]): void {
 	fancyLog(ansiColors.green('[i18n]'), message, ...rest);
 }
 
+function consumeUnusedVar(...args: any[]): void {
+	void args;
+}
+
 export interface Language {
 	id: string; // language id, e.g. zh-tw, de
 	translationId?: string; // language id used in translation tools, e.g. zh-hant, de (optional, if not set, the id is used)
@@ -334,9 +338,9 @@ function escapeCharacters(value: string): string {
 	for (let i = 0; i < value.length; i++) {
 		const ch = value.charAt(i);
 		switch (ch) {
-			case '\'':
-				result.push('\\\'');
-				break;
+			// case '\'':
+			// 	result.push('\\\'');
+			// 	break;
 			case '"':
 				result.push('\\"');
 				break;
@@ -366,6 +370,7 @@ function escapeCharacters(value: string): string {
 }
 
 function processCoreBundleFormat(fileHeader: string, languages: Language[], json: BundledFormat, emitter: ThroughStream) {
+	consumeUnusedVar(fileHeader);
 	const keysSection = json.keys;
 	const messageSection = json.messages;
 	const bundleSection = json.bundles;
@@ -392,11 +397,22 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json
 		});
 	});
 
-	const languageDirectory = path.join(__dirname, '..', '..', '..', 'vscode-loc', 'i18n');
+	let languageDirectory = path.join(__dirname, '..', '..', '..', 'vscode-loc', 'i18n');
 	if (!fs.existsSync(languageDirectory)) {
 		log(`No VS Code localization repository found. Looking at ${languageDirectory}`);
-		log(`To bundle translations please check out the vscode-loc repository as a sibling of the vscode repository.`);
+		languageDirectory = path.join(__dirname, '..', '..', 'vscode-loc', 'i18n');
+		log(`Now looking at ${languageDirectory}`);
+
+		if (!fs.existsSync(languageDirectory)) {
+			log(`No VS Code localization repository found. Looking at ${languageDirectory}`);
+			log(`To bundle translations please check out the vscode-loc repository as a sibling of the vscode repository.`);
+		}
+	}
+
+	if (languageDirectory) {
+		log(`Found VS Code localization repository at ${languageDirectory}`);
 	}
+
 	const sortedLanguages = sortLanguages(languages);
 	sortedLanguages.forEach((language) => {
 		if (process.env['VSCODE_BUILD_VERBOSE']) {
@@ -446,10 +462,10 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json
 			localizedModules[module] = localizedMessages;
 		});
 		Object.keys(bundleSection).forEach((bundle) => {
+
 			const modules = bundleSection[bundle];
 			const contents: string[] = [
-				fileHeader,
-				`define("${bundle}.nls.${language.id}", {`
+				'{',
 			];
 			modules.forEach((module, index) => {
 				contents.push(`\t"${module}": [`);
@@ -459,12 +475,12 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json
 					return;
 				}
 				messages.forEach((message, index) => {
-					contents.push(`\t\t"${escapeCharacters(message)}${index < messages.length ? '",' : '"'}`);
+					contents.push(`\t\t"${escapeCharacters(message)}${index < messages.length - 1 ? '",' : '"'}`);
 				});
 				contents.push(index < modules.length - 1 ? '\t],' : '\t]');
 			});
-			contents.push('});');
-			emitter.queue(new File({ path: bundle + '.nls.' + language.id + '.js', contents: Buffer.from(contents.join('\n'), 'utf-8') }));
+			contents.push('}');
+			emitter.queue(new File({ path: bundle + '.nls.' + language.id + '.json', contents: Buffer.from(contents.join('\n'), 'utf-8') }));
 		});
 	});
 	Object.keys(statistics).forEach(key => {
@@ -479,6 +495,22 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json
 	});
 }
 
+const commonHeader1 = `/*---------------------------------------------------------\n`;
+const commonHeader2 = `* Copyright (c) Microsoft Corporation. All rights reserved.\n`;
+const commonHeader3 = `*--------------------------------------------------------*/`;
+
+// transform nls.js to nls.json
+function toJsonNlsFile(content: string, fileHeader: string): string {
+	return content
+		.replace(fileHeader, '')
+		.replace(commonHeader1, '')
+		.replace(commonHeader2, '')
+		.replace(commonHeader3, '')
+		.replace(`define("vs/editor/editor.main.nls", {`, '{')
+		.replace('});', '}')
+		.trim();
+}
+
 export function processNlsFiles(opts: { fileHeader: string; languages: Language[] }): ThroughStream {
 	return through(function (this: ThroughStream, file: File) {
 		const fileName = path.basename(file.path);
@@ -494,7 +526,17 @@ export function processNlsFiles(opts: { fileHeader: string; languages: Language[
 				processCoreBundleFormat(opts.fileHeader, opts.languages, json, this);
 			}
 		}
-		this.queue(file);
+
+		if (file.path.includes('editor.main.nls.js')) {
+			this.queue(new File(
+				{
+					path: file.path.replace('.js', '.json'),
+					contents: Buffer.from(toJsonNlsFile(file.contents.toString(), opts.fileHeader)),
+				}
+			));
+		} else {
+			this.queue(file);
+		}
 	});
 }