Bundle AMD using requirejs

package.json

@@ -3,9 +3,9 @@
   "version": "2.0.1",
   "description": "HTML plugin for the Monaco Editor",
   "scripts": {
-    "compile": "mrmdir ./out && tsc -p ./src",
+    "compile": "mrmdir ./out && tsc -p ./src/tsconfig.json && tsc -p ./src/tsconfig.esm.json",
     "watch": "tsc -p ./src --watch",
-    "prepublish": "mrmdir ./release && npm run compile && node ./scripts/release.js && webpack --config webpack.dev.config.js && webpack --config webpack.min.config.js && mcopy ./src/monaco.d.ts ./release/monaco.d.ts",
+    "prepublish": "mrmdir ./release && npm run compile && node ./scripts/release.js && node ./scripts/bundle && mcopy ./src/monaco.d.ts ./release/monaco.d.ts",
     "install-service-next": "npm install vscode-html-languageservice@next -f -D && npm install vscode-languageserver-types@next -f -D",
     "install-service-local": "npm install ../vscode-html-languageservice -f -D && npm install ../vscode-languageserver-node/types -f -D"
   },
@@ -19,14 +19,14 @@
     "url": "https://github.com/Microsoft/monaco-editor/issues"
   },
   "devDependencies": {
-    "monaco-editor-core": "0.11.1",
-    "monaco-languages": "^0.9.0",
+    "monaco-editor-core": "0.11.3",
+    "monaco-languages": "^1.0.0",
     "monaco-plugin-helpers": "^1.0.2",
-    "monaco-typescript": "^2.3.0",
-    "typescript": "^2.7.2",
+    "monaco-typescript": "^3.0.0",
+    "requirejs": "^2.3.5",
+    "typescript": "2.7.2",
+    "uglify-js": "^3.3.14",
     "vscode-html-languageservice": "^2.1.1",
-    "vscode-languageserver-types": "^3.6.1",
-    "webpack": "^4.1.1",
-    "webpack-cli": "^2.0.10"
+    "vscode-languageserver-types": "^3.6.1"
   }
 }

scripts/bundle.js

@@ -0,0 +1,69 @@
+const requirejs = require('requirejs');
+const path = require('path');
+const fs = require('fs');
+const UglifyJS = require("uglify-js");
+const helpers = require('monaco-plugin-helpers');
+
+const REPO_ROOT = path.resolve(__dirname, '..');
+
+const sha1 = helpers.getGitVersion(REPO_ROOT);
+const semver = require('../package.json').version;
+const headerVersion = semver + '(' + sha1 + ')';
+
+const BUNDLED_FILE_HEADER = [
+	'/*!-----------------------------------------------------------------------------',
+	' * Copyright (c) Microsoft Corporation. All rights reserved.',
+	' * monaco-html version: ' + headerVersion,
+	' * Released under the MIT license',
+	' * https://github.com/Microsoft/monaco-html/blob/master/LICENSE.md',
+	' *-----------------------------------------------------------------------------*/',
+	''
+].join('\n');
+
+bundleOne('monaco.contribution');
+bundleOne('htmlMode');
+bundleOne('htmlWorker');
+
+function bundleOne(moduleId, exclude) {
+	requirejs.optimize({
+		baseUrl: 'out/amd/',
+		name: 'vs/language/html/' + moduleId,
+		out: 'release/dev/' + moduleId + '.js',
+		exclude: exclude,
+		paths: {
+			'vs/language/html': REPO_ROOT + '/out/amd'
+		},
+		optimize: 'none',
+		packages: [{
+			name: 'vscode-html-languageservice',
+			location: path.join(REPO_ROOT, 'node_modules/vscode-html-languageservice/lib/umd'),
+			main: 'htmlLanguageService'
+		}, {
+			name: 'vscode-languageserver-types',
+			location: path.join(REPO_ROOT, 'node_modules/vscode-languageserver-types/lib/umd'),
+			main: 'main'
+		}, {
+			name: 'vscode-uri',
+			location: path.join(REPO_ROOT, 'node_modules/vscode-uri/lib/umd'),
+			main: 'index'
+		}, {
+			name: 'vscode-nls',
+			location: path.join(REPO_ROOT, '/out/amd/fillers'),
+			main: 'vscode-nls'
+		}]
+	}, function (buildResponse) {
+		const devFilePath = path.join(REPO_ROOT, 'release/dev/' + moduleId + '.js');
+		const minFilePath = path.join(REPO_ROOT, 'release/min/' + moduleId + '.js');
+		const fileContents = fs.readFileSync(devFilePath).toString();
+		console.log();
+		console.log(`Minifying ${devFilePath}...`);
+		const result = UglifyJS.minify(fileContents, {
+			output: {
+				comments: 'some'
+			}
+		});
+		console.log(`Done.`);
+		try { fs.mkdirSync(path.join(REPO_ROOT, 'release/min')) } catch (err) { }
+		fs.writeFileSync(minFilePath, BUNDLED_FILE_HEADER + result.code);
+	})
+}

scripts/release.js

@@ -10,17 +10,17 @@ const REPO_ROOT = path.join(__dirname, '../');
 
 helpers.packageESM({
 	repoRoot: REPO_ROOT,
-	esmSource: 'out',
+	esmSource: 'out/esm',
 	esmDestination: 'release/esm',
 	entryPoints: [
 		'monaco.contribution.js',
 		'htmlMode.js',
 		'html.worker.js',
-		'../node_modules/vscode-html-languageservice/lib/esm/beautify/beautify-css.js',
-		'../node_modules/vscode-html-languageservice/lib/esm/beautify/beautify.js',
+		'../../node_modules/vscode-html-languageservice/lib/esm/beautify/beautify-css.js',
+		'../../node_modules/vscode-html-languageservice/lib/esm/beautify/beautify.js',
 	],
 	resolveAlias: {
-		'vscode-nls': path.join(REPO_ROOT, "out/fillers/vscode-nls.js")
+		'vscode-nls': path.join(REPO_ROOT, "out/esm/fillers/vscode-nls.js")
 	},
 	resolveSkip: [
 		'monaco-editor-core'

scripts/webpack.js

@@ -1,28 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-
-const REPO_ROOT = path.resolve(__dirname, '..');
-
-exports.createWebpackConfig = function (isDev) {
-	let targetFolder = isDev ? './release/dev' : './release/min';
-	let mode = isDev ? 'development' : 'production';
-
-	return {
-		entry: {
-			"monaco.contribution": './release/esm/monaco.contribution',
-			"htmlMode": './release/esm/htmlMode',
-			"htmlWorker": './release/esm/htmlWorker'
-		},
-		output: {
-			filename: '[name].js',
-			path: path.resolve(REPO_ROOT, targetFolder),
-			libraryTarget: "amd"
-		},
-		mode: mode,
-		plugins: [
-			new webpack.optimize.LimitChunkCountPlugin({
-				maxChunks: 1,
-			})
-		],
-	};
-};

src/tsconfig.esm.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "module": "esnext",
+    "moduleResolution": "node",
+    "outDir": "../out/esm",
+    "target": "es5",
+    "lib": [
+      "dom",
+      "es5",
+      "es2015.collection",
+      "es2015.promise"
+    ]
+  }
+}

src/tsconfig.json

@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
-    "module": "esnext",
+    "module": "amd",
     "moduleResolution": "node",
-    "outDir": "../out",
+    "outDir": "../out/amd",
     "target": "es5",
     "lib": [
       "dom",

test/index.html

@@ -15,8 +15,8 @@
 	// Loading monaco-typescript to get javascript coloring
 	var require = {
 		paths: {
-			'vs/basic-languages': '../node_modules/monaco-languages/release',
-			'vs/language/typescript': '../node_modules/monaco-typescript/release',
+			'vs/basic-languages': '../node_modules/monaco-languages/release/dev',
+			'vs/language/typescript': '../node_modules/monaco-typescript/release/dev',
 			'vs/language/html': '../release/dev',
 			'vs': '../node_modules/monaco-editor-core/dev/vs'
 		}
@@ -28,8 +28,8 @@
 
 <script>
 	require([
-		'vs/basic-languages/src/monaco.contribution',
-		'vs/language/typescript/src/monaco.contribution',
+		'vs/basic-languages/monaco.contribution',
+		'vs/language/typescript/monaco.contribution',
 		'vs/language/html/monaco.contribution'
 	], function() {
 		var editor = monaco.editor.create(document.getElementById('container'), {

webpack.dev.config.js

@@ -1 +0,0 @@
-module.exports = require('./scripts/webpack').createWebpackConfig(true);

webpack.min.config.js

@@ -1 +0,0 @@
-module.exports = require('./scripts/webpack').createWebpackConfig(false);