From 213f1821ecc124887faed3a4064190dc710e52e9 Mon Sep 17 00:00:00 2001 From: ValeraS Date: Thu, 30 Dec 2021 17:16:33 +0300 Subject: [PATCH] tune(monaco-editor-webpack-plugin): replace editor.main.js Replace editor.main.js with editor.api.js and requested features and languages --- samples/browser-esm-webpack-monaco-plugin/index.js | 2 +- webpack-plugin/src/loaders/include.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/samples/browser-esm-webpack-monaco-plugin/index.js b/samples/browser-esm-webpack-monaco-plugin/index.js index 712ccd1f..27c82f59 100644 --- a/samples/browser-esm-webpack-monaco-plugin/index.js +++ b/samples/browser-esm-webpack-monaco-plugin/index.js @@ -1,4 +1,4 @@ -import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'; +import * as monaco from 'monaco-editor'; (function () { // create div to avoid needing a HtmlWebpackPlugin template diff --git a/webpack-plugin/src/loaders/include.ts b/webpack-plugin/src/loaders/include.ts index 4bebcce9..1b4a0e95 100644 --- a/webpack-plugin/src/loaders/include.ts +++ b/webpack-plugin/src/loaders/include.ts @@ -26,14 +26,16 @@ export const pitch: PitchLoaderDefinitionFunction = function pit return loaderUtils.stringifyRequest(this, request); }; + // editor.main.js contains all features and languages, replace it with requested features, languages and editor.api.js + const apiRequest = remainingRequest.replace(/editor\.main\.js$/, 'editor.api.js'); return [ ...(globals ? Object.keys(globals).map((key) => `self[${JSON.stringify(key)}] = ${globals[key]};`) : []), ...pre.map((include: any) => `import ${stringifyRequest(include)};`), ` -import * as monaco from ${stringifyRequest(`!!${remainingRequest}`)}; -export * from ${stringifyRequest(`!!${remainingRequest}`)}; +import * as monaco from ${stringifyRequest(`!!${apiRequest}`)}; +export * from ${stringifyRequest(`!!${apiRequest}`)}; export default monaco; `, ...post.map((include: any) => `import ${stringifyRequest(include)};`)