From ed2f428e77126616fb4049ddb8205fc4d10e0e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Szcz=C4=99=C5=9Bniak?= Date: Fri, 7 Jun 2024 15:46:40 +0200 Subject: [PATCH] Unify imports paths. --- tests/commands/insertMermaidCommand.js | 9 ++++++--- tests/commands/mermaidPreviewCommand.js | 9 ++++++--- tests/commands/mermaidSourceViewCommand.js | 9 ++++++--- tests/commands/mermaidSplitViewCommand.js | 9 ++++++--- tests/manual/markdown.js | 21 ++++++++++----------- tests/manual/mermaid.js | 19 +++++++++---------- tests/mermaid.js | 12 ++++++------ tests/mermaidediting.js | 17 ++++++++++------- tests/mermaidtoolbar.js | 12 +++++------- tests/mermaidui.js | 4 ++-- 10 files changed, 66 insertions(+), 55 deletions(-) diff --git a/tests/commands/insertMermaidCommand.js b/tests/commands/insertMermaidCommand.js index a9b637411..f210adcd7 100644 --- a/tests/commands/insertMermaidCommand.js +++ b/tests/commands/insertMermaidCommand.js @@ -1,6 +1,9 @@ -import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor.js'; -import { getData as getModelData, setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model.js'; -import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph.js'; +import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic'; +import { Paragraph } from '@ckeditor/ckeditor5-paragraph'; +import { + _setModelData as setModelData, + _getModelData as getModelData +} from '@ckeditor/ckeditor5-engine'; import InsertMermaidCommand from '../../src/commands/insertMermaidCommand.js'; import MermaidEditing from '../../src/mermaidediting.js'; diff --git a/tests/commands/mermaidPreviewCommand.js b/tests/commands/mermaidPreviewCommand.js index 9236f4c10..3de865799 100644 --- a/tests/commands/mermaidPreviewCommand.js +++ b/tests/commands/mermaidPreviewCommand.js @@ -1,6 +1,9 @@ -import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor.js'; -import { getData as getModelData, setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model.js'; -import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph.js'; +import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic'; +import { Paragraph } from '@ckeditor/ckeditor5-paragraph'; +import { + _setModelData as setModelData, + _getModelData as getModelData +} from '@ckeditor/ckeditor5-engine'; import MermaidPreviewCommand from '../../src/commands/mermaidPreviewCommand.js'; import MermaidEditing from '../../src/mermaidediting.js'; diff --git a/tests/commands/mermaidSourceViewCommand.js b/tests/commands/mermaidSourceViewCommand.js index f4fa0efb2..ec32aadb0 100644 --- a/tests/commands/mermaidSourceViewCommand.js +++ b/tests/commands/mermaidSourceViewCommand.js @@ -1,6 +1,9 @@ -import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor.js'; -import { getData as getModelData, setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model.js'; -import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph.js'; +import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic'; +import { Paragraph } from '@ckeditor/ckeditor5-paragraph'; +import { + _setModelData as setModelData, + _getModelData as getModelData +} from '@ckeditor/ckeditor5-engine'; import MermaidSourceViewCommand from '../../src/commands/mermaidSourceViewCommand.js'; import MermaidEditing from '../../src/mermaidediting.js'; diff --git a/tests/commands/mermaidSplitViewCommand.js b/tests/commands/mermaidSplitViewCommand.js index 1b2f7be57..ddc43a32c 100644 --- a/tests/commands/mermaidSplitViewCommand.js +++ b/tests/commands/mermaidSplitViewCommand.js @@ -1,6 +1,9 @@ -import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor.js'; -import { getData as getModelData, setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model.js'; -import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph.js'; +import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic'; +import { Paragraph } from '@ckeditor/ckeditor5-paragraph'; +import { + _setModelData as setModelData, + _getModelData as getModelData +} from '@ckeditor/ckeditor5-engine'; import MermaidSplitViewCommand from '../../src/commands/mermaidSplitViewCommand.js'; import MermaidEditing from '../../src/mermaidediting.js'; diff --git a/tests/manual/markdown.js b/tests/manual/markdown.js index af95f5da8..8f1f26f9e 100644 --- a/tests/manual/markdown.js +++ b/tests/manual/markdown.js @@ -5,17 +5,16 @@ /* globals console, window, document */ -import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor.js'; -import Typing from '@ckeditor/ckeditor5-typing/src/typing.js'; -import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph.js'; -import Undo from '@ckeditor/ckeditor5-undo/src/undo.js'; -import Enter from '@ckeditor/ckeditor5-enter/src/enter.js'; -import Clipboard from '@ckeditor/ckeditor5-clipboard/src/clipboard.js'; -import Link from '@ckeditor/ckeditor5-link/src/link.js'; -import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold.js'; -import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic.js'; -import Markdown from '@ckeditor/ckeditor5-markdown-gfm/src/markdown.js'; -import CodeBlock from '@ckeditor/ckeditor5-code-block/src/codeblock.js'; +import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic'; +import { Typing } from '@ckeditor/ckeditor5-typing'; +import { Paragraph } from '@ckeditor/ckeditor5-paragraph'; +import { Undo } from '@ckeditor/ckeditor5-undo'; +import { Enter } from '@ckeditor/ckeditor5-enter'; +import { Clipboard } from '@ckeditor/ckeditor5-clipboard'; +import { Link } from '@ckeditor/ckeditor5-link'; +import { Bold, Italic } from '@ckeditor/ckeditor5-basic-styles'; +import { Markdown } from '@ckeditor/ckeditor5-markdown-gfm'; +import { CodeBlock } from '@ckeditor/ckeditor5-code-block'; import Mermaid from '../../src/mermaid.js'; diff --git a/tests/manual/mermaid.js b/tests/manual/mermaid.js index da0f3d3e8..de9f7832b 100644 --- a/tests/manual/mermaid.js +++ b/tests/manual/mermaid.js @@ -5,16 +5,15 @@ /* globals console, window, document */ -import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor.js'; -import Typing from '@ckeditor/ckeditor5-typing/src/typing.js'; -import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph.js'; -import Undo from '@ckeditor/ckeditor5-undo/src/undo.js'; -import Enter from '@ckeditor/ckeditor5-enter/src/enter.js'; -import Clipboard from '@ckeditor/ckeditor5-clipboard/src/clipboard.js'; -import Link from '@ckeditor/ckeditor5-link/src/link.js'; -import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold.js'; -import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic.js'; -import CodeBlock from '@ckeditor/ckeditor5-code-block/src/codeblock.js'; +import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic'; +import { Typing } from '@ckeditor/ckeditor5-typing'; +import { Paragraph } from '@ckeditor/ckeditor5-paragraph'; +import { Undo } from '@ckeditor/ckeditor5-undo'; +import { Enter } from '@ckeditor/ckeditor5-enter'; +import { Clipboard } from '@ckeditor/ckeditor5-clipboard'; +import { Link } from '@ckeditor/ckeditor5-link'; +import { Bold, Italic } from '@ckeditor/ckeditor5-basic-styles'; +import { CodeBlock } from '@ckeditor/ckeditor5-code-block'; import Mermaid from '../../src/mermaid.js'; diff --git a/tests/mermaid.js b/tests/mermaid.js index 12b747342..7a629848b 100644 --- a/tests/mermaid.js +++ b/tests/mermaid.js @@ -1,10 +1,10 @@ -import Essentials from '@ckeditor/ckeditor5-essentials/src/essentials.js'; -import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph.js'; -import Heading from '@ckeditor/ckeditor5-heading/src/heading.js'; -import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor.js'; -import Mermaid from '../src/mermaid.js'; +import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic'; +import { Essentials } from '@ckeditor/ckeditor5-essentials'; +import { Paragraph } from '@ckeditor/ckeditor5-paragraph'; +import { Heading } from '@ckeditor/ckeditor5-heading'; +import { _setModelData as setModelData } from '@ckeditor/ckeditor5-engine'; -import { setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model.js'; +import Mermaid from '../src/mermaid.js'; /* global document */ diff --git a/tests/mermaidediting.js b/tests/mermaidediting.js index 8aabf851f..44e8daed3 100644 --- a/tests/mermaidediting.js +++ b/tests/mermaidediting.js @@ -1,10 +1,13 @@ -import Essentials from '@ckeditor/ckeditor5-essentials/src/essentials.js'; -import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph.js'; -import Heading from '@ckeditor/ckeditor5-heading/src/heading.js'; -import { setData as setModelData, getData as getModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model.js'; -import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view.js'; -import CodeBlockEditing from '@ckeditor/ckeditor5-code-block/src/codeblockediting.js'; -import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor.js'; +import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic'; +import { Essentials } from '@ckeditor/ckeditor5-essentials'; +import { Paragraph } from '@ckeditor/ckeditor5-paragraph'; +import { Heading } from '@ckeditor/ckeditor5-heading'; +import { CodeBlockEditing } from '@ckeditor/ckeditor5-code-block'; +import { + _setModelData as setModelData, + _getModelData as getModelData, + _getViewData as getViewData +} from '@ckeditor/ckeditor5-engine'; import MermaidEditing from '../src/mermaidediting.js'; /* global document */ diff --git a/tests/mermaidtoolbar.js b/tests/mermaidtoolbar.js index c8ea8eff8..2bf0a9550 100644 --- a/tests/mermaidtoolbar.js +++ b/tests/mermaidtoolbar.js @@ -1,10 +1,8 @@ -import ClassicTestEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor.js'; -import { - setData -} from '@ckeditor/ckeditor5-engine/src/dev-utils/model.js'; -import WidgetToolbarRepository from '@ckeditor/ckeditor5-widget/src/widgettoolbarrepository.js'; -import Essentials from '@ckeditor/ckeditor5-essentials/src/essentials.js'; -import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph.js'; +import { ClassicEditor as ClassicTestEditor } from '@ckeditor/ckeditor5-editor-classic'; +import { Essentials } from '@ckeditor/ckeditor5-essentials'; +import { Paragraph } from '@ckeditor/ckeditor5-paragraph'; +import { WidgetToolbarRepository } from '@ckeditor/ckeditor5-widget'; +import { _setModelData as setData } from '@ckeditor/ckeditor5-engine'; import Mermaid from '../src/mermaid.js'; diff --git a/tests/mermaidui.js b/tests/mermaidui.js index 2a857991e..73ef1fd7f 100644 --- a/tests/mermaidui.js +++ b/tests/mermaidui.js @@ -1,5 +1,5 @@ -import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor.js'; -import { setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model.js'; +import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic'; +import { _setModelData as setModelData } from '@ckeditor/ckeditor5-engine'; import Mermaid from '../src/mermaid.js'; import MermaidUI from '../src/mermaidui.js';