gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 07:08:55 +02:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

chore(dx/client): fix SVG icons causing errors in CKEditor

Browse Source
This commit is contained in:
Elian Doran 2025-08-31 19:26:47 +03:00
parent 46cb869237
commit 5f1d2f02ee
No known key found for this signature in database
18 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/client/src/widgets/type_widgets/editable_text.ts
View File

@ -12,7 +12,6 @@ import { buildSelectedBackgroundColor } from "../../components/touch_bar.js";
import { buildConfig, BuildEditorOptions, OPEN_SOURCE_LICENSE_KEY } from "./ckeditor/config.js"; import { buildConfig, BuildEditorOptions, OPEN_SOURCE_LICENSE_KEY } from "./ckeditor/config.js";
import type FNote from "../../entities/fnote.js"; import type FNote from "../../entities/fnote.js";
import { PopupEditor, ClassicEditor, EditorWatchdog, type CKTextEditor, type MentionFeed, type WatchdogConfig, EditorConfig } from "@triliumnext/ckeditor5"; import { PopupEditor, ClassicEditor, EditorWatchdog, type CKTextEditor, type MentionFeed, type WatchdogConfig, EditorConfig } from "@triliumnext/ckeditor5";
import "@triliumnext/ckeditor5/index.css";
import { updateTemplateCache } from "./ckeditor/snippets.js"; import { updateTemplateCache } from "./ckeditor/snippets.js";
const TPL = /*html*/` const TPL = /*html*/`

2
packages/ckeditor5-admonition/src/admonitionui.ts
View File

@ -10,7 +10,7 @@
import { Plugin, addListToDropdown, createDropdown, ListDropdownItemDefinition, SplitButtonView, ViewModel } from 'ckeditor5'; import { Plugin, addListToDropdown, createDropdown, ListDropdownItemDefinition, SplitButtonView, ViewModel } from 'ckeditor5';
import '../theme/blockquote.css'; import '../theme/blockquote.css';
import admonitionIcon from '../theme/icons/admonition.svg'; import admonitionIcon from '../theme/icons/admonition.svg?raw';
import { AdmonitionType } from './admonitioncommand.js'; import { AdmonitionType } from './admonitioncommand.js';
import { Collection } from 'ckeditor5'; import { Collection } from 'ckeditor5';

2
packages/ckeditor5-admonition/src/index.ts
View File

@ -1,4 +1,4 @@
import admonitionIcon from '../theme/icons/admonition.svg'; import admonitionIcon from '../theme/icons/admonition.svg?raw';
import './augmentation.js'; import './augmentation.js';
import "../theme/blockquote.css"; import "../theme/blockquote.css";

2
packages/ckeditor5-admonition/typings/types.d.ts vendored
View File

@ -1,4 +1,4 @@
declare module '*.svg' { declare module '*.svg?raw' {
const content: string; const content: string;
export default content; export default content;
} }

2
packages/ckeditor5-footnotes/src/footnote-ui.ts
View File

@ -6,7 +6,7 @@ import {
ELEMENTS, ELEMENTS,
TOOLBAR_COMPONENT_NAME TOOLBAR_COMPONENT_NAME
} from './constants.js'; } from './constants.js';
import insertFootnoteIcon from '../theme/icons/insert-footnote.svg'; import insertFootnoteIcon from '../theme/icons/insert-footnote.svg?raw';
import { modelQueryElement, modelQueryElementsAll } from './utils.js'; import { modelQueryElement, modelQueryElementsAll } from './utils.js';
export default class FootnoteUI extends Plugin { export default class FootnoteUI extends Plugin {

2
packages/ckeditor5-footnotes/src/index.ts
View File

@ -1,4 +1,4 @@
import insertFootnoteIcon from './../theme/icons/insert-footnote.svg'; import insertFootnoteIcon from './../theme/icons/insert-footnote.svg?raw';
import './augmentation.js'; import './augmentation.js';
import "../theme/footnote.css"; import "../theme/footnote.css";

2
packages/ckeditor5-footnotes/typings/types.d.ts vendored
View File

@ -1,4 +1,4 @@
declare module '*.svg' { declare module '*.svg?raw' {
const content: string; const content: string;
export default content; export default content;
} }

2
packages/ckeditor5-keyboard-marker/src/index.ts
View File

@ -1,4 +1,4 @@
import kbdIcon from '../theme/icons/kbd.svg'; import kbdIcon from '../theme/icons/kbd.svg?raw';
import './augmentation.js'; import './augmentation.js';
export { default as Kbd } from './kbd.js'; export { default as Kbd } from './kbd.js';

2
packages/ckeditor5-keyboard-marker/src/kbdui.ts
View File

@ -1,5 +1,5 @@
import { AttributeCommand, ButtonView, Plugin } from 'ckeditor5'; import { AttributeCommand, ButtonView, Plugin } from 'ckeditor5';
import kbdIcon from '../theme/icons/kbd.svg'; import kbdIcon from '../theme/icons/kbd.svg?raw';
const KBD = 'kbd'; const KBD = 'kbd';

2
packages/ckeditor5-keyboard-marker/typings/types.d.ts vendored
View File

@ -1,4 +1,4 @@
declare module '*.svg' { declare module '*.svg?raw' {
const content: string; const content: string;
export default content; export default content;
} }

2
packages/ckeditor5-math/src/index.ts
View File

@ -1,4 +1,4 @@
import ckeditor from './../theme/icons/math.svg'; import ckeditor from './../theme/icons/math.svg?raw';
import './augmentation.js'; import './augmentation.js';
import "../theme/mathform.css"; import "../theme/mathform.css";

2
packages/ckeditor5-math/src/mathui.ts
View File

@ -1,6 +1,6 @@
import MathEditing from './mathediting.js'; import MathEditing from './mathediting.js';
import MainFormView from './ui/mainformview.js'; import MainFormView from './ui/mainformview.js';
import mathIcon from '../theme/icons/math.svg'; import mathIcon from '../theme/icons/math.svg?raw';
import { Plugin, ClickObserver, ButtonView, ContextualBalloon, clickOutsideHandler, CKEditorError, uid } from 'ckeditor5'; import { Plugin, ClickObserver, ButtonView, ContextualBalloon, clickOutsideHandler, CKEditorError, uid } from 'ckeditor5';
import { getBalloonPositionData } from './utils.js'; import { getBalloonPositionData } from './utils.js';
import MathCommand from './mathcommand.js'; import MathCommand from './mathcommand.js';

2
packages/ckeditor5-math/typings/types.d.ts vendored
View File

@ -1,4 +1,4 @@
declare module '*.svg' { declare module '*.svg?raw' {
const content: string; const content: string;
export default content; export default content;
} }

10
packages/ckeditor5-mermaid/src/index.ts
View File

@ -1,11 +1,11 @@
import './augmentation.js'; import './augmentation.js';
export { default as Mermaid } from './mermaid.js'; export { default as Mermaid } from './mermaid.js';
import infoIcon from './../theme/icons/info.svg'; import infoIcon from './../theme/icons/info.svg?raw';
import insertMermaidIcon from './../theme/icons/insert.svg'; import insertMermaidIcon from './../theme/icons/insert.svg?raw';
import previewModeIcon from './../theme/icons/preview-mode.svg'; import previewModeIcon from './../theme/icons/preview-mode.svg?raw';
import splitModeIcon from './../theme/icons/split-mode.svg'; import splitModeIcon from './../theme/icons/split-mode.svg?raw';
import sourceModeIcon from './../theme/icons/source-mode.svg'; import sourceModeIcon from './../theme/icons/source-mode.svg?raw';
import "../theme/mermaid.css"; import "../theme/mermaid.css";
export const icons = { export const icons = {

10
packages/ckeditor5-mermaid/src/mermaidui.ts
View File

@ -2,11 +2,11 @@
* @module mermaid/mermaidui * @module mermaid/mermaidui
*/ */
import insertMermaidIcon from '../theme/icons/insert.svg'; import insertMermaidIcon from '../theme/icons/insert.svg?raw';
import previewModeIcon from '../theme/icons/preview-mode.svg'; import previewModeIcon from '../theme/icons/preview-mode.svg?raw';
import splitModeIcon from '../theme/icons/split-mode.svg'; import splitModeIcon from '../theme/icons/split-mode.svg?raw';
import sourceModeIcon from '../theme/icons/source-mode.svg'; import sourceModeIcon from '../theme/icons/source-mode.svg?raw';
import infoIcon from '../theme/icons/info.svg'; import infoIcon from '../theme/icons/info.svg?raw';
import { ButtonView, Editor, ModelElement, Locale, Observable, Plugin } from 'ckeditor5'; import { ButtonView, Editor, ModelElement, Locale, Observable, Plugin } from 'ckeditor5';
import InsertMermaidCommand from './commands/insertMermaidCommand.js'; import InsertMermaidCommand from './commands/insertMermaidCommand.js';

10
packages/ckeditor5-mermaid/tests/index.ts
View File

@ -1,11 +1,11 @@
import { Mermaid as MermaidDll, icons } from '../src/index.js'; import { Mermaid as MermaidDll, icons } from '../src/index.js';
import Mermaid from '../src/mermaid.js'; import Mermaid from '../src/mermaid.js';
import infoIcon from './../theme/icons/info.svg'; import infoIcon from './../theme/icons/info.svg?raw';
import insertMermaidIcon from './../theme/icons/insert.svg'; import insertMermaidIcon from './../theme/icons/insert.svg?raw';
import previewModeIcon from './../theme/icons/preview-mode.svg'; import previewModeIcon from './../theme/icons/preview-mode.svg?raw';
import splitModeIcon from './../theme/icons/split-mode.svg'; import splitModeIcon from './../theme/icons/split-mode.svg?raw';
import sourceModeIcon from './../theme/icons/source-mode.svg'; import sourceModeIcon from './../theme/icons/source-mode.svg?raw';
import { describe, it } from 'vitest'; import { describe, it } from 'vitest';
import { expect } from 'vitest'; import { expect } from 'vitest';

2
packages/ckeditor5-mermaid/typings/types.d.ts vendored
View File

@ -1,4 +1,4 @@
declare module '*.svg' { declare module '*.svg?raw' {
const content: string; const content: string;
export default content; export default content;
} }

2
packages/ckeditor5/src/plugins/file_upload/progressbarview.ts
View File

@ -1,4 +1,4 @@
import cancelIcon from '@ckeditor/ckeditor5-core/theme/icons/cancel.svg'; import cancelIcon from '@ckeditor/ckeditor5-core/theme/icons/cancel.svg?raw';
import { ButtonView, Locale, toUnit, View } from 'ckeditor5'; import { ButtonView, Locale, toUnit, View } from 'ckeditor5';
const toPx = toUnit('%'); const toPx = toUnit('%');