From 1d48261b7b6a1030141e2723dce883dc0ae6c8d0 Mon Sep 17 00:00:00 2001 From: Lan Nguyen Thuy Date: Tue, 11 Mar 2025 13:39:55 +0700 Subject: [PATCH] fix bug rte code editor modal pretty print not working --- .../src/external/monaco-editor/index.ts | 10 +++++----- src/Umbraco.Web.UI.Client/src/rollup.config.js | 4 ++++ src/Umbraco.Web.UI.Client/vite.config.ts | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/external/monaco-editor/index.ts b/src/Umbraco.Web.UI.Client/src/external/monaco-editor/index.ts index 4397dee0f9..c4dbacf95f 100644 --- a/src/Umbraco.Web.UI.Client/src/external/monaco-editor/index.ts +++ b/src/Umbraco.Web.UI.Client/src/external/monaco-editor/index.ts @@ -6,18 +6,18 @@ import styles from 'monaco-editor/min/vs/editor/editor.main.css?inline'; const initializeWorkers = () => { self.MonacoEnvironment = { getWorker(workerId: string, label: string): Promise | Worker { - let url = '/umbraco/backoffice/monaco-editor/esm/vs/editor/editor.worker.js'; + let url = '/umbraco/backoffice/monaco-editor/vs/editor/editor.worker.js'; if (label === 'json') { - url = '/umbraco/backoffice/monaco-editor/esm/vs/language/json/json.worker.js'; + url = '/umbraco/backoffice/monaco-editor/vs/language/json/json.worker.js'; } if (label === 'css' || label === 'scss' || label === 'less') { - url = '/umbraco/backoffice/monaco-editor/esm/vs/language/css/css.worker.js'; + url = '/umbraco/backoffice/monaco-editor/vs/language/css/css.worker.js'; } if (label === 'html' || label === 'handlebars' || label === 'razor') { - url = '/umbraco/backoffice/monaco-editor/esm/vs/language/html/html.worker.js'; + url = '/umbraco/backoffice/monaco-editor/vs/language/html/html.worker.js'; } if (label === 'typescript' || label === 'javascript') { - url = '/umbraco/backoffice/monaco-editor/esm/vs/language/typescript/ts.worker.js'; + url = '/umbraco/backoffice/monaco-editor/vs/language/typescript/ts.worker.js'; } return new Worker(url, { name: workerId, type: 'module' }); }, diff --git a/src/Umbraco.Web.UI.Client/src/rollup.config.js b/src/Umbraco.Web.UI.Client/src/rollup.config.js index 5d64dd78a0..f4a313b69c 100644 --- a/src/Umbraco.Web.UI.Client/src/rollup.config.js +++ b/src/Umbraco.Web.UI.Client/src/rollup.config.js @@ -52,6 +52,10 @@ console.log('--- Copying TinyMCE i18n done ---'); // Copy monaco-editor console.log('--- Copying monaco-editor ---'); cpSync('./node_modules/monaco-editor/esm/vs/editor/editor.worker.js', `${DIST_DIRECTORY}/monaco-editor/vs/editor/editor.worker.js`); +cpSync('./node_modules/monaco-editor/esm/vs/base', `${DIST_DIRECTORY}/monaco-editor/vs/base`, { recursive: true }); +cpSync('./node_modules/monaco-editor/esm/vs/nls.js', `${DIST_DIRECTORY}/monaco-editor/vs/nls.js`, { recursive: true }); +cpSync('./node_modules/monaco-editor/esm/vs/nls.messages.js', `${DIST_DIRECTORY}/monaco-editor/vs/nls.messages.js`, { recursive: true }); +cpSync('./node_modules/monaco-editor/esm/vs/editor/common', `${DIST_DIRECTORY}/monaco-editor/vs/editor/common`, { recursive: true }); cpSync('./node_modules/monaco-editor/esm/vs/language', `${DIST_DIRECTORY}/monaco-editor/vs/language`, { recursive: true }); cpSync('./node_modules/monaco-editor/min/vs/base/browser/ui/codicons', `${DIST_DIRECTORY}/assets/fonts`, { recursive: true }); console.log('--- Copying monaco-editor done ---'); diff --git a/src/Umbraco.Web.UI.Client/vite.config.ts b/src/Umbraco.Web.UI.Client/vite.config.ts index 53747768db..c57b7aa65d 100644 --- a/src/Umbraco.Web.UI.Client/vite.config.ts +++ b/src/Umbraco.Web.UI.Client/vite.config.ts @@ -35,7 +35,7 @@ export const plugins: PluginOption[] = [ }, { src: 'node_modules/monaco-editor/esm/**/*', - dest: 'umbraco/backoffice/monaco-editor/esm', + dest: 'umbraco/backoffice/monaco-editor/vs', }, ], }),