diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js index 2f5d8b8d8a2418fe28291e2a8bf3bd4b152d1c3c..9278f689ec3c9b40686c45c9b73c61f92cd73029 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 d0cc7e9290a5bdc123404bd6e39bbe0fad9a14df..b84b5fb4f4122e5b76526933cab1585d23bf55b7 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 fe2067648d462db10751e3271d5e99286fba2a47..974a341a197e1250fd2b85cdcab15ce3c529f1b2 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: {