From a9c07af40277f7daa278166e58dadfe9c9f19538 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 21 Jun 2025 09:00:07 +0300 Subject: [PATCH] fix(client): failing with duplicate modules --- apps/client/src/widgets/type_widgets/ckeditor/config.ts | 3 +-- packages/ckeditor5/src/index.ts | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/client/src/widgets/type_widgets/ckeditor/config.ts b/apps/client/src/widgets/type_widgets/ckeditor/config.ts index 4d4e1a27c..17bb6b611 100644 --- a/apps/client/src/widgets/type_widgets/ckeditor/config.ts +++ b/apps/client/src/widgets/type_widgets/ckeditor/config.ts @@ -1,13 +1,12 @@ import { ALLOWED_PROTOCOLS } from "../../../services/link.js"; import { MIME_TYPE_AUTO } from "@triliumnext/commons"; -import { buildExtraCommands, type EditorConfig } from "@triliumnext/ckeditor5"; +import { buildExtraCommands, type EditorConfig, PREMIUM_PLUGINS } from "@triliumnext/ckeditor5"; import { getHighlightJsNameForMime } from "../../../services/mime_types.js"; import options from "../../../services/options.js"; import { ensureMimeTypesForHighlighting, isSyntaxHighlightEnabled } from "../../../services/syntax_highlight.js"; import emojiDefinitionsUrl from "@triliumnext/ckeditor5/emoji_definitions/en.json?url"; import { copyTextWithToast } from "../../../services/clipboard_ext.js"; import getTemplates from "./snippets.js"; -import { PREMIUM_PLUGINS } from "../../../../../../packages/ckeditor5/src/plugins.js"; import { t } from "../../../services/i18n.js"; import { getMermaidConfig } from "../../../services/mermaid.js"; import noteAutocompleteService, { type Suggestion } from "../../../services/note_autocomplete.js"; diff --git a/packages/ckeditor5/src/index.ts b/packages/ckeditor5/src/index.ts index 1bdaed5be..cc3db23c4 100644 --- a/packages/ckeditor5/src/index.ts +++ b/packages/ckeditor5/src/index.ts @@ -1,9 +1,10 @@ import "ckeditor5/ckeditor5.css"; import "./theme/code_block_toolbar.css"; -import { COMMON_PLUGINS, CORE_PLUGINS, POPUP_EDITOR_PLUGINS, PREMIUM_PLUGINS } from "./plugins"; +import { COMMON_PLUGINS, CORE_PLUGINS, POPUP_EDITOR_PLUGINS } from "./plugins.js"; import { BalloonEditor, DecoupledEditor, FindAndReplaceEditing, FindCommand } from "ckeditor5"; import "./translation_overrides.js"; export { EditorWatchdog } from "ckeditor5"; +export { PREMIUM_PLUGINS } from "./plugins.js"; export type { EditorConfig, MentionFeed, MentionFeedObjectItem, Node, Position, Element, WatchdogConfig } from "ckeditor5"; export type { TemplateDefinition } from "ckeditor5-premium-features"; export { default as buildExtraCommands } from "./extra_slash_commands.js";