yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18633 from umbraco/v15/fix-bug/rte-code-editor-modal-pretty-print

Browse Source 
Fix bug RTE code editor modal - pretty print not working
This commit is contained in:
Lee Kelleher
2025-03-11 10:55:49 +00:00
committed by GitHub
parent 863d3d11c6 1d48261b7b
commit 434dd50021
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/external/monaco-editor/index.ts vendored
View File

@@ -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> | 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' });
},

4
src/Umbraco.Web.UI.Client/src/rollup.config.js
View File

@@ -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 ---');

2
src/Umbraco.Web.UI.Client/vite.config.ts
View File

@@ -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',
},
],
}),