diff --git a/packages/core/src/editor/config/config.ts b/packages/core/src/editor/config/config.ts index 8f1b000bc..db5857aee 100644 --- a/packages/core/src/editor/config/config.ts +++ b/packages/core/src/editor/config/config.ts @@ -2,28 +2,28 @@ import { AssetManagerConfig } from '../../asset_manager/config/config'; import { BlockManagerConfig } from '../../block_manager/config/config'; import { CanvasConfig } from '../../canvas/config/config'; import { CodeManagerConfig } from '../../code_manager/config/config'; +import { CssGeneratorBuildOptions } from '../../code_manager/model/CssGenerator'; +import { HTMLGeneratorBuildOptions } from '../../code_manager/model/HtmlGenerator'; +import { CommandsConfig } from '../../commands/config/config'; +import { ObjectAny } from '../../common'; import { CssComposerConfig } from '../../css_composer/config/config'; +import type { DataSourcesConfig } from '../../data_sources/config/config'; import { DeviceManagerConfig } from '../../device_manager/config/config'; +import { DomComponentsConfig } from '../../dom_components/config/config'; import { I18nConfig } from '../../i18n/config'; +import { KeymapsConfig } from '../../keymaps/config'; import { ModalConfig } from '../../modal_dialog/config/config'; import { LayerManagerConfig } from '../../navigator/config/config'; -import { KeymapsConfig } from '../../keymaps/config'; import { PageManagerConfig } from '../../pages/types'; import { PanelsConfig } from '../../panels/config/config'; import { ParserConfig } from '../../parser/config/config'; +import { PluginInput } from '../../plugin_manager/types'; import { RichTextEditorConfig } from '../../rich_text_editor/config/config'; import { SelectorManagerConfig } from '../../selector_manager/config/config'; import { StorageManagerConfig } from '../../storage_manager/config/config'; -import { UndoManagerConfig } from '../../undo_manager/config'; -import { PluginInput } from '../../plugin_manager'; -import { TraitManagerConfig } from '../../trait_manager/config/config'; -import { CommandsConfig } from '../../commands/config/config'; import { StyleManagerConfig } from '../../style_manager/config/config'; -import { DomComponentsConfig } from '../../dom_components/config/config'; -import { HTMLGeneratorBuildOptions } from '../../code_manager/model/HtmlGenerator'; -import { CssGeneratorBuildOptions } from '../../code_manager/model/CssGenerator'; -import { ObjectAny } from '../../common'; -import type { DataSourcesConfig } from '../../data_sources/config/config'; +import { TraitManagerConfig } from '../../trait_manager/config/config'; +import { UndoManagerConfig } from '../../undo_manager/config'; import { ColorPickerOptions } from '../../utils/ColorPicker'; export interface EditorConfig { diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 4f93c49b6..4154d3e5e 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -1,7 +1,8 @@ import { isElement } from 'underscore'; import Editor from './editor'; import { EditorConfig } from './editor/config/config'; -import { PluginInput, legacyGlobalPlugins, usePlugin as pluginUsePlugin } from './plugin_manager'; +import { PluginInput } from './plugin_manager/types'; +import { legacyGlobalPlugins, usePlugin as pluginUsePlugin } from './plugin_manager/utils'; import $ from './utils/cash-dom'; import polyfills from './utils/polyfills'; diff --git a/packages/core/src/plugin_manager/index.ts b/packages/core/src/plugin_manager/index.ts index 7db501184..587fe29f9 100644 --- a/packages/core/src/plugin_manager/index.ts +++ b/packages/core/src/plugin_manager/index.ts @@ -8,42 +8,8 @@ import { KeymapsEvents } from '../keymaps/types'; import { StyleManagerEvents } from '../style_manager/types'; import PluginModel, { createPluginAdded } from './model/Plugin'; import Plugins from './model/Plugins'; -import { - Plugin, - PluginAdded, - PluginCleanup, - PluginCleanupHandler, - PluginDescriptor, - PluginInput, - PluginOptions, - PluginWithMeta, - PluginsEvents, -} from './types'; -import { - addLegacyPlugin, - getLegacyPlugin, - getLegacyPlugins, - getPluginId, - getPlugin, - isPluginDescriptor, - isPluginFunction, - logPluginWarn, - legacyGlobalPlugins, - unwrapPluginMeta, - usePlugin, -} from './utils'; - -export type { - Plugin, - PluginAdded, - PluginCleanup, - PluginCleanupHandler, - PluginDescriptor, - PluginInput, - PluginOptions, - PluginWithMeta, -}; -export { addLegacyPlugin, getLegacyPlugin, getLegacyPlugins, getPlugin, legacyGlobalPlugins, logPluginWarn, usePlugin }; +import { Plugin, PluginCleanup, PluginInput, PluginOptions, PluginsEvents } from './types'; +import { getPluginId, getPlugin, isPluginDescriptor, isPluginFunction, logPluginWarn, unwrapPluginMeta } from './utils'; type PluginTarget = string | Plugin | PluginModel; diff --git a/packages/core/test/specs/grapesjs/index.ts b/packages/core/test/specs/grapesjs/index.ts index 6c0fcc190..d04c2a82a 100644 --- a/packages/core/test/specs/grapesjs/index.ts +++ b/packages/core/test/specs/grapesjs/index.ts @@ -2,8 +2,7 @@ import grapesjs, { Component, Editor, usePlugin } from '../../../src'; import CssRule from '../../../src/css_composer/model/CssRule'; import ComponentWrapper from '../../../src/dom_components/model/ComponentWrapper'; import { EditorConfig } from '../../../src/editor/config/config'; -import type { Plugin } from '../../../src/plugin_manager'; -import PluginsEvents from '../../../src/plugin_manager/types'; +import PluginsEvents, { Plugin } from '../../../src/plugin_manager/types'; import { StorageManagerConfig } from '../../../src/storage_manager/config/config'; import { fixJsDom, fixJsDomIframe, waitEditorEvent } from '../../common';