Merge from vscode 5e80bf449c995aa32a59254c0ff845d37da11b70 (#9317)

build/monaco/api.js

@@ -135,11 +135,12 @@ function getMassagedTopLevelDeclarationText(sourceFile, declaration, importName,
                 }
                 else {
                     const memberName = member.name.text;
+                    const memberAccess = (memberName.indexOf('.') >= 0 ? `['${memberName}']` : `.${memberName}`);
                     if (isStatic(member)) {
-                        usage.push(`a = ${staticTypeName}.${memberName};`);
+                        usage.push(`a = ${staticTypeName}${memberAccess};`);
                     }
                     else {
-                        usage.push(`a = (<${instanceTypeName}>b).${memberName};`);
+                        usage.push(`a = (<${instanceTypeName}>b)${memberAccess};`);
                     }
                 }
             }

build/monaco/api.ts

@@ -167,10 +167,11 @@ function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declarati
 					result = result.replace(memberText, '');
 				} else {
 					const memberName = (<ts.Identifier | ts.StringLiteral>member.name).text;
+					const memberAccess = (memberName.indexOf('.') >= 0 ? `['${memberName}']` : `.${memberName}`);
 					if (isStatic(member)) {
-						usage.push(`a = ${staticTypeName}.${memberName};`);
+						usage.push(`a = ${staticTypeName}${memberAccess};`);
 					} else {
-						usage.push(`a = (<${instanceTypeName}>b).${memberName};`);
+						usage.push(`a = (<${instanceTypeName}>b)${memberAccess};`);
 					}
 				}
 			} catch (err) {

build/monaco/esm.core.js

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Entry file for webpack bunlding.
+
+import * as monaco from 'monaco-editor-core';
+
+self.MonacoEnvironment = {
+	getWorkerUrl: function (moduleId, label) {
+		return './editor.worker.bundle.js';
+	}
+};
+
+monaco.editor.create(document.getElementById('container'), {
+	value: [
+		'var hello = "hello world";'
+	].join('\n'),
+	language: 'javascript'
+});

build/monaco/monaco.webpack.config.js

@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const path = require('path');
+
+module.exports = {
+	mode: 'production',
+	entry: {
+		'core': './build/monaco/esm.core.js',
+		'editor.worker': './out-monaco-editor-core/esm/vs/editor/editor.worker.js'
+	},
+	output: {
+		globalObject: 'self',
+		filename: '[name].bundle.js',
+		path: path.resolve(__dirname, 'dist')
+	},
+	module: {
+		rules: [{
+			test: /\.css$/,
+			use: ['style-loader', 'css-loader']
+		}, {
+			test: /\.ttf$/,
+			use: ['file-loader']
+		}]
+	},
+	resolve: {
+		alias: {
+			'monaco-editor-core': path.resolve(__dirname, '../../out-monaco-editor-core/esm/vs/editor/editor.main.js'),
+		}
+	},
+	stats: {
+		all: false,
+		modules: true,
+		maxModules: 0,
+		errors: true,
+		warnings: true,
+		// our additional options
+		moduleTrace: true,
+		errorDetails: true,
+		chunks: true
+	}
+};