diff --git a/blocksuite/affine/all/src/extensions/store.ts b/blocksuite/affine/all/src/extensions/store.ts index 1a723dee9e..f1e972dacf 100644 --- a/blocksuite/affine/all/src/extensions/store.ts +++ b/blocksuite/affine/all/src/extensions/store.ts @@ -1,8 +1,4 @@ -import { CodeMarkdownPreprocessorExtension } from '@blocksuite/affine-block-code'; import { DatabaseSelectionExtension } from '@blocksuite/affine-block-database'; -import { EmbedIframeConfigExtensions } from '@blocksuite/affine-block-embed'; -import { ImageStoreSpec } from '@blocksuite/affine-block-image'; -import { LatexMarkdownPreprocessorExtension } from '@blocksuite/affine-block-latex'; import { RootBlockHtmlAdapterExtension, RootBlockMarkdownAdapterExtension, @@ -36,7 +32,6 @@ import { import { HighlightSelectionExtension } from '@blocksuite/affine-shared/selection'; import { BlockMetaService, - EmbedIframeService, FeatureFlagService, FileSizeLimitService, LinkPreviewerService, @@ -64,17 +59,10 @@ const defaultBlockHtmlAdapterMatchers = [RootBlockHtmlAdapterExtension]; const defaultBlockMarkdownAdapterMatchers = [RootBlockMarkdownAdapterExtension]; -const defaultMarkdownPreprocessors = [ - LatexMarkdownPreprocessorExtension, - CodeMarkdownPreprocessorExtension, -]; - const defaultBlockNotionHtmlAdapterMatchers: ExtensionType[] = [ RootBlockNotionHtmlAdapterExtension, ]; -const defaultBlockPlainTextAdapterMatchers: ExtensionType[] = []; - function getHtmlAdapterExtensions(): ExtensionType[] { return [ ...HtmlInlineToDeltaAdapterExtensions, @@ -88,7 +76,6 @@ function getMarkdownAdapterExtensions(): ExtensionType[] { ...MarkdownInlineToDeltaAdapterExtensions, ...defaultBlockMarkdownAdapterMatchers, ...InlineDeltaToMarkdownAdapterExtensions, - ...defaultMarkdownPreprocessors, ]; } @@ -100,10 +87,7 @@ function getNotionHtmlAdapterExtensions(): ExtensionType[] { } function getPlainTextAdapterExtensions(): ExtensionType[] { - return [ - ...defaultBlockPlainTextAdapterMatchers, - ...InlineDeltaToPlainTextAdapterExtensions, - ]; + return [...InlineDeltaToPlainTextAdapterExtensions]; } const MigratingStoreExtensions: ExtensionType[] = [ @@ -127,10 +111,7 @@ const MigratingStoreExtensions: ExtensionType[] = [ FeatureFlagService, LinkPreviewerService, FileSizeLimitService, - ImageStoreSpec, BlockMetaService, - EmbedIframeConfigExtensions, - EmbedIframeService, ].flat(); export class MigratingStoreExtension extends StoreExtensionProvider { diff --git a/blocksuite/affine/blocks/code/src/store.ts b/blocksuite/affine/blocks/code/src/store.ts index 3d0c730767..8621f9b6f4 100644 --- a/blocksuite/affine/blocks/code/src/store.ts +++ b/blocksuite/affine/blocks/code/src/store.ts @@ -5,6 +5,7 @@ import { import { CodeBlockSchemaExtension } from '@blocksuite/affine-model'; import { CodeBlockAdapterExtensions } from './adapters/extension'; +import { CodeMarkdownPreprocessorExtension } from './adapters/markdown/preprocessor'; export class CodeStoreExtension extends StoreExtensionProvider { override name = 'affine-code-block'; @@ -13,5 +14,6 @@ export class CodeStoreExtension extends StoreExtensionProvider { super.setup(context); context.register(CodeBlockSchemaExtension); context.register(CodeBlockAdapterExtensions); + context.register(CodeMarkdownPreprocessorExtension); } } diff --git a/blocksuite/affine/blocks/embed/src/store.ts b/blocksuite/affine/blocks/embed/src/store.ts index 0ed339a34e..ffa8bb03f9 100644 --- a/blocksuite/affine/blocks/embed/src/store.ts +++ b/blocksuite/affine/blocks/embed/src/store.ts @@ -12,9 +12,11 @@ import { EmbedSyncedDocBlockSchemaExtension, EmbedYoutubeBlockSchemaExtension, } from '@blocksuite/affine-model'; +import { EmbedIframeService } from '@blocksuite/affine-shared/services'; import { EmbedFigmaBlockAdapterExtensions } from './embed-figma-block/adapters/extension'; import { EmbedGithubBlockAdapterExtensions } from './embed-github-block/adapters/extension'; +import { EmbedIframeConfigExtensions } from './embed-iframe-block'; import { EmbedIframeBlockAdapterExtensions } from './embed-iframe-block/adapters'; import { EmbedLinkedDocBlockAdapterExtensions } from './embed-linked-doc-block/adapters/extension'; import { EmbedLoomBlockAdapterExtensions } from './embed-loom-block/adapters/extension'; @@ -43,5 +45,8 @@ export class EmbedStoreExtension extends StoreExtensionProvider { context.register(EmbedIframeBlockAdapterExtensions); context.register(EmbedLinkedDocBlockAdapterExtensions); context.register(EmbedSyncedDocBlockAdapterExtensions); + + context.register(EmbedIframeConfigExtensions); + context.register(EmbedIframeService); } } diff --git a/blocksuite/affine/blocks/latex/src/store.ts b/blocksuite/affine/blocks/latex/src/store.ts index 1dfb3a15ea..0815c16a41 100644 --- a/blocksuite/affine/blocks/latex/src/store.ts +++ b/blocksuite/affine/blocks/latex/src/store.ts @@ -5,6 +5,7 @@ import { import { LatexBlockSchemaExtension } from '@blocksuite/affine-model'; import { LatexBlockAdapterExtensions } from './adapters/extension'; +import { LatexMarkdownPreprocessorExtension } from './adapters/markdown/preprocessor'; export class LatexStoreExtension extends StoreExtensionProvider { override name = 'affine-latex-block'; @@ -13,5 +14,6 @@ export class LatexStoreExtension extends StoreExtensionProvider { super.setup(context); context.register([LatexBlockSchemaExtension]); context.register(LatexBlockAdapterExtensions); + context.register(LatexMarkdownPreprocessorExtension); } }