diff --git a/demo/Playground.tsx b/demo/Playground.tsx index aa4626ca9..4aee68ddd 100644 --- a/demo/Playground.tsx +++ b/demo/Playground.tsx @@ -20,11 +20,11 @@ import { } from '../src'; import type {EscapeConfig, ToolbarActionData} from '../src/bundle/Editor'; import {Extension} from '../src/cm/state'; -import {FoldingHeading} from '../src/extensions/yfm/FoldingHeading'; -import {Math} from '../src/extensions/yfm/Math'; -import {Mermaid} from '../src/extensions/yfm/Mermaid'; -import {YfmHtmlBlock} from '../src/extensions/yfm/YfmHtmlBlock'; -import {getSanitizeYfmHtmlBlock} from '../src/extensions/yfm/YfmHtmlBlock/utils'; +import {FoldingHeading} from '../src/extensions/additional/FoldingHeading'; +import {Math} from '../src/extensions/additional/Math'; +import {Mermaid} from '../src/extensions/additional/Mermaid'; +import {YfmHtmlBlock} from '../src/extensions/additional/YfmHtmlBlock'; +import {getSanitizeYfmHtmlBlock} from '../src/extensions/additional/YfmHtmlBlock/utils'; import {cloneDeep} from '../src/lodash'; import {CodeEditor} from '../src/markup/editor'; import type {FileUploadHandler} from '../src/utils/upload'; diff --git a/src/bundle/config/wysiwyg.ts b/src/bundle/config/wysiwyg.ts index 4dcdbffba..27bc581a5 100644 --- a/src/bundle/config/wysiwyg.ts +++ b/src/bundle/config/wysiwyg.ts @@ -2,12 +2,12 @@ import {ActionStorage} from 'src/core'; import {headingType, pType} from '../../extensions'; import {gptHotKeys} from '../../extensions/additional/GPT/constants'; +// for typings from Math +import type {} from '../../extensions/additional/Math'; import type { SelectionContextConfig, SelectionContextItemData, } from '../../extensions/behavior/SelectionContext'; -// for typings from Math -import type {} from '../../extensions/yfm/Math'; import {i18n as i18nHint} from '../../i18n/hints'; import {i18n} from '../../i18n/menubar'; import {Action as A, formatter as f} from '../../shortcuts'; diff --git a/src/extensions/yfm/FoldingHeading/FoldingHeading.ts b/src/extensions/additional/FoldingHeading/FoldingHeading.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/FoldingHeading.ts rename to src/extensions/additional/FoldingHeading/FoldingHeading.ts diff --git a/src/extensions/yfm/FoldingHeading/FoldingHeadingSpec/FoldingHeadingSpecs.test.ts b/src/extensions/additional/FoldingHeading/FoldingHeadingSpec/FoldingHeadingSpecs.test.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/FoldingHeadingSpec/FoldingHeadingSpecs.test.ts rename to src/extensions/additional/FoldingHeading/FoldingHeadingSpec/FoldingHeadingSpecs.test.ts diff --git a/src/extensions/yfm/FoldingHeading/FoldingHeadingSpec/FoldingHeadingSpecs.ts b/src/extensions/additional/FoldingHeading/FoldingHeadingSpec/FoldingHeadingSpecs.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/FoldingHeadingSpec/FoldingHeadingSpecs.ts rename to src/extensions/additional/FoldingHeading/FoldingHeadingSpec/FoldingHeadingSpecs.ts diff --git a/src/extensions/yfm/FoldingHeading/FoldingHeadingSpec/const.ts b/src/extensions/additional/FoldingHeading/FoldingHeadingSpec/const.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/FoldingHeadingSpec/const.ts rename to src/extensions/additional/FoldingHeading/FoldingHeadingSpec/const.ts diff --git a/src/extensions/yfm/FoldingHeading/FoldingHeadingSpec/index.ts b/src/extensions/additional/FoldingHeading/FoldingHeadingSpec/index.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/FoldingHeadingSpec/index.ts rename to src/extensions/additional/FoldingHeading/FoldingHeadingSpec/index.ts diff --git a/src/extensions/yfm/FoldingHeading/FoldingHeadingSpec/md/skip-heading-sections.ts b/src/extensions/additional/FoldingHeading/FoldingHeadingSpec/md/skip-heading-sections.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/FoldingHeadingSpec/md/skip-heading-sections.ts rename to src/extensions/additional/FoldingHeading/FoldingHeadingSpec/md/skip-heading-sections.ts diff --git a/src/extensions/yfm/FoldingHeading/actions.ts b/src/extensions/additional/FoldingHeading/actions.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/actions.ts rename to src/extensions/additional/FoldingHeading/actions.ts diff --git a/src/extensions/yfm/FoldingHeading/commands/index.ts b/src/extensions/additional/FoldingHeading/commands/index.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/commands/index.ts rename to src/extensions/additional/FoldingHeading/commands/index.ts diff --git a/src/extensions/yfm/FoldingHeading/commands/openHeadingAndCreateParagraphAfterIfCursorAtEndOfHeading.ts b/src/extensions/additional/FoldingHeading/commands/openHeadingAndCreateParagraphAfterIfCursorAtEndOfHeading.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/commands/openHeadingAndCreateParagraphAfterIfCursorAtEndOfHeading.ts rename to src/extensions/additional/FoldingHeading/commands/openHeadingAndCreateParagraphAfterIfCursorAtEndOfHeading.ts diff --git a/src/extensions/yfm/FoldingHeading/commands/removeFoldingIfCursorAtStartOfHeading.ts b/src/extensions/additional/FoldingHeading/commands/removeFoldingIfCursorAtStartOfHeading.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/commands/removeFoldingIfCursorAtStartOfHeading.ts rename to src/extensions/additional/FoldingHeading/commands/removeFoldingIfCursorAtStartOfHeading.ts diff --git a/src/extensions/yfm/FoldingHeading/commands/toggleFoldingOfHeading.ts b/src/extensions/additional/FoldingHeading/commands/toggleFoldingOfHeading.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/commands/toggleFoldingOfHeading.ts rename to src/extensions/additional/FoldingHeading/commands/toggleFoldingOfHeading.ts diff --git a/src/extensions/yfm/FoldingHeading/const.ts b/src/extensions/additional/FoldingHeading/const.ts similarity index 67% rename from src/extensions/yfm/FoldingHeading/const.ts rename to src/extensions/additional/FoldingHeading/const.ts index 88e45fb80..dae14e52f 100644 --- a/src/extensions/yfm/FoldingHeading/const.ts +++ b/src/extensions/additional/FoldingHeading/const.ts @@ -1 +1 @@ -export {YfmHeadingAttr, headingNodeName, type HeadingLevel} from '../YfmHeading/const'; +export {YfmHeadingAttr, headingNodeName, type HeadingLevel} from '../../yfm/YfmHeading/const'; diff --git a/src/extensions/yfm/FoldingHeading/index.ts b/src/extensions/additional/FoldingHeading/index.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/index.ts rename to src/extensions/additional/FoldingHeading/index.ts diff --git a/src/extensions/yfm/FoldingHeading/input-rules.ts b/src/extensions/additional/FoldingHeading/input-rules.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/input-rules.ts rename to src/extensions/additional/FoldingHeading/input-rules.ts diff --git a/src/extensions/yfm/FoldingHeading/plugins/Folding.ts b/src/extensions/additional/FoldingHeading/plugins/Folding.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/plugins/Folding.ts rename to src/extensions/additional/FoldingHeading/plugins/Folding.ts diff --git a/src/extensions/yfm/FoldingHeading/plugins/folding.scss b/src/extensions/additional/FoldingHeading/plugins/folding.scss similarity index 100% rename from src/extensions/yfm/FoldingHeading/plugins/folding.scss rename to src/extensions/additional/FoldingHeading/plugins/folding.scss diff --git a/src/extensions/yfm/FoldingHeading/utils.ts b/src/extensions/additional/FoldingHeading/utils.ts similarity index 100% rename from src/extensions/yfm/FoldingHeading/utils.ts rename to src/extensions/additional/FoldingHeading/utils.ts diff --git a/src/extensions/yfm/Math/Math.test.ts b/src/extensions/additional/Math/Math.test.ts similarity index 100% rename from src/extensions/yfm/Math/Math.test.ts rename to src/extensions/additional/Math/Math.test.ts diff --git a/src/extensions/yfm/Math/MathSpecs/const.ts b/src/extensions/additional/Math/MathSpecs/const.ts similarity index 100% rename from src/extensions/yfm/Math/MathSpecs/const.ts rename to src/extensions/additional/Math/MathSpecs/const.ts diff --git a/src/extensions/yfm/Math/MathSpecs/index.ts b/src/extensions/additional/Math/MathSpecs/index.ts similarity index 100% rename from src/extensions/yfm/Math/MathSpecs/index.ts rename to src/extensions/additional/Math/MathSpecs/index.ts diff --git a/src/extensions/yfm/Math/commands.ts b/src/extensions/additional/Math/commands.ts similarity index 100% rename from src/extensions/yfm/Math/commands.ts rename to src/extensions/additional/Math/commands.ts diff --git a/src/extensions/yfm/Math/const.ts b/src/extensions/additional/Math/const.ts similarity index 100% rename from src/extensions/yfm/Math/const.ts rename to src/extensions/additional/Math/const.ts diff --git a/src/extensions/yfm/Math/hint.tsx b/src/extensions/additional/Math/hint.tsx similarity index 100% rename from src/extensions/yfm/Math/hint.tsx rename to src/extensions/additional/Math/hint.tsx diff --git a/src/extensions/yfm/Math/index.scss b/src/extensions/additional/Math/index.scss similarity index 100% rename from src/extensions/yfm/Math/index.scss rename to src/extensions/additional/Math/index.scss diff --git a/src/extensions/yfm/Math/index.ts b/src/extensions/additional/Math/index.ts similarity index 100% rename from src/extensions/yfm/Math/index.ts rename to src/extensions/additional/Math/index.ts diff --git a/src/extensions/yfm/Math/types.ts b/src/extensions/additional/Math/types.ts similarity index 100% rename from src/extensions/yfm/Math/types.ts rename to src/extensions/additional/Math/types.ts diff --git a/src/extensions/yfm/Math/view-and-edit.scss b/src/extensions/additional/Math/view-and-edit.scss similarity index 100% rename from src/extensions/yfm/Math/view-and-edit.scss rename to src/extensions/additional/Math/view-and-edit.scss diff --git a/src/extensions/yfm/Math/view-and-edit.ts b/src/extensions/additional/Math/view-and-edit.ts similarity index 99% rename from src/extensions/yfm/Math/view-and-edit.ts rename to src/extensions/additional/Math/view-and-edit.ts index 6024b343c..5db758fc7 100644 --- a/src/extensions/yfm/Math/view-and-edit.ts +++ b/src/extensions/additional/Math/view-and-edit.ts @@ -3,8 +3,8 @@ import type {Node} from 'prosemirror-model'; import {Plugin} from 'prosemirror-state'; import {Decoration, DecorationSet, NodeView} from 'prosemirror-view'; -import type {ReactRenderer, RendererItem} from '../../../extensions/behavior/ReactRenderer'; import {isTextSelection} from '../../../utils/selection'; +import type {ReactRenderer, RendererItem} from '../../behavior/ReactRenderer'; import {moveCursorLeftOfMathInline, moveCursorRightOfMathInline} from './commands'; import {CLASSNAMES, MathNode} from './const'; diff --git a/src/extensions/yfm/Mermaid/Mermaid.test.ts b/src/extensions/additional/Mermaid/Mermaid.test.ts similarity index 92% rename from src/extensions/yfm/Mermaid/Mermaid.test.ts rename to src/extensions/additional/Mermaid/Mermaid.test.ts index dbc18bd9b..af29c40b2 100644 --- a/src/extensions/yfm/Mermaid/Mermaid.test.ts +++ b/src/extensions/additional/Mermaid/Mermaid.test.ts @@ -2,7 +2,7 @@ import {builders} from 'prosemirror-test-builder'; import {createMarkupChecker} from '../../../../tests/sameMarkup'; import {ExtensionsManager} from '../../../core'; -import {BaseNode, BaseSchemaSpecs} from '../../../extensions/specs'; +import {BaseNode, BaseSchemaSpecs} from '../../specs'; import {MermaidSpecs} from './MermaidSpecs'; import {MermaidAttrs, mermaidNodeName} from './const'; diff --git a/src/extensions/yfm/Mermaid/MermaidNodeView/Mermaid.scss b/src/extensions/additional/Mermaid/MermaidNodeView/Mermaid.scss similarity index 100% rename from src/extensions/yfm/Mermaid/MermaidNodeView/Mermaid.scss rename to src/extensions/additional/Mermaid/MermaidNodeView/Mermaid.scss diff --git a/src/extensions/yfm/Mermaid/MermaidNodeView/MermaidView.tsx b/src/extensions/additional/Mermaid/MermaidNodeView/MermaidView.tsx similarity index 100% rename from src/extensions/yfm/Mermaid/MermaidNodeView/MermaidView.tsx rename to src/extensions/additional/Mermaid/MermaidNodeView/MermaidView.tsx diff --git a/src/extensions/yfm/Mermaid/MermaidNodeView/NodeView.tsx b/src/extensions/additional/Mermaid/MermaidNodeView/NodeView.tsx similarity index 100% rename from src/extensions/yfm/Mermaid/MermaidNodeView/NodeView.tsx rename to src/extensions/additional/Mermaid/MermaidNodeView/NodeView.tsx diff --git a/src/extensions/yfm/Mermaid/MermaidNodeView/index.ts b/src/extensions/additional/Mermaid/MermaidNodeView/index.ts similarity index 100% rename from src/extensions/yfm/Mermaid/MermaidNodeView/index.ts rename to src/extensions/additional/Mermaid/MermaidNodeView/index.ts diff --git a/src/extensions/yfm/Mermaid/MermaidSpecs/const.ts b/src/extensions/additional/Mermaid/MermaidSpecs/const.ts similarity index 100% rename from src/extensions/yfm/Mermaid/MermaidSpecs/const.ts rename to src/extensions/additional/Mermaid/MermaidSpecs/const.ts diff --git a/src/extensions/yfm/Mermaid/MermaidSpecs/index.tsx b/src/extensions/additional/Mermaid/MermaidSpecs/index.tsx similarity index 100% rename from src/extensions/yfm/Mermaid/MermaidSpecs/index.tsx rename to src/extensions/additional/Mermaid/MermaidSpecs/index.tsx diff --git a/src/extensions/yfm/Mermaid/actions.ts b/src/extensions/additional/Mermaid/actions.ts similarity index 100% rename from src/extensions/yfm/Mermaid/actions.ts rename to src/extensions/additional/Mermaid/actions.ts diff --git a/src/extensions/yfm/Mermaid/const.ts b/src/extensions/additional/Mermaid/const.ts similarity index 100% rename from src/extensions/yfm/Mermaid/const.ts rename to src/extensions/additional/Mermaid/const.ts diff --git a/src/extensions/yfm/Mermaid/index.ts b/src/extensions/additional/Mermaid/index.ts similarity index 100% rename from src/extensions/yfm/Mermaid/index.ts rename to src/extensions/additional/Mermaid/index.ts diff --git a/src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlock.test.ts b/src/extensions/additional/YfmHtmlBlock/YfmHtmlBlock.test.ts similarity index 93% rename from src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlock.test.ts rename to src/extensions/additional/YfmHtmlBlock/YfmHtmlBlock.test.ts index 1de493be1..ca1d589e6 100644 --- a/src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlock.test.ts +++ b/src/extensions/additional/YfmHtmlBlock/YfmHtmlBlock.test.ts @@ -2,7 +2,7 @@ import {builders} from 'prosemirror-test-builder'; import {createMarkupChecker} from '../../../../tests/sameMarkup'; import {ExtensionsManager} from '../../../core'; -import {BaseNode, BaseSchemaSpecs} from '../../../extensions/specs'; +import {BaseNode, BaseSchemaSpecs} from '../../specs'; import {YfmHtmlBlockSpecs} from './YfmHtmlBlockSpecs'; import {YfmHtmlBlockAttrs, yfmHtmlBlockNodeName} from './const'; diff --git a/src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlockNodeView/NodeView.tsx b/src/extensions/additional/YfmHtmlBlock/YfmHtmlBlockNodeView/NodeView.tsx similarity index 100% rename from src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlockNodeView/NodeView.tsx rename to src/extensions/additional/YfmHtmlBlock/YfmHtmlBlockNodeView/NodeView.tsx diff --git a/src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlockNodeView/YfmHtmlBlock.scss b/src/extensions/additional/YfmHtmlBlock/YfmHtmlBlockNodeView/YfmHtmlBlock.scss similarity index 100% rename from src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlockNodeView/YfmHtmlBlock.scss rename to src/extensions/additional/YfmHtmlBlock/YfmHtmlBlockNodeView/YfmHtmlBlock.scss diff --git a/src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlockNodeView/YfmHtmlBlockView.tsx b/src/extensions/additional/YfmHtmlBlock/YfmHtmlBlockNodeView/YfmHtmlBlockView.tsx similarity index 100% rename from src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlockNodeView/YfmHtmlBlockView.tsx rename to src/extensions/additional/YfmHtmlBlock/YfmHtmlBlockNodeView/YfmHtmlBlockView.tsx diff --git a/src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlockNodeView/index.ts b/src/extensions/additional/YfmHtmlBlock/YfmHtmlBlockNodeView/index.ts similarity index 100% rename from src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlockNodeView/index.ts rename to src/extensions/additional/YfmHtmlBlock/YfmHtmlBlockNodeView/index.ts diff --git a/src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlockSpecs/const.ts b/src/extensions/additional/YfmHtmlBlock/YfmHtmlBlockSpecs/const.ts similarity index 100% rename from src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlockSpecs/const.ts rename to src/extensions/additional/YfmHtmlBlock/YfmHtmlBlockSpecs/const.ts diff --git a/src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlockSpecs/index.tsx b/src/extensions/additional/YfmHtmlBlock/YfmHtmlBlockSpecs/index.tsx similarity index 100% rename from src/extensions/yfm/YfmHtmlBlock/YfmHtmlBlockSpecs/index.tsx rename to src/extensions/additional/YfmHtmlBlock/YfmHtmlBlockSpecs/index.tsx diff --git a/src/extensions/yfm/YfmHtmlBlock/actions.ts b/src/extensions/additional/YfmHtmlBlock/actions.ts similarity index 100% rename from src/extensions/yfm/YfmHtmlBlock/actions.ts rename to src/extensions/additional/YfmHtmlBlock/actions.ts diff --git a/src/extensions/yfm/YfmHtmlBlock/const.ts b/src/extensions/additional/YfmHtmlBlock/const.ts similarity index 100% rename from src/extensions/yfm/YfmHtmlBlock/const.ts rename to src/extensions/additional/YfmHtmlBlock/const.ts diff --git a/src/extensions/yfm/YfmHtmlBlock/index.ts b/src/extensions/additional/YfmHtmlBlock/index.ts similarity index 100% rename from src/extensions/yfm/YfmHtmlBlock/index.ts rename to src/extensions/additional/YfmHtmlBlock/index.ts diff --git a/src/extensions/yfm/YfmHtmlBlock/utils.test.ts b/src/extensions/additional/YfmHtmlBlock/utils.test.ts similarity index 100% rename from src/extensions/yfm/YfmHtmlBlock/utils.test.ts rename to src/extensions/additional/YfmHtmlBlock/utils.test.ts diff --git a/src/extensions/yfm/YfmHtmlBlock/utils.ts b/src/extensions/additional/YfmHtmlBlock/utils.ts similarity index 100% rename from src/extensions/yfm/YfmHtmlBlock/utils.ts rename to src/extensions/additional/YfmHtmlBlock/utils.ts