diff --git a/packages/editor/src/ce/extensions/index.ts b/packages/editor/src/ce/extensions/index.ts deleted file mode 100644 index c5929b0eb78..00000000000 --- a/packages/editor/src/ce/extensions/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Copyright (c) 2023-present Plane Software, Inc. and contributors - * SPDX-License-Identifier: AGPL-3.0-only - * See the LICENSE file for details. - */ - -export * from "./core"; -export * from "./document-extensions"; -export * from "./slash-commands"; diff --git a/packages/editor/src/ce/helpers/parser.ts b/packages/editor/src/ce/helpers/parser.ts deleted file mode 100644 index bc60a82c4b1..00000000000 --- a/packages/editor/src/ce/helpers/parser.ts +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright (c) 2023-present Plane Software, Inc. and contributors - * SPDX-License-Identifier: AGPL-3.0-only - * See the LICENSE file for details. - */ - -/** - * @description function to extract all additional assets from HTML content - * @param htmlContent - * @returns {string[]} array of additional asset sources - */ -export const extractAdditionalAssetsFromHTMLContent = (_htmlContent: string): string[] => []; - -/** - * @description function to replace additional assets in HTML content with new IDs - * @param props - * @returns {string} HTML content with replaced additional assets - */ -export const replaceAdditionalAssetsInHTMLContent = (props: { - htmlContent: string; - assetMap: Record; -}): string => { - const { htmlContent } = props; - return htmlContent; -}; diff --git a/packages/editor/src/ce/types/asset.ts b/packages/editor/src/ce/types/asset.ts deleted file mode 100644 index 9d3f4b824dd..00000000000 --- a/packages/editor/src/ce/types/asset.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Copyright (c) 2023-present Plane Software, Inc. and contributors - * SPDX-License-Identifier: AGPL-3.0-only - * See the LICENSE file for details. - */ - -export type TAdditionalEditorAsset = never; diff --git a/packages/editor/src/ce/types/config.ts b/packages/editor/src/ce/types/config.ts deleted file mode 100644 index cc8a43e8975..00000000000 --- a/packages/editor/src/ce/types/config.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Copyright (c) 2023-present Plane Software, Inc. and contributors - * SPDX-License-Identifier: AGPL-3.0-only - * See the LICENSE file for details. - */ - -export type TExtendedFileHandler = object; diff --git a/packages/editor/src/ce/types/index.ts b/packages/editor/src/ce/types/index.ts deleted file mode 100644 index 2745670e5a7..00000000000 --- a/packages/editor/src/ce/types/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Copyright (c) 2023-present Plane Software, Inc. and contributors - * SPDX-License-Identifier: AGPL-3.0-only - * See the LICENSE file for details. - */ - -export * from "./issue-embed"; -export * from "./editor-extended"; -export * from "./config"; diff --git a/packages/editor/src/ce/components/document-editor-side-effects.ts b/packages/editor/src/core/components/document-editor-side-effects.ts similarity index 100% rename from packages/editor/src/ce/components/document-editor-side-effects.ts rename to packages/editor/src/core/components/document-editor-side-effects.ts diff --git a/packages/editor/src/core/components/editors/document/editor.tsx b/packages/editor/src/core/components/editors/document/editor.tsx index f85b89710a6..cb0e112871b 100644 --- a/packages/editor/src/core/components/editors/document/editor.tsx +++ b/packages/editor/src/core/components/editors/document/editor.tsx @@ -20,7 +20,7 @@ import { getEditorClassNames } from "@/helpers/common"; // hooks import { useEditor } from "@/hooks/use-editor"; // plane editor extensions -import { DocumentEditorAdditionalExtensions } from "@/plane-editor/extensions"; +import { DocumentEditorAdditionalExtensions } from "@/extensions/document-extensions"; // types import type { EditorRefApi, IDocumentEditorProps } from "@/types"; diff --git a/packages/editor/src/core/components/editors/editor-container.tsx b/packages/editor/src/core/components/editors/editor-container.tsx index b9631cbfbd0..4d2f2f8e080 100644 --- a/packages/editor/src/core/components/editors/editor-container.tsx +++ b/packages/editor/src/core/components/editors/editor-container.tsx @@ -15,7 +15,7 @@ import { DEFAULT_DISPLAY_CONFIG } from "@/constants/config"; import { CORE_EXTENSIONS } from "@/constants/extension"; // components import type { TCollabValue } from "@/contexts"; -import { LinkContainer } from "@/plane-editor/components/link-container"; +import { LinkContainer } from "@/components/link-container"; // plugins import { nodeHighlightPluginKey } from "@/plugins/highlight"; // types diff --git a/packages/editor/src/core/components/editors/rich-text/editor.tsx b/packages/editor/src/core/components/editors/rich-text/editor.tsx index 1ab43e8e702..c00bba35d7c 100644 --- a/packages/editor/src/core/components/editors/rich-text/editor.tsx +++ b/packages/editor/src/core/components/editors/rich-text/editor.tsx @@ -11,7 +11,7 @@ import { BlockMenu, EditorBubbleMenu } from "@/components/menus"; // extensions import { SideMenuExtension } from "@/extensions"; // plane editor imports -import { RichTextEditorAdditionalExtensions } from "@/plane-editor/extensions/rich-text-extensions"; +import { RichTextEditorAdditionalExtensions } from "@/extensions/rich-text-extensions"; // types import type { EditorRefApi, IRichTextEditorProps } from "@/types"; diff --git a/packages/editor/src/ce/components/link-container.tsx b/packages/editor/src/core/components/link-container.tsx similarity index 100% rename from packages/editor/src/ce/components/link-container.tsx rename to packages/editor/src/core/components/link-container.tsx diff --git a/packages/editor/src/ce/constants/assets.ts b/packages/editor/src/core/constants/assets.ts similarity index 100% rename from packages/editor/src/ce/constants/assets.ts rename to packages/editor/src/core/constants/assets.ts diff --git a/packages/editor/src/ce/constants/extensions.ts b/packages/editor/src/core/constants/extensions.ts similarity index 100% rename from packages/editor/src/ce/constants/extensions.ts rename to packages/editor/src/core/constants/extensions.ts diff --git a/packages/editor/src/ce/constants/utility.ts b/packages/editor/src/core/constants/utility.ts similarity index 89% rename from packages/editor/src/ce/constants/utility.ts rename to packages/editor/src/core/constants/utility.ts index 355c50cc0d4..a523df07676 100644 --- a/packages/editor/src/ce/constants/utility.ts +++ b/packages/editor/src/core/constants/utility.ts @@ -8,7 +8,7 @@ import type { ADDITIONAL_EXTENSIONS } from "@plane/utils"; import { CORE_EXTENSIONS } from "@plane/utils"; // plane editor imports -import type { ExtensionFileSetStorageKey } from "@/plane-editor/types/storage"; +import type { ExtensionFileSetStorageKey } from "@/types/storage"; export type NodeFileMapType = Partial< Record< diff --git a/packages/editor/src/ce/extensions/slash-commands.tsx b/packages/editor/src/core/extensions/additional-slash-command-options.tsx similarity index 100% rename from packages/editor/src/ce/extensions/slash-commands.tsx rename to packages/editor/src/core/extensions/additional-slash-command-options.tsx diff --git a/packages/editor/src/core/extensions/core-without-props.ts b/packages/editor/src/core/extensions/core-without-props.ts index 62ef955e487..b610c96fde3 100644 --- a/packages/editor/src/core/extensions/core-without-props.ts +++ b/packages/editor/src/core/extensions/core-without-props.ts @@ -9,7 +9,7 @@ import TaskList from "@tiptap/extension-task-list"; import { TextStyle } from "@tiptap/extension-text-style"; import { Underline } from "@tiptap/extension-underline"; // plane editor imports -import { CoreEditorAdditionalExtensionsWithoutProps } from "@/plane-editor/extensions/core/without-props"; +import { CoreEditorAdditionalExtensionsWithoutProps } from "@/extensions/core/without-props"; // extensions import { CustomCalloutExtensionConfig } from "./callout/extension-config"; import { CustomCodeBlockExtensionWithoutProps } from "./code/without-props"; diff --git a/packages/editor/src/ce/extensions/core/extensions.ts b/packages/editor/src/core/extensions/core/extensions.ts similarity index 100% rename from packages/editor/src/ce/extensions/core/extensions.ts rename to packages/editor/src/core/extensions/core/extensions.ts diff --git a/packages/editor/src/ce/extensions/core/index.ts b/packages/editor/src/core/extensions/core/index.ts similarity index 100% rename from packages/editor/src/ce/extensions/core/index.ts rename to packages/editor/src/core/extensions/core/index.ts diff --git a/packages/editor/src/ce/extensions/core/without-props.ts b/packages/editor/src/core/extensions/core/without-props.ts similarity index 100% rename from packages/editor/src/ce/extensions/core/without-props.ts rename to packages/editor/src/core/extensions/core/without-props.ts diff --git a/packages/editor/src/ce/extensions/document-extensions.tsx b/packages/editor/src/core/extensions/document-extensions.tsx similarity index 100% rename from packages/editor/src/ce/extensions/document-extensions.tsx rename to packages/editor/src/core/extensions/document-extensions.tsx diff --git a/packages/editor/src/core/extensions/extensions.ts b/packages/editor/src/core/extensions/extensions.ts index 420e749507f..90649bc1043 100644 --- a/packages/editor/src/core/extensions/extensions.ts +++ b/packages/editor/src/core/extensions/extensions.ts @@ -34,7 +34,7 @@ import { UtilityExtension, } from "@/extensions"; // plane editor extensions -import { CoreEditorAdditionalExtensions } from "@/plane-editor/extensions"; +import { CoreEditorAdditionalExtensions } from "@/extensions/core"; // types import type { IEditorProps } from "@/types"; // local imports diff --git a/packages/editor/src/core/extensions/index.ts b/packages/editor/src/core/extensions/index.ts index 815f31ed401..96d01a72c82 100644 --- a/packages/editor/src/core/extensions/index.ts +++ b/packages/editor/src/core/extensions/index.ts @@ -26,3 +26,6 @@ export * from "./quote"; export * from "./side-menu"; export * from "./text-align"; export * from "./utility"; +export * from "./core"; +export * from "./document-extensions"; +export * from "./additional-slash-command-options"; diff --git a/packages/editor/src/ce/extensions/rich-text-extensions.tsx b/packages/editor/src/core/extensions/rich-text-extensions.tsx similarity index 100% rename from packages/editor/src/ce/extensions/rich-text-extensions.tsx rename to packages/editor/src/core/extensions/rich-text-extensions.tsx diff --git a/packages/editor/src/core/extensions/slash-commands/command-items-list.tsx b/packages/editor/src/core/extensions/slash-commands/command-items-list.tsx index 154887fb609..c1de43e5fe1 100644 --- a/packages/editor/src/core/extensions/slash-commands/command-items-list.tsx +++ b/packages/editor/src/core/extensions/slash-commands/command-items-list.tsx @@ -42,7 +42,7 @@ import { openEmojiPicker, } from "@/helpers/editor-commands"; // plane editor extensions -import { coreEditorAdditionalSlashCommandOptions } from "@/plane-editor/extensions"; +import { coreEditorAdditionalSlashCommandOptions } from "@/extensions/additional-slash-command-options"; // types import type { CommandProps, ISlashCommandItem, TSlashCommandSectionKeys } from "@/types"; // local types diff --git a/packages/editor/src/core/extensions/unique-id/extension.ts b/packages/editor/src/core/extensions/unique-id/extension.ts index bd220080c5f..d313abe5d04 100644 --- a/packages/editor/src/core/extensions/unique-id/extension.ts +++ b/packages/editor/src/core/extensions/unique-id/extension.ts @@ -11,7 +11,7 @@ import type { Transaction } from "@tiptap/pm/state"; import { v4 as uuidv4 } from "uuid"; // constants import { CORE_EXTENSIONS, BLOCK_NODE_TYPES } from "@/constants/extension"; -import { ADDITIONAL_BLOCK_NODE_TYPES } from "@/plane-editor/constants/extensions"; +import { ADDITIONAL_BLOCK_NODE_TYPES } from "@/constants/extensions"; import { createUniqueIDPlugin } from "./plugin"; import { createIdsForView } from "./utils"; // plane imports diff --git a/packages/editor/src/core/extensions/utility.ts b/packages/editor/src/core/extensions/utility.ts index ddc598d0d6c..ae8af2340f3 100644 --- a/packages/editor/src/core/extensions/utility.ts +++ b/packages/editor/src/core/extensions/utility.ts @@ -10,7 +10,7 @@ import codemark from "prosemirror-codemark"; import { CORE_EXTENSIONS } from "@/constants/extension"; import { restorePublicImages } from "@/helpers/image-helpers"; // plugins -import type { TAdditionalActiveDropbarExtensions } from "@/plane-editor/types/utils"; +import type { TAdditionalActiveDropbarExtensions } from "@/types/utils"; import { DropHandlerPlugin } from "@/plugins/drop"; import { FilePlugins } from "@/plugins/file/root"; import { MarkdownClipboardPlugin } from "@/plugins/markdown-clipboard"; diff --git a/packages/editor/src/ce/helpers/asset-duplication.ts b/packages/editor/src/core/helpers/asset-duplication.ts similarity index 100% rename from packages/editor/src/ce/helpers/asset-duplication.ts rename to packages/editor/src/core/helpers/asset-duplication.ts diff --git a/packages/editor/src/core/helpers/assets.ts b/packages/editor/src/core/helpers/assets.ts index 7cc937b2d6c..7ca5edaad0d 100644 --- a/packages/editor/src/core/helpers/assets.ts +++ b/packages/editor/src/core/helpers/assets.ts @@ -11,7 +11,7 @@ import { CORE_EXTENSIONS } from "@plane/utils"; // extensions import { getImageBlockId } from "@/extensions/custom-image/utils"; // plane editor imports -import { ADDITIONAL_ASSETS_META_DATA_RECORD } from "@/plane-editor/constants/assets"; +import { ADDITIONAL_ASSETS_META_DATA_RECORD } from "@/constants/assets"; // types import type { TEditorAsset } from "@/types"; diff --git a/packages/editor/src/core/helpers/parser.ts b/packages/editor/src/core/helpers/parser.ts index a96cdf0f5a1..3270fbcd954 100644 --- a/packages/editor/src/core/helpers/parser.ts +++ b/packages/editor/src/core/helpers/parser.ts @@ -6,14 +6,29 @@ // plane imports import type { TDocumentPayload, TDuplicateAssetData, TDuplicateAssetResponse, TEditorAssetType } from "@plane/types"; -// plane web imports -import { - extractAdditionalAssetsFromHTMLContent, - replaceAdditionalAssetsInHTMLContent, -} from "@/plane-editor/helpers/parser"; // local imports import { convertHTMLDocumentToAllFormats } from "./yjs-utils"; +/** + * @description function to extract all additional assets from HTML content + * @param htmlContent + * @returns {string[]} array of additional asset sources + */ +export const extractAdditionalAssetsFromHTMLContent = (_htmlContent: string): string[] => []; + +/** + * @description function to replace additional assets in HTML content with new IDs + * @param props + * @returns {string} HTML content with replaced additional assets + */ +export const replaceAdditionalAssetsInHTMLContent = (props: { + htmlContent: string; + assetMap: Record; +}): string => { + const { htmlContent } = props; + return htmlContent; +}; + /** * @description function to extract all assets from HTML content * @param htmlContent diff --git a/packages/editor/src/core/helpers/paste-asset.ts b/packages/editor/src/core/helpers/paste-asset.ts index 1c6b3bbc5b6..40ec1ea905f 100644 --- a/packages/editor/src/core/helpers/paste-asset.ts +++ b/packages/editor/src/core/helpers/paste-asset.ts @@ -4,7 +4,7 @@ * See the LICENSE file for details. */ -import { assetDuplicationHandlers } from "@/plane-editor/helpers/asset-duplication"; +import { assetDuplicationHandlers } from "@/helpers/asset-duplication"; // Utility function to process HTML content with all registered handlers export const processAssetDuplication = (htmlContent: string): { processedHtml: string } => { diff --git a/packages/editor/src/core/hooks/use-collaborative-editor.ts b/packages/editor/src/core/hooks/use-collaborative-editor.ts index 8815c668333..552a2ec2bb1 100644 --- a/packages/editor/src/core/hooks/use-collaborative-editor.ts +++ b/packages/editor/src/core/hooks/use-collaborative-editor.ts @@ -15,7 +15,7 @@ import { HeadingListExtension, SideMenuExtension } from "@/extensions"; // hooks import { useEditor } from "@/hooks/use-editor"; // plane editor extensions -import { DocumentEditorAdditionalExtensions } from "@/plane-editor/extensions"; +import { DocumentEditorAdditionalExtensions } from "@/extensions/document-extensions"; // types import type { TCollaborativeEditorHookProps, diff --git a/packages/editor/src/core/plugins/file/delete.ts b/packages/editor/src/core/plugins/file/delete.ts index cb7ed66faf5..f15287dde55 100644 --- a/packages/editor/src/core/plugins/file/delete.ts +++ b/packages/editor/src/core/plugins/file/delete.ts @@ -10,11 +10,11 @@ import type { EditorState, Transaction } from "@tiptap/pm/state"; // constants import { CORE_EDITOR_META } from "@/constants/meta"; // plane editor imports -import { NODE_FILE_MAP } from "@/plane-editor/constants/utility"; +import { NODE_FILE_MAP } from "@/constants/utility"; // types import type { TFileHandler } from "@/types"; // local imports -import type { NodeFileMapType } from "../../../ce/constants/utility"; +import type { NodeFileMapType } from "../../constants/utility"; import type { TFileNode } from "./types"; const DELETE_PLUGIN_KEY = new PluginKey("delete-utility"); diff --git a/packages/editor/src/core/plugins/file/restore.ts b/packages/editor/src/core/plugins/file/restore.ts index b222b15fd65..7fdfa6b6688 100644 --- a/packages/editor/src/core/plugins/file/restore.ts +++ b/packages/editor/src/core/plugins/file/restore.ts @@ -12,11 +12,11 @@ import { CORE_EXTENSIONS } from "@plane/utils"; // helpers import { CORE_ASSETS_META_DATA_RECORD } from "@/helpers/assets"; // plane editor imports -import { NODE_FILE_MAP } from "@/plane-editor/constants/utility"; +import { NODE_FILE_MAP } from "@/constants/utility"; // types import type { TFileHandler } from "@/types"; // local imports -import type { NodeFileMapType } from "../../../ce/constants/utility"; +import type { NodeFileMapType } from "../../constants/utility"; import type { TFileNode } from "./types"; const RESTORE_PLUGIN_KEY = new PluginKey("restore-utility"); diff --git a/packages/editor/src/core/types/asset.ts b/packages/editor/src/core/types/asset.ts index 09269835309..21590a41fb3 100644 --- a/packages/editor/src/core/types/asset.ts +++ b/packages/editor/src/core/types/asset.ts @@ -6,8 +6,8 @@ // constants import type { CORE_EXTENSIONS } from "@/constants/extension"; -// plane editor imports -import type { TAdditionalEditorAsset } from "@/plane-editor/types/asset"; + +export type TAdditionalEditorAsset = never; export type TEditorImageAsset = { href: string; diff --git a/packages/editor/src/core/types/config.ts b/packages/editor/src/core/types/config.ts index 74fff4dfe01..26f4184cd8e 100644 --- a/packages/editor/src/core/types/config.ts +++ b/packages/editor/src/core/types/config.ts @@ -4,8 +4,7 @@ * See the LICENSE file for details. */ -// plane imports -import type { TExtendedFileHandler } from "@/plane-editor/types/config"; +export type TExtendedFileHandler = object; export type TFileHandler = { assetsUploadStatus: Record; // blockId => progress percentage diff --git a/packages/editor/src/ce/types/editor-extended.ts b/packages/editor/src/core/types/editor-extended.ts similarity index 100% rename from packages/editor/src/ce/types/editor-extended.ts rename to packages/editor/src/core/types/editor-extended.ts diff --git a/packages/editor/src/core/types/editor.ts b/packages/editor/src/core/types/editor.ts index 5da8e419a41..91b7e994a43 100644 --- a/packages/editor/src/core/types/editor.ts +++ b/packages/editor/src/core/types/editor.ts @@ -18,7 +18,7 @@ import type { IEditorPropsExtended, TExtendedEditorCommands, ICollaborativeDocumentEditorPropsExtended, -} from "@/plane-editor/types/editor-extended"; +} from "@/types/editor-extended"; // types import type { IMarking, diff --git a/packages/editor/src/core/types/index.ts b/packages/editor/src/core/types/index.ts index 7ba7f104d99..69a67c38d40 100644 --- a/packages/editor/src/core/types/index.ts +++ b/packages/editor/src/core/types/index.ts @@ -15,5 +15,5 @@ export * from "./hook"; export * from "./mention"; export * from "./slash-commands-suggestion"; export * from "./document-collaborative-events"; - -export * from "@/plane-editor/types"; +export * from "./issue-embed"; +export * from "./editor-extended"; diff --git a/packages/editor/src/ce/types/issue-embed.ts b/packages/editor/src/core/types/issue-embed.ts similarity index 100% rename from packages/editor/src/ce/types/issue-embed.ts rename to packages/editor/src/core/types/issue-embed.ts diff --git a/packages/editor/src/ce/types/storage.ts b/packages/editor/src/core/types/storage.ts similarity index 100% rename from packages/editor/src/ce/types/storage.ts rename to packages/editor/src/core/types/storage.ts diff --git a/packages/editor/src/ce/types/utils.ts b/packages/editor/src/core/types/utils.ts similarity index 100% rename from packages/editor/src/ce/types/utils.ts rename to packages/editor/src/core/types/utils.ts diff --git a/packages/editor/src/ee/extensions/index.ts b/packages/editor/src/ee/extensions/index.ts deleted file mode 100644 index 31184b3417a..00000000000 --- a/packages/editor/src/ee/extensions/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Copyright (c) 2023-present Plane Software, Inc. and contributors - * SPDX-License-Identifier: AGPL-3.0-only - * See the LICENSE file for details. - */ - -export * from "src/ce/extensions"; diff --git a/packages/editor/src/ee/types/index.ts b/packages/editor/src/ee/types/index.ts deleted file mode 100644 index 2d08dc4bee0..00000000000 --- a/packages/editor/src/ee/types/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Copyright (c) 2023-present Plane Software, Inc. and contributors - * SPDX-License-Identifier: AGPL-3.0-only - * See the LICENSE file for details. - */ - -export * from "src/ce/types"; diff --git a/packages/editor/src/index.ts b/packages/editor/src/index.ts index fd52c83f57d..d13fd7b28e0 100644 --- a/packages/editor/src/index.ts +++ b/packages/editor/src/index.ts @@ -20,7 +20,7 @@ export * from "@/helpers/common"; export * from "@/helpers/yjs-utils"; export { CORE_EXTENSIONS } from "@/constants/extension"; -export { ADDITIONAL_EXTENSIONS } from "@/plane-editor/constants/extensions"; +export { ADDITIONAL_EXTENSIONS } from "@/constants/extensions"; // types export * from "@/types"; diff --git a/packages/editor/tsconfig.json b/packages/editor/tsconfig.json index a78d77e7301..ec2feab3f69 100644 --- a/packages/editor/tsconfig.json +++ b/packages/editor/tsconfig.json @@ -6,9 +6,7 @@ "noUnusedLocals": false, "noUnusedParameters": false, "paths": { - "src/*": ["./src/*"], "@/*": ["./src/core/*"], - "@/plane-editor/*": ["./src/ce/*"], "@/styles/*": ["./src/styles/*"] } },