From 4d92b1d1f8a43465c50e82d26d432b101283b142 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Sat, 22 Feb 2020 16:02:23 +0100
Subject: [PATCH] Fix minor issues

---
 build/gulpfile.editor.js              |  5 +----
 build/monaco/esm.core.js              |  2 +-
 build/monaco/monaco.webpack.config.js | 29 +++++++++------------------
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
index 2f5d8b8d8a2..9278f689ec3 100644
--- a/build/gulpfile.editor.js
+++ b/build/gulpfile.editor.js
@@ -392,17 +392,14 @@ gulp.task('editor-esm-bundle',
 	task.series(
 		task.parallel(
 			util.rimraf('out-editor-src'),
-			util.rimraf('out-editor-build'),
 			util.rimraf('out-editor-esm'),
 			util.rimraf('out-monaco-editor-core'),
-			util.rimraf('out-editor'),
-			util.rimraf('out-editor-min')
+			util.rimraf('out-editor-esm-bundle'),
 		),
 		extractEditorSrcTask,
 		createESMSourcesAndResourcesTask,
 		compileEditorESMTask,
 		bundleEditorESMTask,
-		finalEditorResourcesTask
 	)
 );
 
diff --git a/build/monaco/esm.core.js b/build/monaco/esm.core.js
index d0cc7e9290a..b84b5fb4f41 100644
--- a/build/monaco/esm.core.js
+++ b/build/monaco/esm.core.js
@@ -11,7 +11,7 @@ self.MonacoEnvironment = {
 	getWorkerUrl: function (moduleId, label) {
 		return './editor.worker.bundle.js';
 	}
-}
+};
 
 monaco.editor.create(document.getElementById('container'), {
 	value: [
diff --git a/build/monaco/monaco.webpack.config.js b/build/monaco/monaco.webpack.config.js
index fe2067648d4..974a341a197 100644
--- a/build/monaco/monaco.webpack.config.js
+++ b/build/monaco/monaco.webpack.config.js
@@ -8,8 +8,8 @@ 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'
+		'core': './build/monaco/esm.core.js',
+		'editor.worker': './out-monaco-editor-core/esm/vs/editor/editor.worker.js'
 	},
 	output: {
 		globalObject: 'self',
@@ -17,24 +17,13 @@ module.exports = {
 		path: path.resolve(__dirname, 'dist')
 	},
 	module: {
-		rules: [
-			{
-				test: /\.css$/,
-				use: ['style-loader', 'css-loader'],
-			},
-			{
-				test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
-				use: [
-					{
-						loader: 'file-loader',
-						options: {
-							name: '[name].[ext]',
-							outputPath: 'fonts/'
-						}
-					}
-				]
-			}
-		]
+		rules: [{
+			test: /\.css$/,
+			use: ['style-loader', 'css-loader']
+		}, {
+			test: /\.ttf$/,
+			use: ['file-loader']
+		}]
 	},
 	resolve: {
 		alias: {
-- 
GitLab