From 39d1763c929cf369a802d691f85fbdfe1fb189f5 Mon Sep 17 00:00:00 2001 From: Nathan Woulfe Date: Wed, 21 Jun 2023 13:41:05 +1000 Subject: [PATCH] no import CodeEditorLanguage types --- .../src/external/monaco-editor/index.ts | 2 +- .../packages/core/modal/token/code-editor-modal.token.ts | 6 ++++-- .../src/packages/templating/code-editor/index.ts | 1 - 3 files changed, 5 insertions(+), 4 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 82dd0fdf1e..d77864aa8c 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 @@ -1,4 +1,4 @@ -import styles from 'monaco-editor/min/vs/editor/editor.main.css'; +import styles from 'monaco-editor/min/vs/editor/editor.main.css?inline'; //eslint-disable-next-line import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker.js?worker'; //eslint-disable-next-line diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/code-editor-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/code-editor-modal.token.ts index d01695f6bc..39fdbd4192 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/code-editor-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/code-editor-modal.token.ts @@ -1,10 +1,12 @@ import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; -import { CodeEditorLanguage } from '@umbraco-cms/backoffice/code-editor'; +// TODO => investigate why exporting CodeEditorLanguage in code-editor barrel +// causes the schema generation task to fail... For now, language property below +// duplicates the CodeEditorLanguage type export interface UmbCodeEditorModalData { headline: string; content: string; - language: CodeEditorLanguage; + language: 'razor' | 'typescript' | 'javascript' | 'css' | 'markdown' | 'json' | 'html'; color?: 'positive' | 'danger'; confirmLabel?: string; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/code-editor/index.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/code-editor/index.ts index 84da824073..75222eb351 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/code-editor/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/code-editor/index.ts @@ -1,6 +1,5 @@ export type { UmbCodeEditorElement } from './code-editor.element.js'; export type { UmbCodeEditorController } from './code-editor.controller.js'; -export type { CodeEditorLanguage } from './code-editor.model.js'; export function loadCodeEditor() { return import('./code-editor.element.js');