diff --git a/blocksuite/affine/all/package.json b/blocksuite/affine/all/package.json index 42aa51c1ad..9bfd97ef3f 100644 --- a/blocksuite/affine/all/package.json +++ b/blocksuite/affine/all/package.json @@ -58,9 +58,9 @@ "@blocksuite/affine-widget-scroll-anchoring": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", "@blocksuite/affine-widget-toolbar": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/data-view": "workspace:*", "@blocksuite/global": "workspace:*", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@blocksuite/sync": "workspace:*", "rxjs": "^7.8.1" @@ -68,10 +68,10 @@ "exports": { ".": "./src/index.ts", "./effects": "./src/effects.ts", - "./block-std": "./src/block-std/index.ts", - "./block-std/gfx": "./src/block-std/gfx.ts", - "./block-std/inline": "./src/block-std/inline.ts", - "./block-std/effects": "./src/block-std/effects.ts", + "./std": "./src/std/index.ts", + "./std/gfx": "./src/std/gfx.ts", + "./std/inline": "./src/std/inline.ts", + "./std/effects": "./src/std/effects.ts", "./global": "./src/global/index.ts", "./global/utils": "./src/global/utils.ts", "./global/env": "./src/global/env.ts", diff --git a/blocksuite/affine/all/src/block-std/effects.ts b/blocksuite/affine/all/src/block-std/effects.ts deleted file mode 100644 index c7b225a01e..0000000000 --- a/blocksuite/affine/all/src/block-std/effects.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@blocksuite/block-std/effects'; diff --git a/blocksuite/affine/all/src/block-std/gfx.ts b/blocksuite/affine/all/src/block-std/gfx.ts deleted file mode 100644 index 71b416e051..0000000000 --- a/blocksuite/affine/all/src/block-std/gfx.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@blocksuite/block-std/gfx'; diff --git a/blocksuite/affine/all/src/block-std/index.ts b/blocksuite/affine/all/src/block-std/index.ts deleted file mode 100644 index 82982c0b36..0000000000 --- a/blocksuite/affine/all/src/block-std/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@blocksuite/block-std'; diff --git a/blocksuite/affine/all/src/block-std/inline.ts b/blocksuite/affine/all/src/block-std/inline.ts deleted file mode 100644 index a2dfc7f0a8..0000000000 --- a/blocksuite/affine/all/src/block-std/inline.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@blocksuite/block-std/inline'; diff --git a/blocksuite/affine/all/src/effects.ts b/blocksuite/affine/all/src/effects.ts index 45afee1c44..b43683af7f 100644 --- a/blocksuite/affine/all/src/effects.ts +++ b/blocksuite/affine/all/src/effects.ts @@ -59,8 +59,8 @@ import { effects as widgetRemoteSelectionEffects } from '@blocksuite/affine-widg import { effects as widgetScrollAnchoringEffects } from '@blocksuite/affine-widget-scroll-anchoring/effects'; import { effects as widgetSlashMenuEffects } from '@blocksuite/affine-widget-slash-menu/effects'; import { effects as widgetToolbarEffects } from '@blocksuite/affine-widget-toolbar/effects'; -import { effects as stdEffects } from '@blocksuite/block-std/effects'; import { effects as dataViewEffects } from '@blocksuite/data-view/effects'; +import { effects as stdEffects } from '@blocksuite/std/effects'; import { registerSpecs } from './extensions/register.js'; diff --git a/blocksuite/affine/all/src/extensions/store.ts b/blocksuite/affine/all/src/extensions/store.ts index db705af053..03179ffbbf 100644 --- a/blocksuite/affine/all/src/extensions/store.ts +++ b/blocksuite/affine/all/src/extensions/store.ts @@ -47,7 +47,7 @@ import { CursorSelectionExtension, SurfaceSelectionExtension, TextSelectionExtension, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { diff --git a/blocksuite/affine/all/src/std/effects.ts b/blocksuite/affine/all/src/std/effects.ts new file mode 100644 index 0000000000..c377143ccf --- /dev/null +++ b/blocksuite/affine/all/src/std/effects.ts @@ -0,0 +1 @@ +export * from '@blocksuite/std/effects'; diff --git a/blocksuite/affine/all/src/std/gfx.ts b/blocksuite/affine/all/src/std/gfx.ts new file mode 100644 index 0000000000..2540014f75 --- /dev/null +++ b/blocksuite/affine/all/src/std/gfx.ts @@ -0,0 +1 @@ +export * from '@blocksuite/std/gfx'; diff --git a/blocksuite/affine/all/src/std/index.ts b/blocksuite/affine/all/src/std/index.ts new file mode 100644 index 0000000000..5ee6fec9d3 --- /dev/null +++ b/blocksuite/affine/all/src/std/index.ts @@ -0,0 +1 @@ +export * from '@blocksuite/std'; diff --git a/blocksuite/affine/all/src/std/inline.ts b/blocksuite/affine/all/src/std/inline.ts new file mode 100644 index 0000000000..ddb3252fc7 --- /dev/null +++ b/blocksuite/affine/all/src/std/inline.ts @@ -0,0 +1 @@ +export * from '@blocksuite/std/inline'; diff --git a/blocksuite/affine/all/tsconfig.json b/blocksuite/affine/all/tsconfig.json index 7aca2bd51f..dcad202a3e 100644 --- a/blocksuite/affine/all/tsconfig.json +++ b/blocksuite/affine/all/tsconfig.json @@ -55,9 +55,9 @@ { "path": "../widgets/widget-scroll-anchoring" }, { "path": "../widgets/widget-slash-menu" }, { "path": "../widgets/widget-toolbar" }, - { "path": "../../framework/block-std" }, { "path": "../data-view" }, { "path": "../../framework/global" }, + { "path": "../../framework/std" }, { "path": "../../framework/store" }, { "path": "../../framework/sync" } ] diff --git a/blocksuite/affine/blocks/block-attachment/package.json b/blocksuite/affine/blocks/block-attachment/package.json index e062eae2a4..59b7a40978 100644 --- a/blocksuite/affine/blocks/block-attachment/package.json +++ b/blocksuite/affine/blocks/block-attachment/package.json @@ -16,9 +16,9 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/blocks/block-attachment/src/attachment-block.ts b/blocksuite/affine/blocks/block-attachment/src/attachment-block.ts index b7191920c2..0062f1afdd 100644 --- a/blocksuite/affine/blocks/block-attachment/src/attachment-block.ts +++ b/blocksuite/affine/blocks/block-attachment/src/attachment-block.ts @@ -15,7 +15,7 @@ import { ThemeProvider, } from '@blocksuite/affine-shared/services'; import { humanFileSize } from '@blocksuite/affine-shared/utils'; -import { BlockSelection } from '@blocksuite/block-std'; +import { BlockSelection } from '@blocksuite/std'; import { Slice } from '@blocksuite/store'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-attachment/src/attachment-edgeless-block.ts b/blocksuite/affine/blocks/block-attachment/src/attachment-edgeless-block.ts index ca05c3245e..12c42d8cca 100644 --- a/blocksuite/affine/blocks/block-attachment/src/attachment-edgeless-block.ts +++ b/blocksuite/affine/blocks/block-attachment/src/attachment-edgeless-block.ts @@ -4,7 +4,7 @@ import { EMBED_CARD_HEIGHT, EMBED_CARD_WIDTH, } from '@blocksuite/affine-shared/consts'; -import { toGfxBlockComponent } from '@blocksuite/block-std'; +import { toGfxBlockComponent } from '@blocksuite/std'; import { styleMap } from 'lit/directives/style-map.js'; import { AttachmentBlockComponent } from './attachment-block.js'; diff --git a/blocksuite/affine/blocks/block-attachment/src/attachment-service.ts b/blocksuite/affine/blocks/block-attachment/src/attachment-service.ts index 3337b446f7..46637e8948 100644 --- a/blocksuite/affine/blocks/block-attachment/src/attachment-service.ts +++ b/blocksuite/affine/blocks/block-attachment/src/attachment-service.ts @@ -9,7 +9,7 @@ import { isInsideEdgelessEditor, matchModels, } from '@blocksuite/affine-shared/utils'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { addAttachments, addSiblingAttachmentBlocks } from './utils.js'; diff --git a/blocksuite/affine/blocks/block-attachment/src/attachment-spec.ts b/blocksuite/affine/blocks/block-attachment/src/attachment-spec.ts index 961f26d130..727bcd07ca 100644 --- a/blocksuite/affine/blocks/block-attachment/src/attachment-spec.ts +++ b/blocksuite/affine/blocks/block-attachment/src/attachment-spec.ts @@ -1,6 +1,6 @@ import { AttachmentBlockSchema } from '@blocksuite/affine-model'; import { SlashMenuConfigExtension } from '@blocksuite/affine-widget-slash-menu'; -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-attachment/src/components/rename-model.ts b/blocksuite/affine/blocks/block-attachment/src/components/rename-model.ts index bfc8076c68..1a151a3a44 100644 --- a/blocksuite/affine/blocks/block-attachment/src/components/rename-model.ts +++ b/blocksuite/affine/blocks/block-attachment/src/components/rename-model.ts @@ -1,7 +1,7 @@ import { ConfirmIcon } from '@blocksuite/affine-components/icons'; import { toast } from '@blocksuite/affine-components/toast'; import type { AttachmentBlockModel } from '@blocksuite/affine-model'; -import type { EditorHost } from '@blocksuite/block-std'; +import type { EditorHost } from '@blocksuite/std'; import { html } from 'lit'; import { createRef, ref } from 'lit/directives/ref.js'; diff --git a/blocksuite/affine/blocks/block-attachment/src/configs/toolbar.ts b/blocksuite/affine/blocks/block-attachment/src/configs/toolbar.ts index 55eb883829..10482dafd9 100644 --- a/blocksuite/affine/blocks/block-attachment/src/configs/toolbar.ts +++ b/blocksuite/affine/blocks/block-attachment/src/configs/toolbar.ts @@ -15,7 +15,6 @@ import { type ToolbarModuleConfig, ToolbarModuleExtension, } from '@blocksuite/affine-shared/services'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; import { CaptionIcon, @@ -26,6 +25,7 @@ import { EditIcon, ResetIcon, } from '@blocksuite/icons/lit'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { flip, offset } from '@floating-ui/dom'; import { computed } from '@preact/signals-core'; diff --git a/blocksuite/affine/blocks/block-attachment/src/embed.ts b/blocksuite/affine/blocks/block-attachment/src/embed.ts index 671ef34ca7..19130080fa 100644 --- a/blocksuite/affine/blocks/block-attachment/src/embed.ts +++ b/blocksuite/affine/blocks/block-attachment/src/embed.ts @@ -9,10 +9,10 @@ import { transformModel, withTempBlobData, } from '@blocksuite/affine-shared/utils'; -import { type BlockStdScope, StdIdentifier } from '@blocksuite/block-std'; import type { Container } from '@blocksuite/global/di'; import { createIdentifier } from '@blocksuite/global/di'; import { Bound } from '@blocksuite/global/gfx'; +import { type BlockStdScope, StdIdentifier } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { Extension } from '@blocksuite/store'; import type { TemplateResult } from 'lit'; diff --git a/blocksuite/affine/blocks/block-attachment/src/utils.ts b/blocksuite/affine/blocks/block-attachment/src/utils.ts index 52530f9b14..266ae67a99 100644 --- a/blocksuite/affine/blocks/block-attachment/src/utils.ts +++ b/blocksuite/affine/blocks/block-attachment/src/utils.ts @@ -13,9 +13,9 @@ import { TelemetryProvider, } from '@blocksuite/affine-shared/services'; import { humanFileSize } from '@blocksuite/affine-shared/utils'; -import type { BlockStdScope, EditorHost } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { Bound, type IVec, Point, Vec } from '@blocksuite/global/gfx'; +import type { BlockStdScope, EditorHost } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import type { BlockModel } from '@blocksuite/store'; import type { AttachmentBlockComponent } from './attachment-block.js'; diff --git a/blocksuite/affine/blocks/block-attachment/tsconfig.json b/blocksuite/affine/blocks/block-attachment/tsconfig.json index 786c8affaf..8d401bfec1 100644 --- a/blocksuite/affine/blocks/block-attachment/tsconfig.json +++ b/blocksuite/affine/blocks/block-attachment/tsconfig.json @@ -13,8 +13,8 @@ { "path": "../../model" }, { "path": "../../shared" }, { "path": "../../widgets/widget-slash-menu" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-bookmark/package.json b/blocksuite/affine/blocks/block-bookmark/package.json index 24c6de8a6b..73ec519846 100644 --- a/blocksuite/affine/blocks/block-bookmark/package.json +++ b/blocksuite/affine/blocks/block-bookmark/package.json @@ -16,9 +16,9 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@lit/context": "^1.1.2", "@preact/signals-core": "^1.8.0", diff --git a/blocksuite/affine/blocks/block-bookmark/src/bookmark-edgeless-block.ts b/blocksuite/affine/blocks/block-bookmark/src/bookmark-edgeless-block.ts index bb723615d3..44df09cabb 100644 --- a/blocksuite/affine/blocks/block-bookmark/src/bookmark-edgeless-block.ts +++ b/blocksuite/affine/blocks/block-bookmark/src/bookmark-edgeless-block.ts @@ -2,7 +2,7 @@ import { EMBED_CARD_HEIGHT, EMBED_CARD_WIDTH, } from '@blocksuite/affine-shared/consts'; -import { toGfxBlockComponent } from '@blocksuite/block-std'; +import { toGfxBlockComponent } from '@blocksuite/std'; import { type StyleInfo, styleMap } from 'lit/directives/style-map.js'; import { BookmarkBlockComponent } from './bookmark-block.js'; diff --git a/blocksuite/affine/blocks/block-bookmark/src/bookmark-spec.ts b/blocksuite/affine/blocks/block-bookmark/src/bookmark-spec.ts index c78ac7c3e7..e709c8e24d 100644 --- a/blocksuite/affine/blocks/block-bookmark/src/bookmark-spec.ts +++ b/blocksuite/affine/blocks/block-bookmark/src/bookmark-spec.ts @@ -1,5 +1,5 @@ import { BookmarkBlockSchema } from '@blocksuite/affine-model'; -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-bookmark/src/commands/insert-bookmark.ts b/blocksuite/affine/blocks/block-bookmark/src/commands/insert-bookmark.ts index b54ba66e98..148b499b49 100644 --- a/blocksuite/affine/blocks/block-bookmark/src/commands/insert-bookmark.ts +++ b/blocksuite/affine/blocks/block-bookmark/src/commands/insert-bookmark.ts @@ -3,7 +3,7 @@ import '@blocksuite/affine-block-embed/effects'; import { insertEmbedCard } from '@blocksuite/affine-block-embed'; import type { EmbedCardStyle } from '@blocksuite/affine-model'; import { EmbedOptionProvider } from '@blocksuite/affine-shared/services'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; export const insertBookmarkCommand: Command< { url: string }, diff --git a/blocksuite/affine/blocks/block-bookmark/src/commands/insert-link-by-quick-search.ts b/blocksuite/affine/blocks/block-bookmark/src/commands/insert-link-by-quick-search.ts index 5f2e6a69e9..84cf68c45a 100644 --- a/blocksuite/affine/blocks/block-bookmark/src/commands/insert-link-by-quick-search.ts +++ b/blocksuite/affine/blocks/block-bookmark/src/commands/insert-link-by-quick-search.ts @@ -8,7 +8,7 @@ import { FeatureFlagService, QuickSearchProvider, } from '@blocksuite/affine-shared/services'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import { insertBookmarkCommand } from './insert-bookmark'; diff --git a/blocksuite/affine/blocks/block-bookmark/src/components/bookmark-card.ts b/blocksuite/affine/blocks/block-bookmark/src/components/bookmark-card.ts index 0f052b4d51..b333d4c2bb 100644 --- a/blocksuite/affine/blocks/block-bookmark/src/components/bookmark-card.ts +++ b/blocksuite/affine/blocks/block-bookmark/src/components/bookmark-card.ts @@ -2,9 +2,9 @@ import { getEmbedCardIcons } from '@blocksuite/affine-block-embed'; import { WebIcon16 } from '@blocksuite/affine-components/icons'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; import { getHostName } from '@blocksuite/affine-shared/utils'; -import { BlockSelection, ShadowlessElement } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; import { OpenInNewIcon } from '@blocksuite/icons/lit'; +import { BlockSelection, ShadowlessElement } from '@blocksuite/std'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/blocks/block-bookmark/src/configs/toolbar.ts b/blocksuite/affine/blocks/block-bookmark/src/configs/toolbar.ts index 3ef41c44be..ab6ae6fa8d 100644 --- a/blocksuite/affine/blocks/block-bookmark/src/configs/toolbar.ts +++ b/blocksuite/affine/blocks/block-bookmark/src/configs/toolbar.ts @@ -26,7 +26,6 @@ import { ToolbarModuleExtension, } from '@blocksuite/affine-shared/services'; import { getBlockProps } from '@blocksuite/affine-shared/utils'; -import { BlockFlavourIdentifier, BlockSelection } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; import { CaptionIcon, @@ -35,6 +34,7 @@ import { DuplicateIcon, ResetIcon, } from '@blocksuite/icons/lit'; +import { BlockFlavourIdentifier, BlockSelection } from '@blocksuite/std'; import { type ExtensionType, Slice, Text } from '@blocksuite/store'; import { computed, signal } from '@preact/signals-core'; import { html } from 'lit'; diff --git a/blocksuite/affine/blocks/block-bookmark/tsconfig.json b/blocksuite/affine/blocks/block-bookmark/tsconfig.json index 786c8affaf..8d401bfec1 100644 --- a/blocksuite/affine/blocks/block-bookmark/tsconfig.json +++ b/blocksuite/affine/blocks/block-bookmark/tsconfig.json @@ -13,8 +13,8 @@ { "path": "../../model" }, { "path": "../../shared" }, { "path": "../../widgets/widget-slash-menu" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-callout/package.json b/blocksuite/affine/blocks/block-callout/package.json index f819146ff0..12865c5897 100644 --- a/blocksuite/affine/blocks/block-callout/package.json +++ b/blocksuite/affine/blocks/block-callout/package.json @@ -16,9 +16,9 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@emoji-mart/data": "^1.2.1", "@floating-ui/dom": "^1.6.10", diff --git a/blocksuite/affine/blocks/block-callout/src/callout-block.ts b/blocksuite/affine/blocks/block-callout/src/callout-block.ts index 74c44106ac..aca504b978 100644 --- a/blocksuite/affine/blocks/block-callout/src/callout-block.ts +++ b/blocksuite/affine/blocks/block-callout/src/callout-block.ts @@ -8,7 +8,7 @@ import { ThemeProvider, } from '@blocksuite/affine-shared/services'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import type { BlockComponent } from '@blocksuite/block-std'; +import type { BlockComponent } from '@blocksuite/std'; import { flip, offset } from '@floating-ui/dom'; import { css, html } from 'lit'; import { query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-callout/src/callout-keymap.ts b/blocksuite/affine/blocks/block-callout/src/callout-keymap.ts index 138755d7d6..298b2d0a74 100644 --- a/blocksuite/affine/blocks/block-callout/src/callout-keymap.ts +++ b/blocksuite/affine/blocks/block-callout/src/callout-keymap.ts @@ -4,7 +4,7 @@ import { BlockSelection, KeymapExtension, TextSelection, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; export const CalloutKeymapExtension = KeymapExtension(std => { return { diff --git a/blocksuite/affine/blocks/block-callout/src/callout-spec.ts b/blocksuite/affine/blocks/block-callout/src/callout-spec.ts index db583ebcc7..920228da88 100644 --- a/blocksuite/affine/blocks/block-callout/src/callout-spec.ts +++ b/blocksuite/affine/blocks/block-callout/src/callout-spec.ts @@ -1,5 +1,5 @@ import { SlashMenuConfigExtension } from '@blocksuite/affine-widget-slash-menu'; -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-callout/tsconfig.json b/blocksuite/affine/blocks/block-callout/tsconfig.json index 3b03fbd474..df9b63e254 100644 --- a/blocksuite/affine/blocks/block-callout/tsconfig.json +++ b/blocksuite/affine/blocks/block-callout/tsconfig.json @@ -13,8 +13,8 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/widget-slash-menu" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-code/package.json b/blocksuite/affine/blocks/block-code/package.json index c24e9d8c2e..6722584599 100644 --- a/blocksuite/affine/blocks/block-code/package.json +++ b/blocksuite/affine/blocks/block-code/package.json @@ -18,9 +18,9 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/blocks/block-code/src/code-block-config.ts b/blocksuite/affine/blocks/block-code/src/code-block-config.ts index edacfba115..d6c41bc917 100644 --- a/blocksuite/affine/blocks/block-code/src/code-block-config.ts +++ b/blocksuite/affine/blocks/block-code/src/code-block-config.ts @@ -1,4 +1,4 @@ -import { ConfigExtensionFactory } from '@blocksuite/block-std'; +import { ConfigExtensionFactory } from '@blocksuite/std'; import type { BundledLanguageInfo, ThemeInput } from 'shiki'; export interface CodeBlockConfig { diff --git a/blocksuite/affine/blocks/block-code/src/code-block-inline.ts b/blocksuite/affine/blocks/block-code/src/code-block-inline.ts index 6a604cfb72..1312411581 100644 --- a/blocksuite/affine/blocks/block-code/src/code-block-inline.ts +++ b/blocksuite/affine/blocks/block-code/src/code-block-inline.ts @@ -13,7 +13,7 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; import { InlineManagerExtension, InlineSpecExtension, -} from '@blocksuite/block-std/inline'; +} from '@blocksuite/std/inline'; import { html } from 'lit'; import { z } from 'zod'; diff --git a/blocksuite/affine/blocks/block-code/src/code-block-service.ts b/blocksuite/affine/blocks/block-code/src/code-block-service.ts index c2cd66bc07..b101fe8b0f 100644 --- a/blocksuite/affine/blocks/block-code/src/code-block-service.ts +++ b/blocksuite/affine/blocks/block-code/src/code-block-service.ts @@ -1,6 +1,6 @@ import { ColorScheme } from '@blocksuite/affine-model'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; -import { LifeCycleWatcher } from '@blocksuite/block-std'; +import { LifeCycleWatcher } from '@blocksuite/std'; import { type Signal, signal } from '@preact/signals-core'; import { createHighlighterCore, diff --git a/blocksuite/affine/blocks/block-code/src/code-block-spec.ts b/blocksuite/affine/blocks/block-code/src/code-block-spec.ts index f38d82e15a..fae649f674 100644 --- a/blocksuite/affine/blocks/block-code/src/code-block-spec.ts +++ b/blocksuite/affine/blocks/block-code/src/code-block-spec.ts @@ -3,7 +3,7 @@ import { BlockViewExtension, FlavourExtension, WidgetViewExtension, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal, unsafeStatic } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-code/src/code-block.ts b/blocksuite/affine/blocks/block-code/src/code-block.ts index fc6d4d1646..89319a3edb 100644 --- a/blocksuite/affine/blocks/block-code/src/code-block.ts +++ b/blocksuite/affine/blocks/block-code/src/code-block.ts @@ -7,17 +7,17 @@ import { NotificationProvider, } from '@blocksuite/affine-shared/services'; import { getViewportElement } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { BlockSelection, TextSelection } from '@blocksuite/block-std'; +import { IS_MAC, IS_MOBILE } from '@blocksuite/global/env'; +import { noop } from '@blocksuite/global/utils'; +import type { BlockComponent } from '@blocksuite/std'; +import { BlockSelection, TextSelection } from '@blocksuite/std'; import { getInlineRangeProvider, INLINE_ROOT_ATTR, type InlineRangeProvider, type InlineRootElement, type VLine, -} from '@blocksuite/block-std/inline'; -import { IS_MAC, IS_MOBILE } from '@blocksuite/global/env'; -import { noop } from '@blocksuite/global/utils'; +} from '@blocksuite/std/inline'; import { Slice } from '@blocksuite/store'; import { computed, effect, type Signal, signal } from '@preact/signals-core'; import { html, nothing, type TemplateResult } from 'lit'; diff --git a/blocksuite/affine/blocks/block-code/src/code-keymap.ts b/blocksuite/affine/blocks/block-code/src/code-keymap.ts index 9904f34cc8..6f4cc1fdbb 100644 --- a/blocksuite/affine/blocks/block-code/src/code-keymap.ts +++ b/blocksuite/affine/blocks/block-code/src/code-keymap.ts @@ -1,6 +1,6 @@ import { textKeymap } from '@blocksuite/affine-inline-preset'; import { CodeBlockSchema } from '@blocksuite/affine-model'; -import { KeymapExtension } from '@blocksuite/block-std'; +import { KeymapExtension } from '@blocksuite/std'; export const CodeKeymapExtension = KeymapExtension(textKeymap, { flavour: CodeBlockSchema.model.flavour, diff --git a/blocksuite/affine/blocks/block-code/src/code-toolbar/config.ts b/blocksuite/affine/blocks/block-code/src/code-toolbar/config.ts index 4475308fb8..ed31b496cc 100644 --- a/blocksuite/affine/blocks/block-code/src/code-toolbar/config.ts +++ b/blocksuite/affine/blocks/block-code/src/code-toolbar/config.ts @@ -8,8 +8,8 @@ import { } from '@blocksuite/affine-components/icons'; import type { MenuItemGroup } from '@blocksuite/affine-components/toolbar'; import { isInsidePageEditor } from '@blocksuite/affine-shared/utils'; -import { BlockSelection } from '@blocksuite/block-std'; import { noop, sleep } from '@blocksuite/global/utils'; +import { BlockSelection } from '@blocksuite/std'; import { html } from 'lit'; import { ifDefined } from 'lit/directives/if-defined.js'; diff --git a/blocksuite/affine/blocks/block-code/src/code-toolbar/index.ts b/blocksuite/affine/blocks/block-code/src/code-toolbar/index.ts index 29f72c694f..26962b8870 100644 --- a/blocksuite/affine/blocks/block-code/src/code-toolbar/index.ts +++ b/blocksuite/affine/blocks/block-code/src/code-toolbar/index.ts @@ -12,7 +12,7 @@ import { BlockSelection, TextSelection, WidgetComponent, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import { limitShift, shift, size } from '@floating-ui/dom'; import { html } from 'lit'; diff --git a/blocksuite/affine/blocks/block-code/src/highlight/affine-code-unit.ts b/blocksuite/affine/blocks/block-code/src/highlight/affine-code-unit.ts index 890d549f17..684f7e4ae1 100644 --- a/blocksuite/affine/blocks/block-code/src/highlight/affine-code-unit.ts +++ b/blocksuite/affine/blocks/block-code/src/highlight/affine-code-unit.ts @@ -1,7 +1,7 @@ import { affineTextStyles } from '@blocksuite/affine-shared/styles'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { ShadowlessElement } from '@blocksuite/block-std'; -import { ZERO_WIDTH_SPACE } from '@blocksuite/block-std/inline'; +import { ShadowlessElement } from '@blocksuite/std'; +import { ZERO_WIDTH_SPACE } from '@blocksuite/std/inline'; import type { DeltaInsert } from '@blocksuite/store'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-code/tsconfig.json b/blocksuite/affine/blocks/block-code/tsconfig.json index 0487cffc2b..dba4360dcc 100644 --- a/blocksuite/affine/blocks/block-code/tsconfig.json +++ b/blocksuite/affine/blocks/block-code/tsconfig.json @@ -15,8 +15,8 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/widget-slash-menu" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-data-view/package.json b/blocksuite/affine/blocks/block-data-view/package.json index 8732f9f29d..be2ad34a72 100644 --- a/blocksuite/affine/blocks/block-data-view/package.json +++ b/blocksuite/affine/blocks/block-data-view/package.json @@ -15,10 +15,10 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/data-view": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/blocks/block-data-view/src/data-source.ts b/blocksuite/affine/blocks/block-data-view/src/data-source.ts index 4a0c5c398a..86908306ee 100644 --- a/blocksuite/affine/blocks/block-data-view/src/data-source.ts +++ b/blocksuite/affine/blocks/block-data-view/src/data-source.ts @@ -7,10 +7,10 @@ import { insertPositionToIndex, type InsertToPosition, } from '@blocksuite/affine-shared/utils'; -import type { EditorHost } from '@blocksuite/block-std'; import { DataSourceBase, type PropertyMetaConfig } from '@blocksuite/data-view'; import { propertyPresets } from '@blocksuite/data-view/property-presets'; import { BlockSuiteError } from '@blocksuite/global/exceptions'; +import type { EditorHost } from '@blocksuite/std'; import type { Block, Store } from '@blocksuite/store'; import { Subject } from 'rxjs'; diff --git a/blocksuite/affine/blocks/block-data-view/src/data-view-block.ts b/blocksuite/affine/blocks/block-data-view/src/data-view-block.ts index ff8ea187c9..b89b6b89d3 100644 --- a/blocksuite/affine/blocks/block-data-view/src/data-view-block.ts +++ b/blocksuite/affine/blocks/block-data-view/src/data-view-block.ts @@ -19,8 +19,6 @@ import { type TelemetryEventMap, TelemetryProvider, } from '@blocksuite/affine-shared/services'; -import { type BlockComponent } from '@blocksuite/block-std'; -import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline'; import { createRecordDetail, createUniComponentFromWebComponent, @@ -37,6 +35,8 @@ import { } from '@blocksuite/data-view'; import { widgetPresets } from '@blocksuite/data-view/widget-presets'; import { MoreHorizontalIcon } from '@blocksuite/icons/lit'; +import { type BlockComponent } from '@blocksuite/std'; +import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/std/inline'; import { Slice } from '@blocksuite/store'; import { computed, signal } from '@preact/signals-core'; import { css, nothing, unsafeCSS } from 'lit'; diff --git a/blocksuite/affine/blocks/block-data-view/src/data-view-spec.ts b/blocksuite/affine/blocks/block-data-view/src/data-view-spec.ts index d28dbb87dc..fd852a6f2c 100644 --- a/blocksuite/affine/blocks/block-data-view/src/data-view-spec.ts +++ b/blocksuite/affine/blocks/block-data-view/src/data-view-spec.ts @@ -1,4 +1,4 @@ -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-data-view/tsconfig.json b/blocksuite/affine/blocks/block-data-view/tsconfig.json index 1273f28aab..fd15f06baa 100644 --- a/blocksuite/affine/blocks/block-data-view/tsconfig.json +++ b/blocksuite/affine/blocks/block-data-view/tsconfig.json @@ -12,9 +12,9 @@ { "path": "../../model" }, { "path": "../../shared" }, { "path": "../../widgets/widget-slash-menu" }, - { "path": "../../../framework/block-std" }, { "path": "../../data-view" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-database/package.json b/blocksuite/affine/blocks/block-database/package.json index 576f725a03..3e6d8c2733 100644 --- a/blocksuite/affine/blocks/block-database/package.json +++ b/blocksuite/affine/blocks/block-database/package.json @@ -18,10 +18,10 @@ "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-drag-handle": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/data-view": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/blocks/block-database/src/commands.ts b/blocksuite/affine/blocks/block-database/src/commands.ts index e6939a77b9..6ff46ce7c3 100644 --- a/blocksuite/affine/blocks/block-database/src/commands.ts +++ b/blocksuite/affine/blocks/block-database/src/commands.ts @@ -1,5 +1,5 @@ import type { DatabaseBlockModel } from '@blocksuite/affine-model'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import type { BlockModel, Store } from '@blocksuite/store'; import { diff --git a/blocksuite/affine/blocks/block-database/src/components/layout.ts b/blocksuite/affine/blocks/block-database/src/components/layout.ts index 8d9846ecf4..6f34263d8e 100644 --- a/blocksuite/affine/blocks/block-database/src/components/layout.ts +++ b/blocksuite/affine/blocks/block-database/src/components/layout.ts @@ -1,6 +1,6 @@ import { createModal } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { CloseIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, html, type TemplateResult } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-database/src/components/title/index.ts b/blocksuite/affine/blocks/block-database/src/components/title/index.ts index dcbe6cfa22..4c4d1f5565 100644 --- a/blocksuite/affine/blocks/block-database/src/components/title/index.ts +++ b/blocksuite/affine/blocks/block-database/src/components/title/index.ts @@ -1,6 +1,6 @@ import { stopPropagation } from '@blocksuite/affine-shared/utils'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import type { Text } from '@blocksuite/store'; import { css, html } from 'lit'; import { property, query, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-database/src/config.ts b/blocksuite/affine/blocks/block-database/src/config.ts index 35dc7ec44d..9ad4b88bdc 100644 --- a/blocksuite/affine/blocks/block-database/src/config.ts +++ b/blocksuite/affine/blocks/block-database/src/config.ts @@ -1,6 +1,6 @@ import type { MenuOptions } from '@blocksuite/affine-components/context-menu'; import { type DatabaseBlockModel } from '@blocksuite/affine-model'; -import { ConfigExtensionFactory } from '@blocksuite/block-std'; +import { ConfigExtensionFactory } from '@blocksuite/std'; export interface DatabaseOptionsConfig { configure: (model: DatabaseBlockModel, options: MenuOptions) => MenuOptions; diff --git a/blocksuite/affine/blocks/block-database/src/context/host-context.ts b/blocksuite/affine/blocks/block-database/src/context/host-context.ts index 642bf10e21..727a147c3a 100644 --- a/blocksuite/affine/blocks/block-database/src/context/host-context.ts +++ b/blocksuite/affine/blocks/block-database/src/context/host-context.ts @@ -1,5 +1,5 @@ -import type { EditorHost } from '@blocksuite/block-std'; import { createContextKey } from '@blocksuite/data-view'; +import type { EditorHost } from '@blocksuite/std'; export const HostContextKey = createContextKey( 'editor-host', diff --git a/blocksuite/affine/blocks/block-database/src/data-source.ts b/blocksuite/affine/blocks/block-database/src/data-source.ts index f16e236d5d..7d3650b146 100644 --- a/blocksuite/affine/blocks/block-database/src/data-source.ts +++ b/blocksuite/affine/blocks/block-database/src/data-source.ts @@ -9,7 +9,6 @@ import { insertPositionToIndex, type InsertToPosition, } from '@blocksuite/affine-shared/utils'; -import type { EditorHost } from '@blocksuite/block-std'; import { type DatabaseFlags, DataSourceBase, @@ -23,6 +22,7 @@ import { import { propertyPresets } from '@blocksuite/data-view/property-presets'; import { IS_MOBILE } from '@blocksuite/global/env'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +import type { EditorHost } from '@blocksuite/std'; import { type BlockModel } from '@blocksuite/store'; import { computed, type ReadonlySignal, signal } from '@preact/signals-core'; diff --git a/blocksuite/affine/blocks/block-database/src/database-block.ts b/blocksuite/affine/blocks/block-database/src/database-block.ts index ee501d1656..6b4aaefc6e 100644 --- a/blocksuite/affine/blocks/block-database/src/database-block.ts +++ b/blocksuite/affine/blocks/block-database/src/database-block.ts @@ -16,8 +16,6 @@ import { TelemetryProvider, } from '@blocksuite/affine-shared/services'; import { getDropResult } from '@blocksuite/affine-widget-drag-handle'; -import { type BlockComponent } from '@blocksuite/block-std'; -import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline'; import { createRecordDetail, createUniComponentFromWebComponent, @@ -40,6 +38,8 @@ import { DeleteIcon, MoreHorizontalIcon, } from '@blocksuite/icons/lit'; +import { type BlockComponent } from '@blocksuite/std'; +import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/std/inline'; import { Slice } from '@blocksuite/store'; import { autoUpdate } from '@floating-ui/dom'; import { computed, signal } from '@preact/signals-core'; diff --git a/blocksuite/affine/blocks/block-database/src/database-dnd-preview-block.ts b/blocksuite/affine/blocks/block-database/src/database-dnd-preview-block.ts index 215929fed6..a2b7f78702 100644 --- a/blocksuite/affine/blocks/block-database/src/database-dnd-preview-block.ts +++ b/blocksuite/affine/blocks/block-database/src/database-dnd-preview-block.ts @@ -1,7 +1,7 @@ import type { DatabaseBlockModel } from '@blocksuite/affine-model'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { BlockComponent } from '@blocksuite/block-std'; import { DatabaseListViewIcon } from '@blocksuite/icons/lit'; +import { BlockComponent } from '@blocksuite/std'; import { css, html } from 'lit'; export class DatabaseDndPreviewBlockComponent extends BlockComponent { diff --git a/blocksuite/affine/blocks/block-database/src/database-spec.ts b/blocksuite/affine/blocks/block-database/src/database-spec.ts index 1a4d0b6cdd..863db62e22 100644 --- a/blocksuite/affine/blocks/block-database/src/database-spec.ts +++ b/blocksuite/affine/blocks/block-database/src/database-spec.ts @@ -1,5 +1,5 @@ import { SlashMenuConfigExtension } from '@blocksuite/affine-widget-slash-menu'; -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-database/src/detail-panel/block-renderer.ts b/blocksuite/affine/blocks/block-database/src/detail-panel/block-renderer.ts index 08b72f5fb8..df07e3127e 100644 --- a/blocksuite/affine/blocks/block-database/src/detail-panel/block-renderer.ts +++ b/blocksuite/affine/blocks/block-database/src/detail-panel/block-renderer.ts @@ -1,12 +1,12 @@ import { DefaultInlineManagerExtension } from '@blocksuite/affine-inline-preset'; -import type { EditorHost } from '@blocksuite/block-std'; -import { ShadowlessElement } from '@blocksuite/block-std'; import type { DetailSlotProps } from '@blocksuite/data-view'; import type { KanbanSingleView, TableSingleView, } from '@blocksuite/data-view/view-presets'; import { WithDisposable } from '@blocksuite/global/lit'; +import type { EditorHost } from '@blocksuite/std'; +import { ShadowlessElement } from '@blocksuite/std'; import { cssVarV2 } from '@toeverything/theme/v2'; import { css, html, unsafeCSS } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-database/src/detail-panel/note-renderer.ts b/blocksuite/affine/blocks/block-database/src/detail-panel/note-renderer.ts index 2828a15030..a1494e23e9 100644 --- a/blocksuite/affine/blocks/block-database/src/detail-panel/note-renderer.ts +++ b/blocksuite/affine/blocks/block-database/src/detail-panel/note-renderer.ts @@ -9,9 +9,9 @@ import { REFERENCE_NODE } from '@blocksuite/affine-shared/consts'; import { TelemetryProvider } from '@blocksuite/affine-shared/services'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; import { createDefaultDoc, matchModels } from '@blocksuite/affine-shared/utils'; -import { type EditorHost, ShadowlessElement } from '@blocksuite/block-std'; import type { DetailSlotProps, SingleView } from '@blocksuite/data-view'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { type EditorHost, ShadowlessElement } from '@blocksuite/std'; import type { BaseTextAttributes } from '@blocksuite/store'; import { computed } from '@preact/signals-core'; import { cssVarV2 } from '@toeverything/theme/v2'; diff --git a/blocksuite/affine/blocks/block-database/tsconfig.json b/blocksuite/affine/blocks/block-database/tsconfig.json index c231481930..b96f024b7b 100644 --- a/blocksuite/affine/blocks/block-database/tsconfig.json +++ b/blocksuite/affine/blocks/block-database/tsconfig.json @@ -16,9 +16,9 @@ { "path": "../../shared" }, { "path": "../../widgets/widget-drag-handle" }, { "path": "../../widgets/widget-slash-menu" }, - { "path": "../../../framework/block-std" }, { "path": "../../data-view" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-divider/package.json b/blocksuite/affine/blocks/block-divider/package.json index b15f8f690e..43921927d2 100644 --- a/blocksuite/affine/blocks/block-divider/package.json +++ b/blocksuite/affine/blocks/block-divider/package.json @@ -13,8 +13,8 @@ "@blocksuite/affine-components": "workspace:*", "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/blocks/block-divider/src/divider-block.ts b/blocksuite/affine/blocks/block-divider/src/divider-block.ts index bc51fb295f..31b549b00d 100644 --- a/blocksuite/affine/blocks/block-divider/src/divider-block.ts +++ b/blocksuite/affine/blocks/block-divider/src/divider-block.ts @@ -1,7 +1,7 @@ import { CaptionedBlockComponent } from '@blocksuite/affine-components/caption'; import type { DividerBlockModel } from '@blocksuite/affine-model'; import { BLOCK_CHILDREN_CONTAINER_PADDING_LEFT } from '@blocksuite/affine-shared/consts'; -import { BlockSelection } from '@blocksuite/block-std'; +import { BlockSelection } from '@blocksuite/std'; import { html } from 'lit'; import { dividerBlockStyles } from './styles.js'; diff --git a/blocksuite/affine/blocks/block-divider/src/divider-spec.ts b/blocksuite/affine/blocks/block-divider/src/divider-spec.ts index a5b9949e06..04c27a86fb 100644 --- a/blocksuite/affine/blocks/block-divider/src/divider-spec.ts +++ b/blocksuite/affine/blocks/block-divider/src/divider-spec.ts @@ -1,4 +1,4 @@ -import { BlockViewExtension } from '@blocksuite/block-std'; +import { BlockViewExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-divider/tsconfig.json b/blocksuite/affine/blocks/block-divider/tsconfig.json index 1e2cb0da10..76a74f3404 100644 --- a/blocksuite/affine/blocks/block-divider/tsconfig.json +++ b/blocksuite/affine/blocks/block-divider/tsconfig.json @@ -10,8 +10,8 @@ { "path": "../../components" }, { "path": "../../model" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-edgeless-text/package.json b/blocksuite/affine/blocks/block-edgeless-text/package.json index a5ee7a5f64..b11b473d2f 100644 --- a/blocksuite/affine/blocks/block-edgeless-text/package.json +++ b/blocksuite/affine/blocks/block-edgeless-text/package.json @@ -17,9 +17,9 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/blocks/block-edgeless-text/src/commands/insert-edgeless-text.ts b/blocksuite/affine/blocks/block-edgeless-text/src/commands/insert-edgeless-text.ts index 44f5fb0517..e74a4686b7 100644 --- a/blocksuite/affine/blocks/block-edgeless-text/src/commands/insert-edgeless-text.ts +++ b/blocksuite/affine/blocks/block-edgeless-text/src/commands/insert-edgeless-text.ts @@ -3,9 +3,9 @@ import { getSurfaceBlock, } from '@blocksuite/affine-block-surface'; import { focusTextModel } from '@blocksuite/affine-rich-text'; -import type { Command } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; +import type { Command } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { EDGELESS_TEXT_BLOCK_MIN_HEIGHT, diff --git a/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-text-block.ts b/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-text-block.ts index 9782606a87..17a3197956 100644 --- a/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-text-block.ts +++ b/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-text-block.ts @@ -11,14 +11,14 @@ import { handleNativeRangeAtPoint, matchModels, } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent } from '@blocksuite/block-std'; +import { Bound, clamp } from '@blocksuite/global/gfx'; +import type { BlockComponent } from '@blocksuite/std'; import { BlockSelection, GfxBlockComponent, TextSelection, -} from '@blocksuite/block-std'; -import type { SelectedContext } from '@blocksuite/block-std/gfx'; -import { Bound, clamp } from '@blocksuite/global/gfx'; +} from '@blocksuite/std'; +import type { SelectedContext } from '@blocksuite/std/gfx'; import { css, html } from 'lit'; import { query, state } from 'lit/decorators.js'; import { type StyleInfo, styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-text-spec.ts b/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-text-spec.ts index d58b78da91..204b9f254f 100644 --- a/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-text-spec.ts +++ b/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-text-spec.ts @@ -1,4 +1,4 @@ -import { BlockViewExtension } from '@blocksuite/block-std'; +import { BlockViewExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-edgeless-text/src/edgelss-toolbar/config.ts b/blocksuite/affine/blocks/block-edgeless-text/src/edgelss-toolbar/config.ts index c2367624fc..fa78a0a4f5 100644 --- a/blocksuite/affine/blocks/block-edgeless-text/src/edgelss-toolbar/config.ts +++ b/blocksuite/affine/blocks/block-edgeless-text/src/edgelss-toolbar/config.ts @@ -4,7 +4,7 @@ import { ToolbarModuleExtension, } from '@blocksuite/affine-shared/services'; import { createTextActions } from '@blocksuite/affine-widget-edgeless-toolbar'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; export const edgelessTextToolbarConfig = { // No need to adjust element bounds, which updates itself using ResizeObserver diff --git a/blocksuite/affine/blocks/block-edgeless-text/tsconfig.json b/blocksuite/affine/blocks/block-edgeless-text/tsconfig.json index 0166f9138d..30bb600a75 100644 --- a/blocksuite/affine/blocks/block-edgeless-text/tsconfig.json +++ b/blocksuite/affine/blocks/block-edgeless-text/tsconfig.json @@ -14,8 +14,8 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/widget-edgeless-toolbar" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-embed/package.json b/blocksuite/affine/blocks/block-embed/package.json index 119081f479..3ec9836c72 100644 --- a/blocksuite/affine/blocks/block-embed/package.json +++ b/blocksuite/affine/blocks/block-embed/package.json @@ -17,9 +17,9 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/blocks/block-embed/src/common/embed-block-element.ts b/blocksuite/affine/blocks/block-embed/src/common/embed-block-element.ts index 6fea451b72..c09a541423 100644 --- a/blocksuite/affine/blocks/block-embed/src/common/embed-block-element.ts +++ b/blocksuite/affine/blocks/block-embed/src/common/embed-block-element.ts @@ -10,8 +10,8 @@ import { } from '@blocksuite/affine-shared/consts'; import { DocModeProvider } from '@blocksuite/affine-shared/services'; import { findAncestorModel } from '@blocksuite/affine-shared/utils'; -import type { BlockService } from '@blocksuite/block-std'; -import type { GfxCompatibleProps } from '@blocksuite/block-std/gfx'; +import type { BlockService } from '@blocksuite/std'; +import type { GfxCompatibleProps } from '@blocksuite/std/gfx'; import type { BlockModel } from '@blocksuite/store'; import { computed, type ReadonlySignal, signal } from '@preact/signals-core'; import type { TemplateResult } from 'lit'; diff --git a/blocksuite/affine/blocks/block-embed/src/common/insert-embed-card.ts b/blocksuite/affine/blocks/block-embed/src/common/insert-embed-card.ts index 6b7aa7d16b..74e746c2b6 100644 --- a/blocksuite/affine/blocks/block-embed/src/common/insert-embed-card.ts +++ b/blocksuite/affine/blocks/block-embed/src/common/insert-embed-card.ts @@ -7,14 +7,14 @@ import { EMBED_CARD_HEIGHT, EMBED_CARD_WIDTH, } from '@blocksuite/affine-shared/consts'; +import { Bound, Vec } from '@blocksuite/global/gfx'; import { BlockSelection, type BlockStdScope, SurfaceSelection, TextSelection, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; -import { Bound, Vec } from '@blocksuite/global/gfx'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; interface EmbedCardProperties { flavour: string; diff --git a/blocksuite/affine/blocks/block-embed/src/common/render-linked-doc.ts b/blocksuite/affine/blocks/block-embed/src/common/render-linked-doc.ts index d0233d817d..270dfc96c2 100644 --- a/blocksuite/affine/blocks/block-embed/src/common/render-linked-doc.ts +++ b/blocksuite/affine/blocks/block-embed/src/common/render-linked-doc.ts @@ -10,7 +10,7 @@ import { import { EMBED_CARD_HEIGHT } from '@blocksuite/affine-shared/consts'; import { NotificationProvider } from '@blocksuite/affine-shared/services'; import { matchModels, SpecProvider } from '@blocksuite/affine-shared/utils'; -import { BlockStdScope, EditorLifeCycleExtension } from '@blocksuite/block-std'; +import { BlockStdScope, EditorLifeCycleExtension } from '@blocksuite/std'; import { type BlockModel, type BlockSnapshot, diff --git a/blocksuite/affine/blocks/block-embed/src/common/to-edgeless-embed-block.ts b/blocksuite/affine/blocks/block-embed/src/common/to-edgeless-embed-block.ts index efff0983cf..a6699c17ca 100644 --- a/blocksuite/affine/blocks/block-embed/src/common/to-edgeless-embed-block.ts +++ b/blocksuite/affine/blocks/block-embed/src/common/to-edgeless-embed-block.ts @@ -1,16 +1,16 @@ import { EdgelessLegacySlotIdentifier } from '@blocksuite/affine-block-surface'; +import { Bound } from '@blocksuite/global/gfx'; import { blockComponentSymbol, type BlockService, type GfxBlockComponent, GfxElementSymbol, toGfxBlockComponent, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import type { GfxBlockElementModel, GfxCompatibleProps, -} from '@blocksuite/block-std/gfx'; -import { Bound } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import type { StyleInfo } from 'lit/directives/style-map.js'; import type { EmbedBlockComponent } from './embed-block-element.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/configs/toolbar.ts b/blocksuite/affine/blocks/block-embed/src/configs/toolbar.ts index 74735d6f2b..bfd82413d6 100644 --- a/blocksuite/affine/blocks/block-embed/src/configs/toolbar.ts +++ b/blocksuite/affine/blocks/block-embed/src/configs/toolbar.ts @@ -22,7 +22,6 @@ import { ToolbarModuleExtension, } from '@blocksuite/affine-shared/services'; import { getBlockProps } from '@blocksuite/affine-shared/utils'; -import { BlockFlavourIdentifier, BlockSelection } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; import { CaptionIcon, @@ -31,6 +30,7 @@ import { DuplicateIcon, ResetIcon, } from '@blocksuite/icons/lit'; +import { BlockFlavourIdentifier, BlockSelection } from '@blocksuite/std'; import { type ExtensionType, Slice, Text } from '@blocksuite/store'; import { computed, signal } from '@preact/signals-core'; import { html } from 'lit'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-figma-block/embed-figma-block.ts b/blocksuite/affine/blocks/block-embed/src/embed-figma-block/embed-figma-block.ts index b877c6789a..596cc1cd11 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-figma-block/embed-figma-block.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-figma-block/embed-figma-block.ts @@ -3,7 +3,7 @@ import type { EmbedFigmaModel, EmbedFigmaStyles, } from '@blocksuite/affine-model'; -import { BlockSelection } from '@blocksuite/block-std'; +import { BlockSelection } from '@blocksuite/std'; import { html, nothing } from 'lit'; import { classMap } from 'lit/directives/class-map.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-figma-block/embed-figma-spec.ts b/blocksuite/affine/blocks/block-embed/src/embed-figma-block/embed-figma-spec.ts index a41da4f259..39eb0a4671 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-figma-block/embed-figma-spec.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-figma-block/embed-figma-spec.ts @@ -1,6 +1,6 @@ import { EmbedFigmaBlockSchema } from '@blocksuite/affine-model'; import { SlashMenuConfigExtension } from '@blocksuite/affine-widget-slash-menu'; -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-github-block/embed-github-block.ts b/blocksuite/affine/blocks/block-embed/src/embed-github-block/embed-github-block.ts index a97763243a..7a5bbdc392 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-github-block/embed-github-block.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-github-block/embed-github-block.ts @@ -4,7 +4,7 @@ import type { EmbedGithubStyles, } from '@blocksuite/affine-model'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; -import { BlockSelection } from '@blocksuite/block-std'; +import { BlockSelection } from '@blocksuite/std'; import { html, nothing } from 'lit'; import { property } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-github-block/embed-github-service.ts b/blocksuite/affine/blocks/block-embed/src/embed-github-block/embed-github-service.ts index 0f3d257b8f..853522d70e 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-github-block/embed-github-service.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-github-block/embed-github-service.ts @@ -7,7 +7,7 @@ import { EmbedOptionConfig, LinkPreviewerService, } from '@blocksuite/affine-shared/services'; -import { BlockService } from '@blocksuite/block-std'; +import { BlockService } from '@blocksuite/std'; import { githubUrlRegex } from './embed-github-model.js'; import { queryEmbedGithubApiData, queryEmbedGithubData } from './utils.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-github-block/embed-github-spec.ts b/blocksuite/affine/blocks/block-embed/src/embed-github-block/embed-github-spec.ts index 1f97d360d6..9746c59683 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-github-block/embed-github-spec.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-github-block/embed-github-spec.ts @@ -1,6 +1,6 @@ import { EmbedGithubBlockSchema } from '@blocksuite/affine-model'; import { SlashMenuConfigExtension } from '@blocksuite/affine-widget-slash-menu'; -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-html-block/configs/toolbar.ts b/blocksuite/affine/blocks/block-embed/src/embed-html-block/configs/toolbar.ts index 4861c3a02d..a9f5645ea0 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-html-block/configs/toolbar.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-html-block/configs/toolbar.ts @@ -8,7 +8,6 @@ import { ToolbarModuleExtension, } from '@blocksuite/affine-shared/services'; import { getBlockProps } from '@blocksuite/affine-shared/utils'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; import { CaptionIcon, CopyIcon, @@ -16,6 +15,7 @@ import { DuplicateIcon, ExpandFullIcon, } from '@blocksuite/icons/lit'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; import { type ExtensionType, Slice } from '@blocksuite/store'; import { html } from 'lit'; import { keyed } from 'lit/directives/keyed.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-html-block/embed-html-block.ts b/blocksuite/affine/blocks/block-embed/src/embed-html-block/embed-html-block.ts index f8c038e169..3a003b1ea3 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-html-block/embed-html-block.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-html-block/embed-html-block.ts @@ -1,5 +1,5 @@ import type { EmbedHtmlModel, EmbedHtmlStyles } from '@blocksuite/affine-model'; -import { BlockSelection } from '@blocksuite/block-std'; +import { BlockSelection } from '@blocksuite/std'; import { html } from 'lit'; import { query } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-html-block/embed-html-spec.ts b/blocksuite/affine/blocks/block-embed/src/embed-html-block/embed-html-spec.ts index 8c13cd37fb..9bc7c06211 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-html-block/embed-html-spec.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-html-block/embed-html-spec.ts @@ -1,5 +1,5 @@ import { EmbedHtmlBlockSchema } from '@blocksuite/affine-model'; -import { BlockViewExtension } from '@blocksuite/block-std'; +import { BlockViewExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/commands/insert-embed-iframe-with-url.ts b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/commands/insert-embed-iframe-with-url.ts index 91f7513370..a481c3b3e7 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/commands/insert-embed-iframe-with-url.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/commands/insert-embed-iframe-with-url.ts @@ -3,14 +3,14 @@ import { SurfaceBlockComponent, } from '@blocksuite/affine-block-surface'; import { EmbedIframeService } from '@blocksuite/affine-shared/services'; +import { Bound, Vec } from '@blocksuite/global/gfx'; import { BlockSelection, type Command, SurfaceSelection, TextSelection, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; -import { Bound, Vec } from '@blocksuite/global/gfx'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { EMBED_IFRAME_DEFAULT_HEIGHT_IN_SURFACE, diff --git a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/commands/insert-empty-embed-iframe.ts b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/commands/insert-empty-embed-iframe.ts index cb48b925f4..9f49873cb1 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/commands/insert-empty-embed-iframe.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/commands/insert-empty-embed-iframe.ts @@ -1,5 +1,5 @@ import type { EmbedIframeBlockProps } from '@blocksuite/affine-model'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import type { EmbedLinkInputPopupOptions } from '../components/embed-iframe-link-input-popup'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-error-card.ts b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-error-card.ts index 5c5cbaf397..8f93938e19 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-error-card.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-error-card.ts @@ -1,9 +1,9 @@ import { createLitPortal } from '@blocksuite/affine-components/portal'; import type { EmbedIframeBlockModel } from '@blocksuite/affine-model'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import type { BlockStdScope } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; import { EditIcon, InformationIcon, ResetIcon } from '@blocksuite/icons/lit'; +import type { BlockStdScope } from '@blocksuite/std'; import { flip, offset } from '@floating-ui/dom'; import { baseTheme } from '@toeverything/theme'; import { css, html, LitElement, nothing, unsafeCSS } from 'lit'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-link-input-base.ts b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-link-input-base.ts index 19a7426172..9526292317 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-link-input-base.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-link-input-base.ts @@ -4,8 +4,8 @@ import { NotificationProvider, } from '@blocksuite/affine-shared/services'; import { isValidUrl, stopPropagation } from '@blocksuite/affine-shared/utils'; -import { BlockSelection, type BlockStdScope } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; +import { BlockSelection, type BlockStdScope } from '@blocksuite/std'; import { LitElement } from 'lit'; import { property, query, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-loading-card.ts b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-loading-card.ts index 4f29110d31..c0bb0432a4 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-loading-card.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-loading-card.ts @@ -1,7 +1,7 @@ import { ThemeProvider } from '@blocksuite/affine-shared/services'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { type BlockStdScope } from '@blocksuite/block-std'; import { EmbedIcon } from '@blocksuite/icons/lit'; +import { type BlockStdScope } from '@blocksuite/std'; import { css, html, LitElement } from 'lit'; import { property } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/configs/toolbar.ts b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/configs/toolbar.ts index 162531230f..4d4e74a024 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/configs/toolbar.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/configs/toolbar.ts @@ -17,7 +17,6 @@ import { ToolbarModuleExtension, } from '@blocksuite/affine-shared/services'; import { getBlockProps } from '@blocksuite/affine-shared/utils'; -import { BlockFlavourIdentifier, BlockSelection } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; import { CaptionIcon, @@ -28,6 +27,7 @@ import { OpenInNewIcon, ResetIcon, } from '@blocksuite/icons/lit'; +import { BlockFlavourIdentifier, BlockSelection } from '@blocksuite/std'; import { type ExtensionType, Slice, diff --git a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-edgeless-iframe-block.ts b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-edgeless-iframe-block.ts index 0b585d9de3..4122371781 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-edgeless-iframe-block.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-edgeless-iframe-block.ts @@ -1,6 +1,6 @@ import { EdgelessLegacySlotIdentifier } from '@blocksuite/affine-block-surface'; -import { toGfxBlockComponent } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; +import { toGfxBlockComponent } from '@blocksuite/std'; import { nothing } from 'lit'; import { styleMap } from 'lit/directives/style-map.js'; import { html } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-iframe-block.ts b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-iframe-block.ts index 51b0de70d2..7432746f9d 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-iframe-block.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-iframe-block.ts @@ -14,8 +14,8 @@ import { NotificationProvider, } from '@blocksuite/affine-shared/services'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import { BlockSelection } from '@blocksuite/block-std'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +import { BlockSelection } from '@blocksuite/std'; import { flip, offset, shift } from '@floating-ui/dom'; import { computed, diff --git a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-iframe-spec.ts b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-iframe-spec.ts index 784cc4b096..cca07abda3 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-iframe-spec.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-iframe-spec.ts @@ -1,6 +1,6 @@ import { EmbedIframeBlockSchema } from '@blocksuite/affine-model'; import { SlashMenuConfigExtension } from '@blocksuite/affine-widget-slash-menu'; -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/utils.ts b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/utils.ts index 6ff5c36aa4..5748e29b59 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/utils.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/utils.ts @@ -2,7 +2,7 @@ import { EmbedIframeService, FeatureFlagService, } from '@blocksuite/affine-shared/services'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; /** * The options for the embed iframe url validation diff --git a/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/commands/insert-embed-linked-doc.ts b/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/commands/insert-embed-linked-doc.ts index bc5dcf3d1a..c5a33b5284 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/commands/insert-embed-linked-doc.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/commands/insert-embed-linked-doc.ts @@ -1,5 +1,5 @@ import type { EmbedCardStyle, ReferenceParams } from '@blocksuite/affine-model'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import { insertEmbedCard } from '../../common/insert-embed-card.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/configs/toolbar.ts b/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/configs/toolbar.ts index ed5586ede6..6b113112e1 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/configs/toolbar.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/configs/toolbar.ts @@ -23,7 +23,6 @@ import { getBlockProps, referenceToNode, } from '@blocksuite/affine-shared/utils'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; import { CaptionIcon, @@ -33,6 +32,7 @@ import { ExpandFullIcon, OpenInNewIcon, } from '@blocksuite/icons/lit'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; import { type ExtensionType, Slice } from '@blocksuite/store'; import { computed, signal } from '@preact/signals-core'; import { html } from 'lit'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/embed-linked-doc-block.ts b/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/embed-linked-doc-block.ts index 672757bbad..992de2dd10 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/embed-linked-doc-block.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/embed-linked-doc-block.ts @@ -26,8 +26,8 @@ import { matchModels, referenceToNode, } from '@blocksuite/affine-shared/utils'; -import { BlockSelection } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; +import { BlockSelection } from '@blocksuite/std'; import { Text } from '@blocksuite/store'; import { computed } from '@preact/signals-core'; import { html, nothing } from 'lit'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/embed-linked-doc-spec.ts b/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/embed-linked-doc-spec.ts index 239912b00d..5ccb624457 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/embed-linked-doc-spec.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-linked-doc-block/embed-linked-doc-spec.ts @@ -1,5 +1,5 @@ import { EmbedLinkedDocBlockSchema } from '@blocksuite/affine-model'; -import { BlockViewExtension } from '@blocksuite/block-std'; +import { BlockViewExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-loom-block/embed-loom-block.ts b/blocksuite/affine/blocks/block-embed/src/embed-loom-block/embed-loom-block.ts index d56f3bc880..7ca561bf78 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-loom-block/embed-loom-block.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-loom-block/embed-loom-block.ts @@ -1,7 +1,7 @@ import { OpenIcon } from '@blocksuite/affine-components/icons'; import type { EmbedLoomModel, EmbedLoomStyles } from '@blocksuite/affine-model'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; -import { BlockSelection } from '@blocksuite/block-std'; +import { BlockSelection } from '@blocksuite/std'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-loom-block/embed-loom-service.ts b/blocksuite/affine/blocks/block-embed/src/embed-loom-block/embed-loom-service.ts index 830bc75ff9..405cea65b1 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-loom-block/embed-loom-service.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-loom-block/embed-loom-service.ts @@ -4,7 +4,7 @@ import { EmbedLoomStyles, } from '@blocksuite/affine-model'; import { EmbedOptionConfig } from '@blocksuite/affine-shared/services'; -import { BlockService } from '@blocksuite/block-std'; +import { BlockService } from '@blocksuite/std'; import { loomUrlRegex } from './embed-loom-model.js'; import { queryEmbedLoomData } from './utils.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-loom-block/embed-loom-spec.ts b/blocksuite/affine/blocks/block-embed/src/embed-loom-block/embed-loom-spec.ts index 4edf2d877d..5a6b269430 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-loom-block/embed-loom-spec.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-loom-block/embed-loom-spec.ts @@ -1,6 +1,6 @@ import { EmbedLoomBlockSchema } from '@blocksuite/affine-model'; import { SlashMenuConfigExtension } from '@blocksuite/affine-widget-slash-menu'; -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/components/embed-synced-doc-card.ts b/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/components/embed-synced-doc-card.ts index aa4866b3b9..98cdcf3c6d 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/components/embed-synced-doc-card.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/components/embed-synced-doc-card.ts @@ -1,10 +1,10 @@ import { ThemeProvider } from '@blocksuite/affine-shared/services'; +import { WithDisposable } from '@blocksuite/global/lit'; import { BlockSelection, isGfxBlockComponent, ShadowlessElement, -} from '@blocksuite/block-std'; -import { WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; import { html, nothing } from 'lit'; import { property, queryAsync } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/configs/toolbar.ts b/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/configs/toolbar.ts index 5f978c502a..1bceb29dc3 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/configs/toolbar.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/configs/toolbar.ts @@ -12,7 +12,6 @@ import { ToolbarModuleExtension, } from '@blocksuite/affine-shared/services'; import { getBlockProps } from '@blocksuite/affine-shared/utils'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; import { CaptionIcon, @@ -22,6 +21,7 @@ import { ExpandFullIcon, OpenInNewIcon, } from '@blocksuite/icons/lit'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; import { type ExtensionType, Slice } from '@blocksuite/store'; import { computed, signal } from '@preact/signals-core'; import { html } from 'lit'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-edgeless-synced-doc-block.ts b/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-edgeless-synced-doc-block.ts index c7417fb2bb..00446dd284 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-edgeless-synced-doc-block.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-edgeless-synced-doc-block.ts @@ -11,8 +11,8 @@ import { ThemeExtensionIdentifier, ThemeProvider, } from '@blocksuite/affine-shared/services'; -import { BlockStdScope } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; +import { BlockStdScope } from '@blocksuite/std'; import { html, nothing } from 'lit'; import { choose } from 'lit/directives/choose.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-block.ts b/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-block.ts index d82fb12740..c0b4c87420 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-block.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-block.ts @@ -24,17 +24,14 @@ import { cloneReferenceInfo, SpecProvider, } from '@blocksuite/affine-shared/utils'; +import { Bound, getCommonBound } from '@blocksuite/global/gfx'; import { BlockSelection, BlockStdScope, type EditorHost, LifeCycleWatcher, -} from '@blocksuite/block-std'; -import { - GfxControllerIdentifier, - GfxExtension, -} from '@blocksuite/block-std/gfx'; -import { Bound, getCommonBound } from '@blocksuite/global/gfx'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier, GfxExtension } from '@blocksuite/std/gfx'; import { type GetBlocksOptions, type Query, Text } from '@blocksuite/store'; import { computed, signal } from '@preact/signals-core'; import { html, nothing, type PropertyValues } from 'lit'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-spec.ts b/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-spec.ts index 081bdbda17..e4e0c31de1 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-spec.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-spec.ts @@ -1,5 +1,5 @@ import { EmbedSyncedDocBlockSchema } from '@blocksuite/affine-model'; -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-youtube-block/embed-youtube-block.ts b/blocksuite/affine/blocks/block-embed/src/embed-youtube-block/embed-youtube-block.ts index 451c2ca9af..ebebeb1d39 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-youtube-block/embed-youtube-block.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-youtube-block/embed-youtube-block.ts @@ -4,7 +4,7 @@ import type { EmbedYoutubeStyles, } from '@blocksuite/affine-model'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; -import { BlockSelection } from '@blocksuite/block-std'; +import { BlockSelection } from '@blocksuite/std'; import { html, nothing } from 'lit'; import { property, state } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-youtube-block/embed-youtube-service.ts b/blocksuite/affine/blocks/block-embed/src/embed-youtube-block/embed-youtube-service.ts index 316c75212f..d0b47be546 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-youtube-block/embed-youtube-service.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-youtube-block/embed-youtube-service.ts @@ -7,7 +7,7 @@ import { EmbedOptionConfig, LinkPreviewerService, } from '@blocksuite/affine-shared/services'; -import { BlockService } from '@blocksuite/block-std'; +import { BlockService } from '@blocksuite/std'; import { youtubeUrlRegex } from './embed-youtube-model.js'; import { queryEmbedYoutubeData } from './utils.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/embed-youtube-block/embed-youtube-spec.ts b/blocksuite/affine/blocks/block-embed/src/embed-youtube-block/embed-youtube-spec.ts index 101f79ce4f..1344d72949 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-youtube-block/embed-youtube-spec.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-youtube-block/embed-youtube-spec.ts @@ -1,6 +1,6 @@ import { EmbedYoutubeBlockSchema } from '@blocksuite/affine-model'; import { SlashMenuConfigExtension } from '@blocksuite/affine-widget-slash-menu'; -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-embed/src/types.ts b/blocksuite/affine/blocks/block-embed/src/types.ts index a8cf14f8cd..63950f84b8 100644 --- a/blocksuite/affine/blocks/block-embed/src/types.ts +++ b/blocksuite/affine/blocks/block-embed/src/types.ts @@ -1,4 +1,4 @@ -import type { BlockComponent } from '@blocksuite/block-std'; +import type { BlockComponent } from '@blocksuite/std'; import { EmbedFigmaBlockComponent } from './embed-figma-block'; import { EmbedGithubBlockComponent } from './embed-github-block'; diff --git a/blocksuite/affine/blocks/block-embed/tsconfig.json b/blocksuite/affine/blocks/block-embed/tsconfig.json index dec8de5499..2e8687f03a 100644 --- a/blocksuite/affine/blocks/block-embed/tsconfig.json +++ b/blocksuite/affine/blocks/block-embed/tsconfig.json @@ -14,8 +14,8 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/widget-slash-menu" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-frame/package.json b/blocksuite/affine/blocks/block-frame/package.json index 4319886e0a..f980634160 100644 --- a/blocksuite/affine/blocks/block-frame/package.json +++ b/blocksuite/affine/blocks/block-frame/package.json @@ -16,9 +16,9 @@ "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*", "@blocksuite/affine-widget-frame-title": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/blocks/block-frame/src/edgeless-toolbar/frame-menu.ts b/blocksuite/affine/blocks/block-frame/src/edgeless-toolbar/frame-menu.ts index ed63d38490..8655a7b680 100644 --- a/blocksuite/affine/blocks/block-frame/src/edgeless-toolbar/frame-menu.ts +++ b/blocksuite/affine/blocks/block-frame/src/edgeless-toolbar/frame-menu.ts @@ -1,5 +1,5 @@ import { EdgelessToolbarToolMixin } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx'; +import type { GfxToolsFullOptionValue } from '@blocksuite/std/gfx'; import { css, html, LitElement } from 'lit'; import { repeat } from 'lit/directives/repeat.js'; diff --git a/blocksuite/affine/blocks/block-frame/src/edgeless-toolbar/frame-tool-button.ts b/blocksuite/affine/blocks/block-frame/src/edgeless-toolbar/frame-tool-button.ts index b6a801f135..c6a3763010 100644 --- a/blocksuite/affine/blocks/block-frame/src/edgeless-toolbar/frame-tool-button.ts +++ b/blocksuite/affine/blocks/block-frame/src/edgeless-toolbar/frame-tool-button.ts @@ -1,6 +1,6 @@ import { QuickToolMixin } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx'; import { FrameIcon } from '@blocksuite/icons/lit'; +import type { GfxToolsFullOptionValue } from '@blocksuite/std/gfx'; import { css, html, LitElement } from 'lit'; export class EdgelessFrameToolButton extends QuickToolMixin(LitElement) { diff --git a/blocksuite/affine/blocks/block-frame/src/edgeless-toolbar/presentation-toolbar.ts b/blocksuite/affine/blocks/block-frame/src/edgeless-toolbar/presentation-toolbar.ts index 349a2e354d..bc796525c6 100644 --- a/blocksuite/affine/blocks/block-frame/src/edgeless-toolbar/presentation-toolbar.ts +++ b/blocksuite/affine/blocks/block-frame/src/edgeless-toolbar/presentation-toolbar.ts @@ -6,8 +6,6 @@ import { ViewportElementProvider, } from '@blocksuite/affine-shared/services'; import { EdgelessToolbarToolMixin } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { BlockComponent } from '@blocksuite/block-std'; -import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx'; import { Bound, clamp } from '@blocksuite/global/gfx'; import { SignalWatcher } from '@blocksuite/global/lit'; import { @@ -17,6 +15,8 @@ import { StartPointArrowIcon, StopAiIcon, } from '@blocksuite/icons/lit'; +import type { BlockComponent } from '@blocksuite/std'; +import type { GfxToolsFullOptionValue } from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import { cssVar } from '@toeverything/theme'; import { css, html, LitElement, nothing, type PropertyValues } from 'lit'; diff --git a/blocksuite/affine/blocks/block-frame/src/frame-block.ts b/blocksuite/affine/blocks/block-frame/src/frame-block.ts index f05222db48..5b7415eb11 100644 --- a/blocksuite/affine/blocks/block-frame/src/frame-block.ts +++ b/blocksuite/affine/blocks/block-frame/src/frame-block.ts @@ -1,8 +1,8 @@ import { DefaultTheme, type FrameBlockModel } from '@blocksuite/affine-model'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; -import { GfxBlockComponent } from '@blocksuite/block-std'; -import type { SelectedContext } from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; +import { GfxBlockComponent } from '@blocksuite/std'; +import type { SelectedContext } from '@blocksuite/std/gfx'; import { cssVarV2 } from '@toeverything/theme/v2'; import { html } from 'lit'; import { state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-frame/src/frame-highlight-manager.ts b/blocksuite/affine/blocks/block-frame/src/frame-highlight-manager.ts index a15f359e00..a0f021fe3d 100644 --- a/blocksuite/affine/blocks/block-frame/src/frame-highlight-manager.ts +++ b/blocksuite/affine/blocks/block-frame/src/frame-highlight-manager.ts @@ -11,7 +11,7 @@ import { getTopElements, GfxExtensionIdentifier, TransformExtension, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; import { type EdgelessFrameManager, diff --git a/blocksuite/affine/blocks/block-frame/src/frame-manager.ts b/blocksuite/affine/blocks/block-frame/src/frame-manager.ts index 7bfc4849f8..ef5b695550 100644 --- a/blocksuite/affine/blocks/block-frame/src/frame-manager.ts +++ b/blocksuite/affine/blocks/block-frame/src/frame-manager.ts @@ -2,6 +2,14 @@ import type { SurfaceBlockModel } from '@blocksuite/affine-block-surface'; import { Overlay } from '@blocksuite/affine-block-surface'; import type { FrameBlockModel } from '@blocksuite/affine-model'; import { EditPropsStore } from '@blocksuite/affine-shared/services'; +import { DisposableGroup } from '@blocksuite/global/disposable'; +import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +import { + Bound, + deserializeXYWH, + type IVec, + type SerializedXYWH, +} from '@blocksuite/global/gfx'; import { generateKeyBetweenV2, getTopElements, @@ -12,15 +20,7 @@ import { type GfxModel, isGfxGroupCompatibleModel, renderableInEdgeless, -} from '@blocksuite/block-std/gfx'; -import { DisposableGroup } from '@blocksuite/global/disposable'; -import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; -import { - Bound, - deserializeXYWH, - type IVec, - type SerializedXYWH, -} from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import { type BlockModel, Text } from '@blocksuite/store'; import * as Y from 'yjs'; diff --git a/blocksuite/affine/blocks/block-frame/src/frame-spec.ts b/blocksuite/affine/blocks/block-frame/src/frame-spec.ts index 0e21a6905a..07e2a0c23c 100644 --- a/blocksuite/affine/blocks/block-frame/src/frame-spec.ts +++ b/blocksuite/affine/blocks/block-frame/src/frame-spec.ts @@ -1,5 +1,5 @@ import { FrameBlockSchema } from '@blocksuite/affine-model'; -import { BlockViewExtension } from '@blocksuite/block-std'; +import { BlockViewExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-frame/src/frame-tool.ts b/blocksuite/affine/blocks/block-frame/src/frame-tool.ts index 1509b0fbba..805219bec1 100644 --- a/blocksuite/affine/blocks/block-frame/src/frame-tool.ts +++ b/blocksuite/affine/blocks/block-frame/src/frame-tool.ts @@ -4,10 +4,10 @@ import { EditPropsStore, TelemetryProvider, } from '@blocksuite/affine-shared/services'; -import type { PointerEventState } from '@blocksuite/block-std'; -import { BaseTool, getTopElements } from '@blocksuite/block-std/gfx'; import type { IPoint, IVec } from '@blocksuite/global/gfx'; import { Bound, Vec } from '@blocksuite/global/gfx'; +import type { PointerEventState } from '@blocksuite/std'; +import { BaseTool, getTopElements } from '@blocksuite/std/gfx'; import { Text } from '@blocksuite/store'; import * as Y from 'yjs'; diff --git a/blocksuite/affine/blocks/block-frame/src/frame-toolbar.ts b/blocksuite/affine/blocks/block-frame/src/frame-toolbar.ts index 57e8c897da..471947108b 100644 --- a/blocksuite/affine/blocks/block-frame/src/frame-toolbar.ts +++ b/blocksuite/affine/blocks/block-frame/src/frame-toolbar.ts @@ -25,13 +25,10 @@ import { matchModels, } from '@blocksuite/affine-shared/utils'; import { mountFrameTitleEditor } from '@blocksuite/affine-widget-frame-title'; -import { - type BlockComponent, - BlockFlavourIdentifier, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; import { EditIcon, PageIcon, UngroupIcon } from '@blocksuite/icons/lit'; +import { type BlockComponent, BlockFlavourIdentifier } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import type { ExtensionType } from '@blocksuite/store'; import { html } from 'lit'; diff --git a/blocksuite/affine/blocks/block-frame/src/index.ts b/blocksuite/affine/blocks/block-frame/src/index.ts index 49a8c0fe05..404352994d 100644 --- a/blocksuite/affine/blocks/block-frame/src/index.ts +++ b/blocksuite/affine/blocks/block-frame/src/index.ts @@ -10,7 +10,7 @@ export * from './frame-tool'; export * from './frame-toolbar'; export * from './preset-tool'; -declare module '@blocksuite/block-std/gfx' { +declare module '@blocksuite/std/gfx' { interface GfxToolsMap { frameNavigator: PresentTool; frame: FrameTool; diff --git a/blocksuite/affine/blocks/block-frame/src/present/frame-order-button.ts b/blocksuite/affine/blocks/block-frame/src/present/frame-order-button.ts index 51b875acbd..fc79be5a52 100644 --- a/blocksuite/affine/blocks/block-frame/src/present/frame-order-button.ts +++ b/blocksuite/affine/blocks/block-frame/src/present/frame-order-button.ts @@ -1,8 +1,8 @@ import type { FrameBlockModel } from '@blocksuite/affine-model'; import { createButtonPopper } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; import { LayerIcon } from '@blocksuite/icons/lit'; +import type { BlockComponent } from '@blocksuite/std'; import { css, html, LitElement } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-frame/src/present/frame-order-menu.ts b/blocksuite/affine/blocks/block-frame/src/present/frame-order-menu.ts index 56b26d919f..206e7742bb 100644 --- a/blocksuite/affine/blocks/block-frame/src/present/frame-order-menu.ts +++ b/blocksuite/affine/blocks/block-frame/src/present/frame-order-menu.ts @@ -1,8 +1,8 @@ import { EdgelessCRUDIdentifier } from '@blocksuite/affine-block-surface'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { generateKeyBetweenV2 } from '@blocksuite/block-std/gfx'; import { DisposableGroup } from '@blocksuite/global/disposable'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import type { BlockComponent } from '@blocksuite/std'; +import { generateKeyBetweenV2 } from '@blocksuite/std/gfx'; import { css, html, LitElement, nothing } from 'lit'; import { property, query, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; diff --git a/blocksuite/affine/blocks/block-frame/src/present/navigator-setting-button.ts b/blocksuite/affine/blocks/block-frame/src/present/navigator-setting-button.ts index 52ed0276ab..0dddd3161b 100644 --- a/blocksuite/affine/blocks/block-frame/src/present/navigator-setting-button.ts +++ b/blocksuite/affine/blocks/block-frame/src/present/navigator-setting-button.ts @@ -1,9 +1,9 @@ import { EdgelessLegacySlotIdentifier } from '@blocksuite/affine-block-surface'; import { EditPropsStore } from '@blocksuite/affine-shared/services'; import { createButtonPopper } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; import { SettingsIcon } from '@blocksuite/icons/lit'; +import type { BlockComponent } from '@blocksuite/std'; import { css, html, LitElement, nothing } from 'lit'; import { property, query, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-frame/src/present/present-button.ts b/blocksuite/affine/blocks/block-frame/src/present/present-button.ts index 85ae7f169a..a502bf6ad5 100644 --- a/blocksuite/affine/blocks/block-frame/src/present/present-button.ts +++ b/blocksuite/affine/blocks/block-frame/src/present/present-button.ts @@ -2,8 +2,8 @@ import { EdgelessToolbarToolMixin, QuickToolMixin, } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx'; import { PresentationIcon } from '@blocksuite/icons/lit'; +import type { GfxToolsFullOptionValue } from '@blocksuite/std/gfx'; import { css, html, LitElement } from 'lit'; export class EdgelessPresentButton extends QuickToolMixin( diff --git a/blocksuite/affine/blocks/block-frame/src/preset-tool.ts b/blocksuite/affine/blocks/block-frame/src/preset-tool.ts index 236e916612..3576e87047 100644 --- a/blocksuite/affine/blocks/block-frame/src/preset-tool.ts +++ b/blocksuite/affine/blocks/block-frame/src/preset-tool.ts @@ -1,4 +1,4 @@ -import { BaseTool } from '@blocksuite/block-std/gfx'; +import { BaseTool } from '@blocksuite/std/gfx'; import type { NavigatorMode } from './frame-manager'; diff --git a/blocksuite/affine/blocks/block-frame/tsconfig.json b/blocksuite/affine/blocks/block-frame/tsconfig.json index 04c8d82d8c..396b138a4f 100644 --- a/blocksuite/affine/blocks/block-frame/tsconfig.json +++ b/blocksuite/affine/blocks/block-frame/tsconfig.json @@ -13,8 +13,8 @@ { "path": "../../shared" }, { "path": "../../widgets/widget-edgeless-toolbar" }, { "path": "../../widgets/widget-frame-title" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-image/package.json b/blocksuite/affine/blocks/block-image/package.json index 31e670b515..1a78a8845e 100644 --- a/blocksuite/affine/blocks/block-image/package.json +++ b/blocksuite/affine/blocks/block-image/package.json @@ -16,9 +16,9 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/blocks/block-image/src/commands/insert-images.ts b/blocksuite/affine/blocks/block-image/src/commands/insert-images.ts index 9b8ac41ebd..4bbfe275c1 100644 --- a/blocksuite/affine/blocks/block-image/src/commands/insert-images.ts +++ b/blocksuite/affine/blocks/block-image/src/commands/insert-images.ts @@ -1,6 +1,6 @@ import { FileSizeLimitService } from '@blocksuite/affine-shared/services'; import { getImageFilesFromLocal } from '@blocksuite/affine-shared/utils'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { addSiblingImageBlock } from '../utils.js'; diff --git a/blocksuite/affine/blocks/block-image/src/components/image-block-fallback.ts b/blocksuite/affine/blocks/block-image/src/components/image-block-fallback.ts index 11d03b603e..6347c05f52 100644 --- a/blocksuite/affine/blocks/block-image/src/components/image-block-fallback.ts +++ b/blocksuite/affine/blocks/block-image/src/components/image-block-fallback.ts @@ -1,7 +1,7 @@ import type { ImageBlockModel } from '@blocksuite/affine-model'; import { humanFileSize } from '@blocksuite/affine-shared/utils'; -import { modelContext, ShadowlessElement } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; +import { modelContext, ShadowlessElement } from '@blocksuite/std'; import { consume } from '@lit/context'; import { css, html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-image/src/components/page-image-block.ts b/blocksuite/affine/blocks/block-image/src/components/page-image-block.ts index d4a80d34be..64851d90cb 100644 --- a/blocksuite/affine/blocks/block-image/src/components/page-image-block.ts +++ b/blocksuite/affine/blocks/block-image/src/components/page-image-block.ts @@ -5,16 +5,13 @@ import { getPrevBlockCommand, } from '@blocksuite/affine-shared/commands'; import { ImageSelection } from '@blocksuite/affine-shared/selection'; -import type { - BlockComponent, - UIEventStateContext, -} from '@blocksuite/block-std'; +import { WithDisposable } from '@blocksuite/global/lit'; +import type { BlockComponent, UIEventStateContext } from '@blocksuite/std'; import { BlockSelection, ShadowlessElement, TextSelection, -} from '@blocksuite/block-std'; -import { WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; import type { BaseSelection } from '@blocksuite/store'; import { css, html, type PropertyValues } from 'lit'; import { property, query, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-image/src/configs/toolbar.ts b/blocksuite/affine/blocks/block-image/src/configs/toolbar.ts index 71d9586682..2fd97b7e11 100644 --- a/blocksuite/affine/blocks/block-image/src/configs/toolbar.ts +++ b/blocksuite/affine/blocks/block-image/src/configs/toolbar.ts @@ -3,8 +3,8 @@ import { type ToolbarModuleConfig, ToolbarModuleExtension, } from '@blocksuite/affine-shared/services'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; import { CaptionIcon, DownloadIcon } from '@blocksuite/icons/lit'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { ImageEdgelessBlockComponent } from '../image-edgeless-block'; diff --git a/blocksuite/affine/blocks/block-image/src/image-block.ts b/blocksuite/affine/blocks/block-image/src/image-block.ts index 3455221a5d..230a857d87 100644 --- a/blocksuite/affine/blocks/block-image/src/image-block.ts +++ b/blocksuite/affine/blocks/block-image/src/image-block.ts @@ -1,8 +1,8 @@ import { CaptionedBlockComponent } from '@blocksuite/affine-components/caption'; import { Peekable } from '@blocksuite/affine-components/peek'; import type { ImageBlockModel } from '@blocksuite/affine-model'; -import { BlockSelection } from '@blocksuite/block-std'; import { IS_MOBILE } from '@blocksuite/global/env'; +import { BlockSelection } from '@blocksuite/std'; import { html } from 'lit'; import { property, query, state } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/blocks/block-image/src/image-edgeless-block.ts b/blocksuite/affine/blocks/block-image/src/image-edgeless-block.ts index ce8d840d9a..4bbf872b92 100644 --- a/blocksuite/affine/blocks/block-image/src/image-edgeless-block.ts +++ b/blocksuite/affine/blocks/block-image/src/image-edgeless-block.ts @@ -1,7 +1,7 @@ import type { BlockCaptionEditor } from '@blocksuite/affine-components/caption'; import { Peekable } from '@blocksuite/affine-components/peek'; import type { ImageBlockModel } from '@blocksuite/affine-model'; -import { GfxBlockComponent } from '@blocksuite/block-std'; +import { GfxBlockComponent } from '@blocksuite/std'; import { css, html } from 'lit'; import { property, query, state } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/blocks/block-image/src/image-resize-manager.ts b/blocksuite/affine/blocks/block-image/src/image-resize-manager.ts index 1e32eb3f43..e076ce5103 100644 --- a/blocksuite/affine/blocks/block-image/src/image-resize-manager.ts +++ b/blocksuite/affine/blocks/block-image/src/image-resize-manager.ts @@ -3,8 +3,8 @@ import { getClosestBlockComponentByElement, getModelByElement, } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent, PointerEventState } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; +import type { BlockComponent, PointerEventState } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; export class ImageResizeManager { private _activeComponent: BlockComponent | null = null; diff --git a/blocksuite/affine/blocks/block-image/src/image-service.ts b/blocksuite/affine/blocks/block-image/src/image-service.ts index f5e176944a..70cdb60006 100644 --- a/blocksuite/affine/blocks/block-image/src/image-service.ts +++ b/blocksuite/affine/blocks/block-image/src/image-service.ts @@ -9,7 +9,7 @@ import { isInsideEdgelessEditor, matchModels, } from '@blocksuite/affine-shared/utils'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { addImages, addSiblingImageBlock } from './utils.js'; diff --git a/blocksuite/affine/blocks/block-image/src/image-spec.ts b/blocksuite/affine/blocks/block-image/src/image-spec.ts index 99b8e0c0fc..f0d692ccad 100644 --- a/blocksuite/affine/blocks/block-image/src/image-spec.ts +++ b/blocksuite/affine/blocks/block-image/src/image-spec.ts @@ -4,7 +4,7 @@ import { BlockViewExtension, FlavourExtension, WidgetViewExtension, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-image/src/preview-image/edgeless.ts b/blocksuite/affine/blocks/block-image/src/preview-image/edgeless.ts index 56b2c55f43..32a01fe159 100644 --- a/blocksuite/affine/blocks/block-image/src/preview-image/edgeless.ts +++ b/blocksuite/affine/blocks/block-image/src/preview-image/edgeless.ts @@ -1,4 +1,4 @@ -import { toGfxBlockComponent } from '@blocksuite/block-std'; +import { toGfxBlockComponent } from '@blocksuite/std'; import { css } from 'lit'; import { ImagePlaceholderBlockComponent } from './page.js'; diff --git a/blocksuite/affine/blocks/block-image/src/preview-image/page.ts b/blocksuite/affine/blocks/block-image/src/preview-image/page.ts index 8b20173da6..d561bc9d49 100644 --- a/blocksuite/affine/blocks/block-image/src/preview-image/page.ts +++ b/blocksuite/affine/blocks/block-image/src/preview-image/page.ts @@ -1,7 +1,7 @@ import type { ImageBlockModel } from '@blocksuite/affine-model'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { BlockComponent } from '@blocksuite/block-std'; import { ImageIcon } from '@blocksuite/icons/lit'; +import { BlockComponent } from '@blocksuite/std'; import { css, html } from 'lit'; export class ImagePlaceholderBlockComponent extends BlockComponent { diff --git a/blocksuite/affine/blocks/block-image/src/utils.ts b/blocksuite/affine/blocks/block-image/src/utils.ts index d233f7e03a..5d0324aa44 100644 --- a/blocksuite/affine/blocks/block-image/src/utils.ts +++ b/blocksuite/affine/blocks/block-image/src/utils.ts @@ -16,9 +16,9 @@ import { transformModel, withTempBlobData, } from '@blocksuite/affine-shared/utils'; -import type { BlockStdScope, EditorHost } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { Bound, type IVec, Point, Vec } from '@blocksuite/global/gfx'; +import type { BlockStdScope, EditorHost } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import type { BlockModel } from '@blocksuite/store'; import { diff --git a/blocksuite/affine/blocks/block-image/tsconfig.json b/blocksuite/affine/blocks/block-image/tsconfig.json index 7dff15976a..868a19309a 100644 --- a/blocksuite/affine/blocks/block-image/tsconfig.json +++ b/blocksuite/affine/blocks/block-image/tsconfig.json @@ -13,8 +13,8 @@ { "path": "../../model" }, { "path": "../../shared" }, { "path": "../../widgets/widget-slash-menu" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-latex/package.json b/blocksuite/affine/blocks/block-latex/package.json index 0fa7703c33..472bca1da1 100644 --- a/blocksuite/affine/blocks/block-latex/package.json +++ b/blocksuite/affine/blocks/block-latex/package.json @@ -17,9 +17,9 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/blocks/block-latex/src/commands.ts b/blocksuite/affine/blocks/block-latex/src/commands.ts index d30a27a1c3..c2bfc2ed27 100644 --- a/blocksuite/affine/blocks/block-latex/src/commands.ts +++ b/blocksuite/affine/blocks/block-latex/src/commands.ts @@ -1,5 +1,5 @@ import type { LatexProps } from '@blocksuite/affine-model'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { LatexBlockComponent } from './latex-block.js'; diff --git a/blocksuite/affine/blocks/block-latex/src/latex-block.ts b/blocksuite/affine/blocks/block-latex/src/latex-block.ts index 1cceb6bd90..05415bdfa8 100644 --- a/blocksuite/affine/blocks/block-latex/src/latex-block.ts +++ b/blocksuite/affine/blocks/block-latex/src/latex-block.ts @@ -2,7 +2,7 @@ import { selectBlock } from '@blocksuite/affine-block-note'; import { CaptionedBlockComponent } from '@blocksuite/affine-components/caption'; import { createLitPortal } from '@blocksuite/affine-components/portal'; import type { LatexBlockModel } from '@blocksuite/affine-model'; -import { BlockSelection } from '@blocksuite/block-std'; +import { BlockSelection } from '@blocksuite/std'; import type { Placement } from '@floating-ui/dom'; import { effect } from '@preact/signals-core'; import katex from 'katex'; diff --git a/blocksuite/affine/blocks/block-latex/src/latex-spec.ts b/blocksuite/affine/blocks/block-latex/src/latex-spec.ts index 06c22844e0..151876c3fa 100644 --- a/blocksuite/affine/blocks/block-latex/src/latex-spec.ts +++ b/blocksuite/affine/blocks/block-latex/src/latex-spec.ts @@ -1,5 +1,5 @@ import { SlashMenuConfigExtension } from '@blocksuite/affine-widget-slash-menu'; -import { BlockViewExtension } from '@blocksuite/block-std'; +import { BlockViewExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-latex/tsconfig.json b/blocksuite/affine/blocks/block-latex/tsconfig.json index 83790cc158..e41067eb2e 100644 --- a/blocksuite/affine/blocks/block-latex/tsconfig.json +++ b/blocksuite/affine/blocks/block-latex/tsconfig.json @@ -14,8 +14,8 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/widget-slash-menu" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-list/package.json b/blocksuite/affine/blocks/block-list/package.json index d5ebc67970..aa80b49c35 100644 --- a/blocksuite/affine/blocks/block-list/package.json +++ b/blocksuite/affine/blocks/block-list/package.json @@ -15,9 +15,9 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/blocks/block-list/src/commands/convert-to-numbered-list.ts b/blocksuite/affine/blocks/block-list/src/commands/convert-to-numbered-list.ts index 42e4b6761c..ae5f29396b 100644 --- a/blocksuite/affine/blocks/block-list/src/commands/convert-to-numbered-list.ts +++ b/blocksuite/affine/blocks/block-list/src/commands/convert-to-numbered-list.ts @@ -1,5 +1,5 @@ import { toNumberedList } from '@blocksuite/affine-shared/utils'; -import type { Command, EditorHost } from '@blocksuite/block-std'; +import type { Command, EditorHost } from '@blocksuite/std'; export const convertToNumberedListCommand: Command< { diff --git a/blocksuite/affine/blocks/block-list/src/commands/dedent-list.ts b/blocksuite/affine/blocks/block-list/src/commands/dedent-list.ts index 016de4210a..7274ebc4ba 100644 --- a/blocksuite/affine/blocks/block-list/src/commands/dedent-list.ts +++ b/blocksuite/affine/blocks/block-list/src/commands/dedent-list.ts @@ -1,7 +1,7 @@ import { ListBlockModel } from '@blocksuite/affine-model'; import type { IndentContext } from '@blocksuite/affine-shared/types'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import { type Command, TextSelection } from '@blocksuite/block-std'; +import { type Command, TextSelection } from '@blocksuite/std'; import { correctNumberedListsOrderToPrev } from './utils.js'; diff --git a/blocksuite/affine/blocks/block-list/src/commands/indent-list.ts b/blocksuite/affine/blocks/block-list/src/commands/indent-list.ts index 8635cda9ff..b9b2634686 100644 --- a/blocksuite/affine/blocks/block-list/src/commands/indent-list.ts +++ b/blocksuite/affine/blocks/block-list/src/commands/indent-list.ts @@ -4,7 +4,7 @@ import { getNearestHeadingBefore, matchModels, } from '@blocksuite/affine-shared/utils'; -import { type Command, TextSelection } from '@blocksuite/block-std'; +import { type Command, TextSelection } from '@blocksuite/std'; import { correctNumberedListsOrderToPrev } from './utils.js'; diff --git a/blocksuite/affine/blocks/block-list/src/commands/list-to-paragraph.ts b/blocksuite/affine/blocks/block-list/src/commands/list-to-paragraph.ts index 78b843cbfd..d2c55d7f19 100644 --- a/blocksuite/affine/blocks/block-list/src/commands/list-to-paragraph.ts +++ b/blocksuite/affine/blocks/block-list/src/commands/list-to-paragraph.ts @@ -1,7 +1,7 @@ import { ListBlockModel } from '@blocksuite/affine-model'; import { focusTextModel } from '@blocksuite/affine-rich-text'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; export const listToParagraphCommand: Command< { diff --git a/blocksuite/affine/blocks/block-list/src/commands/split-list.ts b/blocksuite/affine/blocks/block-list/src/commands/split-list.ts index 919ae9084b..1d344c9841 100644 --- a/blocksuite/affine/blocks/block-list/src/commands/split-list.ts +++ b/blocksuite/affine/blocks/block-list/src/commands/split-list.ts @@ -4,7 +4,7 @@ import { getNextContinuousNumberedLists, matchModels, } from '@blocksuite/affine-shared/utils'; -import type { Command, EditorHost } from '@blocksuite/block-std'; +import type { Command, EditorHost } from '@blocksuite/std'; import { canDedentListCommand, dedentListCommand } from './dedent-list.js'; import { correctNumberedListsOrderToPrev } from './utils.js'; diff --git a/blocksuite/affine/blocks/block-list/src/list-block.ts b/blocksuite/affine/blocks/block-list/src/list-block.ts index b108af06c0..9e546c7feb 100644 --- a/blocksuite/affine/blocks/block-list/src/list-block.ts +++ b/blocksuite/affine/blocks/block-list/src/list-block.ts @@ -12,12 +12,12 @@ import { } from '@blocksuite/affine-shared/consts'; import { DocModeProvider } from '@blocksuite/affine-shared/services'; import { getViewportElement } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { BlockSelection, TextSelection } from '@blocksuite/block-std'; +import type { BlockComponent } from '@blocksuite/std'; +import { BlockSelection, TextSelection } from '@blocksuite/std'; import { getInlineRangeProvider, type InlineRangeProvider, -} from '@blocksuite/block-std/inline'; +} from '@blocksuite/std/inline'; import type { BaseSelection } from '@blocksuite/store'; import { effect } from '@preact/signals-core'; import { html, nothing, type TemplateResult } from 'lit'; diff --git a/blocksuite/affine/blocks/block-list/src/list-keymap.ts b/blocksuite/affine/blocks/block-list/src/list-keymap.ts index 11d63a3c5a..a4fddc2d7a 100644 --- a/blocksuite/affine/blocks/block-list/src/list-keymap.ts +++ b/blocksuite/affine/blocks/block-list/src/list-keymap.ts @@ -2,8 +2,8 @@ import { textKeymap } from '@blocksuite/affine-inline-preset'; import { ListBlockSchema } from '@blocksuite/affine-model'; import { markdownInput } from '@blocksuite/affine-rich-text'; import { getSelectedModelsCommand } from '@blocksuite/affine-shared/commands'; -import { KeymapExtension, TextSelection } from '@blocksuite/block-std'; import { IS_MAC } from '@blocksuite/global/env'; +import { KeymapExtension, TextSelection } from '@blocksuite/std'; import { canDedentListCommand, diff --git a/blocksuite/affine/blocks/block-list/src/list-spec.ts b/blocksuite/affine/blocks/block-list/src/list-spec.ts index e496e9772c..1e0bb02ac2 100644 --- a/blocksuite/affine/blocks/block-list/src/list-spec.ts +++ b/blocksuite/affine/blocks/block-list/src/list-spec.ts @@ -1,4 +1,4 @@ -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-list/src/utils/forward-delete.ts b/blocksuite/affine/blocks/block-list/src/utils/forward-delete.ts index 1ce73fa1f2..b925992b32 100644 --- a/blocksuite/affine/blocks/block-list/src/utils/forward-delete.ts +++ b/blocksuite/affine/blocks/block-list/src/utils/forward-delete.ts @@ -3,7 +3,7 @@ import { getNextContentBlock, matchModels, } from '@blocksuite/affine-shared/utils'; -import { type BlockStdScope, TextSelection } from '@blocksuite/block-std'; +import { type BlockStdScope, TextSelection } from '@blocksuite/std'; import type { Text } from '@blocksuite/store'; // When deleting at line end of a list block, diff --git a/blocksuite/affine/blocks/block-list/tsconfig.json b/blocksuite/affine/blocks/block-list/tsconfig.json index 3ad8f63b98..83457418c1 100644 --- a/blocksuite/affine/blocks/block-list/tsconfig.json +++ b/blocksuite/affine/blocks/block-list/tsconfig.json @@ -12,8 +12,8 @@ { "path": "../../model" }, { "path": "../../rich-text" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-note/package.json b/blocksuite/affine/blocks/block-note/package.json index fe5192ed6f..eb48025269 100644 --- a/blocksuite/affine/blocks/block-note/package.json +++ b/blocksuite/affine/blocks/block-note/package.json @@ -19,9 +19,9 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@lit/context": "^1.1.2", "@preact/signals-core": "^1.8.0", diff --git a/blocksuite/affine/blocks/block-note/src/commands/block-type.ts b/blocksuite/affine/blocks/block-note/src/commands/block-type.ts index bf35ad3197..b5d82db2de 100644 --- a/blocksuite/affine/blocks/block-note/src/commands/block-type.ts +++ b/blocksuite/affine/blocks/block-note/src/commands/block-type.ts @@ -23,7 +23,7 @@ import { BlockSelection, type Command, TextSelection, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; type UpdateBlockConfig = { diff --git a/blocksuite/affine/blocks/block-note/src/commands/change-note-display-mode.ts b/blocksuite/affine/blocks/block-note/src/commands/change-note-display-mode.ts index 14d5c254a2..29e233d652 100644 --- a/blocksuite/affine/blocks/block-note/src/commands/change-note-display-mode.ts +++ b/blocksuite/affine/blocks/block-note/src/commands/change-note-display-mode.ts @@ -1,6 +1,6 @@ import { NoteBlockModel, NoteDisplayMode } from '@blocksuite/affine-model'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; export const changeNoteDisplayMode: Command<{ noteId: string; diff --git a/blocksuite/affine/blocks/block-note/src/commands/dedent-block-to-root.ts b/blocksuite/affine/blocks/block-note/src/commands/dedent-block-to-root.ts index da34bd7d3d..aa3e1120ed 100644 --- a/blocksuite/affine/blocks/block-note/src/commands/dedent-block-to-root.ts +++ b/blocksuite/affine/blocks/block-note/src/commands/dedent-block-to-root.ts @@ -1,6 +1,6 @@ import { NoteBlockModel } from '@blocksuite/affine-model'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import { dedentBlock } from './dedent-block'; diff --git a/blocksuite/affine/blocks/block-note/src/commands/dedent-block.ts b/blocksuite/affine/blocks/block-note/src/commands/dedent-block.ts index 3dd92bfc15..6b21800294 100644 --- a/blocksuite/affine/blocks/block-note/src/commands/dedent-block.ts +++ b/blocksuite/affine/blocks/block-note/src/commands/dedent-block.ts @@ -3,7 +3,7 @@ import { calculateCollapsedSiblings, matchModels, } from '@blocksuite/affine-shared/utils'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; /** * @example diff --git a/blocksuite/affine/blocks/block-note/src/commands/dedent-blocks-to-root.ts b/blocksuite/affine/blocks/block-note/src/commands/dedent-blocks-to-root.ts index fc9f81ed92..ca5d61a17e 100644 --- a/blocksuite/affine/blocks/block-note/src/commands/dedent-blocks-to-root.ts +++ b/blocksuite/affine/blocks/block-note/src/commands/dedent-blocks-to-root.ts @@ -1,6 +1,6 @@ import { NoteBlockModel } from '@blocksuite/affine-model'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import { type Command, TextSelection } from '@blocksuite/block-std'; +import { type Command, TextSelection } from '@blocksuite/std'; import { dedentBlockToRoot } from './dedent-block-to-root'; diff --git a/blocksuite/affine/blocks/block-note/src/commands/dedent-blocks.ts b/blocksuite/affine/blocks/block-note/src/commands/dedent-blocks.ts index 4cac085e9e..af6c622b16 100644 --- a/blocksuite/affine/blocks/block-note/src/commands/dedent-blocks.ts +++ b/blocksuite/affine/blocks/block-note/src/commands/dedent-blocks.ts @@ -3,7 +3,7 @@ import { calculateCollapsedSiblings, matchModels, } from '@blocksuite/affine-shared/utils'; -import { type Command, TextSelection } from '@blocksuite/block-std'; +import { type Command, TextSelection } from '@blocksuite/std'; import { dedentBlock } from './dedent-block'; diff --git a/blocksuite/affine/blocks/block-note/src/commands/indent-block.ts b/blocksuite/affine/blocks/block-note/src/commands/indent-block.ts index bf1d419935..265d7997c0 100644 --- a/blocksuite/affine/blocks/block-note/src/commands/indent-block.ts +++ b/blocksuite/affine/blocks/block-note/src/commands/indent-block.ts @@ -3,7 +3,7 @@ import { calculateCollapsedSiblings, matchModels, } from '@blocksuite/affine-shared/utils'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; /** * @example diff --git a/blocksuite/affine/blocks/block-note/src/commands/indent-blocks.ts b/blocksuite/affine/blocks/block-note/src/commands/indent-blocks.ts index c25e9b1c10..aa3fc65ee4 100644 --- a/blocksuite/affine/blocks/block-note/src/commands/indent-blocks.ts +++ b/blocksuite/affine/blocks/block-note/src/commands/indent-blocks.ts @@ -4,7 +4,7 @@ import { getNearestHeadingBefore, matchModels, } from '@blocksuite/affine-shared/utils'; -import { type Command, TextSelection } from '@blocksuite/block-std'; +import { type Command, TextSelection } from '@blocksuite/std'; import { indentBlock } from './indent-block'; diff --git a/blocksuite/affine/blocks/block-note/src/commands/select-block.ts b/blocksuite/affine/blocks/block-note/src/commands/select-block.ts index a0d8793678..641d26a3b2 100644 --- a/blocksuite/affine/blocks/block-note/src/commands/select-block.ts +++ b/blocksuite/affine/blocks/block-note/src/commands/select-block.ts @@ -2,7 +2,7 @@ import { type BlockComponent, BlockSelection, type Command, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; export const selectBlock: Command<{ focusBlock?: BlockComponent; diff --git a/blocksuite/affine/blocks/block-note/src/commands/select-blocks-between.ts b/blocksuite/affine/blocks/block-note/src/commands/select-blocks-between.ts index ef6aee7e7f..c805fe7de7 100644 --- a/blocksuite/affine/blocks/block-note/src/commands/select-blocks-between.ts +++ b/blocksuite/affine/blocks/block-note/src/commands/select-blocks-between.ts @@ -2,7 +2,7 @@ import { type BlockComponent, BlockSelection, type Command, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; export const selectBlocksBetween: Command<{ focusBlock?: BlockComponent; diff --git a/blocksuite/affine/blocks/block-note/src/components/edgeless-note-background.ts b/blocksuite/affine/blocks/block-note/src/components/edgeless-note-background.ts index dd17b5ed12..ad1eef64eb 100644 --- a/blocksuite/affine/blocks/block-note/src/components/edgeless-note-background.ts +++ b/blocksuite/affine/blocks/block-note/src/components/edgeless-note-background.ts @@ -12,6 +12,8 @@ import { matchModels, stopPropagation, } from '@blocksuite/affine-shared/utils'; +import { clamp, Point } from '@blocksuite/global/gfx'; +import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { type BlockComponent, type BlockStdScope, @@ -20,10 +22,8 @@ import { ShadowlessElement, stdContext, TextSelection, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; -import { clamp, Point } from '@blocksuite/global/gfx'; -import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import type { BlockModel } from '@blocksuite/store'; import { consume } from '@lit/context'; import { computed } from '@preact/signals-core'; diff --git a/blocksuite/affine/blocks/block-note/src/components/edgeless-note-border-dropdown-menu.ts b/blocksuite/affine/blocks/block-note/src/components/edgeless-note-border-dropdown-menu.ts index 5eb655ea3c..9f2f75cf3f 100644 --- a/blocksuite/affine/blocks/block-note/src/components/edgeless-note-border-dropdown-menu.ts +++ b/blocksuite/affine/blocks/block-note/src/components/edgeless-note-border-dropdown-menu.ts @@ -1,7 +1,7 @@ import { EditorChevronDown } from '@blocksuite/affine-components/toolbar'; import { LineWidth, type StrokeStyle } from '@blocksuite/affine-model'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { LineStyleIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-note/src/components/edgeless-note-display-mode-dropdown-menu.ts b/blocksuite/affine/blocks/block-note/src/components/edgeless-note-display-mode-dropdown-menu.ts index b459148698..e4ddb36439 100644 --- a/blocksuite/affine/blocks/block-note/src/components/edgeless-note-display-mode-dropdown-menu.ts +++ b/blocksuite/affine/blocks/block-note/src/components/edgeless-note-display-mode-dropdown-menu.ts @@ -1,6 +1,6 @@ import { EditorChevronDown } from '@blocksuite/affine-components/toolbar'; import { NoteDisplayMode } from '@blocksuite/affine-model'; -import { ShadowlessElement } from '@blocksuite/block-std'; +import { ShadowlessElement } from '@blocksuite/std'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-note/src/components/edgeless-note-mask.ts b/blocksuite/affine/blocks/block-note/src/components/edgeless-note-mask.ts index e94469626c..9c1686b43e 100644 --- a/blocksuite/affine/blocks/block-note/src/components/edgeless-note-mask.ts +++ b/blocksuite/affine/blocks/block-note/src/components/edgeless-note-mask.ts @@ -1,7 +1,7 @@ import type { NoteBlockModel } from '@blocksuite/affine-model'; -import { type EditorHost, ShadowlessElement } from '@blocksuite/block-std'; import { almostEqual, Bound } from '@blocksuite/global/gfx'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { type EditorHost, ShadowlessElement } from '@blocksuite/std'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/blocks/block-note/src/components/edgeless-page-block-title.ts b/blocksuite/affine/blocks/block-note/src/components/edgeless-page-block-title.ts index 476c4c112d..ac08247400 100644 --- a/blocksuite/affine/blocks/block-note/src/components/edgeless-page-block-title.ts +++ b/blocksuite/affine/blocks/block-note/src/components/edgeless-page-block-title.ts @@ -1,12 +1,12 @@ import { NoteBlockModel } from '@blocksuite/affine-model'; +import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { type BlockStdScope, PropTypes, requiredProperties, ShadowlessElement, stdContext, -} from '@blocksuite/block-std'; -import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; import { consume } from '@lit/context'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-note/src/config.ts b/blocksuite/affine/blocks/block-note/src/config.ts index 531679d2c0..6ebd7dc745 100644 --- a/blocksuite/affine/blocks/block-note/src/config.ts +++ b/blocksuite/affine/blocks/block-note/src/config.ts @@ -1,8 +1,5 @@ import type { NoteBlockModel } from '@blocksuite/affine-model'; -import { - type BlockStdScope, - ConfigExtensionFactory, -} from '@blocksuite/block-std'; +import { type BlockStdScope, ConfigExtensionFactory } from '@blocksuite/std'; import type { TemplateResult } from 'lit'; type NoteBlockContext = { diff --git a/blocksuite/affine/blocks/block-note/src/configs/slash-menu.ts b/blocksuite/affine/blocks/block-note/src/configs/slash-menu.ts index c851d27423..f78b16a398 100644 --- a/blocksuite/affine/blocks/block-note/src/configs/slash-menu.ts +++ b/blocksuite/affine/blocks/block-note/src/configs/slash-menu.ts @@ -14,8 +14,8 @@ import { SlashMenuConfigExtension, type SlashMenuItem, } from '@blocksuite/affine-widget-slash-menu'; -import { BlockSelection } from '@blocksuite/block-std'; import { HeadingsIcon } from '@blocksuite/icons/lit'; +import { BlockSelection } from '@blocksuite/std'; import { updateBlockType } from '../commands'; import { tooltips } from './tooltips'; diff --git a/blocksuite/affine/blocks/block-note/src/configs/toolbar.ts b/blocksuite/affine/blocks/block-note/src/configs/toolbar.ts index b407b3f8a4..178791643e 100644 --- a/blocksuite/affine/blocks/block-note/src/configs/toolbar.ts +++ b/blocksuite/affine/blocks/block-note/src/configs/toolbar.ts @@ -23,10 +23,6 @@ import { ToolbarModuleExtension, } from '@blocksuite/affine-shared/services'; import { getMostCommonResolvedValue } from '@blocksuite/affine-shared/utils'; -import { - BlockFlavourIdentifier, - EditorLifeCycleExtension, -} from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; import { AutoHeightIcon, @@ -35,6 +31,10 @@ import { LinkedPageIcon, ScissorsIcon, } from '@blocksuite/icons/lit'; +import { + BlockFlavourIdentifier, + EditorLifeCycleExtension, +} from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { computed } from '@preact/signals-core'; import { html } from 'lit'; diff --git a/blocksuite/affine/blocks/block-note/src/move-block.ts b/blocksuite/affine/blocks/block-note/src/move-block.ts index 364563a4e8..1f278c58b7 100644 --- a/blocksuite/affine/blocks/block-note/src/move-block.ts +++ b/blocksuite/affine/blocks/block-note/src/move-block.ts @@ -2,7 +2,7 @@ import { BlockSelection, type BlockStdScope, TextSelection, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; const getSelection = (std: BlockStdScope) => std.selection; diff --git a/blocksuite/affine/blocks/block-note/src/note-block.ts b/blocksuite/affine/blocks/block-note/src/note-block.ts index b1ee64fad1..bfbd8f4d7c 100644 --- a/blocksuite/affine/blocks/block-note/src/note-block.ts +++ b/blocksuite/affine/blocks/block-note/src/note-block.ts @@ -1,5 +1,5 @@ import type { NoteBlockModel } from '@blocksuite/affine-model'; -import { BlockComponent } from '@blocksuite/block-std'; +import { BlockComponent } from '@blocksuite/std'; import { css, html } from 'lit'; export class NoteBlockComponent extends BlockComponent { diff --git a/blocksuite/affine/blocks/block-note/src/note-edgeless-block.ts b/blocksuite/affine/blocks/block-note/src/note-edgeless-block.ts index 9fd2d46574..4c50a35a2c 100644 --- a/blocksuite/affine/blocks/block-note/src/note-edgeless-block.ts +++ b/blocksuite/affine/blocks/block-note/src/note-edgeless-block.ts @@ -8,9 +8,9 @@ import { handleNativeRangeAtPoint, stopPropagation, } from '@blocksuite/affine-shared/utils'; -import { toGfxBlockComponent } from '@blocksuite/block-std'; -import type { SelectedContext } from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; +import { toGfxBlockComponent } from '@blocksuite/std'; +import type { SelectedContext } from '@blocksuite/std/gfx'; import { html, nothing, type PropertyValues } from 'lit'; import { query, state } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/blocks/block-note/src/note-keymap.ts b/blocksuite/affine/blocks/block-note/src/note-keymap.ts index 6e468a6ef5..80bf9c477d 100644 --- a/blocksuite/affine/blocks/block-note/src/note-keymap.ts +++ b/blocksuite/affine/blocks/block-note/src/note-keymap.ts @@ -27,7 +27,7 @@ import { TextSelection, type UIEventHandler, type UIEventStateContext, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import type { BaseSelection } from '@blocksuite/store'; import { diff --git a/blocksuite/affine/blocks/block-note/src/note-spec.ts b/blocksuite/affine/blocks/block-note/src/note-spec.ts index 9d7c6b849f..6904c6bd76 100644 --- a/blocksuite/affine/blocks/block-note/src/note-spec.ts +++ b/blocksuite/affine/blocks/block-note/src/note-spec.ts @@ -1,5 +1,5 @@ import { NoteBlockSchema } from '@blocksuite/affine-model'; -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-note/src/quick-action.ts b/blocksuite/affine/blocks/block-note/src/quick-action.ts index 339bcd75d0..361636cf40 100644 --- a/blocksuite/affine/blocks/block-note/src/quick-action.ts +++ b/blocksuite/affine/blocks/block-note/src/quick-action.ts @@ -8,7 +8,7 @@ import { draftSelectedModelsCommand, getSelectedModelsCommand, } from '@blocksuite/affine-shared/commands'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import { toDraftModel } from '@blocksuite/store'; export interface QuickActionConfig { diff --git a/blocksuite/affine/blocks/block-note/tsconfig.json b/blocksuite/affine/blocks/block-note/tsconfig.json index 6fd9bb9bfa..6342c79939 100644 --- a/blocksuite/affine/blocks/block-note/tsconfig.json +++ b/blocksuite/affine/blocks/block-note/tsconfig.json @@ -16,8 +16,8 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/widget-slash-menu" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-paragraph/package.json b/blocksuite/affine/blocks/block-paragraph/package.json index bb93507204..fc3a2e4d08 100644 --- a/blocksuite/affine/blocks/block-paragraph/package.json +++ b/blocksuite/affine/blocks/block-paragraph/package.json @@ -16,8 +16,8 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/blocks/block-paragraph/src/commands/add-paragraph.ts b/blocksuite/affine/blocks/block-paragraph/src/commands/add-paragraph.ts index 9864d4fa92..e577ccf85c 100644 --- a/blocksuite/affine/blocks/block-paragraph/src/commands/add-paragraph.ts +++ b/blocksuite/affine/blocks/block-paragraph/src/commands/add-paragraph.ts @@ -1,5 +1,5 @@ import { focusTextModel } from '@blocksuite/affine-rich-text'; -import { type Command, TextSelection } from '@blocksuite/block-std'; +import { type Command, TextSelection } from '@blocksuite/std'; /** * Add a paragraph next to the current block. diff --git a/blocksuite/affine/blocks/block-paragraph/src/commands/append-paragraph.ts b/blocksuite/affine/blocks/block-paragraph/src/commands/append-paragraph.ts index 916c1bb79d..611e14adc8 100644 --- a/blocksuite/affine/blocks/block-paragraph/src/commands/append-paragraph.ts +++ b/blocksuite/affine/blocks/block-paragraph/src/commands/append-paragraph.ts @@ -1,6 +1,6 @@ import { focusTextModel } from '@blocksuite/affine-rich-text'; import { getLastNoteBlock } from '@blocksuite/affine-shared/utils'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import { Text } from '@blocksuite/store'; /** diff --git a/blocksuite/affine/blocks/block-paragraph/src/commands/dedent-paragraph.ts b/blocksuite/affine/blocks/block-paragraph/src/commands/dedent-paragraph.ts index 865ad41d83..bb5dbee0a5 100644 --- a/blocksuite/affine/blocks/block-paragraph/src/commands/dedent-paragraph.ts +++ b/blocksuite/affine/blocks/block-paragraph/src/commands/dedent-paragraph.ts @@ -4,7 +4,7 @@ import { calculateCollapsedSiblings, matchModels, } from '@blocksuite/affine-shared/utils'; -import { type Command, TextSelection } from '@blocksuite/block-std'; +import { type Command, TextSelection } from '@blocksuite/std'; export const canDedentParagraphCommand: Command< Partial>, diff --git a/blocksuite/affine/blocks/block-paragraph/src/commands/indent-paragraph.ts b/blocksuite/affine/blocks/block-paragraph/src/commands/indent-paragraph.ts index 444dc37c9c..500ef2e843 100644 --- a/blocksuite/affine/blocks/block-paragraph/src/commands/indent-paragraph.ts +++ b/blocksuite/affine/blocks/block-paragraph/src/commands/indent-paragraph.ts @@ -5,7 +5,7 @@ import { getNearestHeadingBefore, matchModels, } from '@blocksuite/affine-shared/utils'; -import { type Command, TextSelection } from '@blocksuite/block-std'; +import { type Command, TextSelection } from '@blocksuite/std'; export const canIndentParagraphCommand: Command< Partial>, diff --git a/blocksuite/affine/blocks/block-paragraph/src/commands/split-paragraph.ts b/blocksuite/affine/blocks/block-paragraph/src/commands/split-paragraph.ts index 3d4310b7fe..9e08dcf300 100644 --- a/blocksuite/affine/blocks/block-paragraph/src/commands/split-paragraph.ts +++ b/blocksuite/affine/blocks/block-paragraph/src/commands/split-paragraph.ts @@ -4,7 +4,7 @@ import { getInlineEditorByModel, } from '@blocksuite/affine-rich-text'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import { type Command, TextSelection } from '@blocksuite/block-std'; +import { type Command, TextSelection } from '@blocksuite/std'; export const splitParagraphCommand: Command< { diff --git a/blocksuite/affine/blocks/block-paragraph/src/heading-icon.ts b/blocksuite/affine/blocks/block-paragraph/src/heading-icon.ts index f7421051ad..d60eec2847 100644 --- a/blocksuite/affine/blocks/block-paragraph/src/heading-icon.ts +++ b/blocksuite/affine/blocks/block-paragraph/src/heading-icon.ts @@ -7,8 +7,8 @@ import { Heading6Icon, } from '@blocksuite/affine-components/icons'; import type { ParagraphBlockModel } from '@blocksuite/affine-model'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { cssVarV2 } from '@toeverything/theme/v2'; import { css, html, nothing, unsafeCSS } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-paragraph/src/paragraph-block-config.ts b/blocksuite/affine/blocks/block-paragraph/src/paragraph-block-config.ts index 4650906399..60321edbb8 100644 --- a/blocksuite/affine/blocks/block-paragraph/src/paragraph-block-config.ts +++ b/blocksuite/affine/blocks/block-paragraph/src/paragraph-block-config.ts @@ -1,5 +1,5 @@ import type { ParagraphBlockModel } from '@blocksuite/affine-model'; -import { ConfigExtensionFactory } from '@blocksuite/block-std'; +import { ConfigExtensionFactory } from '@blocksuite/std'; export interface ParagraphBlockConfig { getPlaceholder: (model: ParagraphBlockModel) => string; diff --git a/blocksuite/affine/blocks/block-paragraph/src/paragraph-block.ts b/blocksuite/affine/blocks/block-paragraph/src/paragraph-block.ts index 4e9405eccb..eb449a0853 100644 --- a/blocksuite/affine/blocks/block-paragraph/src/paragraph-block.ts +++ b/blocksuite/affine/blocks/block-paragraph/src/paragraph-block.ts @@ -13,12 +13,12 @@ import { getNearestHeadingBefore, getViewportElement, } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { TextSelection } from '@blocksuite/block-std'; +import type { BlockComponent } from '@blocksuite/std'; +import { TextSelection } from '@blocksuite/std'; import { getInlineRangeProvider, type InlineRangeProvider, -} from '@blocksuite/block-std/inline'; +} from '@blocksuite/std/inline'; import { computed, effect, signal } from '@preact/signals-core'; import { html, nothing, type TemplateResult } from 'lit'; import { query, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-paragraph/src/paragraph-keymap.ts b/blocksuite/affine/blocks/block-paragraph/src/paragraph-keymap.ts index d35201c638..021696075c 100644 --- a/blocksuite/affine/blocks/block-paragraph/src/paragraph-keymap.ts +++ b/blocksuite/affine/blocks/block-paragraph/src/paragraph-keymap.ts @@ -13,8 +13,8 @@ import { calculateCollapsedSiblings, matchModels, } from '@blocksuite/affine-shared/utils'; -import { KeymapExtension, TextSelection } from '@blocksuite/block-std'; import { IS_MAC } from '@blocksuite/global/env'; +import { KeymapExtension, TextSelection } from '@blocksuite/std'; import { addParagraphCommand } from './commands/add-paragraph.js'; import { diff --git a/blocksuite/affine/blocks/block-paragraph/src/paragraph-spec.ts b/blocksuite/affine/blocks/block-paragraph/src/paragraph-spec.ts index d2439f63ad..6827a327ce 100644 --- a/blocksuite/affine/blocks/block-paragraph/src/paragraph-spec.ts +++ b/blocksuite/affine/blocks/block-paragraph/src/paragraph-spec.ts @@ -1,4 +1,4 @@ -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-paragraph/src/turbo/paragraph-layout-provider.ts b/blocksuite/affine/blocks/block-paragraph/src/turbo/paragraph-layout-provider.ts index ec38061a3c..3563cca090 100644 --- a/blocksuite/affine/blocks/block-paragraph/src/turbo/paragraph-layout-provider.ts +++ b/blocksuite/affine/blocks/block-paragraph/src/turbo/paragraph-layout-provider.ts @@ -5,9 +5,9 @@ import { getSentenceRects, segmentSentences, } from '@blocksuite/affine-gfx-turbo-renderer'; -import type { GfxBlockComponent } from '@blocksuite/block-std'; -import { clientToModelCoord } from '@blocksuite/block-std/gfx'; import type { Container } from '@blocksuite/global/di'; +import type { GfxBlockComponent } from '@blocksuite/std'; +import { clientToModelCoord } from '@blocksuite/std/gfx'; import type { ParagraphLayout } from './paragraph-painter.worker'; diff --git a/blocksuite/affine/blocks/block-paragraph/src/utils/forward-delete.ts b/blocksuite/affine/blocks/block-paragraph/src/utils/forward-delete.ts index 691f153f1b..aa997104d5 100644 --- a/blocksuite/affine/blocks/block-paragraph/src/utils/forward-delete.ts +++ b/blocksuite/affine/blocks/block-paragraph/src/utils/forward-delete.ts @@ -18,7 +18,7 @@ import { BlockSelection, type BlockStdScope, TextSelection, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; export function forwardDelete(std: BlockStdScope) { const { store, host } = std; diff --git a/blocksuite/affine/blocks/block-paragraph/src/utils/merge-with-prev.ts b/blocksuite/affine/blocks/block-paragraph/src/utils/merge-with-prev.ts index 2cddc68170..36920f80b5 100644 --- a/blocksuite/affine/blocks/block-paragraph/src/utils/merge-with-prev.ts +++ b/blocksuite/affine/blocks/block-paragraph/src/utils/merge-with-prev.ts @@ -23,7 +23,7 @@ import { getPrevContentBlock, matchModels, } from '@blocksuite/affine-shared/utils'; -import { BlockSelection, type EditorHost } from '@blocksuite/block-std'; +import { BlockSelection, type EditorHost } from '@blocksuite/std'; import type { BlockModel, Text } from '@blocksuite/store'; /** diff --git a/blocksuite/affine/blocks/block-paragraph/tsconfig.json b/blocksuite/affine/blocks/block-paragraph/tsconfig.json index 500df54d81..5a8a2133e6 100644 --- a/blocksuite/affine/blocks/block-paragraph/tsconfig.json +++ b/blocksuite/affine/blocks/block-paragraph/tsconfig.json @@ -13,8 +13,8 @@ { "path": "../../model" }, { "path": "../../rich-text" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-root/package.json b/blocksuite/affine/blocks/block-root/package.json index 2b13d5943a..9b55102cb4 100644 --- a/blocksuite/affine/blocks/block-root/package.json +++ b/blocksuite/affine/blocks/block-root/package.json @@ -49,10 +49,10 @@ "@blocksuite/affine-widget-scroll-anchoring": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", "@blocksuite/affine-widget-toolbar": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/data-view": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/blocks/block-root/src/clipboard/page-clipboard.ts b/blocksuite/affine/blocks/block-root/src/clipboard/page-clipboard.ts index 9834e2d56f..c0fcd74fc8 100644 --- a/blocksuite/affine/blocks/block-root/src/clipboard/page-clipboard.ts +++ b/blocksuite/affine/blocks/block-root/src/clipboard/page-clipboard.ts @@ -14,8 +14,8 @@ import { getTextSelectionCommand, retainFirstModelCommand, } from '@blocksuite/affine-shared/commands'; -import type { UIEventHandler } from '@blocksuite/block-std'; import { DisposableGroup } from '@blocksuite/global/disposable'; +import type { UIEventHandler } from '@blocksuite/std'; import type { BlockSnapshot, Store } from '@blocksuite/store'; import { ReadOnlyClipboard } from './readonly-clipboard'; diff --git a/blocksuite/affine/blocks/block-root/src/clipboard/readonly-clipboard.ts b/blocksuite/affine/blocks/block-root/src/clipboard/readonly-clipboard.ts index e478897db0..3e8e24ef10 100644 --- a/blocksuite/affine/blocks/block-root/src/clipboard/readonly-clipboard.ts +++ b/blocksuite/affine/blocks/block-root/src/clipboard/readonly-clipboard.ts @@ -14,12 +14,12 @@ import { draftSelectedModelsCommand, getSelectedModelsCommand, } from '@blocksuite/affine-shared/commands'; +import { DisposableGroup } from '@blocksuite/global/disposable'; import { ClipboardAdapterConfigExtension, LifeCycleWatcher, type UIEventHandler, -} from '@blocksuite/block-std'; -import { DisposableGroup } from '@blocksuite/global/disposable'; +} from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; const SnapshotClipboardConfig = ClipboardAdapterConfigExtension({ diff --git a/blocksuite/affine/blocks/block-root/src/common-specs/index.ts b/blocksuite/affine/blocks/block-root/src/common-specs/index.ts index ef0dc0312c..4532b9de04 100644 --- a/blocksuite/affine/blocks/block-root/src/common-specs/index.ts +++ b/blocksuite/affine/blocks/block-root/src/common-specs/index.ts @@ -14,10 +14,7 @@ import { docRemoteSelectionWidget } from '@blocksuite/affine-widget-remote-selec import { scrollAnchoringWidget } from '@blocksuite/affine-widget-scroll-anchoring'; import { SlashMenuExtension } from '@blocksuite/affine-widget-slash-menu'; import { toolbarWidget } from '@blocksuite/affine-widget-toolbar'; -import { - BlockFlavourIdentifier, - FlavourExtension, -} from '@blocksuite/block-std'; +import { BlockFlavourIdentifier, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { RootBlockAdapterExtensions } from '../adapters/extension'; diff --git a/blocksuite/affine/blocks/block-root/src/common-specs/widgets.ts b/blocksuite/affine/blocks/block-root/src/common-specs/widgets.ts index 95b47cc97d..47d9216d0a 100644 --- a/blocksuite/affine/blocks/block-root/src/common-specs/widgets.ts +++ b/blocksuite/affine/blocks/block-root/src/common-specs/widgets.ts @@ -1,4 +1,4 @@ -import { WidgetViewExtension } from '@blocksuite/block-std'; +import { WidgetViewExtension } from '@blocksuite/std'; import { literal, unsafeStatic } from 'lit/static-html.js'; import { AFFINE_INNER_MODAL_WIDGET } from '../widgets/inner-modal/inner-modal.js'; diff --git a/blocksuite/affine/blocks/block-root/src/configs/toolbar.ts b/blocksuite/affine/blocks/block-root/src/configs/toolbar.ts index 8bb0d190cb..df58914535 100644 --- a/blocksuite/affine/blocks/block-root/src/configs/toolbar.ts +++ b/blocksuite/affine/blocks/block-root/src/configs/toolbar.ts @@ -38,7 +38,6 @@ import type { } from '@blocksuite/affine-shared/services'; import { ActionPlacement } from '@blocksuite/affine-shared/services'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { type BlockComponent, BlockSelection } from '@blocksuite/block-std'; import { tableViewMeta } from '@blocksuite/data-view/view-presets'; import { ArrowDownSmallIcon, @@ -48,6 +47,7 @@ import { DuplicateIcon, LinkedPageIcon, } from '@blocksuite/icons/lit'; +import { type BlockComponent, BlockSelection } from '@blocksuite/std'; import { toDraftModel } from '@blocksuite/store'; import { html } from 'lit'; import { repeat } from 'lit/directives/repeat.js'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/canvas.ts b/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/canvas.ts index ea370dc209..f46237e24f 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/canvas.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/canvas.ts @@ -5,12 +5,12 @@ import { } from '@blocksuite/affine-block-surface'; import type { Connection } from '@blocksuite/affine-model'; import { TelemetryProvider } from '@blocksuite/affine-shared/services'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import { Bound, type SerializedXYWH, Vec } from '@blocksuite/global/gfx'; +import type { BlockStdScope } from '@blocksuite/std'; import type { GfxPrimitiveElementModel, SerializedElement, -} from '@blocksuite/block-std/gfx'; -import { Bound, type SerializedXYWH, Vec } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import * as Y from 'yjs'; const { GROUP, MINDMAP, CONNECTOR } = CanvasElementType; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/clipboard.ts b/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/clipboard.ts index e8901a47f5..bc3386caf1 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/clipboard.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/clipboard.ts @@ -36,18 +36,6 @@ import { matchModels, referenceToNode, } from '@blocksuite/affine-shared/utils'; -import type { - EditorHost, - SurfaceSelection, - UIEventStateContext, -} from '@blocksuite/block-std'; -import { - compareLayer, - type GfxBlockElementModel, - GfxControllerIdentifier, - type GfxPrimitiveElementModel, - type SerializedElement, -} from '@blocksuite/block-std/gfx'; import { DisposableGroup } from '@blocksuite/global/disposable'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; import { @@ -57,6 +45,18 @@ import { type IVec, Vec, } from '@blocksuite/global/gfx'; +import type { + EditorHost, + SurfaceSelection, + UIEventStateContext, +} from '@blocksuite/std'; +import { + compareLayer, + type GfxBlockElementModel, + GfxControllerIdentifier, + type GfxPrimitiveElementModel, + type SerializedElement, +} from '@blocksuite/std/gfx'; import { type BlockSnapshot, type SliceSnapshot } from '@blocksuite/store'; import * as Y from 'yjs'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/command.ts b/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/command.ts index 3617c2c1da..22e4db4df8 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/command.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/command.ts @@ -4,7 +4,9 @@ import { EdgelessCRUDIdentifier, SurfaceGroupLikeModel, } from '@blocksuite/affine-block-surface'; -import type { BlockStdScope, Command } from '@blocksuite/block-std'; +import { Bound, type IVec, type SerializedXYWH } from '@blocksuite/global/gfx'; +import { assertType } from '@blocksuite/global/utils'; +import type { BlockStdScope, Command } from '@blocksuite/std'; import { type GfxBlockElementModel, type GfxCompatibleProps, @@ -13,9 +15,7 @@ import { type GfxPrimitiveElementModel, type SerializedElement, SortOrder, -} from '@blocksuite/block-std/gfx'; -import { Bound, type IVec, type SerializedXYWH } from '@blocksuite/global/gfx'; -import { assertType } from '@blocksuite/global/utils'; +} from '@blocksuite/std/gfx'; import { type BlockSnapshot, BlockSnapshotSchema } from '@blocksuite/store'; import { createCanvasElement } from './canvas'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/utils.ts b/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/utils.ts index df6752bdec..6dcfb565e1 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/utils.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/utils.ts @@ -4,13 +4,13 @@ import { } from '@blocksuite/affine-block-frame'; import type { FrameBlockProps } from '@blocksuite/affine-model'; import { encodeClipboardBlobs } from '@blocksuite/affine-shared/adapters'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import { Bound, getBoundWithRotation } from '@blocksuite/global/gfx'; +import type { BlockStdScope } from '@blocksuite/std'; import { generateKeyBetweenV2, type GfxModel, type SerializedElement, -} from '@blocksuite/block-std/gfx'; -import { Bound, getBoundWithRotation } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import { type BlockSnapshot, BlockSnapshotSchema } from '@blocksuite/store'; import DOMPurify from 'dompurify'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts index 1709944082..f450887224 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts @@ -40,12 +40,6 @@ import { captureEventTarget, matchModels, } from '@blocksuite/affine-shared/utils'; -import { - type BlockComponent, - type BlockStdScope, - stdContext, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import type { XYWH } from '@blocksuite/global/gfx'; import { Bound, @@ -57,6 +51,12 @@ import { } from '@blocksuite/global/gfx'; import { WithDisposable } from '@blocksuite/global/lit'; import { FrameIcon, PageIcon } from '@blocksuite/icons/lit'; +import { + type BlockComponent, + type BlockStdScope, + stdContext, +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { consume } from '@lit/context'; import { baseTheme } from '@toeverything/theme'; import { css, html, LitElement, nothing, unsafeCSS } from 'lit'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/edgeless-auto-complete.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/edgeless-auto-complete.ts index cd19c77b09..317ac484bd 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/edgeless-auto-complete.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/edgeless-auto-complete.ts @@ -26,12 +26,6 @@ import { shapeMethods, } from '@blocksuite/affine-model'; import { handleNativeRangeAtPoint } from '@blocksuite/affine-shared/utils'; -import { - type BlockComponent, - type BlockStdScope, - stdContext, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { DisposableGroup } from '@blocksuite/global/disposable'; import type { Bound, IVec } from '@blocksuite/global/gfx'; import { Vec } from '@blocksuite/global/gfx'; @@ -42,6 +36,12 @@ import { SiblingNodeIcon, SubNodeIcon, } from '@blocksuite/icons/lit'; +import { + type BlockComponent, + type BlockStdScope, + stdContext, +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { consume } from '@lit/context'; import { css, html, LitElement, nothing } from 'lit'; import { property, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/utils.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/utils.ts index 3e2de8977e..05960d6051 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/utils.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/utils.ts @@ -15,11 +15,11 @@ import { type ShapeName, type ShapeStyle, } from '@blocksuite/affine-model'; -import type { BlockComponent } from '@blocksuite/block-std'; -import type { GfxController, GfxModel } from '@blocksuite/block-std/gfx'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; import { Bound, normalizeDegAngle, type XYWH } from '@blocksuite/global/gfx'; import { assertType } from '@blocksuite/global/utils'; +import type { BlockComponent } from '@blocksuite/std'; +import type { GfxController, GfxModel } from '@blocksuite/std/gfx'; import * as Y from 'yjs'; export enum Direction { diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/note-slicer/index.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/note-slicer/index.ts index 979cd0d9c8..89d2c18a97 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/note-slicer/index.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/note-slicer/index.ts @@ -12,11 +12,11 @@ import { import { EDGELESS_BLOCK_CHILD_PADDING } from '@blocksuite/affine-shared/consts'; import { TelemetryProvider } from '@blocksuite/affine-shared/services'; import { getRectByBlockComponent } from '@blocksuite/affine-shared/utils'; -import { WidgetComponent } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { DisposableGroup } from '@blocksuite/global/disposable'; import { deserializeXYWH, Point, serializeXYWH } from '@blocksuite/global/gfx'; import { ScissorsIcon } from '@blocksuite/icons/lit'; +import { WidgetComponent } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { css, html, nothing, type PropertyValues } from 'lit'; import { state } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-dragging-area-rect.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-dragging-area-rect.ts index 17facc2f3d..0724a308ab 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-dragging-area-rect.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-dragging-area-rect.ts @@ -1,5 +1,5 @@ import type { RootBlockModel } from '@blocksuite/affine-model'; -import { WidgetComponent } from '@blocksuite/block-std'; +import { WidgetComponent } from '@blocksuite/std'; import { cssVarV2 } from '@toeverything/theme/v2'; import { css, html, nothing, unsafeCSS } from 'lit'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts index db428d4779..60cbb90341 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts @@ -41,14 +41,6 @@ import { requestThrottledConnectedFrame, stopPropagation, } from '@blocksuite/affine-shared/utils'; -import { WidgetComponent } from '@blocksuite/block-std'; -import { - type CursorType, - getTopElements, - GfxControllerIdentifier, - type GfxModel, - type GfxPrimitiveElementModel, -} from '@blocksuite/block-std/gfx'; import type { IPoint, IVec, PointLocation } from '@blocksuite/global/gfx'; import { Bound, @@ -56,6 +48,14 @@ import { normalizeDegAngle, } from '@blocksuite/global/gfx'; import { assertType } from '@blocksuite/global/utils'; +import { WidgetComponent } from '@blocksuite/std'; +import { + type CursorType, + getTopElements, + GfxControllerIdentifier, + type GfxModel, + type GfxPrimitiveElementModel, +} from '@blocksuite/std/gfx'; import { css, html, nothing } from 'lit'; import { state } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/common/toolbar-arrow-up-icon.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/common/toolbar-arrow-up-icon.ts index 4c446b6a02..0c0ee9313e 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/common/toolbar-arrow-up-icon.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/common/toolbar-arrow-up-icon.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { ArrowUpSmallIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, html } from 'lit'; export class ToolbarArrowUpIcon extends ShadowlessElement { diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/default/default-tool-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/default/default-tool-button.ts index cb8cf4c570..15bbe13a8c 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/default/default-tool-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/default/default-tool-button.ts @@ -1,6 +1,6 @@ import { QuickToolMixin } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx'; import { HandIcon, SelectIcon } from '@blocksuite/icons/lit'; +import type { GfxToolsFullOptionValue } from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import { css, html, LitElement } from 'lit'; import { query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-panel.ts index f18c2364d7..8a1db741c3 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-panel.ts @@ -11,10 +11,10 @@ import { stopPropagation, } from '@blocksuite/affine-shared/utils'; import { EdgelessDraggableElementController } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import type { Bound } from '@blocksuite/global/gfx'; import { WithDisposable } from '@blocksuite/global/lit'; +import type { BlockComponent } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { baseTheme } from '@toeverything/theme'; import { css, html, LitElement, nothing, unsafeCSS } from 'lit'; import { property, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-tool-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-tool-button.ts index a6ef48cf6c..3d2ed2f51b 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-tool-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-tool-button.ts @@ -1,7 +1,7 @@ import { ArrowDownSmallIcon } from '@blocksuite/affine-components/icons'; import { once } from '@blocksuite/affine-shared/utils'; import { EdgelessToolbarToolMixin } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx'; +import type { GfxToolsFullOptionValue } from '@blocksuite/std/gfx'; import { arrow, autoUpdate, diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/utils.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/utils.ts index 1a7948320c..140e441e5a 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/utils.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/utils.ts @@ -1,6 +1,6 @@ -import type { CursorType, StandardCursor } from '@blocksuite/block-std/gfx'; import type { IVec } from '@blocksuite/global/gfx'; import { normalizeDegAngle, Vec } from '@blocksuite/global/gfx'; +import type { CursorType, StandardCursor } from '@blocksuite/std/gfx'; export function generateCursorUrl( angle = 0, diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/alignment.ts b/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/alignment.ts index ea6203e4ae..b9bdb2509a 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/alignment.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/alignment.ts @@ -11,7 +11,6 @@ import type { MenuItem, } from '@blocksuite/affine-widget-edgeless-toolbar'; import { renderMenuItems } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { GfxModel } from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; import { AlignBottomIcon, @@ -25,6 +24,7 @@ import { DistributeVerticalIcon, ResizeTidyUpIcon, } from '@blocksuite/icons/lit'; +import type { GfxModel } from '@blocksuite/std/gfx'; import { html } from 'lit'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/index.ts b/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/index.ts index 544fb6fa09..e0f63df512 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/index.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/index.ts @@ -10,7 +10,7 @@ import { mindmapToolbarExtension } from '@blocksuite/affine-gfx-mindmap'; import { shapeToolbarExtension } from '@blocksuite/affine-gfx-shape'; import { textToolbarExtension } from '@blocksuite/affine-gfx-text'; import { ToolbarModuleExtension } from '@blocksuite/affine-shared/services'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { builtinLockedToolbarConfig, builtinMiscToolbarConfig } from './misc'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/misc.ts b/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/misc.ts index 179485bac3..0d0104ba78 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/misc.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/misc.ts @@ -21,7 +21,6 @@ import { type ToolbarContext, type ToolbarModuleConfig, } from '@blocksuite/affine-shared/services'; -import type { GfxModel } from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; import { AlignLeftIcon, @@ -32,6 +31,7 @@ import { ReleaseFromGroupIcon, UnlockIcon, } from '@blocksuite/icons/lit'; +import type { GfxModel } from '@blocksuite/std/gfx'; import { html } from 'lit'; import { renderAlignmentMenu } from './alignment'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/more.ts b/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/more.ts index a99e3f766a..4d65018610 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/more.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/more.ts @@ -29,8 +29,6 @@ import type { ToolbarContext, } from '@blocksuite/affine-shared/services'; import { type ReorderingType } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { GfxBlockElementModel, type GfxModel } from '@blocksuite/block-std/gfx'; import { Bound, getCommonBoundWithRotation } from '@blocksuite/global/gfx'; import { ArrowDownBigBottomIcon, @@ -45,6 +43,8 @@ import { LinkedPageIcon, ResetIcon, } from '@blocksuite/icons/lit'; +import type { BlockComponent } from '@blocksuite/std'; +import { GfxBlockElementModel, type GfxModel } from '@blocksuite/std/gfx'; import { EdgelessClipboardController } from '../../clipboard/clipboard'; import { duplicate } from '../../utils/clipboard-utils'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/render-linked-doc.ts b/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/render-linked-doc.ts index 53a6b998ae..1a7444d31d 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/render-linked-doc.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/render-linked-doc.ts @@ -4,8 +4,8 @@ import type { FrameBlockModel, NoteBlockModel } from '@blocksuite/affine-model'; import { replaceIdMiddleware } from '@blocksuite/affine-shared/adapters'; import { DocModeProvider } from '@blocksuite/affine-shared/services'; import { getBlockProps } from '@blocksuite/affine-shared/utils'; -import type { EditorHost } from '@blocksuite/block-std'; -import { GfxBlockElementModel, type GfxModel } from '@blocksuite/block-std/gfx'; +import type { EditorHost } from '@blocksuite/std'; +import { GfxBlockElementModel, type GfxModel } from '@blocksuite/std/gfx'; import { type Store, Text } from '@blocksuite/store'; import { diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-builtin-spec.ts b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-builtin-spec.ts index 7a52fc8ca4..aa3613559a 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-builtin-spec.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-builtin-spec.ts @@ -20,7 +20,7 @@ import { import { NoteTool } from '@blocksuite/affine-gfx-note'; import { ShapeTool } from '@blocksuite/affine-gfx-shape'; import { TextTool } from '@blocksuite/affine-gfx-text'; -import { ElementTransformManager } from '@blocksuite/block-std/gfx'; +import { ElementTransformManager } from '@blocksuite/std/gfx'; import type { ExtensionType } from '@blocksuite/store'; import { EdgelessElementToolbarExtension } from './configs/toolbar'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-keyboard.ts b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-keyboard.ts index 8553973f61..4a7dc143c0 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-keyboard.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-keyboard.ts @@ -31,16 +31,16 @@ import { } from '@blocksuite/affine-shared/services'; import { LassoMode } from '@blocksuite/affine-shared/types'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import { SurfaceSelection, TextSelection } from '@blocksuite/block-std'; +import { IS_MAC } from '@blocksuite/global/env'; +import { Bound, getCommonBound } from '@blocksuite/global/gfx'; +import { SurfaceSelection, TextSelection } from '@blocksuite/std'; import { GfxBlockElementModel, type GfxPrimitiveElementModel, type GfxToolsMap, type GfxToolsOption, isGfxGroupCompatibleModel, -} from '@blocksuite/block-std/gfx'; -import { IS_MAC } from '@blocksuite/global/env'; -import { Bound, getCommonBound } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import { PageKeyboardManager } from '../keyboard/keyboard-manager.js'; import type { EdgelessRootBlockComponent } from './edgeless-root-block.js'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-block.ts b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-block.ts index dab8e56ca9..4495ac182b 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-block.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-block.ts @@ -28,18 +28,18 @@ import { requestConnectedFrame, requestThrottledConnectedFrame, } from '@blocksuite/affine-shared/utils'; +import { IS_WINDOWS } from '@blocksuite/global/env'; +import { Bound, Point, Vec } from '@blocksuite/global/gfx'; import { BlockComponent, type GfxBlockComponent, SurfaceSelection, type UIEventHandler, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import { GfxControllerIdentifier, type GfxViewportElement, -} from '@blocksuite/block-std/gfx'; -import { IS_WINDOWS } from '@blocksuite/global/env'; -import { Bound, Point, Vec } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import { css, html } from 'lit'; import { query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-preview-block.ts b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-preview-block.ts index 8b736412c4..963342a143 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-preview-block.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-preview-block.ts @@ -16,11 +16,11 @@ import { BlockComponent, type GfxBlockComponent, SurfaceSelection, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import { GfxControllerIdentifier, type GfxViewportElement, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; import { css, html } from 'lit'; import { query, state } from 'lit/decorators.js'; import { type StyleInfo, styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-service.ts b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-service.ts index 2c71dc2f0f..cef30fe3fb 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-service.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-service.ts @@ -12,14 +12,16 @@ import { type ConnectorElementModel, RootBlockSchema, } from '@blocksuite/affine-model'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +import { Bound, getCommonBound } from '@blocksuite/global/gfx'; +import type { BlockStdScope } from '@blocksuite/std'; import type { GfxController, GfxModel, LayerManager, PointTestOptions, ReorderingDirection, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; import { GfxBlockElementModel, GfxControllerIdentifier, @@ -27,9 +29,7 @@ import { ZOOM_MAX, ZOOM_MIN, ZOOM_STEP, -} from '@blocksuite/block-std/gfx'; -import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; -import { Bound, getCommonBound } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import clamp from 'lodash-es/clamp'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-spec.ts b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-spec.ts index 4808676085..11a5aba2e1 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-spec.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-spec.ts @@ -12,11 +12,8 @@ import { BlockViewExtension, LifeCycleWatcher, WidgetViewExtension, -} from '@blocksuite/block-std'; -import { - GfxControllerIdentifier, - ToolController, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier, ToolController } from '@blocksuite/std/gfx'; import type { ExtensionType } from '@blocksuite/store'; import { literal, unsafeStatic } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/element-transform/dblclick-add-edgeless-text.ts b/blocksuite/affine/blocks/block-root/src/edgeless/element-transform/dblclick-add-edgeless-text.ts index a0dbd88545..81194f0989 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/element-transform/dblclick-add-edgeless-text.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/element-transform/dblclick-add-edgeless-text.ts @@ -4,8 +4,8 @@ import { FeatureFlagService, TelemetryProvider, } from '@blocksuite/affine-shared/services'; -import type { PointerEventState } from '@blocksuite/block-std'; -import { TransformExtension } from '@blocksuite/block-std/gfx'; +import type { PointerEventState } from '@blocksuite/std'; +import { TransformExtension } from '@blocksuite/std/gfx'; export class DblClickAddEdgelessText extends TransformExtension { static override key = 'dbl-click-add-edgeless-text'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/element-transform/snap-manager.ts b/blocksuite/affine/blocks/block-root/src/edgeless/element-transform/snap-manager.ts index 14d7509780..d4c98df8a4 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/element-transform/snap-manager.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/element-transform/snap-manager.ts @@ -1,12 +1,12 @@ import { OverlayIdentifier } from '@blocksuite/affine-block-surface'; import { MindmapElementModel } from '@blocksuite/affine-model'; +import type { Bound } from '@blocksuite/global/gfx'; import { type DragExtensionInitializeContext, type ExtensionDragMoveContext, type GfxModel, TransformExtension, -} from '@blocksuite/block-std/gfx'; -import type { Bound } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import type { SnapOverlay } from '../utils/snap-manager'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/default-tool.ts b/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/default-tool.ts index e9baf5f5c6..af91be6345 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/default-tool.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/default-tool.ts @@ -12,7 +12,10 @@ import { MindmapElementModel, } from '@blocksuite/affine-model'; import { resetNativeSelection } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent, PointerEventState } from '@blocksuite/block-std'; +import { DisposableGroup } from '@blocksuite/global/disposable'; +import type { IVec } from '@blocksuite/global/gfx'; +import { Bound, getCommonBoundWithRotation, Vec } from '@blocksuite/global/gfx'; +import type { BlockComponent, PointerEventState } from '@blocksuite/std'; import { BaseTool, getTopElements, @@ -20,10 +23,7 @@ import { isGfxGroupCompatibleModel, type PointTestOptions, TransformManagerIdentifier, -} from '@blocksuite/block-std/gfx'; -import { DisposableGroup } from '@blocksuite/global/disposable'; -import type { IVec } from '@blocksuite/global/gfx'; -import { Bound, getCommonBoundWithRotation, Vec } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import { createElementsFromClipboardDataCommand } from '../clipboard/command.js'; @@ -546,7 +546,7 @@ export class DefaultTool extends BaseTool { override unmounted(): void {} } -declare module '@blocksuite/block-std/gfx' { +declare module '@blocksuite/std/gfx' { interface GfxToolsMap { default: DefaultTool; } diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/empty-tool.ts b/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/empty-tool.ts index 6fb6d2c874..1e2ddfb0ee 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/empty-tool.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/empty-tool.ts @@ -1,4 +1,4 @@ -import { BaseTool } from '@blocksuite/block-std/gfx'; +import { BaseTool } from '@blocksuite/std/gfx'; /** * Empty tool that does nothing. @@ -7,7 +7,7 @@ export class EmptyTool extends BaseTool { static override toolName: string = 'empty'; } -declare module '@blocksuite/block-std/gfx' { +declare module '@blocksuite/std/gfx' { interface GfxToolsMap { empty: EmptyTool; } diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/lasso-tool.ts b/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/lasso-tool.ts index 822cabe978..3d1658d3ec 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/lasso-tool.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/lasso-tool.ts @@ -4,8 +4,6 @@ import { } from '@blocksuite/affine-block-surface'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; import { LassoMode } from '@blocksuite/affine-shared/types'; -import type { PointerEventState } from '@blocksuite/block-std'; -import { BaseTool } from '@blocksuite/block-std/gfx'; import type { IPoint, IVec } from '@blocksuite/global/gfx'; import { Bound, @@ -17,6 +15,8 @@ import { rotatePoints, Vec, } from '@blocksuite/global/gfx'; +import type { PointerEventState } from '@blocksuite/std'; +import { BaseTool } from '@blocksuite/std/gfx'; class LassoOverlay extends Overlay { d = ''; @@ -315,7 +315,7 @@ export class LassoTool extends BaseTool { } } -declare module '@blocksuite/block-std/gfx' { +declare module '@blocksuite/std/gfx' { interface GfxToolsMap { lasso: LassoTool; } diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/pan-tool.ts b/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/pan-tool.ts index ca66d9daa1..4a07b7b59e 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/pan-tool.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/pan-tool.ts @@ -1,6 +1,6 @@ import { on } from '@blocksuite/affine-shared/utils'; -import type { PointerEventState } from '@blocksuite/block-std'; -import { BaseTool, MouseButton } from '@blocksuite/block-std/gfx'; +import type { PointerEventState } from '@blocksuite/std'; +import { BaseTool, MouseButton } from '@blocksuite/std/gfx'; import { Signal } from '@preact/signals-core'; export type PanToolOption = { @@ -76,7 +76,7 @@ export class PanTool extends BaseTool { } } -declare module '@blocksuite/block-std/gfx' { +declare module '@blocksuite/std/gfx' { interface GfxToolsMap { pan: PanTool; } diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/template-tool.ts b/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/template-tool.ts index c239be181d..fa323dee55 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/template-tool.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/gfx-tool/template-tool.ts @@ -1,10 +1,10 @@ -import { BaseTool } from '@blocksuite/block-std/gfx'; +import { BaseTool } from '@blocksuite/std/gfx'; export class TemplateTool extends BaseTool { static override toolName: string = 'template'; } -declare module '@blocksuite/block-std/gfx' { +declare module '@blocksuite/std/gfx' { interface GfxToolsMap { template: TemplateTool; } diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/middlewares/base.ts b/blocksuite/affine/blocks/block-root/src/edgeless/middlewares/base.ts index 0935e5bc2e..8bcc38e418 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/middlewares/base.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/middlewares/base.ts @@ -3,7 +3,7 @@ import { EditPropsStore } from '@blocksuite/affine-shared/services'; import { type SurfaceMiddleware, SurfaceMiddlewareBuilder, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; export class EditPropsMiddlewareBuilder extends SurfaceMiddlewareBuilder { static override key = 'editProps'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/utils/clipboard-utils.ts b/blocksuite/affine/blocks/block-root/src/edgeless/utils/clipboard-utils.ts index 7698c50741..6622a596e9 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/utils/clipboard-utils.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/utils/clipboard-utils.ts @@ -12,12 +12,9 @@ import type { ShapeElementModel, } from '@blocksuite/affine-model'; import { getElementsWithoutGroup } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { - GfxControllerIdentifier, - type GfxModel, -} from '@blocksuite/block-std/gfx'; import { getCommonBoundWithRotation } from '@blocksuite/global/gfx'; +import type { BlockComponent } from '@blocksuite/std'; +import { GfxControllerIdentifier, type GfxModel } from '@blocksuite/std/gfx'; import groupBy from 'lodash-es/groupBy'; import { createElementsFromClipboardDataCommand } from '../clipboard/command.js'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/utils/clone-utils.ts b/blocksuite/affine/blocks/block-root/src/edgeless/utils/clone-utils.ts index 3df306128b..b55b28f19b 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/utils/clone-utils.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/utils/clone-utils.ts @@ -10,7 +10,7 @@ import { GroupElementModel, MindmapElementModel, } from '@blocksuite/affine-model'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import { getTopElements, GfxBlockElementModel, @@ -18,7 +18,7 @@ import { type GfxPrimitiveElementModel, isGfxGroupCompatibleModel, type SerializedElement, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; import type { BlockSnapshot, Transformer } from '@blocksuite/store'; /** diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/utils/crud.ts b/blocksuite/affine/blocks/block-root/src/edgeless/utils/crud.ts index 3a6a7033af..c7fe3f6ccd 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/utils/crud.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/utils/crud.ts @@ -1,6 +1,6 @@ import { isNoteBlock } from '@blocksuite/affine-block-surface'; import type { Connectable } from '@blocksuite/affine-model'; -import type { GfxModel } from '@blocksuite/block-std/gfx'; +import type { GfxModel } from '@blocksuite/std/gfx'; import type { EdgelessRootBlockComponent } from '../index.js'; import { isConnectable } from './query.js'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/utils/panning-utils.ts b/blocksuite/affine/blocks/block-root/src/edgeless/utils/panning-utils.ts index 06956f29b3..85cb16ec0d 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/utils/panning-utils.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/utils/panning-utils.ts @@ -1,6 +1,6 @@ -import type { PointerEventState } from '@blocksuite/block-std'; -import type { Viewport } from '@blocksuite/block-std/gfx'; import type { IVec } from '@blocksuite/global/gfx'; +import type { PointerEventState } from '@blocksuite/std'; +import type { Viewport } from '@blocksuite/std/gfx'; const PANNING_DISTANCE = 30; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/utils/query.ts b/blocksuite/affine/blocks/block-root/src/edgeless/utils/query.ts index 304c962170..c247853780 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/utils/query.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/utils/query.ts @@ -21,14 +21,14 @@ import { getElementsWithoutGroup, isTopLevelBlock, } from '@blocksuite/affine-shared/utils'; +import type { PointLocation } from '@blocksuite/global/gfx'; +import { Bound } from '@blocksuite/global/gfx'; import type { GfxModel, GfxPrimitiveElementModel, GfxToolsFullOptionValue, Viewport, -} from '@blocksuite/block-std/gfx'; -import type { PointLocation } from '@blocksuite/global/gfx'; -import { Bound } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import type { BlockModel } from '@blocksuite/store'; export function isEdgelessTextBlock( diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/utils/snap-manager.ts b/blocksuite/affine/blocks/block-root/src/edgeless/utils/snap-manager.ts index 205dc5c3fb..86e1ec2fc5 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/utils/snap-manager.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/utils/snap-manager.ts @@ -3,8 +3,8 @@ import { ConnectorElementModel, MindmapElementModel, } from '@blocksuite/affine-model'; -import type { GfxModel } from '@blocksuite/block-std/gfx'; import { almostEqual, Bound, Point } from '@blocksuite/global/gfx'; +import type { GfxModel } from '@blocksuite/std/gfx'; interface Distance { horiz?: { diff --git a/blocksuite/affine/blocks/block-root/src/keyboard/keyboard-manager.ts b/blocksuite/affine/blocks/block-root/src/keyboard/keyboard-manager.ts index 3c4a07ea16..47ef3cb05f 100644 --- a/blocksuite/affine/blocks/block-root/src/keyboard/keyboard-manager.ts +++ b/blocksuite/affine/blocks/block-root/src/keyboard/keyboard-manager.ts @@ -11,12 +11,12 @@ import { getSelectedModelsCommand, } from '@blocksuite/affine-shared/commands'; import { matchModels } from '@blocksuite/affine-shared/utils'; +import { IS_MAC, IS_WINDOWS } from '@blocksuite/global/env'; import { type BlockComponent, BlockSelection, type UIEventHandler, -} from '@blocksuite/block-std'; -import { IS_MAC, IS_WINDOWS } from '@blocksuite/global/env'; +} from '@blocksuite/std'; import { toDraftModel } from '@blocksuite/store'; export class PageKeyboardManager { diff --git a/blocksuite/affine/blocks/block-root/src/page/page-root-block.ts b/blocksuite/affine/blocks/block-root/src/page/page-root-block.ts index 25721692fa..47083da085 100644 --- a/blocksuite/affine/blocks/block-root/src/page/page-root-block.ts +++ b/blocksuite/affine/blocks/block-root/src/page/page-root-block.ts @@ -19,13 +19,9 @@ import { getScrollContainer, matchModels, } from '@blocksuite/affine-shared/utils'; -import type { PointerEventState } from '@blocksuite/block-std'; -import { - BlockComponent, - BlockSelection, - TextSelection, -} from '@blocksuite/block-std'; import { Point } from '@blocksuite/global/gfx'; +import type { PointerEventState } from '@blocksuite/std'; +import { BlockComponent, BlockSelection, TextSelection } from '@blocksuite/std'; import type { BlockModel, Text } from '@blocksuite/store'; import { css, html } from 'lit'; import { query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-root/src/page/page-root-spec.ts b/blocksuite/affine/blocks/block-root/src/page/page-root-spec.ts index bae605ae2b..373105f432 100644 --- a/blocksuite/affine/blocks/block-root/src/page/page-root-spec.ts +++ b/blocksuite/affine/blocks/block-root/src/page/page-root-spec.ts @@ -1,5 +1,5 @@ import { ViewportElementExtension } from '@blocksuite/affine-shared/services'; -import { BlockViewExtension, WidgetViewExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, WidgetViewExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal, unsafeStatic } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-root/src/preview/preview-root-block.ts b/blocksuite/affine/blocks/block-root/src/preview/preview-root-block.ts index 09bff43e7c..3d88a3b4e6 100644 --- a/blocksuite/affine/blocks/block-root/src/preview/preview-root-block.ts +++ b/blocksuite/affine/blocks/block-root/src/preview/preview-root-block.ts @@ -1,6 +1,6 @@ import { NoteBlockModel, NoteDisplayMode } from '@blocksuite/affine-model'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import { BlockComponent } from '@blocksuite/block-std'; +import { BlockComponent } from '@blocksuite/std'; import { css, html } from 'lit'; import { repeat } from 'lit/directives/repeat.js'; diff --git a/blocksuite/affine/blocks/block-root/src/root-config.ts b/blocksuite/affine/blocks/block-root/src/root-config.ts index 43575c229e..9c12d9ec59 100644 --- a/blocksuite/affine/blocks/block-root/src/root-config.ts +++ b/blocksuite/affine/blocks/block-root/src/root-config.ts @@ -1,4 +1,4 @@ -import { ConfigExtensionFactory } from '@blocksuite/block-std'; +import { ConfigExtensionFactory } from '@blocksuite/std'; import type { KeyboardToolbarConfig } from './widgets/keyboard-toolbar/config.js'; import type { LinkedWidgetConfig } from './widgets/linked-doc/index.js'; diff --git a/blocksuite/affine/blocks/block-root/src/root-service.ts b/blocksuite/affine/blocks/block-root/src/root-service.ts index 2f6ea88181..fd71c3a058 100644 --- a/blocksuite/affine/blocks/block-root/src/root-service.ts +++ b/blocksuite/affine/blocks/block-root/src/root-service.ts @@ -5,8 +5,8 @@ import { getSelectedBlocksCommand, getTextSelectionCommand, } from '@blocksuite/affine-shared/commands'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { BlockService } from '@blocksuite/block-std'; +import type { BlockComponent } from '@blocksuite/std'; +import { BlockService } from '@blocksuite/std'; import type { RootBlockComponent } from './types.js'; diff --git a/blocksuite/affine/blocks/block-root/src/utils/callback.ts b/blocksuite/affine/blocks/block-root/src/utils/callback.ts index ccb0c76ac8..b1d80bbd6d 100644 --- a/blocksuite/affine/blocks/block-root/src/utils/callback.ts +++ b/blocksuite/affine/blocks/block-root/src/utils/callback.ts @@ -1,4 +1,4 @@ -import type { BlockComponent, EditorHost } from '@blocksuite/block-std'; +import type { BlockComponent, EditorHost } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; // Run the callback until a model's element updated. diff --git a/blocksuite/affine/blocks/block-root/src/utils/types.ts b/blocksuite/affine/blocks/block-root/src/utils/types.ts index 91ff028e42..406b42c635 100644 --- a/blocksuite/affine/blocks/block-root/src/utils/types.ts +++ b/blocksuite/affine/blocks/block-root/src/utils/types.ts @@ -9,7 +9,7 @@ import { EmbedYoutubeBlockComponent, type LinkableEmbedBlockComponent, } from '@blocksuite/affine-block-embed'; -import type { BlockComponent } from '@blocksuite/block-std'; +import type { BlockComponent } from '@blocksuite/std'; export type BuiltInEmbedBlockComponent = | BookmarkBlockComponent diff --git a/blocksuite/affine/blocks/block-root/src/widgets/edgeless-navigator-bg/index.ts b/blocksuite/affine/blocks/block-root/src/widgets/edgeless-navigator-bg/index.ts index 6c6ff4bdc5..6fb0eb9571 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/edgeless-navigator-bg/index.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/edgeless-navigator-bg/index.ts @@ -1,9 +1,9 @@ import { EdgelessLegacySlotIdentifier } from '@blocksuite/affine-block-surface'; import type { FrameBlockModel, RootBlockModel } from '@blocksuite/affine-model'; import { EditPropsStore } from '@blocksuite/affine-shared/services'; -import { WidgetComponent, WidgetViewExtension } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; +import { WidgetComponent, WidgetViewExtension } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import { css, html, nothing } from 'lit'; import { state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/index.ts b/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/index.ts index f0dcb24352..74d6701a8e 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/index.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/index.ts @@ -1,6 +1,6 @@ import { EdgelessLegacySlotIdentifier } from '@blocksuite/affine-block-surface'; import type { RootBlockModel } from '@blocksuite/affine-model'; -import { WidgetComponent } from '@blocksuite/block-std'; +import { WidgetComponent } from '@blocksuite/std'; import { effect } from '@preact/signals-core'; import { css, html, nothing } from 'lit'; import { state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/zoom-toolbar.ts b/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/zoom-toolbar.ts index a507a735d0..71e5a00b89 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/zoom-toolbar.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/zoom-toolbar.ts @@ -1,7 +1,7 @@ import { stopPropagation } from '@blocksuite/affine-shared/utils'; -import { ZOOM_STEP } from '@blocksuite/block-std/gfx'; import { WithDisposable } from '@blocksuite/global/lit'; import { MinusIcon, PlusIcon, ViewBarIcon } from '@blocksuite/icons/lit'; +import { ZOOM_STEP } from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import { baseTheme } from '@toeverything/theme'; import { css, html, LitElement, nothing, unsafeCSS } from 'lit'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/index.ts b/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/index.ts index e89b85bc68..f7abdc3012 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/index.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/index.ts @@ -14,7 +14,7 @@ import { BlockSelection, TextSelection, WidgetComponent, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import { limitShift, shift } from '@floating-ui/dom'; import { html } from 'lit'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/utils.ts b/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/utils.ts index 64166f4a49..9b7e14bd85 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/utils.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/utils.ts @@ -3,7 +3,7 @@ import { getBlockProps, isInsidePageEditor, } from '@blocksuite/affine-shared/utils'; -import { BlockSelection } from '@blocksuite/block-std'; +import { BlockSelection } from '@blocksuite/std'; export function duplicate( block: ImageBlockComponent, diff --git a/blocksuite/affine/blocks/block-root/src/widgets/inner-modal/inner-modal.ts b/blocksuite/affine/blocks/block-root/src/widgets/inner-modal/inner-modal.ts index bf4e8e3bd0..a40fe65511 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/inner-modal/inner-modal.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/inner-modal/inner-modal.ts @@ -1,4 +1,4 @@ -import { WidgetComponent } from '@blocksuite/block-std'; +import { WidgetComponent } from '@blocksuite/std'; import { autoUpdate, computePosition, diff --git a/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/config.ts b/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/config.ts index 054657c5d5..9670994c5d 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/config.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/config.ts @@ -58,7 +58,6 @@ import { openFileOrFiles, type Signal, } from '@blocksuite/affine-shared/utils'; -import type { BlockStdScope } from '@blocksuite/block-std'; import { viewPresets } from '@blocksuite/data-view/view-presets'; import { assertType } from '@blocksuite/global/utils'; import { @@ -103,6 +102,7 @@ import { YesterdayIcon, YoutubeDuotoneIcon, } from '@blocksuite/icons/lit'; +import type { BlockStdScope } from '@blocksuite/std'; import { computed } from '@preact/signals-core'; import { cssVarV2 } from '@toeverything/theme/v2'; import type { TemplateResult } from 'lit'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/index.ts b/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/index.ts index 82680bf5e4..5d9792cf24 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/index.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/index.ts @@ -1,8 +1,8 @@ import { getDocTitleByEditorHost } from '@blocksuite/affine-fragment-doc-title'; import type { RootBlockModel } from '@blocksuite/affine-model'; import { FeatureFlagService } from '@blocksuite/affine-shared/services'; -import { WidgetComponent } from '@blocksuite/block-std'; import { IS_MOBILE } from '@blocksuite/global/env'; +import { WidgetComponent } from '@blocksuite/std'; import { signal } from '@preact/signals-core'; import { html, nothing } from 'lit'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/keyboard-tool-panel.ts b/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/keyboard-tool-panel.ts index 068c6f97d3..d27d9bd890 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/keyboard-tool-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/keyboard-tool-panel.ts @@ -1,9 +1,9 @@ +import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { PropTypes, requiredProperties, ShadowlessElement, -} from '@blocksuite/block-std'; -import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; import { html, nothing, type PropertyValues } from 'lit'; import { property } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/keyboard-toolbar.ts b/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/keyboard-toolbar.ts index c72a59759b..7c6a876dc0 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/keyboard-toolbar.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/keyboard-toolbar.ts @@ -1,12 +1,12 @@ import { getSelectedModelsCommand } from '@blocksuite/affine-shared/commands'; import { VirtualKeyboardProvider } from '@blocksuite/affine-shared/services'; +import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ArrowLeftBigIcon, KeyboardIcon } from '@blocksuite/icons/lit'; import { PropTypes, requiredProperties, ShadowlessElement, -} from '@blocksuite/block-std'; -import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; -import { ArrowLeftBigIcon, KeyboardIcon } from '@blocksuite/icons/lit'; +} from '@blocksuite/std'; import { effect, type Signal, signal } from '@preact/signals-core'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/position-controller.ts b/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/position-controller.ts index 0822664e0c..ae3105708b 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/position-controller.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/keyboard-toolbar/position-controller.ts @@ -1,6 +1,6 @@ import { type VirtualKeyboardProvider } from '@blocksuite/affine-shared/services'; -import type { BlockStdScope, ShadowlessElement } from '@blocksuite/block-std'; import { DisposableGroup } from '@blocksuite/global/disposable'; +import type { BlockStdScope, ShadowlessElement } from '@blocksuite/std'; import { effect, type Signal } from '@preact/signals-core'; import type { ReactiveController, ReactiveControllerHost } from 'lit'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/config.ts b/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/config.ts index 8845e5ba06..2015cb9586 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/config.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/config.ts @@ -16,8 +16,8 @@ import { isFuzzyMatch, type Signal, } from '@blocksuite/affine-shared/utils'; -import type { BlockStdScope, EditorHost } from '@blocksuite/block-std'; -import type { InlineRange } from '@blocksuite/block-std/inline'; +import type { BlockStdScope, EditorHost } from '@blocksuite/std'; +import type { InlineRange } from '@blocksuite/std/inline'; import type { TemplateResult } from 'lit'; import { showImportModal } from './import-doc/index.js'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/import-doc/loader.ts b/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/import-doc/loader.ts index bb86e47eda..2bdfa9bc09 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/import-doc/loader.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/import-doc/loader.ts @@ -1,4 +1,4 @@ -import { BLOCK_ID_ATTR } from '@blocksuite/block-std'; +import { BLOCK_ID_ATTR } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { css, html, LitElement } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/index.ts b/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/index.ts index 71ab8c97a9..8ddb2778ad 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/index.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/index.ts @@ -5,15 +5,15 @@ import { } from '@blocksuite/affine-shared/commands'; import { FeatureFlagService } from '@blocksuite/affine-shared/services'; import { getViewportElement } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { BLOCK_ID_ATTR, WidgetComponent } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; +import { IS_MOBILE } from '@blocksuite/global/env'; +import type { BlockComponent } from '@blocksuite/std'; +import { BLOCK_ID_ATTR, WidgetComponent } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { INLINE_ROOT_ATTR, type InlineEditor, type InlineRootElement, -} from '@blocksuite/block-std/inline'; -import { IS_MOBILE } from '@blocksuite/global/env'; +} from '@blocksuite/std/inline'; import { signal } from '@preact/signals-core'; import { html, nothing } from 'lit'; import { choose } from 'lit/directives/choose.js'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/linked-doc-popover.ts b/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/linked-doc-popover.ts index 9b20baa898..27a62b5579 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/linked-doc-popover.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/linked-doc-popover.ts @@ -11,10 +11,10 @@ import { getPopperPosition, getViewportElement, } from '@blocksuite/affine-shared/utils'; -import { PropTypes, requiredProperties } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { MoreHorizontalIcon } from '@blocksuite/icons/lit'; +import { PropTypes, requiredProperties } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import { css, html, LitElement, nothing } from 'lit'; import { property, query, queryAll, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/mobile-linked-doc-menu.ts b/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/mobile-linked-doc-menu.ts index 45e92b5943..9ef5fe348c 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/mobile-linked-doc-menu.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/mobile-linked-doc-menu.ts @@ -7,9 +7,9 @@ import { createKeydownObserver, getViewportElement, } from '@blocksuite/affine-shared/utils'; -import { PropTypes, requiredProperties } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { MoreHorizontalIcon } from '@blocksuite/icons/lit'; +import { PropTypes, requiredProperties } from '@blocksuite/std'; import { signal } from '@preact/signals-core'; import { html, LitElement, nothing } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/modal/modal.ts b/blocksuite/affine/blocks/block-root/src/widgets/modal/modal.ts index 2cc6727066..14944e5e63 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/modal/modal.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/modal/modal.ts @@ -1,4 +1,4 @@ -import { WidgetComponent } from '@blocksuite/block-std'; +import { WidgetComponent } from '@blocksuite/std'; import { nothing } from 'lit'; import { createCustomModal } from './custom-modal.js'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/page-dragging-area/page-dragging-area.ts b/blocksuite/affine/blocks/block-root/src/widgets/page-dragging-area/page-dragging-area.ts index 50eb7b9fe9..d3c6392fe4 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/page-dragging-area/page-dragging-area.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/page-dragging-area/page-dragging-area.ts @@ -11,7 +11,7 @@ import { BlockSelection, type PointerEventState, WidgetComponent, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import { html, nothing } from 'lit'; import { state } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/blocks/block-root/src/widgets/viewport-overlay/viewport-overlay.ts b/blocksuite/affine/blocks/block-root/src/widgets/viewport-overlay/viewport-overlay.ts index 475b4f9e7d..b0410bd347 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/viewport-overlay/viewport-overlay.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/viewport-overlay/viewport-overlay.ts @@ -1,5 +1,5 @@ import type { RootBlockModel } from '@blocksuite/affine-model'; -import { WidgetComponent } from '@blocksuite/block-std'; +import { WidgetComponent } from '@blocksuite/std'; import { css, html } from 'lit'; import { state } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/blocks/block-root/tsconfig.json b/blocksuite/affine/blocks/block-root/tsconfig.json index d0f1c98bea..8aa9aed556 100644 --- a/blocksuite/affine/blocks/block-root/tsconfig.json +++ b/blocksuite/affine/blocks/block-root/tsconfig.json @@ -46,9 +46,9 @@ { "path": "../../widgets/widget-scroll-anchoring" }, { "path": "../../widgets/widget-slash-menu" }, { "path": "../../widgets/widget-toolbar" }, - { "path": "../../../framework/block-std" }, { "path": "../../data-view" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-surface-ref/package.json b/blocksuite/affine/blocks/block-surface-ref/package.json index a0664d90fe..b91035e432 100644 --- a/blocksuite/affine/blocks/block-surface-ref/package.json +++ b/blocksuite/affine/blocks/block-surface-ref/package.json @@ -17,9 +17,9 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/blocks/block-surface-ref/src/commands.ts b/blocksuite/affine/blocks/block-surface-ref/src/commands.ts index c747cb824d..643490d26a 100644 --- a/blocksuite/affine/blocks/block-surface-ref/src/commands.ts +++ b/blocksuite/affine/blocks/block-surface-ref/src/commands.ts @@ -1,7 +1,7 @@ import { EdgelessCRUDExtension } from '@blocksuite/affine-block-surface'; import { type SurfaceRefProps } from '@blocksuite/affine-model'; -import type { Command } from '@blocksuite/block-std'; -import { GfxPrimitiveElementModel } from '@blocksuite/block-std/gfx'; +import type { Command } from '@blocksuite/std'; +import { GfxPrimitiveElementModel } from '@blocksuite/std/gfx'; import type { BlockModel } from '@blocksuite/store'; export const insertSurfaceRefBlockCommand: Command< diff --git a/blocksuite/affine/blocks/block-surface-ref/src/components/surface-ref-toolbar-title.ts b/blocksuite/affine/blocks/block-surface-ref/src/components/surface-ref-toolbar-title.ts index 40c704069a..2364c5dde6 100644 --- a/blocksuite/affine/blocks/block-surface-ref/src/components/surface-ref-toolbar-title.ts +++ b/blocksuite/affine/blocks/block-surface-ref/src/components/surface-ref-toolbar-title.ts @@ -5,14 +5,14 @@ import { ShapeElementModel, } from '@blocksuite/affine-model'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { ShadowlessElement } from '@blocksuite/block-std'; -import type { GfxModel } from '@blocksuite/block-std/gfx'; import { EdgelessIcon, FrameIcon, GroupIcon, MindmapIcon, } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; +import type { GfxModel } from '@blocksuite/std/gfx'; import { css, html, type TemplateResult } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-surface-ref/src/configs/slash-menu.ts b/blocksuite/affine/blocks/block-surface-ref/src/configs/slash-menu.ts index 823034fdaa..408e5bdae9 100644 --- a/blocksuite/affine/blocks/block-surface-ref/src/configs/slash-menu.ts +++ b/blocksuite/affine/blocks/block-surface-ref/src/configs/slash-menu.ts @@ -7,10 +7,10 @@ import { SlashMenuConfigExtension, type SlashMenuItem, } from '@blocksuite/affine-widget-slash-menu'; -import { BlockSelection } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; import { FrameIcon, GroupingIcon, MindmapIcon } from '@blocksuite/icons/lit'; +import { BlockSelection } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { insertSurfaceRefBlockCommand } from '../commands'; import { EdgelessTooltip } from './tooltips'; diff --git a/blocksuite/affine/blocks/block-surface-ref/src/portal/generic-block.ts b/blocksuite/affine/blocks/block-surface-ref/src/portal/generic-block.ts index 76cd3c1034..5d4d19d381 100644 --- a/blocksuite/affine/blocks/block-surface-ref/src/portal/generic-block.ts +++ b/blocksuite/affine/blocks/block-surface-ref/src/portal/generic-block.ts @@ -10,9 +10,9 @@ import type { EmbedYoutubeModel, ImageBlockModel, } from '@blocksuite/affine-model'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; import { WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { css, type TemplateResult } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-surface-ref/src/portal/note.ts b/blocksuite/affine/blocks/block-surface-ref/src/portal/note.ts index 76bd0f5798..a80637743a 100644 --- a/blocksuite/affine/blocks/block-surface-ref/src/portal/note.ts +++ b/blocksuite/affine/blocks/block-surface-ref/src/portal/note.ts @@ -11,14 +11,14 @@ import { } from '@blocksuite/affine-shared/consts'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; import { SpecProvider } from '@blocksuite/affine-shared/utils'; +import { deserializeXYWH } from '@blocksuite/global/gfx'; +import { WithDisposable } from '@blocksuite/global/lit'; import { BlockStdScope, type EditorHost, ShadowlessElement, -} from '@blocksuite/block-std'; -import { RANGE_QUERY_EXCLUDE_ATTR } from '@blocksuite/block-std/inline'; -import { deserializeXYWH } from '@blocksuite/global/gfx'; -import { WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; +import { RANGE_QUERY_EXCLUDE_ATTR } from '@blocksuite/std/inline'; import { type BlockModel, type Query } from '@blocksuite/store'; import { css, nothing } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-surface-ref/src/surface-ref-block-edgeless.ts b/blocksuite/affine/blocks/block-surface-ref/src/surface-ref-block-edgeless.ts index f7b6df54de..f7e72f2ef3 100644 --- a/blocksuite/affine/blocks/block-surface-ref/src/surface-ref-block-edgeless.ts +++ b/blocksuite/affine/blocks/block-surface-ref/src/surface-ref-block-edgeless.ts @@ -1,5 +1,5 @@ import type { SurfaceRefBlockModel } from '@blocksuite/affine-model'; -import { BlockComponent } from '@blocksuite/block-std'; +import { BlockComponent } from '@blocksuite/std'; import { nothing } from 'lit'; export class EdgelessSurfaceRefBlockComponent extends BlockComponent { diff --git a/blocksuite/affine/blocks/block-surface-ref/src/surface-ref-block.ts b/blocksuite/affine/blocks/block-surface-ref/src/surface-ref-block.ts index 2340e0cc09..cf1fbe50fd 100644 --- a/blocksuite/affine/blocks/block-surface-ref/src/surface-ref-block.ts +++ b/blocksuite/affine/blocks/block-surface-ref/src/surface-ref-block.ts @@ -24,20 +24,6 @@ import { requestConnectedFrame, SpecProvider, } from '@blocksuite/affine-shared/utils'; -import { - BlockComponent, - BlockSelection, - BlockStdScope, - type EditorHost, - LifeCycleWatcher, - TextSelection, -} from '@blocksuite/block-std'; -import { - GfxBlockElementModel, - GfxControllerIdentifier, - type GfxModel, - GfxPrimitiveElementModel, -} from '@blocksuite/block-std/gfx'; import { DisposableGroup } from '@blocksuite/global/disposable'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; import { @@ -47,6 +33,20 @@ import { } from '@blocksuite/global/gfx'; import { assertType } from '@blocksuite/global/utils'; import { DeleteIcon } from '@blocksuite/icons/lit'; +import { + BlockComponent, + BlockSelection, + BlockStdScope, + type EditorHost, + LifeCycleWatcher, + TextSelection, +} from '@blocksuite/std'; +import { + GfxBlockElementModel, + GfxControllerIdentifier, + type GfxModel, + GfxPrimitiveElementModel, +} from '@blocksuite/std/gfx'; import type { BaseSelection, Store } from '@blocksuite/store'; import { effect, signal } from '@preact/signals-core'; import { css, html, nothing } from 'lit'; diff --git a/blocksuite/affine/blocks/block-surface-ref/src/surface-ref-spec.ts b/blocksuite/affine/blocks/block-surface-ref/src/surface-ref-spec.ts index 0a16ed768d..637d5bf82e 100644 --- a/blocksuite/affine/blocks/block-surface-ref/src/surface-ref-spec.ts +++ b/blocksuite/affine/blocks/block-surface-ref/src/surface-ref-spec.ts @@ -4,7 +4,7 @@ import { BlockFlavourIdentifier, BlockViewExtension, FlavourExtension, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-surface-ref/src/utils.ts b/blocksuite/affine/blocks/block-surface-ref/src/utils.ts index e13a6da927..7544b18993 100644 --- a/blocksuite/affine/blocks/block-surface-ref/src/utils.ts +++ b/blocksuite/affine/blocks/block-surface-ref/src/utils.ts @@ -1,10 +1,10 @@ import type { SurfaceBlockComponent } from '@blocksuite/affine-block-surface'; import { ExportManager } from '@blocksuite/affine-block-surface'; import type { SurfaceRefBlockComponent } from '@blocksuite/affine-block-surface-ref'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { BlockSuiteError } from '@blocksuite/global/exceptions'; import { Bound } from '@blocksuite/global/gfx'; import { assertType } from '@blocksuite/global/utils'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { html } from 'lit'; export const noContentPlaceholder = html` diff --git a/blocksuite/affine/blocks/block-surface-ref/tsconfig.json b/blocksuite/affine/blocks/block-surface-ref/tsconfig.json index 6472f3c17a..067de84a30 100644 --- a/blocksuite/affine/blocks/block-surface-ref/tsconfig.json +++ b/blocksuite/affine/blocks/block-surface-ref/tsconfig.json @@ -14,8 +14,8 @@ { "path": "../../model" }, { "path": "../../shared" }, { "path": "../../widgets/widget-slash-menu" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-surface/package.json b/blocksuite/affine/blocks/block-surface/package.json index dd09f17910..2342f8a66f 100644 --- a/blocksuite/affine/blocks/block-surface/package.json +++ b/blocksuite/affine/blocks/block-surface/package.json @@ -14,8 +14,8 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@lit/context": "^1.1.2", "@preact/signals-core": "^1.8.0", diff --git a/blocksuite/affine/blocks/block-surface/src/commands/auto-align.ts b/blocksuite/affine/blocks/block-surface/src/commands/auto-align.ts index 104137df24..97d0bac968 100644 --- a/blocksuite/affine/blocks/block-surface/src/commands/auto-align.ts +++ b/blocksuite/affine/blocks/block-surface/src/commands/auto-align.ts @@ -5,17 +5,14 @@ import { MindmapElementModel, NoteBlockModel, } from '@blocksuite/affine-model'; -import { - GfxControllerIdentifier, - type GfxModel, -} from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; +import { GfxControllerIdentifier, type GfxModel } from '@blocksuite/std/gfx'; import chunk from 'lodash-es/chunk'; const ALIGN_HEIGHT = 200; const ALIGN_PADDING = 20; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import type { BlockModel, BlockProps } from '@blocksuite/store'; import { EdgelessCRUDIdentifier } from '../extensions/crud-extension.js'; diff --git a/blocksuite/affine/blocks/block-surface/src/commands/reassociate-connectors.ts b/blocksuite/affine/blocks/block-surface/src/commands/reassociate-connectors.ts index d229dcdd17..53c30b53e2 100644 --- a/blocksuite/affine/blocks/block-surface/src/commands/reassociate-connectors.ts +++ b/blocksuite/affine/blocks/block-surface/src/commands/reassociate-connectors.ts @@ -1,4 +1,4 @@ -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import { SurfaceBlockService } from '../surface-service'; diff --git a/blocksuite/affine/blocks/block-surface/src/element-model/base.ts b/blocksuite/affine/blocks/block-surface/src/element-model/base.ts index 4745916ec3..36a7214192 100644 --- a/blocksuite/affine/blocks/block-surface/src/element-model/base.ts +++ b/blocksuite/affine/blocks/block-surface/src/element-model/base.ts @@ -1,4 +1,4 @@ export { GfxPrimitiveElementModel as SurfaceElementModel, GfxGroupLikeElementModel as SurfaceGroupLikeModel, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; diff --git a/blocksuite/affine/blocks/block-surface/src/extensions/clipboard-config.ts b/blocksuite/affine/blocks/block-surface/src/extensions/clipboard-config.ts index 7d34e1ed6a..f19ccd0ed3 100644 --- a/blocksuite/affine/blocks/block-surface/src/extensions/clipboard-config.ts +++ b/blocksuite/affine/blocks/block-surface/src/extensions/clipboard-config.ts @@ -1,6 +1,6 @@ -import { type BlockStdScope, StdIdentifier } from '@blocksuite/block-std'; import { type Container, createIdentifier } from '@blocksuite/global/di'; import { BlockSuiteError } from '@blocksuite/global/exceptions'; +import { type BlockStdScope, StdIdentifier } from '@blocksuite/std'; import { type BlockSnapshot, Extension, type Store } from '@blocksuite/store'; import { getSurfaceComponent } from '../utils/get-surface-block'; diff --git a/blocksuite/affine/blocks/block-surface/src/extensions/crud-extension.ts b/blocksuite/affine/blocks/block-surface/src/extensions/crud-extension.ts index 58fdceced3..458244c241 100644 --- a/blocksuite/affine/blocks/block-surface/src/extensions/crud-extension.ts +++ b/blocksuite/affine/blocks/block-surface/src/extensions/crud-extension.ts @@ -1,13 +1,13 @@ import type { SurfaceElementModelMap } from '@blocksuite/affine-model'; import { EditPropsStore } from '@blocksuite/affine-shared/services'; -import { type BlockStdScope, StdIdentifier } from '@blocksuite/block-std'; +import { type Container, createIdentifier } from '@blocksuite/global/di'; +import { type BlockStdScope, StdIdentifier } from '@blocksuite/std'; import { GfxBlockElementModel, GfxControllerIdentifier, type GfxModel, isGfxGroupCompatibleModel, -} from '@blocksuite/block-std/gfx'; -import { type Container, createIdentifier } from '@blocksuite/global/di'; +} from '@blocksuite/std/gfx'; import { type BlockModel, Extension } from '@blocksuite/store'; import type { SurfaceBlockModel } from '../surface-model'; diff --git a/blocksuite/affine/blocks/block-surface/src/extensions/export-manager/export-manager.ts b/blocksuite/affine/blocks/block-surface/src/extensions/export-manager/export-manager.ts index dd2c384b04..b35c32775f 100644 --- a/blocksuite/affine/blocks/block-surface/src/extensions/export-manager/export-manager.ts +++ b/blocksuite/affine/blocks/block-surface/src/extensions/export-manager/export-manager.ts @@ -9,12 +9,15 @@ import { isInsidePageEditor, matchModels, } from '@blocksuite/affine-shared/utils'; +import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +import type { IBound } from '@blocksuite/global/gfx'; +import { deserializeXYWH } from '@blocksuite/global/gfx'; import { type BlockComponent, type BlockStdScope, type EditorHost, StdIdentifier, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import { GfxBlockElementModel, type GfxController, @@ -22,10 +25,7 @@ import { type GfxModel, GfxPrimitiveElementModel, isGfxGroupCompatibleModel, -} from '@blocksuite/block-std/gfx'; -import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; -import type { IBound } from '@blocksuite/global/gfx'; -import { deserializeXYWH } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import type { ExtensionType, Store } from '@blocksuite/store'; import type { CanvasRenderer } from '../../renderer/canvas-renderer.js'; diff --git a/blocksuite/affine/blocks/block-surface/src/extensions/query.ts b/blocksuite/affine/blocks/block-surface/src/extensions/query.ts index 957f8a8a83..f7c3b34063 100644 --- a/blocksuite/affine/blocks/block-surface/src/extensions/query.ts +++ b/blocksuite/affine/blocks/block-surface/src/extensions/query.ts @@ -1,5 +1,5 @@ import type { NoteBlockModel } from '@blocksuite/affine-model'; -import type { GfxModel } from '@blocksuite/block-std/gfx'; +import type { GfxModel } from '@blocksuite/std/gfx'; import type { BlockModel } from '@blocksuite/store'; import type { Connectable } from '../managers/connector-manager'; diff --git a/blocksuite/affine/blocks/block-surface/src/managers/connector-manager.ts b/blocksuite/affine/blocks/block-surface/src/managers/connector-manager.ts index 6cd97ba23b..81c8320644 100644 --- a/blocksuite/affine/blocks/block-surface/src/managers/connector-manager.ts +++ b/blocksuite/affine/blocks/block-surface/src/managers/connector-manager.ts @@ -7,11 +7,6 @@ import { type LocalConnectorElementModel, } from '@blocksuite/affine-model'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; -import type { - GfxController, - GfxLocalElementModel, - GfxModel, -} from '@blocksuite/block-std/gfx'; import { BlockSuiteError } from '@blocksuite/global/exceptions'; import type { IBound, IVec, IVec3 } from '@blocksuite/global/gfx'; import { @@ -33,6 +28,11 @@ import { Vec, } from '@blocksuite/global/gfx'; import { assertType } from '@blocksuite/global/utils'; +import type { + GfxController, + GfxLocalElementModel, + GfxModel, +} from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import last from 'lodash-es/last'; diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/canvas-renderer.ts b/blocksuite/affine/blocks/block-surface/src/renderer/canvas-renderer.ts index a573374aaf..df17e7bb6d 100644 --- a/blocksuite/affine/blocks/block-surface/src/renderer/canvas-renderer.ts +++ b/blocksuite/affine/blocks/block-surface/src/renderer/canvas-renderer.ts @@ -1,14 +1,14 @@ import { type Color, ColorScheme } from '@blocksuite/affine-model'; import { requestConnectedFrame } from '@blocksuite/affine-shared/utils'; +import { DisposableGroup } from '@blocksuite/global/disposable'; +import type { IBound } from '@blocksuite/global/gfx'; +import { getBoundWithRotation, intersects } from '@blocksuite/global/gfx'; import type { GridManager, LayerManager, SurfaceBlockModel, Viewport, -} from '@blocksuite/block-std/gfx'; -import { DisposableGroup } from '@blocksuite/global/disposable'; -import type { IBound } from '@blocksuite/global/gfx'; -import { getBoundWithRotation, intersects } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import last from 'lodash-es/last'; import { Subject } from 'rxjs'; diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/connector/index.ts b/blocksuite/affine/blocks/block-surface/src/renderer/elements/connector/index.ts index 6220f9b70b..242bb23821 100644 --- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/connector/index.ts +++ b/blocksuite/affine/blocks/block-surface/src/renderer/elements/connector/index.ts @@ -5,11 +5,11 @@ import { type LocalConnectorElementModel, type PointStyle, } from '@blocksuite/affine-model'; -import { deltaInsertsToChunks } from '@blocksuite/block-std/inline'; import { getBezierParameters, type PointLocation, } from '@blocksuite/global/gfx'; +import { deltaInsertsToChunks } from '@blocksuite/std/inline'; import { isConnectorWithLabel } from '../../../managers/connector-manager.js'; import type { RoughCanvas } from '../../../utils/rough/canvas.js'; diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/index.ts b/blocksuite/affine/blocks/block-surface/src/renderer/elements/index.ts index 5a12a62308..1d6754b463 100644 --- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/index.ts +++ b/blocksuite/affine/blocks/block-surface/src/renderer/elements/index.ts @@ -1,5 +1,5 @@ -import type { GfxPrimitiveElementModel } from '@blocksuite/block-std/gfx'; import type { IBound } from '@blocksuite/global/gfx'; +import type { GfxPrimitiveElementModel } from '@blocksuite/std/gfx'; import type { RoughCanvas } from '../../index.js'; import type { CanvasRenderer } from '../canvas-renderer.js'; diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/mindmap.ts b/blocksuite/affine/blocks/block-surface/src/renderer/elements/mindmap.ts index 4b34192911..d99ee87d12 100644 --- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/mindmap.ts +++ b/blocksuite/affine/blocks/block-surface/src/renderer/elements/mindmap.ts @@ -2,8 +2,8 @@ import type { MindmapElementModel, MindmapNode, } from '@blocksuite/affine-model'; -import type { GfxModel } from '@blocksuite/block-std/gfx'; import type { IBound } from '@blocksuite/global/gfx'; +import type { GfxModel } from '@blocksuite/std/gfx'; import { ConnectorPathGenerator } from '../../managers/connector-manager.js'; import type { RoughCanvas } from '../../utils/rough/canvas.js'; diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/index.ts b/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/index.ts index 09cb376092..2dcb227877 100644 --- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/index.ts +++ b/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/index.ts @@ -4,9 +4,9 @@ import type { ShapeType, } from '@blocksuite/affine-model'; import { DefaultTheme, TextAlign } from '@blocksuite/affine-model'; -import { deltaInsertsToChunks } from '@blocksuite/block-std/inline'; import type { IBound } from '@blocksuite/global/gfx'; import { Bound } from '@blocksuite/global/gfx'; +import { deltaInsertsToChunks } from '@blocksuite/std/inline'; import type { RoughCanvas } from '../../../utils/rough/canvas.js'; import type { CanvasRenderer } from '../../canvas-renderer.js'; diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/utils.ts b/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/utils.ts index 9b0ca527da..30c5d14d17 100644 --- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/utils.ts +++ b/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/utils.ts @@ -5,8 +5,8 @@ import type { TextVerticalAlign, } from '@blocksuite/affine-model'; import { FeatureFlagService } from '@blocksuite/affine-shared/services'; -import { deltaInsertsToChunks } from '@blocksuite/block-std/inline'; import type { Bound, SerializedXYWH } from '@blocksuite/global/gfx'; +import { deltaInsertsToChunks } from '@blocksuite/std/inline'; import type { CanvasRenderer } from '../../canvas-renderer.js'; import { diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/index.ts b/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/index.ts index 5aec4c2738..ca01d4628a 100644 --- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/index.ts +++ b/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/index.ts @@ -1,5 +1,5 @@ import { DefaultTheme, type TextElementModel } from '@blocksuite/affine-model'; -import { deltaInsertsToChunks } from '@blocksuite/block-std/inline'; +import { deltaInsertsToChunks } from '@blocksuite/std/inline'; import type { CanvasRenderer } from '../../canvas-renderer.js'; import { diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/utils.ts b/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/utils.ts index 87014cb2a4..0117b4d972 100644 --- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/utils.ts +++ b/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/utils.ts @@ -4,12 +4,12 @@ import type { FontWeight, TextElementModel, } from '@blocksuite/affine-model'; -import { deltaInsertsToChunks } from '@blocksuite/block-std/inline'; import type { Bound } from '@blocksuite/global/gfx'; import { getPointsFromBoundWithRotation, rotatePoints, } from '@blocksuite/global/gfx'; +import { deltaInsertsToChunks } from '@blocksuite/std/inline'; import type * as Y from 'yjs'; import { diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/overlay.ts b/blocksuite/affine/blocks/block-surface/src/renderer/overlay.ts index ff7c1192fc..cc6bc61bf6 100644 --- a/blocksuite/affine/blocks/block-surface/src/renderer/overlay.ts +++ b/blocksuite/affine/blocks/block-surface/src/renderer/overlay.ts @@ -1,9 +1,9 @@ +import { type Container, createIdentifier } from '@blocksuite/global/di'; +import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; import { type GfxController, GfxControllerIdentifier, -} from '@blocksuite/block-std/gfx'; -import { type Container, createIdentifier } from '@blocksuite/global/di'; -import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +} from '@blocksuite/std/gfx'; import { Extension } from '@blocksuite/store'; import type { RoughCanvas } from '../utils/rough/canvas.js'; diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/tool-overlay.ts b/blocksuite/affine/blocks/block-surface/src/renderer/tool-overlay.ts index 9eeeb2b482..a753e934d2 100644 --- a/blocksuite/affine/blocks/block-surface/src/renderer/tool-overlay.ts +++ b/blocksuite/affine/blocks/block-surface/src/renderer/tool-overlay.ts @@ -1,6 +1,6 @@ -import type { GfxController } from '@blocksuite/block-std/gfx'; import { DisposableGroup } from '@blocksuite/global/disposable'; import { noop } from '@blocksuite/global/utils'; +import type { GfxController } from '@blocksuite/std/gfx'; import type { RoughCanvas } from '../utils/rough/canvas'; import { Overlay } from './overlay'; diff --git a/blocksuite/affine/blocks/block-surface/src/surface-block-void.ts b/blocksuite/affine/blocks/block-surface/src/surface-block-void.ts index baddd6b760..838ecea27b 100644 --- a/blocksuite/affine/blocks/block-surface/src/surface-block-void.ts +++ b/blocksuite/affine/blocks/block-surface/src/surface-block-void.ts @@ -1,4 +1,4 @@ -import { BlockComponent } from '@blocksuite/block-std'; +import { BlockComponent } from '@blocksuite/std'; import { nothing } from 'lit'; import type { SurfaceBlockModel } from './surface-model.js'; diff --git a/blocksuite/affine/blocks/block-surface/src/surface-block.ts b/blocksuite/affine/blocks/block-surface/src/surface-block.ts index 50a39f157a..62bd8b92a3 100644 --- a/blocksuite/affine/blocks/block-surface/src/surface-block.ts +++ b/blocksuite/affine/blocks/block-surface/src/surface-block.ts @@ -1,13 +1,10 @@ import type { Color } from '@blocksuite/affine-model'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; -import type { EditorHost, SurfaceSelection } from '@blocksuite/block-std'; -import { BlockComponent } from '@blocksuite/block-std'; -import { - GfxControllerIdentifier, - type Viewport, -} from '@blocksuite/block-std/gfx'; -import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline'; import { Bound } from '@blocksuite/global/gfx'; +import type { EditorHost, SurfaceSelection } from '@blocksuite/std'; +import { BlockComponent } from '@blocksuite/std'; +import { GfxControllerIdentifier, type Viewport } from '@blocksuite/std/gfx'; +import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/std/inline'; import { css, html } from 'lit'; import { query } from 'lit/decorators.js'; import type { Subject } from 'rxjs'; diff --git a/blocksuite/affine/blocks/block-surface/src/surface-model.ts b/blocksuite/affine/blocks/block-surface/src/surface-model.ts index 03137f13e2..301c4418da 100644 --- a/blocksuite/affine/blocks/block-surface/src/surface-model.ts +++ b/blocksuite/affine/blocks/block-surface/src/surface-model.ts @@ -2,9 +2,9 @@ import type { ConnectorElementModel, SurfaceElementModelMap, } from '@blocksuite/affine-model'; -import type { SurfaceBlockProps } from '@blocksuite/block-std/gfx'; -import { SurfaceBlockModel as BaseSurfaceModel } from '@blocksuite/block-std/gfx'; import { DisposableGroup } from '@blocksuite/global/disposable'; +import type { SurfaceBlockProps } from '@blocksuite/std/gfx'; +import { SurfaceBlockModel as BaseSurfaceModel } from '@blocksuite/std/gfx'; import { BlockSchemaExtension, defineBlockSchema } from '@blocksuite/store'; import * as Y from 'yjs'; diff --git a/blocksuite/affine/blocks/block-surface/src/surface-service.ts b/blocksuite/affine/blocks/block-surface/src/surface-service.ts index 1760a503eb..d106417c76 100644 --- a/blocksuite/affine/blocks/block-surface/src/surface-service.ts +++ b/blocksuite/affine/blocks/block-surface/src/surface-service.ts @@ -1,5 +1,5 @@ -import { BlockService } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; +import { BlockService } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { type SurfaceBlockModel, SurfaceBlockSchema } from './surface-model.js'; import { getSurfaceBlock } from './utils/get-surface-block.js'; diff --git a/blocksuite/affine/blocks/block-surface/src/surface-spec.ts b/blocksuite/affine/blocks/block-surface/src/surface-spec.ts index d6cee41889..cd320fefb4 100644 --- a/blocksuite/affine/blocks/block-surface/src/surface-spec.ts +++ b/blocksuite/affine/blocks/block-surface/src/surface-spec.ts @@ -1,4 +1,4 @@ -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-surface/src/surface-transformer.ts b/blocksuite/affine/blocks/block-surface/src/surface-transformer.ts index 17ee3cbb2c..489a06a1b8 100644 --- a/blocksuite/affine/blocks/block-surface/src/surface-transformer.ts +++ b/blocksuite/affine/blocks/block-surface/src/surface-transformer.ts @@ -1,8 +1,8 @@ -import type { SurfaceBlockProps } from '@blocksuite/block-std/gfx'; +import type { SurfaceBlockProps } from '@blocksuite/std/gfx'; import { SURFACE_TEXT_UNIQ_IDENTIFIER, SURFACE_YMAP_UNIQ_IDENTIFIER, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; import type { FromSnapshotPayload, SnapshotNode, diff --git a/blocksuite/affine/blocks/block-surface/src/utils/add-note.ts b/blocksuite/affine/blocks/block-surface/src/utils/add-note.ts index e8b6a8c5ae..70bb9238ab 100644 --- a/blocksuite/affine/blocks/block-surface/src/utils/add-note.ts +++ b/blocksuite/affine/blocks/block-surface/src/utils/add-note.ts @@ -9,12 +9,12 @@ import { focusTextModel } from '@blocksuite/affine-rich-text'; import { TelemetryProvider } from '@blocksuite/affine-shared/services'; import type { NoteChildrenFlavour } from '@blocksuite/affine-shared/types'; import { handleNativeRangeAtPoint } from '@blocksuite/affine-shared/utils'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import { type IPoint, type Point, serializeXYWH } from '@blocksuite/global/gfx'; +import type { BlockStdScope } from '@blocksuite/std'; import { type GfxBlockElementModel, GfxControllerIdentifier, -} from '@blocksuite/block-std/gfx'; -import { type IPoint, type Point, serializeXYWH } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import { DEFAULT_NOTE_OFFSET_X, DEFAULT_NOTE_OFFSET_Y } from '../consts'; import { EdgelessCRUDIdentifier } from '../extensions/crud-extension'; diff --git a/blocksuite/affine/blocks/block-surface/src/utils/get-surface-block.ts b/blocksuite/affine/blocks/block-surface/src/utils/get-surface-block.ts index fd8107bcde..2e19a286fc 100644 --- a/blocksuite/affine/blocks/block-surface/src/utils/get-surface-block.ts +++ b/blocksuite/affine/blocks/block-surface/src/utils/get-surface-block.ts @@ -1,4 +1,4 @@ -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import type { Store } from '@blocksuite/store'; import type { SurfaceBlockComponent } from '../surface-block'; diff --git a/blocksuite/affine/blocks/block-surface/src/utils/update-xywh.ts b/blocksuite/affine/blocks/block-surface/src/utils/update-xywh.ts index 8446a026d9..33624dbb71 100644 --- a/blocksuite/affine/blocks/block-surface/src/utils/update-xywh.ts +++ b/blocksuite/affine/blocks/block-surface/src/utils/update-xywh.ts @@ -5,12 +5,12 @@ import { NOTE_MIN_WIDTH, NoteBlockModel, } from '@blocksuite/affine-model'; +import { Bound, clamp } from '@blocksuite/global/gfx'; import { type GfxGroupCompatibleInterface, type GfxModel, isGfxGroupCompatibleModel, -} from '@blocksuite/block-std/gfx'; -import { Bound, clamp } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import type { BlockModel, BlockProps } from '@blocksuite/store'; function updatChildElementsXYWH( diff --git a/blocksuite/affine/blocks/block-surface/src/watchers/connector.ts b/blocksuite/affine/blocks/block-surface/src/watchers/connector.ts index 78a5c1d882..ec262b1183 100644 --- a/blocksuite/affine/blocks/block-surface/src/watchers/connector.ts +++ b/blocksuite/affine/blocks/block-surface/src/watchers/connector.ts @@ -1,5 +1,5 @@ import type { ConnectorElementModel } from '@blocksuite/affine-model'; -import type { GfxModel } from '@blocksuite/block-std/gfx'; +import type { GfxModel } from '@blocksuite/std/gfx'; import { ConnectorPathGenerator } from '../managers/connector-manager.js'; import type { SurfaceBlockModel, SurfaceMiddleware } from '../surface-model.js'; diff --git a/blocksuite/affine/blocks/block-surface/tsconfig.json b/blocksuite/affine/blocks/block-surface/tsconfig.json index b7256b24bc..63067b9805 100644 --- a/blocksuite/affine/blocks/block-surface/tsconfig.json +++ b/blocksuite/affine/blocks/block-surface/tsconfig.json @@ -11,8 +11,8 @@ { "path": "../../model" }, { "path": "../../rich-text" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/blocks/block-table/package.json b/blocksuite/affine/blocks/block-table/package.json index a78804e995..63f6530bc1 100644 --- a/blocksuite/affine/blocks/block-table/package.json +++ b/blocksuite/affine/blocks/block-table/package.json @@ -17,10 +17,10 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/data-view": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@preact/signals-core": "^1.8.0", diff --git a/blocksuite/affine/blocks/block-table/src/add-button.ts b/blocksuite/affine/blocks/block-table/src/add-button.ts index 9b52ed707e..1263c97f9e 100644 --- a/blocksuite/affine/blocks/block-table/src/add-button.ts +++ b/blocksuite/affine/blocks/block-table/src/add-button.ts @@ -1,6 +1,6 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { PlusIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { autoPlacement, autoUpdate, diff --git a/blocksuite/affine/blocks/block-table/src/commands.ts b/blocksuite/affine/blocks/block-table/src/commands.ts index 5dfeaffa81..7d5b6a5ef5 100644 --- a/blocksuite/affine/blocks/block-table/src/commands.ts +++ b/blocksuite/affine/blocks/block-table/src/commands.ts @@ -2,7 +2,7 @@ import { type TableBlockModel, TableModelFlavour, } from '@blocksuite/affine-model'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import { type BlockModel } from '@blocksuite/store'; import { TableDataManager } from './table-data-manager'; diff --git a/blocksuite/affine/blocks/block-table/src/selection-controller.ts b/blocksuite/affine/blocks/block-table/src/selection-controller.ts index f41eedf069..1284d65e91 100644 --- a/blocksuite/affine/blocks/block-table/src/selection-controller.ts +++ b/blocksuite/affine/blocks/block-table/src/selection-controller.ts @@ -3,8 +3,8 @@ import { getAreaByOffsets, getTargetIndexByDraggingOffset, } from '@blocksuite/affine-shared/utils'; -import type { UIEventStateContext } from '@blocksuite/block-std'; import { IS_MOBILE } from '@blocksuite/global/env'; +import type { UIEventStateContext } from '@blocksuite/std'; import { computed } from '@preact/signals-core'; import type { ReactiveController } from 'lit'; diff --git a/blocksuite/affine/blocks/block-table/src/selection-layer.ts b/blocksuite/affine/blocks/block-table/src/selection-layer.ts index ba14a163d3..4ad5491868 100644 --- a/blocksuite/affine/blocks/block-table/src/selection-layer.ts +++ b/blocksuite/affine/blocks/block-table/src/selection-layer.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed, effect, signal } from '@preact/signals-core'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/blocks/block-table/src/table-block.ts b/blocksuite/affine/blocks/block-table/src/table-block.ts index 7f87851a5b..4018cd0185 100644 --- a/blocksuite/affine/blocks/block-table/src/table-block.ts +++ b/blocksuite/affine/blocks/block-table/src/table-block.ts @@ -3,9 +3,9 @@ import type { TableBlockModel } from '@blocksuite/affine-model'; import { NOTE_SELECTOR } from '@blocksuite/affine-shared/consts'; import { DocModeProvider } from '@blocksuite/affine-shared/services'; import { VirtualPaddingController } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline'; import { IS_MOBILE } from '@blocksuite/global/env'; +import type { BlockComponent } from '@blocksuite/std'; +import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/std/inline'; import { signal } from '@preact/signals-core'; import { html, nothing } from 'lit'; import { ref } from 'lit/directives/ref.js'; diff --git a/blocksuite/affine/blocks/block-table/src/table-cell.ts b/blocksuite/affine/blocks/block-table/src/table-cell.ts index 0011bf7e80..2a6b0f5a2e 100644 --- a/blocksuite/affine/blocks/block-table/src/table-cell.ts +++ b/blocksuite/affine/blocks/block-table/src/table-cell.ts @@ -10,7 +10,6 @@ import type { TableColumn, TableRow } from '@blocksuite/affine-model'; import { RichText } from '@blocksuite/affine-rich-text'; import { cssVarV2 } from '@blocksuite/affine-shared/theme'; import { getViewportElement } from '@blocksuite/affine-shared/utils'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { IS_MAC } from '@blocksuite/global/env'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { @@ -29,6 +28,7 @@ import { InsertRightIcon, PasteIcon, } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import type { Text } from '@blocksuite/store'; import { computed, effect, signal } from '@preact/signals-core'; import { html, nothing } from 'lit'; diff --git a/blocksuite/affine/blocks/block-table/src/table-spec.ts b/blocksuite/affine/blocks/block-table/src/table-spec.ts index 134310f329..bf8d2fbd5d 100644 --- a/blocksuite/affine/blocks/block-table/src/table-spec.ts +++ b/blocksuite/affine/blocks/block-table/src/table-spec.ts @@ -1,6 +1,6 @@ import { TableModelFlavour } from '@blocksuite/affine-model'; import { SlashMenuConfigExtension } from '@blocksuite/affine-widget-slash-menu'; -import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; diff --git a/blocksuite/affine/blocks/block-table/tsconfig.json b/blocksuite/affine/blocks/block-table/tsconfig.json index e8cb028cca..b362362052 100644 --- a/blocksuite/affine/blocks/block-table/tsconfig.json +++ b/blocksuite/affine/blocks/block-table/tsconfig.json @@ -14,9 +14,9 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/widget-slash-menu" }, - { "path": "../../../framework/block-std" }, { "path": "../../data-view" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/components/package.json b/blocksuite/affine/components/package.json index f0f3eaf773..b056d0b9b3 100644 --- a/blocksuite/affine/components/package.json +++ b/blocksuite/affine/components/package.json @@ -12,9 +12,9 @@ "dependencies": { "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/components/src/block-zero-width/index.ts b/blocksuite/affine/components/src/block-zero-width/index.ts index b99a60da94..6b22510bf4 100644 --- a/blocksuite/affine/components/src/block-zero-width/index.ts +++ b/blocksuite/affine/components/src/block-zero-width/index.ts @@ -1,5 +1,5 @@ import { stopPropagation } from '@blocksuite/affine-shared/utils'; -import { type BlockComponent, TextSelection } from '@blocksuite/block-std'; +import { type BlockComponent, TextSelection } from '@blocksuite/std'; import { css, html, LitElement } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/components/src/caption/block-caption.ts b/blocksuite/affine/components/src/caption/block-caption.ts index 158fe3bcfb..fa70562143 100644 --- a/blocksuite/affine/components/src/caption/block-caption.ts +++ b/blocksuite/affine/components/src/caption/block-caption.ts @@ -1,14 +1,14 @@ import type { DocMode } from '@blocksuite/affine-model'; import { stopPropagation } from '@blocksuite/affine-shared/utils'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import { WithDisposable } from '@blocksuite/global/lit'; +import type { BlockStdScope } from '@blocksuite/std'; import { docContext, modelContext, ShadowlessElement, stdContext, TextSelection, -} from '@blocksuite/block-std'; -import { WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; import type { BlockModel, Store } from '@blocksuite/store'; import { Text } from '@blocksuite/store'; import { consume } from '@lit/context'; diff --git a/blocksuite/affine/components/src/caption/captioned-block-component.ts b/blocksuite/affine/components/src/caption/captioned-block-component.ts index b0bbf46ba2..17404df049 100644 --- a/blocksuite/affine/components/src/caption/captioned-block-component.ts +++ b/blocksuite/affine/components/src/caption/captioned-block-component.ts @@ -1,5 +1,5 @@ import { ThemeProvider } from '@blocksuite/affine-shared/services'; -import { BlockComponent, type BlockService } from '@blocksuite/block-std'; +import { BlockComponent, type BlockService } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { html, nothing } from 'lit'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/components/src/card-style-dropdown-menu/dropdown-menu.ts b/blocksuite/affine/components/src/card-style-dropdown-menu/dropdown-menu.ts index fb37d49478..ad4052e407 100644 --- a/blocksuite/affine/components/src/card-style-dropdown-menu/dropdown-menu.ts +++ b/blocksuite/affine/components/src/card-style-dropdown-menu/dropdown-menu.ts @@ -3,9 +3,9 @@ import { type ToolbarAction, ToolbarContext, } from '@blocksuite/affine-shared/services'; -import { PropTypes, requiredProperties } from '@blocksuite/block-std'; import { SignalWatcher } from '@blocksuite/global/lit'; import { PaletteIcon } from '@blocksuite/icons/lit'; +import { PropTypes, requiredProperties } from '@blocksuite/std'; import { computed, type ReadonlySignal, diff --git a/blocksuite/affine/components/src/context-menu/item.ts b/blocksuite/affine/components/src/context-menu/item.ts index 34baeec6ee..ceee8a3a03 100644 --- a/blocksuite/affine/components/src/context-menu/item.ts +++ b/blocksuite/affine/components/src/context-menu/item.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { property } from 'lit/decorators.js'; import type { Menu } from './menu.js'; diff --git a/blocksuite/affine/components/src/context-menu/menu-renderer.ts b/blocksuite/affine/components/src/context-menu/menu-renderer.ts index 3250825e60..aa5471c293 100644 --- a/blocksuite/affine/components/src/context-menu/menu-renderer.ts +++ b/blocksuite/affine/components/src/context-menu/menu-renderer.ts @@ -1,5 +1,4 @@ import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { IS_MOBILE } from '@blocksuite/global/env'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { @@ -8,6 +7,7 @@ import { CloseIcon, SearchIcon, } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { autoPlacement, autoUpdate, diff --git a/blocksuite/affine/components/src/drop-indicator/file-drop-manager.ts b/blocksuite/affine/components/src/drop-indicator/file-drop-manager.ts index 84c022c54c..29213cb98f 100644 --- a/blocksuite/affine/components/src/drop-indicator/file-drop-manager.ts +++ b/blocksuite/affine/components/src/drop-indicator/file-drop-manager.ts @@ -6,16 +6,16 @@ import { isInsidePageEditor, matchModels, } from '@blocksuite/affine-shared/utils'; +import { createIdentifier } from '@blocksuite/global/di'; +import type { IVec } from '@blocksuite/global/gfx'; +import { Point } from '@blocksuite/global/gfx'; import { type BlockComponent, type BlockStdScope, type EditorHost, LifeCycleWatcher, -} from '@blocksuite/block-std'; -import { SurfaceBlockModel } from '@blocksuite/block-std/gfx'; -import { createIdentifier } from '@blocksuite/global/di'; -import type { IVec } from '@blocksuite/global/gfx'; -import { Point } from '@blocksuite/global/gfx'; +} from '@blocksuite/std'; +import { SurfaceBlockModel } from '@blocksuite/std/gfx'; import type { BlockModel, ExtensionType } from '@blocksuite/store'; import { computed, signal } from '@preact/signals-core'; import throttle from 'lodash-es/throttle'; diff --git a/blocksuite/affine/components/src/embed-card-modal/embed-card-caption-edit-modal.ts b/blocksuite/affine/components/src/embed-card-modal/embed-card-caption-edit-modal.ts index 1de8eabe7b..7a4df36749 100644 --- a/blocksuite/affine/components/src/embed-card-modal/embed-card-caption-edit-modal.ts +++ b/blocksuite/affine/components/src/embed-card-modal/embed-card-caption-edit-modal.ts @@ -1,6 +1,6 @@ import { stopPropagation } from '@blocksuite/affine-shared/utils'; -import { type BlockComponent, ShadowlessElement } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; +import { type BlockComponent, ShadowlessElement } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { html } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/components/src/embed-card-modal/embed-card-create-modal.ts b/blocksuite/affine/components/src/embed-card-modal/embed-card-create-modal.ts index 7c1d0ae883..29a09dd47c 100644 --- a/blocksuite/affine/components/src/embed-card-modal/embed-card-create-modal.ts +++ b/blocksuite/affine/components/src/embed-card-modal/embed-card-create-modal.ts @@ -1,9 +1,9 @@ import { EmbedOptionProvider } from '@blocksuite/affine-shared/services'; import { isValidUrl, stopPropagation } from '@blocksuite/affine-shared/utils'; -import type { EditorHost } from '@blocksuite/block-std'; -import { ShadowlessElement } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { WithDisposable } from '@blocksuite/global/lit'; +import type { EditorHost } from '@blocksuite/std'; +import { ShadowlessElement } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import type { BlockModel } from '@blocksuite/store'; import { html } from 'lit'; import { property, query, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/components/src/embed-card-modal/embed-card-edit-modal.ts b/blocksuite/affine/components/src/embed-card-modal/embed-card-edit-modal.ts index 495cd91098..097ae3a22f 100644 --- a/blocksuite/affine/components/src/embed-card-modal/embed-card-edit-modal.ts +++ b/blocksuite/affine/components/src/embed-card-modal/embed-card-edit-modal.ts @@ -15,14 +15,14 @@ import { listenClickAway, stopPropagation, } from '@blocksuite/affine-shared/utils'; +import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { nextTick } from '@blocksuite/global/utils'; import { type BlockComponent, type BlockStdScope, type EditorHost, EditorLifeCycleExtension, -} from '@blocksuite/block-std'; -import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; -import { nextTick } from '@blocksuite/global/utils'; +} from '@blocksuite/std'; import { autoUpdate, computePosition, flip, offset } from '@floating-ui/dom'; import { computed, signal } from '@preact/signals-core'; import { css, html, LitElement } from 'lit'; diff --git a/blocksuite/affine/components/src/highlight-dropdown-menu/dropdown-menu.ts b/blocksuite/affine/components/src/highlight-dropdown-menu/dropdown-menu.ts index ec164f1185..1f1c47bb37 100644 --- a/blocksuite/affine/components/src/highlight-dropdown-menu/dropdown-menu.ts +++ b/blocksuite/affine/components/src/highlight-dropdown-menu/dropdown-menu.ts @@ -1,5 +1,5 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { PropTypes, requiredProperties } from '@blocksuite/block-std'; +import { PropTypes, requiredProperties } from '@blocksuite/std'; import { LitElement } from 'lit'; import { property } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/components/src/link-preview/link.ts b/blocksuite/affine/components/src/link-preview/link.ts index 482b4b8f22..a3d211ca01 100644 --- a/blocksuite/affine/components/src/link-preview/link.ts +++ b/blocksuite/affine/components/src/link-preview/link.ts @@ -1,5 +1,5 @@ import { getHostName } from '@blocksuite/affine-shared/utils'; -import { PropTypes, requiredProperties } from '@blocksuite/block-std'; +import { PropTypes, requiredProperties } from '@blocksuite/std'; import { css, LitElement } from 'lit'; import { property } from 'lit/decorators.js'; import { html } from 'lit-html'; diff --git a/blocksuite/affine/components/src/linked-doc-title/doc-title.ts b/blocksuite/affine/components/src/linked-doc-title/doc-title.ts index f48897c02c..eb390c1d91 100644 --- a/blocksuite/affine/components/src/linked-doc-title/doc-title.ts +++ b/blocksuite/affine/components/src/linked-doc-title/doc-title.ts @@ -1,4 +1,4 @@ -import { PropTypes, requiredProperties } from '@blocksuite/block-std'; +import { PropTypes, requiredProperties } from '@blocksuite/std'; import { css, LitElement } from 'lit'; import { property } from 'lit/decorators.js'; import { html } from 'lit-html'; diff --git a/blocksuite/affine/components/src/notification/linked-doc.ts b/blocksuite/affine/components/src/notification/linked-doc.ts index 80162de31c..3d72fb0dbf 100644 --- a/blocksuite/affine/components/src/notification/linked-doc.ts +++ b/blocksuite/affine/components/src/notification/linked-doc.ts @@ -1,8 +1,5 @@ import { NotificationProvider } from '@blocksuite/affine-shared/services'; -import { - type BlockStdScope, - EditorLifeCycleExtension, -} from '@blocksuite/block-std'; +import { type BlockStdScope, EditorLifeCycleExtension } from '@blocksuite/std'; import { toast } from '../toast/toast.js'; diff --git a/blocksuite/affine/components/src/peek/commands.ts b/blocksuite/affine/components/src/peek/commands.ts index 31f8433844..be5c54b6a4 100644 --- a/blocksuite/affine/components/src/peek/commands.ts +++ b/blocksuite/affine/components/src/peek/commands.ts @@ -3,11 +3,7 @@ import { getSelectedBlocksCommand, getTextSelectionCommand, } from '@blocksuite/affine-shared/commands'; -import type { - BlockComponent, - Command, - InitCommandCtx, -} from '@blocksuite/block-std'; +import type { BlockComponent, Command, InitCommandCtx } from '@blocksuite/std'; import { isPeekable, peek } from './peekable.js'; diff --git a/blocksuite/affine/components/src/peek/type.ts b/blocksuite/affine/components/src/peek/type.ts index 7073f9b4a8..8e39b5653d 100644 --- a/blocksuite/affine/components/src/peek/type.ts +++ b/blocksuite/affine/components/src/peek/type.ts @@ -1,5 +1,5 @@ -import type { BlockComponent, BlockStdScope } from '@blocksuite/block-std'; import type { DisposableClass } from '@blocksuite/global/lit'; +import type { BlockComponent, BlockStdScope } from '@blocksuite/std'; import type { LitElement, TemplateResult } from 'lit'; export type PeekableClass = { std: BlockStdScope } & DisposableClass & diff --git a/blocksuite/affine/components/src/size-dropdown-menu/dropdown-menu.ts b/blocksuite/affine/components/src/size-dropdown-menu/dropdown-menu.ts index 8b15b582f6..cc6ad8ead5 100644 --- a/blocksuite/affine/components/src/size-dropdown-menu/dropdown-menu.ts +++ b/blocksuite/affine/components/src/size-dropdown-menu/dropdown-menu.ts @@ -1,7 +1,7 @@ import { stopPropagation } from '@blocksuite/affine-shared/utils'; -import { PropTypes, requiredProperties } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { DoneIcon } from '@blocksuite/icons/lit'; +import { PropTypes, requiredProperties } from '@blocksuite/std'; import type { ReadonlySignal, Signal } from '@preact/signals-core'; import { css, html, LitElement, type TemplateResult } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/components/src/toast/create.ts b/blocksuite/affine/components/src/toast/create.ts index ee225a78cd..92ff372185 100644 --- a/blocksuite/affine/components/src/toast/create.ts +++ b/blocksuite/affine/components/src/toast/create.ts @@ -1,4 +1,4 @@ -import type { BlockComponent, EditorHost } from '@blocksuite/block-std'; +import type { BlockComponent, EditorHost } from '@blocksuite/std'; import { html } from 'lit'; import { htmlToElement } from './html-to-element.js'; diff --git a/blocksuite/affine/components/src/toast/toast.ts b/blocksuite/affine/components/src/toast/toast.ts index 4d40b460b0..580b58fcad 100644 --- a/blocksuite/affine/components/src/toast/toast.ts +++ b/blocksuite/affine/components/src/toast/toast.ts @@ -1,4 +1,4 @@ -import type { EditorHost } from '@blocksuite/block-std'; +import type { EditorHost } from '@blocksuite/std'; import { baseTheme } from '@toeverything/theme'; import { html } from 'lit'; diff --git a/blocksuite/affine/components/src/toggle-button/toggle-button.ts b/blocksuite/affine/components/src/toggle-button/toggle-button.ts index f601a4b0d1..ad2215f208 100644 --- a/blocksuite/affine/components/src/toggle-button/toggle-button.ts +++ b/blocksuite/affine/components/src/toggle-button/toggle-button.ts @@ -1,6 +1,6 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; import { ToggleDownIcon, ToggleRightIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, unsafeCSS } from 'lit'; import { property } from 'lit/decorators.js'; import { html } from 'lit-html'; diff --git a/blocksuite/affine/components/src/toolbar/config.ts b/blocksuite/affine/components/src/toolbar/config.ts index 3c2e0ea2be..1fae49479c 100644 --- a/blocksuite/affine/components/src/toolbar/config.ts +++ b/blocksuite/affine/components/src/toolbar/config.ts @@ -1,4 +1,4 @@ -import { ConfigExtensionFactory } from '@blocksuite/block-std'; +import { ConfigExtensionFactory } from '@blocksuite/std'; import type { ToolbarMoreMenuConfig } from './types'; diff --git a/blocksuite/affine/components/src/toolbar/menu-context.ts b/blocksuite/affine/components/src/toolbar/menu-context.ts index 0f0f2dff8b..f6dd43a20f 100644 --- a/blocksuite/affine/components/src/toolbar/menu-context.ts +++ b/blocksuite/affine/components/src/toolbar/menu-context.ts @@ -1,5 +1,5 @@ -import type { BlockStdScope, EditorHost } from '@blocksuite/block-std'; -import type { GfxModel } from '@blocksuite/block-std/gfx'; +import type { BlockStdScope, EditorHost } from '@blocksuite/std'; +import type { GfxModel } from '@blocksuite/std/gfx'; import type { BlockModel, Store } from '@blocksuite/store'; export abstract class MenuContext { diff --git a/blocksuite/affine/components/src/toolbar/utils.ts b/blocksuite/affine/components/src/toolbar/utils.ts index ff61a2d2ef..647b21e057 100644 --- a/blocksuite/affine/components/src/toolbar/utils.ts +++ b/blocksuite/affine/components/src/toolbar/utils.ts @@ -1,4 +1,4 @@ -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import { html, nothing } from 'lit'; import { ifDefined } from 'lit/directives/if-defined.js'; import { join } from 'lit/directives/join.js'; diff --git a/blocksuite/affine/components/src/view-dropdown-menu/dropdown-menu.ts b/blocksuite/affine/components/src/view-dropdown-menu/dropdown-menu.ts index d88b2b1af8..cd7b55e8eb 100644 --- a/blocksuite/affine/components/src/view-dropdown-menu/dropdown-menu.ts +++ b/blocksuite/affine/components/src/view-dropdown-menu/dropdown-menu.ts @@ -2,8 +2,8 @@ import { type ToolbarAction, ToolbarContext, } from '@blocksuite/affine-shared/services'; -import { PropTypes, requiredProperties } from '@blocksuite/block-std'; import { SignalWatcher } from '@blocksuite/global/lit'; +import { PropTypes, requiredProperties } from '@blocksuite/std'; import type { ReadonlySignal, Signal } from '@preact/signals-core'; import { LitElement } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/components/tsconfig.json b/blocksuite/affine/components/tsconfig.json index a60ef14ba8..22ffcb4d98 100644 --- a/blocksuite/affine/components/tsconfig.json +++ b/blocksuite/affine/components/tsconfig.json @@ -9,8 +9,8 @@ "references": [ { "path": "../model" }, { "path": "../shared" }, - { "path": "../../framework/block-std" }, { "path": "../../framework/global" }, + { "path": "../../framework/std" }, { "path": "../../framework/store" } ] } diff --git a/blocksuite/affine/data-view/package.json b/blocksuite/affine/data-view/package.json index 88c458f4af..56fc48fe7a 100644 --- a/blocksuite/affine/data-view/package.json +++ b/blocksuite/affine/data-view/package.json @@ -12,9 +12,9 @@ "dependencies": { "@blocksuite/affine-components": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@emotion/hash": "^0.9.2", "@floating-ui/dom": "^1.6.13", diff --git a/blocksuite/affine/data-view/src/core/common/properties.ts b/blocksuite/affine/data-view/src/core/common/properties.ts index 25ad815b72..ff061754aa 100644 --- a/blocksuite/affine/data-view/src/core/common/properties.ts +++ b/blocksuite/affine/data-view/src/core/common/properties.ts @@ -3,9 +3,9 @@ import { popMenu, type PopupTarget, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { InvisibleIcon, ViewIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed } from '@preact/signals-core'; import { cssVarV2 } from '@toeverything/theme/v2'; import { css, html, unsafeCSS } from 'lit'; diff --git a/blocksuite/affine/data-view/src/core/component/button/button.ts b/blocksuite/affine/data-view/src/core/component/button/button.ts index fb42cc8150..91fc10ed71 100644 --- a/blocksuite/affine/data-view/src/core/component/button/button.ts +++ b/blocksuite/affine/data-view/src/core/component/button/button.ts @@ -1,6 +1,6 @@ import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, html, type TemplateResult } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/core/component/overflow/overflow.ts b/blocksuite/affine/data-view/src/core/component/overflow/overflow.ts index 7b2d8b85e5..b179056654 100644 --- a/blocksuite/affine/data-view/src/core/component/overflow/overflow.ts +++ b/blocksuite/affine/data-view/src/core/component/overflow/overflow.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, html, type PropertyValues, type TemplateResult } from 'lit'; import { property, query, queryAll, state } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/data-view/src/core/component/tags/multi-tag-select.ts b/blocksuite/affine/data-view/src/core/component/tags/multi-tag-select.ts index ab20bc5afe..46cd3d125a 100644 --- a/blocksuite/affine/data-view/src/core/component/tags/multi-tag-select.ts +++ b/blocksuite/affine/data-view/src/core/component/tags/multi-tag-select.ts @@ -7,7 +7,6 @@ import { } from '@blocksuite/affine-components/context-menu'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; import { rangeWrap } from '@blocksuite/affine-shared/utils'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { IS_MOBILE } from '@blocksuite/global/env'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { @@ -15,6 +14,7 @@ import { DeleteIcon, MoreHorizontalIcon, } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { nanoid } from '@blocksuite/store'; import { flip, offset, shift } from '@floating-ui/dom'; import { computed, type ReadonlySignal, signal } from '@preact/signals-core'; diff --git a/blocksuite/affine/data-view/src/core/component/tags/multi-tag-view.ts b/blocksuite/affine/data-view/src/core/component/tags/multi-tag-view.ts index 77ae43eba0..88806ba73a 100644 --- a/blocksuite/affine/data-view/src/core/component/tags/multi-tag-view.ts +++ b/blocksuite/affine/data-view/src/core/component/tags/multi-tag-view.ts @@ -1,6 +1,6 @@ import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css } from 'lit'; import { property, query } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; diff --git a/blocksuite/affine/data-view/src/core/data-view.ts b/blocksuite/affine/data-view/src/core/data-view.ts index 60ccf77a00..64a5071e3d 100644 --- a/blocksuite/affine/data-view/src/core/data-view.ts +++ b/blocksuite/affine/data-view/src/core/data-view.ts @@ -2,9 +2,9 @@ import type { DatabaseAllEvents, EventTraceFn, } from '@blocksuite/affine-shared/services'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { IS_MOBILE } from '@blocksuite/global/env'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed, type ReadonlySignal, signal } from '@preact/signals-core'; import { css, unsafeCSS } from 'lit'; import { property, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/core/detail/detail.ts b/blocksuite/affine/data-view/src/core/detail/detail.ts index b4bcfb8a46..31d5847a02 100644 --- a/blocksuite/affine/data-view/src/core/detail/detail.ts +++ b/blocksuite/affine/data-view/src/core/detail/detail.ts @@ -4,13 +4,13 @@ import { popupTargetFromElement, } from '@blocksuite/affine-components/context-menu'; import type { UniComponent } from '@blocksuite/affine-shared/types'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { ArrowDownBigIcon, ArrowUpBigIcon, PlusIcon, } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed } from '@preact/signals-core'; import { css, nothing, unsafeCSS } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/core/detail/field.ts b/blocksuite/affine/data-view/src/core/detail/field.ts index 9fc02e04d7..80aee71460 100644 --- a/blocksuite/affine/data-view/src/core/detail/field.ts +++ b/blocksuite/affine/data-view/src/core/detail/field.ts @@ -3,7 +3,6 @@ import { popMenu, popupTargetFromElement, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { DeleteIcon, @@ -11,6 +10,7 @@ import { MoveLeftIcon, MoveRightIcon, } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed, signal } from '@preact/signals-core'; import { css } from 'lit'; import { property, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/core/expression/ref/ref-view.ts b/blocksuite/affine/data-view/src/core/expression/ref/ref-view.ts index 0a19e85d16..d40183c399 100644 --- a/blocksuite/affine/data-view/src/core/expression/ref/ref-view.ts +++ b/blocksuite/affine/data-view/src/core/expression/ref/ref-view.ts @@ -3,8 +3,8 @@ import { popFilterableSimpleMenu, popupTargetFromElement, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/core/group-by/renderer/base.ts b/blocksuite/affine/data-view/src/core/group-by/renderer/base.ts index 867c97267e..80bd84ebed 100644 --- a/blocksuite/affine/data-view/src/core/group-by/renderer/base.ts +++ b/blocksuite/affine/data-view/src/core/group-by/renderer/base.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { property } from 'lit/decorators.js'; import type { GroupRenderProps } from '../types.js'; diff --git a/blocksuite/affine/data-view/src/core/group-by/setting.ts b/blocksuite/affine/data-view/src/core/group-by/setting.ts index 453492286d..893121524c 100644 --- a/blocksuite/affine/data-view/src/core/group-by/setting.ts +++ b/blocksuite/affine/data-view/src/core/group-by/setting.ts @@ -5,9 +5,9 @@ import { popMenu, type PopupTarget, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { DeleteIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed } from '@preact/signals-core'; import { css, html, unsafeCSS } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/core/property/base-cell.ts b/blocksuite/affine/data-view/src/core/property/base-cell.ts index 66c8c002ff..8b96ae3c6d 100644 --- a/blocksuite/affine/data-view/src/core/property/base-cell.ts +++ b/blocksuite/affine/data-view/src/core/property/base-cell.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed, type ReadonlySignal } from '@preact/signals-core'; import type { PropertyValues } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/core/utils/uni-component/render-template.ts b/blocksuite/affine/data-view/src/core/utils/uni-component/render-template.ts index cd23c0a966..46f8934251 100644 --- a/blocksuite/affine/data-view/src/core/utils/uni-component/render-template.ts +++ b/blocksuite/affine/data-view/src/core/utils/uni-component/render-template.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import type { TemplateResult } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/core/utils/uni-component/uni-component.ts b/blocksuite/affine/data-view/src/core/utils/uni-component/uni-component.ts index 1226f24384..9b8729c503 100644 --- a/blocksuite/affine/data-view/src/core/utils/uni-component/uni-component.ts +++ b/blocksuite/affine/data-view/src/core/utils/uni-component/uni-component.ts @@ -2,8 +2,8 @@ import type { UniComponent, UniComponentReturn, } from '@blocksuite/affine-shared/types'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import type { Signal } from '@preact/signals-core'; import type { LitElement, PropertyValues, TemplateResult } from 'lit'; import { css, html } from 'lit'; diff --git a/blocksuite/affine/data-view/src/core/utils/uni-icon.ts b/blocksuite/affine/data-view/src/core/utils/uni-icon.ts index 6ae0802d63..ba304f4355 100644 --- a/blocksuite/affine/data-view/src/core/utils/uni-icon.ts +++ b/blocksuite/affine/data-view/src/core/utils/uni-icon.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import * as icons from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, html, type TemplateResult } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/core/view/data-view-base.ts b/blocksuite/affine/data-view/src/core/view/data-view-base.ts index d5f2595759..beedf23ab3 100644 --- a/blocksuite/affine/data-view/src/core/view/data-view-base.ts +++ b/blocksuite/affine/data-view/src/core/view/data-view-base.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { property } from 'lit/decorators.js'; import type { DataViewSelection } from '../types.js'; diff --git a/blocksuite/affine/data-view/src/core/view/types.ts b/blocksuite/affine/data-view/src/core/view/types.ts index 3f1b738f85..add7ae5aeb 100644 --- a/blocksuite/affine/data-view/src/core/view/types.ts +++ b/blocksuite/affine/data-view/src/core/view/types.ts @@ -3,12 +3,8 @@ import type { EventTraceFn, } from '@blocksuite/affine-shared/services'; import type { InsertToPosition } from '@blocksuite/affine-shared/utils'; -import type { - Clipboard, - EventName, - UIEventHandler, -} from '@blocksuite/block-std'; import type { Disposable } from '@blocksuite/global/disposable'; +import type { Clipboard, EventName, UIEventHandler } from '@blocksuite/std'; import type { ReadonlySignal } from '@preact/signals-core'; import type { DataSource } from '../common/index.js'; diff --git a/blocksuite/affine/data-view/src/core/widget/widget-base.ts b/blocksuite/affine/data-view/src/core/widget/widget-base.ts index bd857a833b..65efc8f892 100644 --- a/blocksuite/affine/data-view/src/core/widget/widget-base.ts +++ b/blocksuite/affine/data-view/src/core/widget/widget-base.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { property } from 'lit/decorators.js'; import type { DataViewInstance } from '../view/types.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/mobile/card.ts b/blocksuite/affine/data-view/src/view-presets/kanban/mobile/card.ts index f4506102b5..6cd46c9e80 100644 --- a/blocksuite/affine/data-view/src/view-presets/kanban/mobile/card.ts +++ b/blocksuite/affine/data-view/src/view-presets/kanban/mobile/card.ts @@ -1,8 +1,8 @@ import { popupTargetFromElement } from '@blocksuite/affine-components/context-menu'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { CenterPeekIcon, MoreHorizontalIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { cssVarV2 } from '@toeverything/theme/v2'; import { css, unsafeCSS } from 'lit'; import { property, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/mobile/cell.ts b/blocksuite/affine/data-view/src/view-presets/kanban/mobile/cell.ts index 97f943679c..dc1ed4172d 100644 --- a/blocksuite/affine/data-view/src/view-presets/kanban/mobile/cell.ts +++ b/blocksuite/affine/data-view/src/view-presets/kanban/mobile/cell.ts @@ -1,8 +1,8 @@ // related component import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed, effect, signal } from '@preact/signals-core'; import { css } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/mobile/group.ts b/blocksuite/affine/data-view/src/view-presets/kanban/mobile/group.ts index c72ccd098f..5e8e51fd1b 100644 --- a/blocksuite/affine/data-view/src/view-presets/kanban/mobile/group.ts +++ b/blocksuite/affine/data-view/src/view-presets/kanban/mobile/group.ts @@ -3,9 +3,9 @@ import { popFilterableSimpleMenu, popupTargetFromElement, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { AddCursorIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, nothing } from 'lit'; import { property } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/pc/card.ts b/blocksuite/affine/data-view/src/view-presets/kanban/pc/card.ts index c7cf0aa605..817e44d0f4 100644 --- a/blocksuite/affine/data-view/src/view-presets/kanban/pc/card.ts +++ b/blocksuite/affine/data-view/src/view-presets/kanban/pc/card.ts @@ -1,7 +1,7 @@ import { popupTargetFromElement } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { CenterPeekIcon, MoreHorizontalIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { cssVarV2 } from '@toeverything/theme/v2'; import { css, unsafeCSS } from 'lit'; import { property, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/pc/cell.ts b/blocksuite/affine/data-view/src/view-presets/kanban/pc/cell.ts index 0b29c328d1..8fcd067ca3 100644 --- a/blocksuite/affine/data-view/src/view-presets/kanban/pc/cell.ts +++ b/blocksuite/affine/data-view/src/view-presets/kanban/pc/cell.ts @@ -1,7 +1,7 @@ // related component -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { signal } from '@preact/signals-core'; import { css } from 'lit'; import { property, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/pc/controller/clipboard.ts b/blocksuite/affine/data-view/src/view-presets/kanban/pc/controller/clipboard.ts index 267ea150b6..2bf38eea6d 100644 --- a/blocksuite/affine/data-view/src/view-presets/kanban/pc/controller/clipboard.ts +++ b/blocksuite/affine/data-view/src/view-presets/kanban/pc/controller/clipboard.ts @@ -1,4 +1,4 @@ -import type { UIEventStateContext } from '@blocksuite/block-std'; +import type { UIEventStateContext } from '@blocksuite/std'; import type { ReactiveController } from 'lit'; import type { KanbanViewSelectionWithType } from '../../selection'; diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/pc/group.ts b/blocksuite/affine/data-view/src/view-presets/kanban/pc/group.ts index 99ae379ab7..0fd37e9a19 100644 --- a/blocksuite/affine/data-view/src/view-presets/kanban/pc/group.ts +++ b/blocksuite/affine/data-view/src/view-presets/kanban/pc/group.ts @@ -3,9 +3,9 @@ import { popFilterableSimpleMenu, popupTargetFromElement, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { AddCursorIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, nothing } from 'lit'; import { property } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/kanban/pc/header.ts b/blocksuite/affine/data-view/src/view-presets/kanban/pc/header.ts index 50ba4e6a3c..2a8667742d 100644 --- a/blocksuite/affine/data-view/src/view-presets/kanban/pc/header.ts +++ b/blocksuite/affine/data-view/src/view-presets/kanban/pc/header.ts @@ -3,8 +3,8 @@ import { popMenu, popupTargetFromElement, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css } from 'lit'; import { property } from 'lit/decorators.js'; import { html } from 'lit/static-html.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/mobile/cell.ts b/blocksuite/affine/data-view/src/view-presets/table/mobile/cell.ts index 9359c9cb80..40b74c26f5 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/mobile/cell.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/mobile/cell.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed, effect, signal } from '@preact/signals-core'; import { css } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/mobile/column-header.ts b/blocksuite/affine/data-view/src/view-presets/table/mobile/column-header.ts index ae5e272e25..74cd09164f 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/mobile/column-header.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/mobile/column-header.ts @@ -5,7 +5,6 @@ import { popupTargetFromElement, } from '@blocksuite/affine-components/context-menu'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { DeleteIcon, @@ -16,6 +15,7 @@ import { MoveRightIcon, ViewIcon, } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css } from 'lit'; import { property } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/mobile/group.ts b/blocksuite/affine/data-view/src/view-presets/table/mobile/group.ts index b49bfa7704..531ddf68bb 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/mobile/group.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/mobile/group.ts @@ -3,9 +3,9 @@ import { popFilterableSimpleMenu, popupTargetFromElement, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { PlusIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { cssVarV2 } from '@toeverything/theme/v2'; import { css, html, unsafeCSS } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/mobile/header.ts b/blocksuite/affine/data-view/src/view-presets/table/mobile/header.ts index e479bc5ea3..6c2381e127 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/mobile/header.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/mobile/header.ts @@ -1,7 +1,7 @@ import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { PlusIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, type TemplateResult } from 'lit'; import { property, query } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/mobile/row.ts b/blocksuite/affine/data-view/src/view-presets/table/mobile/row.ts index deca5d9d7d..2e477e1653 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/mobile/row.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/mobile/row.ts @@ -1,8 +1,8 @@ import { popupTargetFromElement } from '@blocksuite/affine-components/context-menu'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { CenterPeekIcon, MoreHorizontalIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { cssVarV2 } from '@toeverything/theme/v2'; import { css, nothing, unsafeCSS } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/cell.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/cell.ts index 86e6c8d9c9..488264c22e 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/pc/cell.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/pc/cell.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed, signal } from '@preact/signals-core'; import { css } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/controller/clipboard.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/controller/clipboard.ts index 42b116961d..e920e73bf2 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/pc/controller/clipboard.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/pc/controller/clipboard.ts @@ -1,4 +1,4 @@ -import type { UIEventStateContext } from '@blocksuite/block-std'; +import type { UIEventStateContext } from '@blocksuite/std'; import type { ReactiveController } from 'lit'; import type { Cell } from '../../../../core/view-manager/cell.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/controller/drag-to-fill.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/controller/drag-to-fill.ts index fa0612104c..6c950fcac7 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/pc/controller/drag-to-fill.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/pc/controller/drag-to-fill.ts @@ -1,4 +1,4 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; +import { ShadowlessElement } from '@blocksuite/std'; import { type Text } from '@blocksuite/store'; import { css, html } from 'lit'; import { state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/controller/selection.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/controller/selection.ts index 354cb2d244..71ba486705 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/pc/controller/selection.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/pc/controller/selection.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed, effect } from '@preact/signals-core'; import type { ReactiveController } from 'lit'; import { css, html } from 'lit'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/group.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/group.ts index 395d72ba21..97833494b6 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/pc/group.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/pc/group.ts @@ -3,9 +3,9 @@ import { popFilterableSimpleMenu, popupTargetFromElement, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { PlusIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { effect } from '@preact/signals-core'; import { cssVarV2 } from '@toeverything/theme/v2'; import { css, html, unsafeCSS } from 'lit'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-header.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-header.ts index 5468d18a3c..1b00419b9a 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-header.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-header.ts @@ -1,7 +1,7 @@ import { getScrollContainer } from '@blocksuite/affine-shared/utils'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { PlusIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { autoUpdate } from '@floating-ui/dom'; import { nothing, type TemplateResult } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-renderer.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-renderer.ts index 54410ff63b..6cf0e9cf1a 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-renderer.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/pc/header/column-renderer.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { cssVarV2 } from '@toeverything/theme/v2'; import { css, unsafeCSS } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/header/database-header-column.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/header/database-header-column.ts index 94964de40c..500e2d20c5 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/pc/header/database-header-column.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/pc/header/database-header-column.ts @@ -4,7 +4,6 @@ import { popMenu, popupTargetFromElement, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { DeleteIcon, @@ -17,6 +16,7 @@ import { SortIcon, ViewIcon, } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css } from 'lit'; import { property } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/header/vertical-indicator.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/header/vertical-indicator.ts index 568d86ea84..b241148d35 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/pc/header/vertical-indicator.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/pc/header/vertical-indicator.ts @@ -1,6 +1,6 @@ import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, html } from 'lit'; import { property } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/row/row-select-checkbox.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/row/row-select-checkbox.ts index fb17236ee0..0947ee9e96 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/pc/row/row-select-checkbox.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/pc/row/row-select-checkbox.ts @@ -1,6 +1,6 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { CheckBoxCheckSolidIcon, CheckBoxUnIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed, type ReadonlySignal } from '@preact/signals-core'; import { css, html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/pc/row/row.ts b/blocksuite/affine/data-view/src/view-presets/table/pc/row/row.ts index ed2834459b..7a3590085d 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/pc/row/row.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/pc/row/row.ts @@ -1,7 +1,7 @@ import { popupTargetFromElement } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { CenterPeekIcon, MoreHorizontalIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { cssVarV2 } from '@toeverything/theme/v2'; import { css, nothing, unsafeCSS } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-bar.ts b/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-bar.ts index 0065840660..36e5c92a1c 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-bar.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-bar.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, html } from 'lit'; import { property } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; diff --git a/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-column.ts b/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-column.ts index bc5462b55e..9052ba463a 100644 --- a/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-column.ts +++ b/blocksuite/affine/data-view/src/view-presets/table/stats/column-stats-column.ts @@ -4,9 +4,9 @@ import { popMenu, popupTargetFromElement, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { ArrowDownSmallIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { Text } from '@blocksuite/store'; import { autoPlacement, offset } from '@floating-ui/dom'; import { computed, signal } from '@preact/signals-core'; diff --git a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/condition-view.ts b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/condition-view.ts index dde7fedc83..a8ce994814 100644 --- a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/condition-view.ts +++ b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/condition-view.ts @@ -6,13 +6,13 @@ import { popupTargetFromElement, subMenuMiddleware, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher } from '@blocksuite/global/lit'; import { ArrowDownSmallIcon, ArrowRightSmallIcon, DeleteIcon, } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed, type ReadonlySignal } from '@preact/signals-core'; import { css, html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/group-panel-view.ts b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/group-panel-view.ts index beae175bf9..cf99e27f61 100644 --- a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/group-panel-view.ts +++ b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/group-panel-view.ts @@ -5,7 +5,6 @@ import { type PopupTarget, popupTargetFromElement, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher } from '@blocksuite/global/lit'; import { ArrowDownSmallIcon, @@ -15,6 +14,7 @@ import { MoreHorizontalIcon, PlusIcon, } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed, type ReadonlySignal } from '@preact/signals-core'; import { cssVarV2 } from '@toeverything/theme/v2'; import { css, html, nothing, type TemplateResult, unsafeCSS } from 'lit'; diff --git a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/list-view.ts b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/list-view.ts index ccf0bb05fd..4b93b96dd0 100644 --- a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/list-view.ts +++ b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/list-view.ts @@ -2,13 +2,13 @@ import { type PopupTarget, popupTargetFromElement, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher } from '@blocksuite/global/lit'; import { ArrowDownSmallIcon, FilterIcon, PlusIcon, } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed, type ReadonlySignal } from '@preact/signals-core'; import { css, html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/root-panel-view.ts b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/root-panel-view.ts index c3a1eb7f88..96e7f36a1d 100644 --- a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/root-panel-view.ts +++ b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/root-panel-view.ts @@ -6,7 +6,6 @@ import { popupTargetFromElement, subMenuMiddleware, } from '@blocksuite/affine-components/context-menu'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher } from '@blocksuite/global/lit'; import { ArrowDownSmallIcon, @@ -17,6 +16,7 @@ import { MoreHorizontalIcon, PlusIcon, } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed, type ReadonlySignal } from '@preact/signals-core'; import { css, html } from 'lit'; import { property, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/sort/root-panel.ts b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/sort/root-panel.ts index 288d736cec..3bd0ce1ccd 100644 --- a/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/sort/root-panel.ts +++ b/blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/sort/root-panel.ts @@ -5,7 +5,6 @@ import { popupTargetFromElement, } from '@blocksuite/affine-components/context-menu'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { ArrowDownSmallIcon, @@ -13,6 +12,7 @@ import { DeleteIcon, PlusIcon, } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { computed } from '@preact/signals-core'; import { css, html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/data-view/src/widget-presets/tools/presets/table-add-row/new-record-preview.ts b/blocksuite/affine/data-view/src/widget-presets/tools/presets/table-add-row/new-record-preview.ts index 0acb201ee7..bbb220a6e2 100644 --- a/blocksuite/affine/data-view/src/widget-presets/tools/presets/table-add-row/new-record-preview.ts +++ b/blocksuite/affine/data-view/src/widget-presets/tools/presets/table-add-row/new-record-preview.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { PlusIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { cssVarV2 } from '@toeverything/theme/v2'; import { html, unsafeCSS } from 'lit'; diff --git a/blocksuite/affine/data-view/tsconfig.json b/blocksuite/affine/data-view/tsconfig.json index ad636e4176..20dc035a39 100644 --- a/blocksuite/affine/data-view/tsconfig.json +++ b/blocksuite/affine/data-view/tsconfig.json @@ -10,8 +10,8 @@ "references": [ { "path": "../components" }, { "path": "../shared" }, - { "path": "../../framework/block-std" }, { "path": "../../framework/global" }, + { "path": "../../framework/std" }, { "path": "../../framework/store" } ] } diff --git a/blocksuite/affine/fragments/fragment-doc-title/package.json b/blocksuite/affine/fragments/fragment-doc-title/package.json index 09851d9c9c..66705c96ec 100644 --- a/blocksuite/affine/fragments/fragment-doc-title/package.json +++ b/blocksuite/affine/fragments/fragment-doc-title/package.json @@ -16,9 +16,9 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/fragments/fragment-doc-title/src/doc-title.ts b/blocksuite/affine/fragments/fragment-doc-title/src/doc-title.ts index d1f2d5255d..6ed17ec827 100644 --- a/blocksuite/affine/fragments/fragment-doc-title/src/doc-title.ts +++ b/blocksuite/affine/fragments/fragment-doc-title/src/doc-title.ts @@ -8,8 +8,8 @@ import { } from '@blocksuite/affine-model'; import { focusTextModel, type RichText } from '@blocksuite/affine-rich-text'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import type { Store } from '@blocksuite/store'; import { effect } from '@preact/signals-core'; import { css, html } from 'lit'; diff --git a/blocksuite/affine/fragments/fragment-doc-title/src/utils.ts b/blocksuite/affine/fragments/fragment-doc-title/src/utils.ts index d70c225941..db6748e82f 100644 --- a/blocksuite/affine/fragments/fragment-doc-title/src/utils.ts +++ b/blocksuite/affine/fragments/fragment-doc-title/src/utils.ts @@ -1,4 +1,4 @@ -import type { EditorHost } from '@blocksuite/block-std'; +import type { EditorHost } from '@blocksuite/std'; import type { DocTitle } from './doc-title'; diff --git a/blocksuite/affine/fragments/fragment-doc-title/tsconfig.json b/blocksuite/affine/fragments/fragment-doc-title/tsconfig.json index bdc986e61f..3e2a49bff6 100644 --- a/blocksuite/affine/fragments/fragment-doc-title/tsconfig.json +++ b/blocksuite/affine/fragments/fragment-doc-title/tsconfig.json @@ -13,8 +13,8 @@ { "path": "../../model" }, { "path": "../../rich-text" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/fragments/fragment-frame-panel/package.json b/blocksuite/affine/fragments/fragment-frame-panel/package.json index e2aa3734c1..7d658d6178 100644 --- a/blocksuite/affine/fragments/fragment-frame-panel/package.json +++ b/blocksuite/affine/fragments/fragment-frame-panel/package.json @@ -16,9 +16,9 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/fragments/fragment-frame-panel/src/body/frame-panel-body.ts b/blocksuite/affine/fragments/fragment-frame-panel/src/body/frame-panel-body.ts index b9a9c6a2e2..b2527a0877 100644 --- a/blocksuite/affine/fragments/fragment-frame-panel/src/body/frame-panel-body.ts +++ b/blocksuite/affine/fragments/fragment-frame-panel/src/body/frame-panel-body.ts @@ -4,14 +4,14 @@ import { DocModeProvider, EditPropsStore, } from '@blocksuite/affine-shared/services'; -import { type EditorHost, ShadowlessElement } from '@blocksuite/block-std'; -import { - generateKeyBetweenV2, - GfxControllerIdentifier, -} from '@blocksuite/block-std/gfx'; import { DisposableGroup } from '@blocksuite/global/disposable'; import { Bound } from '@blocksuite/global/gfx'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { type EditorHost, ShadowlessElement } from '@blocksuite/std'; +import { + generateKeyBetweenV2, + GfxControllerIdentifier, +} from '@blocksuite/std/gfx'; import type { Store } from '@blocksuite/store'; import { css, html, nothing, type PropertyValues } from 'lit'; import { property, query, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-card-title-editor.ts b/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-card-title-editor.ts index 6cc89d23c5..c96a713279 100644 --- a/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-card-title-editor.ts +++ b/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-card-title-editor.ts @@ -1,7 +1,7 @@ import type { FrameBlockModel } from '@blocksuite/affine-model'; import type { RichText } from '@blocksuite/affine-rich-text'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, html } from 'lit'; import { property, query } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-card-title.ts b/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-card-title.ts index 5f94e66386..df519c6460 100644 --- a/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-card-title.ts +++ b/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-card-title.ts @@ -1,7 +1,7 @@ import type { FrameBlockModel } from '@blocksuite/affine-model'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { DisposableGroup } from '@blocksuite/global/disposable'; import { WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, html, type PropertyValues } from 'lit'; import { property, query } from 'lit/decorators.js'; import type * as Y from 'yjs'; diff --git a/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-card.ts b/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-card.ts index a74d0f0af2..6f8e8c3b5a 100644 --- a/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-card.ts +++ b/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-card.ts @@ -1,7 +1,7 @@ import type { FrameBlockModel } from '@blocksuite/affine-model'; import { on, once } from '@blocksuite/affine-shared/utils'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, html, nothing } from 'lit'; import { property, query } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-preview.ts b/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-preview.ts index 9249ed3153..26d9e9d7ea 100644 --- a/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-preview.ts +++ b/blocksuite/affine/fragments/fragment-frame-panel/src/card/frame-preview.ts @@ -1,16 +1,16 @@ import type { FrameBlockModel } from '@blocksuite/affine-model'; import { ViewportElementExtension } from '@blocksuite/affine-shared/services'; import { SpecProvider } from '@blocksuite/affine-shared/utils'; +import { DisposableGroup } from '@blocksuite/global/disposable'; +import { Bound, deserializeXYWH } from '@blocksuite/global/gfx'; +import { WithDisposable } from '@blocksuite/global/lit'; import { BlockStdScope, type EditorHost, LifeCycleWatcher, ShadowlessElement, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; -import { DisposableGroup } from '@blocksuite/global/disposable'; -import { Bound, deserializeXYWH } from '@blocksuite/global/gfx'; -import { WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { type Query, type Store } from '@blocksuite/store'; import { css, html, nothing, type PropertyValues } from 'lit'; import { property, query, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/fragments/fragment-frame-panel/src/frame-panel.ts b/blocksuite/affine/fragments/fragment-frame-panel/src/frame-panel.ts index f0f3a88061..04e876cc54 100644 --- a/blocksuite/affine/fragments/fragment-frame-panel/src/frame-panel.ts +++ b/blocksuite/affine/fragments/fragment-frame-panel/src/frame-panel.ts @@ -1,5 +1,5 @@ -import { type EditorHost, ShadowlessElement } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; +import { type EditorHost, ShadowlessElement } from '@blocksuite/std'; import { baseTheme } from '@toeverything/theme'; import { css, html, unsafeCSS } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/fragments/fragment-frame-panel/src/header/frame-panel-header.ts b/blocksuite/affine/fragments/fragment-frame-panel/src/header/frame-panel-header.ts index 4e12c1be55..eff64e8c91 100644 --- a/blocksuite/affine/fragments/fragment-frame-panel/src/header/frame-panel-header.ts +++ b/blocksuite/affine/fragments/fragment-frame-panel/src/header/frame-panel-header.ts @@ -5,11 +5,11 @@ import { EditPropsStore, } from '@blocksuite/affine-shared/services'; import { createButtonPopper } from '@blocksuite/affine-shared/utils'; -import type { EditorHost } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { DisposableGroup } from '@blocksuite/global/disposable'; import { WithDisposable } from '@blocksuite/global/lit'; import { PresentationIcon, SettingsIcon } from '@blocksuite/icons/lit'; +import type { EditorHost } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { css, html, LitElement, type PropertyValues } from 'lit'; import { property, query, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/fragments/fragment-frame-panel/src/header/frames-setting-menu.ts b/blocksuite/affine/fragments/fragment-frame-panel/src/header/frames-setting-menu.ts index 46b455e304..4d4c0307ab 100644 --- a/blocksuite/affine/fragments/fragment-frame-panel/src/header/frames-setting-menu.ts +++ b/blocksuite/affine/fragments/fragment-frame-panel/src/header/frames-setting-menu.ts @@ -3,8 +3,8 @@ import { DocModeProvider, EditPropsStore, } from '@blocksuite/affine-shared/services'; -import type { EditorHost } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/global/lit'; +import type { EditorHost } from '@blocksuite/std'; import { css, html, LitElement, type PropertyValues } from 'lit'; import { property, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/fragments/fragment-frame-panel/tsconfig.json b/blocksuite/affine/fragments/fragment-frame-panel/tsconfig.json index bdc986e61f..3e2a49bff6 100644 --- a/blocksuite/affine/fragments/fragment-frame-panel/tsconfig.json +++ b/blocksuite/affine/fragments/fragment-frame-panel/tsconfig.json @@ -13,8 +13,8 @@ { "path": "../../model" }, { "path": "../../rich-text" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/fragments/fragment-outline/package.json b/blocksuite/affine/fragments/fragment-outline/package.json index 5f4e81d088..bfb1204c8a 100644 --- a/blocksuite/affine/fragments/fragment-outline/package.json +++ b/blocksuite/affine/fragments/fragment-outline/package.json @@ -16,9 +16,9 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/fragments/fragment-outline/src/body/outline-notice.ts b/blocksuite/affine/fragments/fragment-outline/src/body/outline-notice.ts index 600e28b899..d2b458fe46 100644 --- a/blocksuite/affine/fragments/fragment-outline/src/body/outline-notice.ts +++ b/blocksuite/affine/fragments/fragment-outline/src/body/outline-notice.ts @@ -1,7 +1,7 @@ import { NoteDisplayMode } from '@blocksuite/affine-model'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { CloseIcon, SortIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { consume } from '@lit/context'; import { effect, signal } from '@preact/signals-core'; import { html, nothing } from 'lit'; diff --git a/blocksuite/affine/fragments/fragment-outline/src/body/outline-panel-body.ts b/blocksuite/affine/fragments/fragment-outline/src/body/outline-panel-body.ts index d188209fbb..49347cc394 100644 --- a/blocksuite/affine/fragments/fragment-outline/src/body/outline-panel-body.ts +++ b/blocksuite/affine/fragments/fragment-outline/src/body/outline-panel-body.ts @@ -2,14 +2,14 @@ import { changeNoteDisplayMode } from '@blocksuite/affine-block-note'; import { NoteBlockModel, NoteDisplayMode } from '@blocksuite/affine-model'; import { DocModeProvider } from '@blocksuite/affine-shared/services'; import { focusTitle, matchModels } from '@blocksuite/affine-shared/utils'; +import { Bound } from '@blocksuite/global/gfx'; +import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { BlockSelection, ShadowlessElement, SurfaceSelection, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; -import { Bound } from '@blocksuite/global/gfx'; -import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import type { BlockModel } from '@blocksuite/store'; import { consume } from '@lit/context'; import { effect, signal } from '@preact/signals-core'; diff --git a/blocksuite/affine/fragments/fragment-outline/src/card/outline-card.ts b/blocksuite/affine/fragments/fragment-outline/src/card/outline-card.ts index 9e3852ade0..dec224bd7c 100644 --- a/blocksuite/affine/fragments/fragment-outline/src/card/outline-card.ts +++ b/blocksuite/affine/fragments/fragment-outline/src/card/outline-card.ts @@ -1,8 +1,8 @@ import { type NoteBlockModel, NoteDisplayMode } from '@blocksuite/affine-model'; import { createButtonPopper } from '@blocksuite/affine-shared/utils'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { ArrowDownSmallIcon, InvisibleIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { consume, ContextProvider } from '@lit/context'; import { signal } from '@preact/signals-core'; diff --git a/blocksuite/affine/fragments/fragment-outline/src/card/outline-preview.ts b/blocksuite/affine/fragments/fragment-outline/src/card/outline-preview.ts index 1fb4711b43..8c781ec251 100644 --- a/blocksuite/affine/fragments/fragment-outline/src/card/outline-preview.ts +++ b/blocksuite/affine/fragments/fragment-outline/src/card/outline-preview.ts @@ -10,10 +10,10 @@ import type { } from '@blocksuite/affine-model'; import { DocDisplayMetaProvider } from '@blocksuite/affine-shared/services'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { noop } from '@blocksuite/global/utils'; import { LinkedPageIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import type { BlockModel, DeltaInsert } from '@blocksuite/store'; import { consume } from '@lit/context'; import { html, nothing } from 'lit'; diff --git a/blocksuite/affine/fragments/fragment-outline/src/config.ts b/blocksuite/affine/fragments/fragment-outline/src/config.ts index b69ec7429b..eb561e8749 100644 --- a/blocksuite/affine/fragments/fragment-outline/src/config.ts +++ b/blocksuite/affine/fragments/fragment-outline/src/config.ts @@ -1,5 +1,4 @@ import type { ParagraphBlockModel } from '@blocksuite/affine-model'; -import type { EditorHost } from '@blocksuite/block-std'; import { AttachmentIcon, BlockIcon, @@ -20,6 +19,7 @@ import { QuoteIcon, TextIcon, } from '@blocksuite/icons/lit'; +import type { EditorHost } from '@blocksuite/std'; import { createContext } from '@lit/context'; import type { Signal } from '@preact/signals-core'; import type { TemplateResult } from 'lit'; diff --git a/blocksuite/affine/fragments/fragment-outline/src/header/outline-panel-header.ts b/blocksuite/affine/fragments/fragment-outline/src/header/outline-panel-header.ts index 50ec1cfe9a..7faa6cd062 100644 --- a/blocksuite/affine/fragments/fragment-outline/src/header/outline-panel-header.ts +++ b/blocksuite/affine/fragments/fragment-outline/src/header/outline-panel-header.ts @@ -1,7 +1,7 @@ import { createButtonPopper } from '@blocksuite/affine-shared/utils'; -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { SettingsIcon, SortIcon } from '@blocksuite/icons/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { consume } from '@lit/context'; import { signal } from '@preact/signals-core'; import { html } from 'lit'; diff --git a/blocksuite/affine/fragments/fragment-outline/src/header/outline-setting-menu.ts b/blocksuite/affine/fragments/fragment-outline/src/header/outline-setting-menu.ts index 7528943dc9..6b87ea0f7e 100644 --- a/blocksuite/affine/fragments/fragment-outline/src/header/outline-setting-menu.ts +++ b/blocksuite/affine/fragments/fragment-outline/src/header/outline-setting-menu.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { consume } from '@lit/context'; import { html } from 'lit'; diff --git a/blocksuite/affine/fragments/fragment-outline/src/mobile-outline-panel.ts b/blocksuite/affine/fragments/fragment-outline/src/mobile-outline-panel.ts index 0125695741..ec7166946a 100644 --- a/blocksuite/affine/fragments/fragment-outline/src/mobile-outline-panel.ts +++ b/blocksuite/affine/fragments/fragment-outline/src/mobile-outline-panel.ts @@ -6,12 +6,12 @@ import { import { DocModeProvider } from '@blocksuite/affine-shared/services'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; import { matchModels } from '@blocksuite/affine-shared/utils'; +import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { type EditorHost, PropTypes, requiredProperties, -} from '@blocksuite/block-std'; -import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { signal } from '@preact/signals-core'; import { css, html, LitElement, nothing } from 'lit'; diff --git a/blocksuite/affine/fragments/fragment-outline/src/outline-panel.ts b/blocksuite/affine/fragments/fragment-outline/src/outline-panel.ts index 0b14b57f56..5d7e9c85f4 100644 --- a/blocksuite/affine/fragments/fragment-outline/src/outline-panel.ts +++ b/blocksuite/affine/fragments/fragment-outline/src/outline-panel.ts @@ -1,11 +1,11 @@ import { DocModeProvider } from '@blocksuite/affine-shared/services'; +import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { type EditorHost, PropTypes, requiredProperties, ShadowlessElement, -} from '@blocksuite/block-std'; -import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; import { provide } from '@lit/context'; import { effect, signal } from '@preact/signals-core'; import { html, type PropertyValues } from 'lit'; diff --git a/blocksuite/affine/fragments/fragment-outline/src/outline-viewer.ts b/blocksuite/affine/fragments/fragment-outline/src/outline-viewer.ts index d104cac379..fdffc9c03e 100644 --- a/blocksuite/affine/fragments/fragment-outline/src/outline-viewer.ts +++ b/blocksuite/affine/fragments/fragment-outline/src/outline-viewer.ts @@ -1,14 +1,14 @@ import { NoteDisplayMode } from '@blocksuite/affine-model'; import { DocModeProvider } from '@blocksuite/affine-shared/services'; import { scrollbarStyle } from '@blocksuite/affine-shared/styles'; +import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import { TocIcon } from '@blocksuite/icons/lit'; import { type EditorHost, PropTypes, requiredProperties, ShadowlessElement, -} from '@blocksuite/block-std'; -import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; -import { TocIcon } from '@blocksuite/icons/lit'; +} from '@blocksuite/std'; import { provide } from '@lit/context'; import { signal } from '@preact/signals-core'; import { css, html, nothing, type PropertyValues } from 'lit'; diff --git a/blocksuite/affine/fragments/fragment-outline/src/utils/scroll.ts b/blocksuite/affine/fragments/fragment-outline/src/utils/scroll.ts index 9c900e9f20..5b42f024d2 100644 --- a/blocksuite/affine/fragments/fragment-outline/src/utils/scroll.ts +++ b/blocksuite/affine/fragments/fragment-outline/src/utils/scroll.ts @@ -2,9 +2,9 @@ import { getDocTitleByEditorHost } from '@blocksuite/affine-fragment-doc-title'; import { NoteDisplayMode } from '@blocksuite/affine-model'; import { DocModeProvider } from '@blocksuite/affine-shared/services'; import type { Viewport } from '@blocksuite/affine-shared/types'; -import type { EditorHost } from '@blocksuite/block-std'; import { DisposableGroup } from '@blocksuite/global/disposable'; import { clamp } from '@blocksuite/global/gfx'; +import type { EditorHost } from '@blocksuite/std'; import { getHeadingBlocksFromDoc } from './query.js'; diff --git a/blocksuite/affine/fragments/fragment-outline/tsconfig.json b/blocksuite/affine/fragments/fragment-outline/tsconfig.json index 7e04d02031..9cad3fde28 100644 --- a/blocksuite/affine/fragments/fragment-outline/tsconfig.json +++ b/blocksuite/affine/fragments/fragment-outline/tsconfig.json @@ -13,8 +13,8 @@ { "path": "../../model" }, { "path": "../../rich-text" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/gfx/brush/package.json b/blocksuite/affine/gfx/brush/package.json index a8186667f4..8623afd9d4 100644 --- a/blocksuite/affine/gfx/brush/package.json +++ b/blocksuite/affine/gfx/brush/package.json @@ -16,9 +16,9 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.6", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@lit/context": "^1.1.2", "@preact/signals-core": "^1.8.0", diff --git a/blocksuite/affine/gfx/brush/src/brush-tool.ts b/blocksuite/affine/gfx/brush/src/brush-tool.ts index 1029b91189..5bc0bd7e2c 100644 --- a/blocksuite/affine/gfx/brush/src/brush-tool.ts +++ b/blocksuite/affine/gfx/brush/src/brush-tool.ts @@ -1,9 +1,9 @@ import { CanvasElementType } from '@blocksuite/affine-block-surface'; import type { BrushElementModel } from '@blocksuite/affine-model'; import { TelemetryProvider } from '@blocksuite/affine-shared/services'; -import type { PointerEventState } from '@blocksuite/block-std'; -import { BaseTool } from '@blocksuite/block-std/gfx'; import type { IVec } from '@blocksuite/global/gfx'; +import type { PointerEventState } from '@blocksuite/std'; +import { BaseTool } from '@blocksuite/std/gfx'; export class BrushTool extends BaseTool { static BRUSH_POP_GAP = 20; @@ -178,7 +178,7 @@ export class BrushTool extends BaseTool { } } -declare module '@blocksuite/block-std/gfx' { +declare module '@blocksuite/std/gfx' { interface GfxToolsMap { brush: BrushTool; } diff --git a/blocksuite/affine/gfx/brush/src/eraser-tool.ts b/blocksuite/affine/gfx/brush/src/eraser-tool.ts index ebca03b45a..e7e4d32511 100644 --- a/blocksuite/affine/gfx/brush/src/eraser-tool.ts +++ b/blocksuite/affine/gfx/brush/src/eraser-tool.ts @@ -4,8 +4,6 @@ import { type SurfaceBlockComponent, } from '@blocksuite/affine-block-surface'; import { isTopLevelBlock } from '@blocksuite/affine-shared/utils'; -import type { PointerEventState } from '@blocksuite/block-std'; -import { BaseTool, type GfxModel } from '@blocksuite/block-std/gfx'; import { Bound, getStroke, @@ -13,6 +11,8 @@ import { type IVec, linePolygonIntersects, } from '@blocksuite/global/gfx'; +import type { PointerEventState } from '@blocksuite/std'; +import { BaseTool, type GfxModel } from '@blocksuite/std/gfx'; class EraserOverlay extends Overlay { d = ''; @@ -156,7 +156,7 @@ export class EraserTool extends BaseTool { } } -declare module '@blocksuite/block-std/gfx' { +declare module '@blocksuite/std/gfx' { interface GfxToolsMap { eraser: EraserTool; } diff --git a/blocksuite/affine/gfx/brush/src/highlighter-tool.ts b/blocksuite/affine/gfx/brush/src/highlighter-tool.ts index 64c5046e54..da9a99c594 100644 --- a/blocksuite/affine/gfx/brush/src/highlighter-tool.ts +++ b/blocksuite/affine/gfx/brush/src/highlighter-tool.ts @@ -1,9 +1,9 @@ import { CanvasElementType } from '@blocksuite/affine-block-surface'; import type { HighlighterElementModel } from '@blocksuite/affine-model'; import { TelemetryProvider } from '@blocksuite/affine-shared/services'; -import type { PointerEventState } from '@blocksuite/block-std'; -import { BaseTool } from '@blocksuite/block-std/gfx'; import type { IVec } from '@blocksuite/global/gfx'; +import type { PointerEventState } from '@blocksuite/std'; +import { BaseTool } from '@blocksuite/std/gfx'; export class HighlighterTool extends BaseTool { static HIGHLIGHTER_POP_GAP = 20; @@ -178,7 +178,7 @@ export class HighlighterTool extends BaseTool { } } -declare module '@blocksuite/block-std/gfx' { +declare module '@blocksuite/std/gfx' { interface GfxToolsMap { highlighter: HighlighterTool; } diff --git a/blocksuite/affine/gfx/brush/src/toolbar/components/eraser/eraser-tool-button.ts b/blocksuite/affine/gfx/brush/src/toolbar/components/eraser/eraser-tool-button.ts index 4653b6b823..2b08d35a60 100644 --- a/blocksuite/affine/gfx/brush/src/toolbar/components/eraser/eraser-tool-button.ts +++ b/blocksuite/affine/gfx/brush/src/toolbar/components/eraser/eraser-tool-button.ts @@ -1,6 +1,6 @@ import { ThemeProvider } from '@blocksuite/affine-shared/services'; import { EdgelessToolbarToolMixin } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx'; +import type { GfxToolsFullOptionValue } from '@blocksuite/std/gfx'; import { css, html, LitElement } from 'lit'; import { EdgelessEraserDarkIcon, EdgelessEraserLightIcon } from './icons.js'; diff --git a/blocksuite/affine/gfx/brush/src/toolbar/components/pen/types.ts b/blocksuite/affine/gfx/brush/src/toolbar/components/pen/types.ts index 4c9de9fd90..9287423b21 100644 --- a/blocksuite/affine/gfx/brush/src/toolbar/components/pen/types.ts +++ b/blocksuite/affine/gfx/brush/src/toolbar/components/pen/types.ts @@ -1,4 +1,4 @@ -import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx'; +import type { GfxToolsFullOptionValue } from '@blocksuite/std/gfx'; export type Pen = Extract< GfxToolsFullOptionValue['type'], diff --git a/blocksuite/affine/gfx/brush/src/toolbar/configs/brush.ts b/blocksuite/affine/gfx/brush/src/toolbar/configs/brush.ts index e38924ca2f..c1ef1c6340 100644 --- a/blocksuite/affine/gfx/brush/src/toolbar/configs/brush.ts +++ b/blocksuite/affine/gfx/brush/src/toolbar/configs/brush.ts @@ -17,7 +17,7 @@ import { getMostCommonResolvedValue, getMostCommonValue, } from '@blocksuite/affine-shared/utils'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; import { html } from 'lit'; export const brushToolbarConfig = { diff --git a/blocksuite/affine/gfx/brush/src/toolbar/configs/highlighter.ts b/blocksuite/affine/gfx/brush/src/toolbar/configs/highlighter.ts index a6fdf847ac..72581924bb 100644 --- a/blocksuite/affine/gfx/brush/src/toolbar/configs/highlighter.ts +++ b/blocksuite/affine/gfx/brush/src/toolbar/configs/highlighter.ts @@ -20,7 +20,7 @@ import { getMostCommonResolvedValue, getMostCommonValue, } from '@blocksuite/affine-shared/utils'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; import { html } from 'lit'; const trackBaseProps = { diff --git a/blocksuite/affine/gfx/brush/tsconfig.json b/blocksuite/affine/gfx/brush/tsconfig.json index 5b280fe89a..df6d3f7734 100644 --- a/blocksuite/affine/gfx/brush/tsconfig.json +++ b/blocksuite/affine/gfx/brush/tsconfig.json @@ -13,8 +13,8 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/widget-edgeless-toolbar" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/gfx/connector/package.json b/blocksuite/affine/gfx/connector/package.json index 134ef096d7..eddc2f5cfa 100644 --- a/blocksuite/affine/gfx/connector/package.json +++ b/blocksuite/affine/gfx/connector/package.json @@ -16,9 +16,9 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@lit/context": "^1.1.2", "@preact/signals-core": "^1.8.0", diff --git a/blocksuite/affine/gfx/connector/src/components/connector-handle.ts b/blocksuite/affine/gfx/connector/src/components/connector-handle.ts index d9f967c928..55bc553d43 100644 --- a/blocksuite/affine/gfx/connector/src/components/connector-handle.ts +++ b/blocksuite/affine/gfx/connector/src/components/connector-handle.ts @@ -4,16 +4,16 @@ import { OverlayIdentifier, } from '@blocksuite/affine-block-surface'; import type { ConnectorElementModel } from '@blocksuite/affine-model'; +import { DisposableGroup } from '@blocksuite/global/disposable'; +import { Vec } from '@blocksuite/global/gfx'; +import { WithDisposable } from '@blocksuite/global/lit'; import { type BlockComponent, type BlockStdScope, docContext, stdContext, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; -import { DisposableGroup } from '@blocksuite/global/disposable'; -import { Vec } from '@blocksuite/global/gfx'; -import { WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import type { Store } from '@blocksuite/store'; import { consume } from '@lit/context'; import { css, html, LitElement } from 'lit'; diff --git a/blocksuite/affine/gfx/connector/src/connector-tool.ts b/blocksuite/affine/gfx/connector/src/connector-tool.ts index c9a8c1b64d..cee1948808 100644 --- a/blocksuite/affine/gfx/connector/src/connector-tool.ts +++ b/blocksuite/affine/gfx/connector/src/connector-tool.ts @@ -17,10 +17,10 @@ import { ShapeType, } from '@blocksuite/affine-model'; import { TelemetryProvider } from '@blocksuite/affine-shared/services'; -import type { PointerEventState } from '@blocksuite/block-std'; -import { BaseTool, type GfxModel } from '@blocksuite/block-std/gfx'; import type { IBound, IVec } from '@blocksuite/global/gfx'; import { Bound } from '@blocksuite/global/gfx'; +import type { PointerEventState } from '@blocksuite/std'; +import { BaseTool, type GfxModel } from '@blocksuite/std/gfx'; enum ConnectorToolMode { // Dragging connect @@ -222,7 +222,7 @@ export class ConnectorTool extends BaseTool { } } -declare module '@blocksuite/block-std/gfx' { +declare module '@blocksuite/std/gfx' { interface GfxToolsMap { connector: ConnectorTool; } diff --git a/blocksuite/affine/gfx/connector/src/element-transform/connector-filter.ts b/blocksuite/affine/gfx/connector/src/element-transform/connector-filter.ts index 97a8930f92..8ec4cec8bc 100644 --- a/blocksuite/affine/gfx/connector/src/element-transform/connector-filter.ts +++ b/blocksuite/affine/gfx/connector/src/element-transform/connector-filter.ts @@ -2,7 +2,7 @@ import { ConnectorElementModel } from '@blocksuite/affine-model'; import { type DragExtensionInitializeContext, TransformExtension, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; export class ConnectorFilter extends TransformExtension { static override key = 'connector-filter'; diff --git a/blocksuite/affine/gfx/connector/src/text/edgeless-connector-label-editor.ts b/blocksuite/affine/gfx/connector/src/text/edgeless-connector-label-editor.ts index abd20ba4e4..c5ddb2aec8 100644 --- a/blocksuite/affine/gfx/connector/src/text/edgeless-connector-label-editor.ts +++ b/blocksuite/affine/gfx/connector/src/text/edgeless-connector-label-editor.ts @@ -6,17 +6,17 @@ import type { ConnectorElementModel } from '@blocksuite/affine-model'; import type { RichText } from '@blocksuite/affine-rich-text'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; import { almostEqual } from '@blocksuite/affine-shared/utils'; +import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +import { Bound, type IVec, Vec } from '@blocksuite/global/gfx'; +import { WithDisposable } from '@blocksuite/global/lit'; import { type BlockComponent, type BlockStdScope, ShadowlessElement, stdContext, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; -import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline'; -import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; -import { Bound, type IVec, Vec } from '@blocksuite/global/gfx'; -import { WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; +import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/std/inline'; import { consume } from '@lit/context'; import { css, html, nothing } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/gfx/connector/src/text/text.ts b/blocksuite/affine/gfx/connector/src/text/text.ts index b84f43f49e..dad71bd7d3 100644 --- a/blocksuite/affine/gfx/connector/src/text/text.ts +++ b/blocksuite/affine/gfx/connector/src/text/text.ts @@ -1,10 +1,10 @@ import { EdgelessCRUDIdentifier } from '@blocksuite/affine-block-surface'; import type { ConnectorElementModel } from '@blocksuite/affine-model'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; import type { IVec } from '@blocksuite/global/gfx'; import { Bound } from '@blocksuite/global/gfx'; +import type { BlockComponent } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import * as Y from 'yjs'; import { EdgelessConnectorLabelEditor } from './edgeless-connector-label-editor'; diff --git a/blocksuite/affine/gfx/connector/src/toolbar/config.ts b/blocksuite/affine/gfx/connector/src/toolbar/config.ts index 457863faaf..c64ff62ec3 100644 --- a/blocksuite/affine/gfx/connector/src/toolbar/config.ts +++ b/blocksuite/affine/gfx/connector/src/toolbar/config.ts @@ -38,7 +38,6 @@ import { LINE_STYLE_LIST, renderMenu, } from '@blocksuite/affine-widget-edgeless-toolbar'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; import { AddTextIcon, @@ -56,6 +55,7 @@ import { StartPointIcon, StartPointTriangleIcon, } from '@blocksuite/icons/lit'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; import { html } from 'lit'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/gfx/connector/src/toolbar/connector-menu.ts b/blocksuite/affine/gfx/connector/src/toolbar/connector-menu.ts index fc61d39563..617b5d32b7 100644 --- a/blocksuite/affine/gfx/connector/src/toolbar/connector-menu.ts +++ b/blocksuite/affine/gfx/connector/src/toolbar/connector-menu.ts @@ -10,13 +10,13 @@ import { } from '@blocksuite/affine-shared/services'; import type { ColorEvent } from '@blocksuite/affine-shared/utils'; import { EdgelessToolbarToolMixin } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx'; import { SignalWatcher } from '@blocksuite/global/lit'; import { ConnectorCIcon, ConnectorEIcon, ConnectorLIcon, } from '@blocksuite/icons/lit'; +import type { GfxToolsFullOptionValue } from '@blocksuite/std/gfx'; import { computed } from '@preact/signals-core'; import { css, html, LitElement } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/gfx/connector/src/view/view.ts b/blocksuite/affine/gfx/connector/src/view/view.ts index 70a4382d25..2da5a4fcb6 100644 --- a/blocksuite/affine/gfx/connector/src/view/view.ts +++ b/blocksuite/affine/gfx/connector/src/view/view.ts @@ -4,7 +4,7 @@ import { type DragMoveContext, type DragStartContext, GfxElementModelView, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; import { mountConnectorLabelEditor } from '../text/edgeless-connector-label-editor'; diff --git a/blocksuite/affine/gfx/connector/tsconfig.json b/blocksuite/affine/gfx/connector/tsconfig.json index 5b280fe89a..df6d3f7734 100644 --- a/blocksuite/affine/gfx/connector/tsconfig.json +++ b/blocksuite/affine/gfx/connector/tsconfig.json @@ -13,8 +13,8 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/widget-edgeless-toolbar" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/gfx/group/package.json b/blocksuite/affine/gfx/group/package.json index fe79c68c94..805a050b52 100644 --- a/blocksuite/affine/gfx/group/package.json +++ b/blocksuite/affine/gfx/group/package.json @@ -16,9 +16,9 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.6", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@lit/context": "^1.1.2", "@preact/signals-core": "^1.8.0", diff --git a/blocksuite/affine/gfx/group/src/command/group-api.ts b/blocksuite/affine/gfx/group/src/command/group-api.ts index abb711c25f..a349d8590d 100644 --- a/blocksuite/affine/gfx/group/src/command/group-api.ts +++ b/blocksuite/affine/gfx/group/src/command/group-api.ts @@ -3,11 +3,8 @@ import { type GroupElementModel, MindmapElementModel, } from '@blocksuite/affine-model'; -import type { Command } from '@blocksuite/block-std'; -import { - GfxControllerIdentifier, - type GfxModel, -} from '@blocksuite/block-std/gfx'; +import type { Command } from '@blocksuite/std'; +import { GfxControllerIdentifier, type GfxModel } from '@blocksuite/std/gfx'; export const createGroupCommand: Command< { elements: GfxModel[] | string[] }, diff --git a/blocksuite/affine/gfx/group/src/text/edgeless-group-title-editor.ts b/blocksuite/affine/gfx/group/src/text/edgeless-group-title-editor.ts index 996f2a5a76..89f1197f20 100644 --- a/blocksuite/affine/gfx/group/src/text/edgeless-group-title-editor.ts +++ b/blocksuite/affine/gfx/group/src/text/edgeless-group-title-editor.ts @@ -5,17 +5,17 @@ import { } from '@blocksuite/affine-block-surface'; import type { GroupElementModel } from '@blocksuite/affine-model'; import type { RichText } from '@blocksuite/affine-rich-text'; +import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +import { Bound } from '@blocksuite/global/gfx'; +import { WithDisposable } from '@blocksuite/global/lit'; import { type BlockComponent, type BlockStdScope, ShadowlessElement, stdContext, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; -import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline'; -import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; -import { Bound } from '@blocksuite/global/gfx'; -import { WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; +import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/std/inline'; import { consume } from '@lit/context'; import { html, nothing } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/gfx/group/src/text/text.ts b/blocksuite/affine/gfx/group/src/text/text.ts index 3a02da4891..c59c78ca09 100644 --- a/blocksuite/affine/gfx/group/src/text/text.ts +++ b/blocksuite/affine/gfx/group/src/text/text.ts @@ -1,7 +1,7 @@ import type { GroupElementModel } from '@blocksuite/affine-model'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +import type { BlockComponent } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { EdgelessGroupTitleEditor } from './edgeless-group-title-editor'; diff --git a/blocksuite/affine/gfx/group/src/toolbar/config.ts b/blocksuite/affine/gfx/group/src/toolbar/config.ts index a4eaa041c7..104f108795 100644 --- a/blocksuite/affine/gfx/group/src/toolbar/config.ts +++ b/blocksuite/affine/gfx/group/src/toolbar/config.ts @@ -13,9 +13,9 @@ import { } from '@blocksuite/affine-shared/services'; import { matchModels } from '@blocksuite/affine-shared/utils'; import { getRootBlock } from '@blocksuite/affine-widget-edgeless-toolbar'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; import { EditIcon, PageIcon, UngroupIcon } from '@blocksuite/icons/lit'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; import { ungroupCommand } from '../command'; import { mountGroupTitleEditor } from '../text/text'; diff --git a/blocksuite/affine/gfx/group/src/view.ts b/blocksuite/affine/gfx/group/src/view.ts index 410e337af7..721df9ecf5 100644 --- a/blocksuite/affine/gfx/group/src/view.ts +++ b/blocksuite/affine/gfx/group/src/view.ts @@ -1,5 +1,5 @@ import type { GroupElementModel } from '@blocksuite/affine-model'; -import { GfxElementModelView } from '@blocksuite/block-std/gfx'; +import { GfxElementModelView } from '@blocksuite/std/gfx'; import { mountGroupTitleEditor } from './text/edgeless-group-title-editor'; diff --git a/blocksuite/affine/gfx/group/tsconfig.json b/blocksuite/affine/gfx/group/tsconfig.json index 5b280fe89a..df6d3f7734 100644 --- a/blocksuite/affine/gfx/group/tsconfig.json +++ b/blocksuite/affine/gfx/group/tsconfig.json @@ -13,8 +13,8 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/widget-edgeless-toolbar" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/gfx/mindmap/package.json b/blocksuite/affine/gfx/mindmap/package.json index de4ada0b97..13f7a3c0e6 100644 --- a/blocksuite/affine/gfx/mindmap/package.json +++ b/blocksuite/affine/gfx/mindmap/package.json @@ -20,9 +20,9 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@lit/context": "^1.1.2", "@preact/signals-core": "^1.8.0", diff --git a/blocksuite/affine/gfx/mindmap/src/element-transform/mind-map-drag.ts b/blocksuite/affine/gfx/mindmap/src/element-transform/mind-map-drag.ts index 9d662ad53c..8fa72631e7 100644 --- a/blocksuite/affine/gfx/mindmap/src/element-transform/mind-map-drag.ts +++ b/blocksuite/affine/gfx/mindmap/src/element-transform/mind-map-drag.ts @@ -8,6 +8,7 @@ import { MindmapElementModel, type MindmapNode, } from '@blocksuite/affine-model'; +import type { Bound, IVec } from '@blocksuite/global/gfx'; import { type DragExtensionInitializeContext, type ExtensionDragEndContext, @@ -17,8 +18,7 @@ import { type GfxPrimitiveElementModel, isGfxGroupCompatibleModel, TransformExtension, -} from '@blocksuite/block-std/gfx'; -import type { Bound, IVec } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import type { MindMapIndicatorOverlay } from '../indicator-overlay'; import { isMindmapNode, isSingleMindMapNode } from '../utils'; diff --git a/blocksuite/affine/gfx/mindmap/src/toolbar/basket-elements.ts b/blocksuite/affine/gfx/mindmap/src/toolbar/basket-elements.ts index a082eb3c0e..61eea93438 100644 --- a/blocksuite/affine/gfx/mindmap/src/toolbar/basket-elements.ts +++ b/blocksuite/affine/gfx/mindmap/src/toolbar/basket-elements.ts @@ -16,8 +16,8 @@ import { TelemetryProvider, } from '@blocksuite/affine-shared/services'; import { openFileOrFiles } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; +import type { BlockComponent } from '@blocksuite/std'; import type { TemplateResult } from 'lit'; import * as Y from 'yjs'; diff --git a/blocksuite/affine/gfx/mindmap/src/toolbar/config.ts b/blocksuite/affine/gfx/mindmap/src/toolbar/config.ts index 460ccd9882..edecc68cbc 100644 --- a/blocksuite/affine/gfx/mindmap/src/toolbar/config.ts +++ b/blocksuite/affine/gfx/mindmap/src/toolbar/config.ts @@ -13,8 +13,8 @@ import { type MenuItem, renderMenu, } from '@blocksuite/affine-widget-edgeless-toolbar'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; import { RadiantIcon, RightLayoutIcon, StyleIcon } from '@blocksuite/icons/lit'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; import { MindmapStyleFour, diff --git a/blocksuite/affine/gfx/mindmap/src/toolbar/mindmap-importing-placeholder.ts b/blocksuite/affine/gfx/mindmap/src/toolbar/mindmap-importing-placeholder.ts index c35c4372df..229848ab8e 100644 --- a/blocksuite/affine/gfx/mindmap/src/toolbar/mindmap-importing-placeholder.ts +++ b/blocksuite/affine/gfx/mindmap/src/toolbar/mindmap-importing-placeholder.ts @@ -1,6 +1,6 @@ import { LightLoadingIcon } from '@blocksuite/affine-components/icons'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import { ShadowlessElement } from '@blocksuite/block-std'; +import { ShadowlessElement } from '@blocksuite/std'; import { css, html } from 'lit'; import { importMindMapIcon } from './icons.js'; diff --git a/blocksuite/affine/gfx/mindmap/src/toolbar/mindmap-menu.ts b/blocksuite/affine/gfx/mindmap/src/toolbar/mindmap-menu.ts index 9a0b54ff25..77f1a8ac7d 100644 --- a/blocksuite/affine/gfx/mindmap/src/toolbar/mindmap-menu.ts +++ b/blocksuite/affine/gfx/mindmap/src/toolbar/mindmap-menu.ts @@ -9,11 +9,11 @@ import { EdgelessDraggableElementController, EdgelessToolbarToolMixin, } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { BlockStdScope } from '@blocksuite/block-std'; -import { modelContext, stdContext } from '@blocksuite/block-std'; import { ErrorCode } from '@blocksuite/global/exceptions'; import type { Bound } from '@blocksuite/global/gfx'; import { SignalWatcher } from '@blocksuite/global/lit'; +import type { BlockStdScope } from '@blocksuite/std'; +import { modelContext, stdContext } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { consume } from '@lit/context'; import { computed } from '@preact/signals-core'; diff --git a/blocksuite/affine/gfx/mindmap/src/toolbar/mindmap-tool-button.ts b/blocksuite/affine/gfx/mindmap/src/toolbar/mindmap-tool-button.ts index eddacf52c4..82bb15b9fd 100644 --- a/blocksuite/affine/gfx/mindmap/src/toolbar/mindmap-tool-button.ts +++ b/blocksuite/affine/gfx/mindmap/src/toolbar/mindmap-tool-button.ts @@ -12,9 +12,9 @@ import { EdgelessDraggableElementController, EdgelessToolbarToolMixin, } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx'; import type { Bound } from '@blocksuite/global/gfx'; import { SignalWatcher } from '@blocksuite/global/lit'; +import type { GfxToolsFullOptionValue } from '@blocksuite/std/gfx'; import { computed } from '@preact/signals-core'; import { css, html, LitElement, nothing } from 'lit'; import { property, query, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/gfx/mindmap/src/utils/index.ts b/blocksuite/affine/gfx/mindmap/src/utils/index.ts index 20b59a0c6d..7b506f9dfd 100644 --- a/blocksuite/affine/gfx/mindmap/src/utils/index.ts +++ b/blocksuite/affine/gfx/mindmap/src/utils/index.ts @@ -3,7 +3,7 @@ import type { GfxBlockElementModel, GfxModel, Viewport, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; export function isMindmapNode(element: GfxBlockElementModel | GfxModel | null) { return element?.group instanceof MindmapElementModel; diff --git a/blocksuite/affine/gfx/mindmap/src/view/utils.ts b/blocksuite/affine/gfx/mindmap/src/view/utils.ts index 591594458f..3b00b1d151 100644 --- a/blocksuite/affine/gfx/mindmap/src/view/utils.ts +++ b/blocksuite/affine/gfx/mindmap/src/view/utils.ts @@ -10,12 +10,12 @@ import { type NodeType, type ShapeElementModel, } from '@blocksuite/affine-model'; +import type { IVec } from '@blocksuite/global/gfx'; +import { assertType } from '@blocksuite/global/utils'; import { generateKeyBetween, type SurfaceBlockModel, -} from '@blocksuite/block-std/gfx'; -import type { IVec } from '@blocksuite/global/gfx'; -import { assertType } from '@blocksuite/global/utils'; +} from '@blocksuite/std/gfx'; import isEqual from 'lodash-es/isEqual'; import last from 'lodash-es/last'; import * as Y from 'yjs'; diff --git a/blocksuite/affine/gfx/mindmap/src/view/view.ts b/blocksuite/affine/gfx/mindmap/src/view/view.ts index 4ff3b8e48e..4090fb1fe5 100644 --- a/blocksuite/affine/gfx/mindmap/src/view/view.ts +++ b/blocksuite/affine/gfx/mindmap/src/view/view.ts @@ -7,8 +7,8 @@ import { } from '@blocksuite/affine-model'; import { TelemetryProvider } from '@blocksuite/affine-shared/services'; import { requestThrottledConnectedFrame } from '@blocksuite/affine-shared/utils'; -import type { PointerEventState } from '@blocksuite/block-std'; -import { GfxElementModelView } from '@blocksuite/block-std/gfx'; +import type { PointerEventState } from '@blocksuite/std'; +import { GfxElementModelView } from '@blocksuite/std/gfx'; import { handleLayout } from './utils.js'; diff --git a/blocksuite/affine/gfx/mindmap/tsconfig.json b/blocksuite/affine/gfx/mindmap/tsconfig.json index 0f14f3d7ab..7a9ce1c4f3 100644 --- a/blocksuite/affine/gfx/mindmap/tsconfig.json +++ b/blocksuite/affine/gfx/mindmap/tsconfig.json @@ -17,8 +17,8 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/widget-edgeless-toolbar" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/gfx/note/package.json b/blocksuite/affine/gfx/note/package.json index 04c9c3f2fa..186b342f44 100644 --- a/blocksuite/affine/gfx/note/package.json +++ b/blocksuite/affine/gfx/note/package.json @@ -19,9 +19,9 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@lit/context": "^1.1.2", "@preact/signals-core": "^1.8.0", diff --git a/blocksuite/affine/gfx/note/src/note-tool.ts b/blocksuite/affine/gfx/note/src/note-tool.ts index 2214629e35..a28a0159f8 100644 --- a/blocksuite/affine/gfx/note/src/note-tool.ts +++ b/blocksuite/affine/gfx/note/src/note-tool.ts @@ -10,9 +10,9 @@ import { import { EditPropsStore } from '@blocksuite/affine-shared/services'; import type { NoteChildrenFlavour } from '@blocksuite/affine-shared/types'; import { hasClassNameInList } from '@blocksuite/affine-shared/utils'; -import type { PointerEventState } from '@blocksuite/block-std'; -import { BaseTool } from '@blocksuite/block-std/gfx'; import { Point } from '@blocksuite/global/gfx'; +import type { PointerEventState } from '@blocksuite/std'; +import { BaseTool } from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import { DraggingNoteOverlay, NoteOverlay } from './overlay'; @@ -201,7 +201,7 @@ export class NoteTool extends BaseTool { } } -declare module '@blocksuite/block-std/gfx' { +declare module '@blocksuite/std/gfx' { interface GfxToolsMap { 'affine:note': NoteTool; } diff --git a/blocksuite/affine/gfx/note/src/overlay/overlay.ts b/blocksuite/affine/gfx/note/src/overlay/overlay.ts index 95607cf900..aa379a4916 100644 --- a/blocksuite/affine/gfx/note/src/overlay/overlay.ts +++ b/blocksuite/affine/gfx/note/src/overlay/overlay.ts @@ -4,8 +4,8 @@ import { } from '@blocksuite/affine-block-surface'; import { type Color, DefaultTheme } from '@blocksuite/affine-model'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; -import type { GfxController, GfxToolsMap } from '@blocksuite/block-std/gfx'; import type { XYWH } from '@blocksuite/global/gfx'; +import type { GfxController, GfxToolsMap } from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import { Subject } from 'rxjs'; diff --git a/blocksuite/affine/gfx/note/src/toolbar/note-menu.ts b/blocksuite/affine/gfx/note/src/toolbar/note-menu.ts index 5bc089c902..c16788d934 100644 --- a/blocksuite/affine/gfx/note/src/toolbar/note-menu.ts +++ b/blocksuite/affine/gfx/note/src/toolbar/note-menu.ts @@ -10,7 +10,7 @@ import { openFileOrFiles, } from '@blocksuite/affine-shared/utils'; import { EdgelessToolbarToolMixin } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx'; +import type { GfxToolsFullOptionValue } from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import { css, html, LitElement } from 'lit'; import { property, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/gfx/note/src/toolbar/note-tool-button.ts b/blocksuite/affine/gfx/note/src/toolbar/note-tool-button.ts index fde43904a8..561bf32778 100644 --- a/blocksuite/affine/gfx/note/src/toolbar/note-tool-button.ts +++ b/blocksuite/affine/gfx/note/src/toolbar/note-tool-button.ts @@ -3,8 +3,8 @@ import { type MenuPopper, QuickToolMixin, } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx'; import { PageIcon } from '@blocksuite/icons/lit'; +import type { GfxToolsFullOptionValue } from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import { css, html, LitElement } from 'lit'; import { state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/gfx/note/tsconfig.json b/blocksuite/affine/gfx/note/tsconfig.json index f15364895a..a3099fe8a7 100644 --- a/blocksuite/affine/gfx/note/tsconfig.json +++ b/blocksuite/affine/gfx/note/tsconfig.json @@ -16,8 +16,8 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/widget-edgeless-toolbar" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/gfx/shape/package.json b/blocksuite/affine/gfx/shape/package.json index 8dc6e627e9..a90cd8c9a0 100644 --- a/blocksuite/affine/gfx/shape/package.json +++ b/blocksuite/affine/gfx/shape/package.json @@ -17,9 +17,9 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@lit/context": "^1.1.2", "@preact/signals-core": "^1.8.0", diff --git a/blocksuite/affine/gfx/shape/src/draggable/shape-menu.ts b/blocksuite/affine/gfx/shape/src/draggable/shape-menu.ts index f7861928ac..d766e077dd 100644 --- a/blocksuite/affine/gfx/shape/src/draggable/shape-menu.ts +++ b/blocksuite/affine/gfx/shape/src/draggable/shape-menu.ts @@ -12,10 +12,10 @@ import { ThemeProvider, } from '@blocksuite/affine-shared/services'; import type { ColorEvent } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { StyleGeneralIcon, StyleScribbleIcon } from '@blocksuite/icons/lit'; +import type { BlockComponent } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { computed, effect, type Signal, signal } from '@preact/signals-core'; import { css, html, LitElement } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/gfx/shape/src/draggable/shape-tool-element.ts b/blocksuite/affine/gfx/shape/src/draggable/shape-tool-element.ts index fa986d2cd6..0d6b034535 100644 --- a/blocksuite/affine/gfx/shape/src/draggable/shape-tool-element.ts +++ b/blocksuite/affine/gfx/shape/src/draggable/shape-tool-element.ts @@ -8,11 +8,11 @@ import { type ShapeName, type ShapeStyle, } from '@blocksuite/affine-model'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; import { WithDisposable } from '@blocksuite/global/lit'; import { sleep } from '@blocksuite/global/utils'; +import type { BlockComponent } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { css, html, diff --git a/blocksuite/affine/gfx/shape/src/overlay/shape-overlay.ts b/blocksuite/affine/gfx/shape/src/overlay/shape-overlay.ts index edfcf62598..61fe3172cc 100644 --- a/blocksuite/affine/gfx/shape/src/overlay/shape-overlay.ts +++ b/blocksuite/affine/gfx/shape/src/overlay/shape-overlay.ts @@ -10,9 +10,9 @@ import { type ShapeStyle, } from '@blocksuite/affine-model'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; -import type { GfxController } from '@blocksuite/block-std/gfx'; import type { XYWH } from '@blocksuite/global/gfx'; import { assertType } from '@blocksuite/global/utils'; +import type { GfxController } from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import { diff --git a/blocksuite/affine/gfx/shape/src/shape-tool.ts b/blocksuite/affine/gfx/shape/src/shape-tool.ts index 425c1c75c5..b26ef0e115 100644 --- a/blocksuite/affine/gfx/shape/src/shape-tool.ts +++ b/blocksuite/affine/gfx/shape/src/shape-tool.ts @@ -11,10 +11,10 @@ import { ThemeProvider, } from '@blocksuite/affine-shared/services'; import { hasClassNameInList } from '@blocksuite/affine-shared/utils'; -import type { PointerEventState } from '@blocksuite/block-std'; -import { BaseTool } from '@blocksuite/block-std/gfx'; import type { IBound } from '@blocksuite/global/gfx'; import { Bound } from '@blocksuite/global/gfx'; +import type { PointerEventState } from '@blocksuite/std'; +import { BaseTool } from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import { @@ -339,7 +339,7 @@ export class ShapeTool extends BaseTool { } } -declare module '@blocksuite/block-std/gfx' { +declare module '@blocksuite/std/gfx' { interface GfxToolsMap { shape: ShapeTool; } diff --git a/blocksuite/affine/gfx/shape/src/text/edgeless-shape-text-editor.ts b/blocksuite/affine/gfx/shape/src/text/edgeless-shape-text-editor.ts index 32850a82b7..767066e55a 100644 --- a/blocksuite/affine/gfx/shape/src/text/edgeless-shape-text-editor.ts +++ b/blocksuite/affine/gfx/shape/src/text/edgeless-shape-text-editor.ts @@ -10,17 +10,17 @@ import { import type { RichText } from '@blocksuite/affine-rich-text'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; import { getSelectedRect } from '@blocksuite/affine-shared/utils'; +import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +import { Bound, toRadian, Vec } from '@blocksuite/global/gfx'; +import { WithDisposable } from '@blocksuite/global/lit'; import { type BlockComponent, type BlockStdScope, ShadowlessElement, stdContext, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; -import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline'; -import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; -import { Bound, toRadian, Vec } from '@blocksuite/global/gfx'; -import { WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; +import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/std/inline'; import { consume } from '@lit/context'; import { html, nothing } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/gfx/shape/src/toolbar/config.ts b/blocksuite/affine/gfx/shape/src/toolbar/config.ts index 5f061d534c..118470e712 100644 --- a/blocksuite/affine/gfx/shape/src/toolbar/config.ts +++ b/blocksuite/affine/gfx/shape/src/toolbar/config.ts @@ -40,9 +40,9 @@ import { LINE_STYLE_LIST, renderMenu, } from '@blocksuite/affine-widget-edgeless-toolbar'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; import { AddTextIcon, ShapeIcon } from '@blocksuite/icons/lit'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; import { html } from 'lit'; import isEqual from 'lodash-es/isEqual'; diff --git a/blocksuite/affine/gfx/shape/src/view.ts b/blocksuite/affine/gfx/shape/src/view.ts index c50d8eaec6..7a423322d1 100644 --- a/blocksuite/affine/gfx/shape/src/view.ts +++ b/blocksuite/affine/gfx/shape/src/view.ts @@ -1,5 +1,5 @@ import type { ShapeElementModel } from '@blocksuite/affine-model'; -import { GfxElementModelView } from '@blocksuite/block-std/gfx'; +import { GfxElementModelView } from '@blocksuite/std/gfx'; import { mountShapeTextEditor } from './text/edgeless-shape-text-editor'; diff --git a/blocksuite/affine/gfx/shape/tsconfig.json b/blocksuite/affine/gfx/shape/tsconfig.json index 749cbf30fd..d766402046 100644 --- a/blocksuite/affine/gfx/shape/tsconfig.json +++ b/blocksuite/affine/gfx/shape/tsconfig.json @@ -14,8 +14,8 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/widget-edgeless-toolbar" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/gfx/text/package.json b/blocksuite/affine/gfx/text/package.json index c5c5cb8582..e8ef24fcdf 100644 --- a/blocksuite/affine/gfx/text/package.json +++ b/blocksuite/affine/gfx/text/package.json @@ -17,9 +17,9 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@lit/context": "^1.1.2", "@preact/signals-core": "^1.8.0", diff --git a/blocksuite/affine/gfx/text/src/edgeless-text-editor.ts b/blocksuite/affine/gfx/text/src/edgeless-text-editor.ts index 3b906be76f..e0a524f9d6 100644 --- a/blocksuite/affine/gfx/text/src/edgeless-text-editor.ts +++ b/blocksuite/affine/gfx/text/src/edgeless-text-editor.ts @@ -9,17 +9,17 @@ import { TextElementModel } from '@blocksuite/affine-model'; import type { RichText } from '@blocksuite/affine-rich-text'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; import { getSelectedRect } from '@blocksuite/affine-shared/utils'; +import { Bound, toRadian, Vec } from '@blocksuite/global/gfx'; +import { WithDisposable } from '@blocksuite/global/lit'; import { type BlockComponent, type BlockStdScope, type PointerEventState, ShadowlessElement, stdContext, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; -import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline'; -import { Bound, toRadian, Vec } from '@blocksuite/global/gfx'; -import { WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; +import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/std/inline'; import { consume } from '@lit/context'; import { css, html, nothing } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/gfx/text/src/mount-text-editor.ts b/blocksuite/affine/gfx/text/src/mount-text-editor.ts index b7d6ba320a..ed9403dd08 100644 --- a/blocksuite/affine/gfx/text/src/mount-text-editor.ts +++ b/blocksuite/affine/gfx/text/src/mount-text-editor.ts @@ -5,9 +5,9 @@ import { TextUtils, } from '@blocksuite/affine-block-surface'; import { TextElementModel } from '@blocksuite/affine-model'; -import type { BlockComponent, PointerEventState } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; +import type { BlockComponent, PointerEventState } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import * as Y from 'yjs'; import { EdgelessTextEditor } from './edgeless-text-editor'; diff --git a/blocksuite/affine/gfx/text/src/tool.ts b/blocksuite/affine/gfx/text/src/tool.ts index d214c51b89..75f8efa373 100644 --- a/blocksuite/affine/gfx/text/src/tool.ts +++ b/blocksuite/affine/gfx/text/src/tool.ts @@ -4,9 +4,9 @@ import { FeatureFlagService, TelemetryProvider, } from '@blocksuite/affine-shared/services'; -import type { PointerEventState } from '@blocksuite/block-std'; -import { BaseTool, type GfxController } from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; +import type { PointerEventState } from '@blocksuite/std'; +import { BaseTool, type GfxController } from '@blocksuite/std/gfx'; import * as Y from 'yjs'; import { mountTextElementEditor } from './mount-text-editor'; @@ -65,7 +65,7 @@ export class TextTool extends BaseTool { } } -declare module '@blocksuite/block-std/gfx' { +declare module '@blocksuite/std/gfx' { interface GfxToolsMap { text: TextTool; } diff --git a/blocksuite/affine/gfx/text/src/toolbar/config.ts b/blocksuite/affine/gfx/text/src/toolbar/config.ts index c1df98557c..4d34aabcb9 100644 --- a/blocksuite/affine/gfx/text/src/toolbar/config.ts +++ b/blocksuite/affine/gfx/text/src/toolbar/config.ts @@ -8,8 +8,8 @@ import { ToolbarModuleExtension, } from '@blocksuite/affine-shared/services'; import { createTextActions } from '@blocksuite/affine-widget-edgeless-toolbar'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; import { Bound } from '@blocksuite/global/gfx'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; export const textToolbarConfig = { actions: createTextActions(TextElementModel, 'text', (ctx, model, props) => { diff --git a/blocksuite/affine/gfx/text/src/toolbar/text-menu.ts b/blocksuite/affine/gfx/text/src/toolbar/text-menu.ts index b456eac646..236353e905 100644 --- a/blocksuite/affine/gfx/text/src/toolbar/text-menu.ts +++ b/blocksuite/affine/gfx/text/src/toolbar/text-menu.ts @@ -2,7 +2,7 @@ import { DefaultTheme } from '@blocksuite/affine-model'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; import type { ColorEvent } from '@blocksuite/affine-shared/utils'; import { EdgelessToolbarToolMixin } from '@blocksuite/affine-widget-edgeless-toolbar'; -import type { GfxToolsFullOptionValue } from '@blocksuite/block-std/gfx'; +import type { GfxToolsFullOptionValue } from '@blocksuite/std/gfx'; import { computed } from '@preact/signals-core'; import { css, html, LitElement, nothing } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/gfx/text/src/view.ts b/blocksuite/affine/gfx/text/src/view.ts index a2e575644f..34d8f870d1 100644 --- a/blocksuite/affine/gfx/text/src/view.ts +++ b/blocksuite/affine/gfx/text/src/view.ts @@ -1,5 +1,5 @@ import type { TextElementModel } from '@blocksuite/affine-model'; -import { GfxElementModelView } from '@blocksuite/block-std/gfx'; +import { GfxElementModelView } from '@blocksuite/std/gfx'; import { mountTextElementEditor } from './edgeless-text-editor'; diff --git a/blocksuite/affine/gfx/text/tsconfig.json b/blocksuite/affine/gfx/text/tsconfig.json index 29996fc4cd..0bc7689c42 100644 --- a/blocksuite/affine/gfx/text/tsconfig.json +++ b/blocksuite/affine/gfx/text/tsconfig.json @@ -14,8 +14,8 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/widget-edgeless-toolbar" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/gfx/turbo-renderer/package.json b/blocksuite/affine/gfx/turbo-renderer/package.json index 2bcea62966..a20e18df67 100644 --- a/blocksuite/affine/gfx/turbo-renderer/package.json +++ b/blocksuite/affine/gfx/turbo-renderer/package.json @@ -10,8 +10,8 @@ "author": "toeverything", "license": "MIT", "dependencies": { - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "rxjs": "^7.8.1" }, diff --git a/blocksuite/affine/gfx/turbo-renderer/src/layout/block-layout-provider.ts b/blocksuite/affine/gfx/turbo-renderer/src/layout/block-layout-provider.ts index d494e11764..0017293c25 100644 --- a/blocksuite/affine/gfx/turbo-renderer/src/layout/block-layout-provider.ts +++ b/blocksuite/affine/gfx/turbo-renderer/src/layout/block-layout-provider.ts @@ -1,5 +1,5 @@ -import type { GfxBlockComponent } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; +import type { GfxBlockComponent } from '@blocksuite/std'; import { Extension } from '@blocksuite/store'; import type { BlockLayout, Rect } from '../types'; diff --git a/blocksuite/affine/gfx/turbo-renderer/src/renderer-utils.ts b/blocksuite/affine/gfx/turbo-renderer/src/renderer-utils.ts index f906fba3f6..e26c054362 100644 --- a/blocksuite/affine/gfx/turbo-renderer/src/renderer-utils.ts +++ b/blocksuite/affine/gfx/turbo-renderer/src/renderer-utils.ts @@ -1,9 +1,9 @@ -import type { EditorHost, GfxBlockComponent } from '@blocksuite/block-std'; +import type { EditorHost, GfxBlockComponent } from '@blocksuite/std'; import { GfxBlockElementModel, GfxControllerIdentifier, type Viewport, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; import { BlockLayoutHandlersIdentifier } from './layout/block-layout-provider'; import type { BlockLayout, RenderingState, ViewportLayout } from './types'; diff --git a/blocksuite/affine/gfx/turbo-renderer/src/turbo-renderer.ts b/blocksuite/affine/gfx/turbo-renderer/src/turbo-renderer.ts index 07fe4f7348..b2f1000295 100644 --- a/blocksuite/affine/gfx/turbo-renderer/src/turbo-renderer.ts +++ b/blocksuite/affine/gfx/turbo-renderer/src/turbo-renderer.ts @@ -1,12 +1,12 @@ -import { ConfigExtensionFactory } from '@blocksuite/block-std'; +import type { Container } from '@blocksuite/global/di'; +import { DisposableGroup } from '@blocksuite/global/disposable'; +import { ConfigExtensionFactory } from '@blocksuite/std'; import { type GfxController, GfxExtension, GfxExtensionIdentifier, type GfxViewportElement, -} from '@blocksuite/block-std/gfx'; -import type { Container } from '@blocksuite/global/di'; -import { DisposableGroup } from '@blocksuite/global/disposable'; +} from '@blocksuite/std/gfx'; import { BehaviorSubject, distinctUntilChanged, diff --git a/blocksuite/affine/gfx/turbo-renderer/tsconfig.json b/blocksuite/affine/gfx/turbo-renderer/tsconfig.json index f221650855..d7d3a1f74b 100644 --- a/blocksuite/affine/gfx/turbo-renderer/tsconfig.json +++ b/blocksuite/affine/gfx/turbo-renderer/tsconfig.json @@ -7,8 +7,8 @@ }, "include": ["./src"], "references": [ - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/inlines/footnote/package.json b/blocksuite/affine/inlines/footnote/package.json index 91c07faae1..c7f3f64184 100644 --- a/blocksuite/affine/inlines/footnote/package.json +++ b/blocksuite/affine/inlines/footnote/package.json @@ -14,9 +14,9 @@ "@blocksuite/affine-inline-reference": "workspace:*", "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/inlines/footnote/src/footnote-node/footnote-config.ts b/blocksuite/affine/inlines/footnote/src/footnote-node/footnote-config.ts index 1c71addc4f..4009105668 100644 --- a/blocksuite/affine/inlines/footnote/src/footnote-node/footnote-config.ts +++ b/blocksuite/affine/inlines/footnote/src/footnote-node/footnote-config.ts @@ -1,6 +1,6 @@ import type { FootNote } from '@blocksuite/affine-model'; -import { type BlockStdScope, StdIdentifier } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; +import { type BlockStdScope, StdIdentifier } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import type { TemplateResult } from 'lit'; diff --git a/blocksuite/affine/inlines/footnote/src/footnote-node/footnote-node.ts b/blocksuite/affine/inlines/footnote/src/footnote-node/footnote-node.ts index b52bea15a1..7d0eadf958 100644 --- a/blocksuite/affine/inlines/footnote/src/footnote-node/footnote-node.ts +++ b/blocksuite/affine/inlines/footnote/src/footnote-node/footnote-node.ts @@ -2,19 +2,19 @@ import { HoverController } from '@blocksuite/affine-components/hover'; import type { FootNote } from '@blocksuite/affine-model'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; +import { WithDisposable } from '@blocksuite/global/lit'; import { BlockSelection, type BlockStdScope, ShadowlessElement, TextSelection, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import { INLINE_ROOT_ATTR, type InlineRootElement, ZERO_WIDTH_NON_JOINER, ZERO_WIDTH_SPACE, -} from '@blocksuite/block-std/inline'; -import { WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std/inline'; import type { DeltaInsert } from '@blocksuite/store'; import { shift } from '@floating-ui/dom'; import { baseTheme } from '@toeverything/theme'; diff --git a/blocksuite/affine/inlines/footnote/src/footnote-node/footnote-popup.ts b/blocksuite/affine/inlines/footnote/src/footnote-node/footnote-popup.ts index cf2a8e3f53..40dcb51268 100644 --- a/blocksuite/affine/inlines/footnote/src/footnote-node/footnote-popup.ts +++ b/blocksuite/affine/inlines/footnote/src/footnote-node/footnote-popup.ts @@ -12,9 +12,9 @@ import { ThemeProvider, } from '@blocksuite/affine-shared/services'; import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; -import type { BlockStdScope } from '@blocksuite/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { DualLinkIcon, LinkIcon } from '@blocksuite/icons/lit'; +import type { BlockStdScope } from '@blocksuite/std'; import { computed, signal } from '@preact/signals-core'; import { css, html, LitElement, type TemplateResult } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/inlines/footnote/src/inline-spec.ts b/blocksuite/affine/inlines/footnote/src/inline-spec.ts index 14ad235afc..a69a6fe3cd 100644 --- a/blocksuite/affine/inlines/footnote/src/inline-spec.ts +++ b/blocksuite/affine/inlines/footnote/src/inline-spec.ts @@ -1,7 +1,7 @@ import { FootNoteSchema } from '@blocksuite/affine-model'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { StdIdentifier } from '@blocksuite/block-std'; -import { InlineSpecExtension } from '@blocksuite/block-std/inline'; +import { StdIdentifier } from '@blocksuite/std'; +import { InlineSpecExtension } from '@blocksuite/std/inline'; import { html } from 'lit'; import { FootNoteNodeConfigIdentifier } from './footnote-node/footnote-config'; diff --git a/blocksuite/affine/inlines/footnote/tsconfig.json b/blocksuite/affine/inlines/footnote/tsconfig.json index 90cfdb6092..3718e88b07 100644 --- a/blocksuite/affine/inlines/footnote/tsconfig.json +++ b/blocksuite/affine/inlines/footnote/tsconfig.json @@ -11,8 +11,8 @@ { "path": "../reference" }, { "path": "../../model" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/inlines/latex/package.json b/blocksuite/affine/inlines/latex/package.json index d31350c1e7..8854b032b0 100644 --- a/blocksuite/affine/inlines/latex/package.json +++ b/blocksuite/affine/inlines/latex/package.json @@ -15,9 +15,9 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/inlines/latex/src/command.ts b/blocksuite/affine/inlines/latex/src/command.ts index ca0c15d2cc..4a92210f9c 100644 --- a/blocksuite/affine/inlines/latex/src/command.ts +++ b/blocksuite/affine/inlines/latex/src/command.ts @@ -1,4 +1,4 @@ -import type { Command, TextSelection } from '@blocksuite/block-std'; +import type { Command, TextSelection } from '@blocksuite/std'; export const insertInlineLatex: Command<{ currentTextSelection?: TextSelection; diff --git a/blocksuite/affine/inlines/latex/src/inline-spec.ts b/blocksuite/affine/inlines/latex/src/inline-spec.ts index 3554244dd4..c06cdd3092 100644 --- a/blocksuite/affine/inlines/latex/src/inline-spec.ts +++ b/blocksuite/affine/inlines/latex/src/inline-spec.ts @@ -1,6 +1,6 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { StdIdentifier } from '@blocksuite/block-std'; -import { InlineSpecExtension } from '@blocksuite/block-std/inline'; +import { StdIdentifier } from '@blocksuite/std'; +import { InlineSpecExtension } from '@blocksuite/std/inline'; import { html } from 'lit'; import { z } from 'zod'; diff --git a/blocksuite/affine/inlines/latex/src/latex-node/latex-editor-menu.ts b/blocksuite/affine/inlines/latex/src/latex-node/latex-editor-menu.ts index ae8527e981..76cb39f7e1 100644 --- a/blocksuite/affine/inlines/latex/src/latex-node/latex-editor-menu.ts +++ b/blocksuite/affine/inlines/latex/src/latex-node/latex-editor-menu.ts @@ -3,11 +3,11 @@ import type { RichText } from '@blocksuite/affine-rich-text'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; import { unsafeCSSVar } from '@blocksuite/affine-shared/theme'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { type BlockStdScope, ShadowlessElement } from '@blocksuite/block-std'; -import { InlineManagerExtension } from '@blocksuite/block-std/inline'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { noop } from '@blocksuite/global/utils'; import { DoneIcon } from '@blocksuite/icons/lit'; +import { type BlockStdScope, ShadowlessElement } from '@blocksuite/std'; +import { InlineManagerExtension } from '@blocksuite/std/inline'; import { effect, type Signal, signal } from '@preact/signals-core'; import { css, html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/inlines/latex/src/latex-node/latex-editor-unit.ts b/blocksuite/affine/inlines/latex/src/latex-node/latex-editor-unit.ts index efedea8f83..ac0fce9d06 100644 --- a/blocksuite/affine/inlines/latex/src/latex-node/latex-editor-unit.ts +++ b/blocksuite/affine/inlines/latex/src/latex-node/latex-editor-unit.ts @@ -1,6 +1,6 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { ShadowlessElement } from '@blocksuite/block-std'; -import { ZERO_WIDTH_SPACE } from '@blocksuite/block-std/inline'; +import { ShadowlessElement } from '@blocksuite/std'; +import { ZERO_WIDTH_SPACE } from '@blocksuite/std/inline'; import type { DeltaInsert } from '@blocksuite/store'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/inlines/latex/src/latex-node/latex-node.ts b/blocksuite/affine/inlines/latex/src/latex-node/latex-node.ts index c08e46110c..c1a5931219 100644 --- a/blocksuite/affine/inlines/latex/src/latex-node/latex-node.ts +++ b/blocksuite/affine/inlines/latex/src/latex-node/latex-node.ts @@ -1,17 +1,17 @@ import { createLitPortal } from '@blocksuite/affine-components/portal'; import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; +import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { type BlockComponent, type BlockStdScope, ShadowlessElement, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import { type InlineEditor, ZERO_WIDTH_NON_JOINER, ZERO_WIDTH_SPACE, -} from '@blocksuite/block-std/inline'; -import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std/inline'; import type { DeltaInsert } from '@blocksuite/store'; import { signal } from '@preact/signals-core'; import katex from 'katex'; diff --git a/blocksuite/affine/inlines/latex/src/markdown.ts b/blocksuite/affine/inlines/latex/src/markdown.ts index ef78a2376c..9bd615d0c4 100644 --- a/blocksuite/affine/inlines/latex/src/markdown.ts +++ b/blocksuite/affine/inlines/latex/src/markdown.ts @@ -1,6 +1,6 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { InlineMarkdownExtension } from '@blocksuite/block-std/inline'; +import type { BlockComponent } from '@blocksuite/std'; +import { InlineMarkdownExtension } from '@blocksuite/std/inline'; export const LatexExtension = InlineMarkdownExtension({ name: 'latex', diff --git a/blocksuite/affine/inlines/latex/tsconfig.json b/blocksuite/affine/inlines/latex/tsconfig.json index 6bc887bdab..6ca999e072 100644 --- a/blocksuite/affine/inlines/latex/tsconfig.json +++ b/blocksuite/affine/inlines/latex/tsconfig.json @@ -12,8 +12,8 @@ { "path": "../../model" }, { "path": "../../rich-text" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/inlines/link/package.json b/blocksuite/affine/inlines/link/package.json index dfcdbf1b22..d97d4ec552 100644 --- a/blocksuite/affine/inlines/link/package.json +++ b/blocksuite/affine/inlines/link/package.json @@ -14,9 +14,9 @@ "@blocksuite/affine-inline-reference": "workspace:*", "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/inlines/link/src/command.ts b/blocksuite/affine/inlines/link/src/command.ts index 0055ad14ab..7774017c20 100644 --- a/blocksuite/affine/inlines/link/src/command.ts +++ b/blocksuite/affine/inlines/link/src/command.ts @@ -1,9 +1,9 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import { INLINE_ROOT_ATTR, type InlineRootElement, -} from '@blocksuite/block-std/inline'; +} from '@blocksuite/std/inline'; import { toggleLinkPopup } from './link-node/link-popup/toggle-link-popup'; diff --git a/blocksuite/affine/inlines/link/src/inline-spec.ts b/blocksuite/affine/inlines/link/src/inline-spec.ts index 8a284a2e58..513243b6d5 100644 --- a/blocksuite/affine/inlines/link/src/inline-spec.ts +++ b/blocksuite/affine/inlines/link/src/inline-spec.ts @@ -1,6 +1,6 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { StdIdentifier } from '@blocksuite/block-std'; -import { InlineSpecExtension } from '@blocksuite/block-std/inline'; +import { StdIdentifier } from '@blocksuite/std'; +import { InlineSpecExtension } from '@blocksuite/std/inline'; import { html } from 'lit'; import { z } from 'zod'; diff --git a/blocksuite/affine/inlines/link/src/link-node/affine-link.ts b/blocksuite/affine/inlines/link/src/link-node/affine-link.ts index 4b0ea49ed4..0fed7e1412 100644 --- a/blocksuite/affine/inlines/link/src/link-node/affine-link.ts +++ b/blocksuite/affine/inlines/link/src/link-node/affine-link.ts @@ -7,14 +7,14 @@ import { } from '@blocksuite/affine-shared/services'; import { affineTextStyles } from '@blocksuite/affine-shared/styles'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import type { BlockComponent, BlockStdScope } from '@blocksuite/block-std'; -import { BLOCK_ID_ATTR, ShadowlessElement } from '@blocksuite/block-std'; +import { WithDisposable } from '@blocksuite/global/lit'; +import type { BlockComponent, BlockStdScope } from '@blocksuite/std'; +import { BLOCK_ID_ATTR, ShadowlessElement } from '@blocksuite/std'; import { INLINE_ROOT_ATTR, type InlineRootElement, ZERO_WIDTH_SPACE, -} from '@blocksuite/block-std/inline'; -import { WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std/inline'; import type { DeltaInsert } from '@blocksuite/store'; import { css, html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/inlines/link/src/link-node/configs/toolbar.ts b/blocksuite/affine/inlines/link/src/link-node/configs/toolbar.ts index ba12ad0ede..91d7cb247f 100644 --- a/blocksuite/affine/inlines/link/src/link-node/configs/toolbar.ts +++ b/blocksuite/affine/inlines/link/src/link-node/configs/toolbar.ts @@ -8,13 +8,13 @@ import { type ToolbarActionGroup, type ToolbarModuleConfig, } from '@blocksuite/affine-shared/services'; -import { BlockSelection } from '@blocksuite/block-std'; import { CopyIcon, DeleteIcon, EditIcon, UnlinkIcon, } from '@blocksuite/icons/lit'; +import { BlockSelection } from '@blocksuite/std'; import { signal } from '@preact/signals-core'; import { html } from 'lit-html'; import { keyed } from 'lit-html/directives/keyed.js'; diff --git a/blocksuite/affine/inlines/link/src/link-node/link-popup/link-popup.ts b/blocksuite/affine/inlines/link/src/link-node/link-popup/link-popup.ts index 69a8603341..aabee5a43b 100644 --- a/blocksuite/affine/inlines/link/src/link-node/link-popup/link-popup.ts +++ b/blocksuite/affine/inlines/link/src/link-node/link-popup/link-popup.ts @@ -5,10 +5,10 @@ import { normalizeUrl, stopPropagation, } from '@blocksuite/affine-shared/utils'; -import { type BlockStdScope, TextSelection } from '@blocksuite/block-std'; -import type { InlineRange } from '@blocksuite/block-std/inline'; import { WithDisposable } from '@blocksuite/global/lit'; import { DoneIcon } from '@blocksuite/icons/lit'; +import { type BlockStdScope, TextSelection } from '@blocksuite/std'; +import type { InlineRange } from '@blocksuite/std/inline'; import { computePosition, inline, offset, shift } from '@floating-ui/dom'; import { html, LitElement } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/inlines/link/src/link-node/link-popup/toggle-link-popup.ts b/blocksuite/affine/inlines/link/src/link-node/link-popup/toggle-link-popup.ts index 98b9c1dbd7..2835be8f98 100644 --- a/blocksuite/affine/inlines/link/src/link-node/link-popup/toggle-link-popup.ts +++ b/blocksuite/affine/inlines/link/src/link-node/link-popup/toggle-link-popup.ts @@ -1,6 +1,6 @@ import type { AffineInlineEditor } from '@blocksuite/affine-shared/types'; -import type { BlockStdScope } from '@blocksuite/block-std'; -import type { InlineRange } from '@blocksuite/block-std/inline'; +import type { BlockStdScope } from '@blocksuite/std'; +import type { InlineRange } from '@blocksuite/std/inline'; import { LinkPopup } from './link-popup'; diff --git a/blocksuite/affine/inlines/link/src/markdown.ts b/blocksuite/affine/inlines/link/src/markdown.ts index e347f62283..bab9b76166 100644 --- a/blocksuite/affine/inlines/link/src/markdown.ts +++ b/blocksuite/affine/inlines/link/src/markdown.ts @@ -1,5 +1,5 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { InlineMarkdownExtension } from '@blocksuite/block-std/inline'; +import { InlineMarkdownExtension } from '@blocksuite/std/inline'; export const LinkExtension = InlineMarkdownExtension({ name: 'link', diff --git a/blocksuite/affine/inlines/link/src/toolbar.ts b/blocksuite/affine/inlines/link/src/toolbar.ts index 6b00c75fd4..ea4e238424 100644 --- a/blocksuite/affine/inlines/link/src/toolbar.ts +++ b/blocksuite/affine/inlines/link/src/toolbar.ts @@ -1,5 +1,5 @@ import { ToolbarModuleExtension } from '@blocksuite/affine-shared/services'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; import { builtinInlineLinkToolbarConfig } from './link-node/configs/toolbar.js'; diff --git a/blocksuite/affine/inlines/link/tsconfig.json b/blocksuite/affine/inlines/link/tsconfig.json index 90cfdb6092..3718e88b07 100644 --- a/blocksuite/affine/inlines/link/tsconfig.json +++ b/blocksuite/affine/inlines/link/tsconfig.json @@ -11,8 +11,8 @@ { "path": "../reference" }, { "path": "../../model" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/inlines/mention/package.json b/blocksuite/affine/inlines/mention/package.json index 9fc9e4eaab..e9ef556261 100644 --- a/blocksuite/affine/inlines/mention/package.json +++ b/blocksuite/affine/inlines/mention/package.json @@ -13,9 +13,9 @@ "@blocksuite/affine-components": "workspace:*", "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/inlines/mention/src/affine-mention.ts b/blocksuite/affine/inlines/mention/src/affine-mention.ts index 5ee6b9edf2..f91bfc0b5f 100644 --- a/blocksuite/affine/inlines/mention/src/affine-mention.ts +++ b/blocksuite/affine/inlines/mention/src/affine-mention.ts @@ -1,13 +1,13 @@ import { UserProvider } from '@blocksuite/affine-shared/services'; import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import type { BlockStdScope } from '@blocksuite/block-std'; -import { ShadowlessElement } from '@blocksuite/block-std'; +import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +import type { BlockStdScope } from '@blocksuite/std'; +import { ShadowlessElement } from '@blocksuite/std'; import { ZERO_WIDTH_NON_JOINER, ZERO_WIDTH_SPACE, -} from '@blocksuite/block-std/inline'; -import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std/inline'; import type { DeltaInsert } from '@blocksuite/store'; import { css, html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/inlines/mention/src/inline-spec.ts b/blocksuite/affine/inlines/mention/src/inline-spec.ts index 46094dd7fc..cc4f0ad433 100644 --- a/blocksuite/affine/inlines/mention/src/inline-spec.ts +++ b/blocksuite/affine/inlines/mention/src/inline-spec.ts @@ -1,6 +1,6 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { StdIdentifier } from '@blocksuite/block-std'; -import { InlineSpecExtension } from '@blocksuite/block-std/inline'; +import { StdIdentifier } from '@blocksuite/std'; +import { InlineSpecExtension } from '@blocksuite/std/inline'; import { html } from 'lit'; import { z } from 'zod'; diff --git a/blocksuite/affine/inlines/mention/tsconfig.json b/blocksuite/affine/inlines/mention/tsconfig.json index 1e2cb0da10..76a74f3404 100644 --- a/blocksuite/affine/inlines/mention/tsconfig.json +++ b/blocksuite/affine/inlines/mention/tsconfig.json @@ -10,8 +10,8 @@ { "path": "../../components" }, { "path": "../../model" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/inlines/preset/package.json b/blocksuite/affine/inlines/preset/package.json index 9761743377..eb33c3ed7e 100644 --- a/blocksuite/affine/inlines/preset/package.json +++ b/blocksuite/affine/inlines/preset/package.json @@ -19,9 +19,9 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/inlines/preset/src/command/config.ts b/blocksuite/affine/inlines/preset/src/command/config.ts index e193b5834e..f982278b89 100644 --- a/blocksuite/affine/inlines/preset/src/command/config.ts +++ b/blocksuite/affine/inlines/preset/src/command/config.ts @@ -7,7 +7,7 @@ import { UnderlineIcon, } from '@blocksuite/affine-components/icons'; import { toggleLink } from '@blocksuite/affine-inline-link'; -import { type EditorHost, TextSelection } from '@blocksuite/block-std'; +import { type EditorHost, TextSelection } from '@blocksuite/std'; import type { TemplateResult } from 'lit'; import { diff --git a/blocksuite/affine/inlines/preset/src/command/delete-text.ts b/blocksuite/affine/inlines/preset/src/command/delete-text.ts index 06d7649a5b..971ed99f0a 100644 --- a/blocksuite/affine/inlines/preset/src/command/delete-text.ts +++ b/blocksuite/affine/inlines/preset/src/command/delete-text.ts @@ -1,6 +1,6 @@ import { RootBlockModel } from '@blocksuite/affine-model'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import { type Command, TextSelection } from '@blocksuite/block-std'; +import { type Command, TextSelection } from '@blocksuite/std'; import type { Text } from '@blocksuite/store'; export const deleteTextCommand: Command<{ diff --git a/blocksuite/affine/inlines/preset/src/command/format-block.ts b/blocksuite/affine/inlines/preset/src/command/format-block.ts index 5c0903ec0b..771fbfe5fc 100644 --- a/blocksuite/affine/inlines/preset/src/command/format-block.ts +++ b/blocksuite/affine/inlines/preset/src/command/format-block.ts @@ -1,10 +1,10 @@ import { getSelectedBlocksCommand } from '@blocksuite/affine-shared/commands'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import type { BlockSelection, Command } from '@blocksuite/block-std'; +import type { BlockSelection, Command } from '@blocksuite/std'; import { INLINE_ROOT_ATTR, type InlineRootElement, -} from '@blocksuite/block-std/inline'; +} from '@blocksuite/std/inline'; import { FORMAT_BLOCK_SUPPORT_FLAVOURS } from './consts.js'; diff --git a/blocksuite/affine/inlines/preset/src/command/format-native.ts b/blocksuite/affine/inlines/preset/src/command/format-native.ts index de509a36aa..aadcca8493 100644 --- a/blocksuite/affine/inlines/preset/src/command/format-native.ts +++ b/blocksuite/affine/inlines/preset/src/command/format-native.ts @@ -3,11 +3,11 @@ import { BLOCK_ID_ATTR, type BlockComponent, type Command, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import { INLINE_ROOT_ATTR, type InlineRootElement, -} from '@blocksuite/block-std/inline'; +} from '@blocksuite/std/inline'; import { FORMAT_NATIVE_SUPPORT_FLAVOURS } from './consts.js'; diff --git a/blocksuite/affine/inlines/preset/src/command/format-text.ts b/blocksuite/affine/inlines/preset/src/command/format-text.ts index 1958158a22..728f2df0b7 100644 --- a/blocksuite/affine/inlines/preset/src/command/format-text.ts +++ b/blocksuite/affine/inlines/preset/src/command/format-text.ts @@ -1,11 +1,11 @@ import { clearMarksOnDiscontinuousInput } from '@blocksuite/affine-rich-text'; import { getSelectedBlocksCommand } from '@blocksuite/affine-shared/commands'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import type { Command, TextSelection } from '@blocksuite/block-std'; +import type { Command, TextSelection } from '@blocksuite/std'; import { INLINE_ROOT_ATTR, type InlineRootElement, -} from '@blocksuite/block-std/inline'; +} from '@blocksuite/std/inline'; import { FORMAT_TEXT_SUPPORT_FLAVOURS } from './consts.js'; diff --git a/blocksuite/affine/inlines/preset/src/command/text-style.ts b/blocksuite/affine/inlines/preset/src/command/text-style.ts index 75cdb3a21d..6fcec20515 100644 --- a/blocksuite/affine/inlines/preset/src/command/text-style.ts +++ b/blocksuite/affine/inlines/preset/src/command/text-style.ts @@ -3,7 +3,7 @@ import { getTextSelectionCommand, } from '@blocksuite/affine-shared/commands'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import { formatBlockCommand } from './format-block.js'; import { formatNativeCommand } from './format-native.js'; diff --git a/blocksuite/affine/inlines/preset/src/command/utils.ts b/blocksuite/affine/inlines/preset/src/command/utils.ts index 666af33881..c0443b0011 100644 --- a/blocksuite/affine/inlines/preset/src/command/utils.ts +++ b/blocksuite/affine/inlines/preset/src/command/utils.ts @@ -12,13 +12,13 @@ import { type BlockComponent, type Chain, type InitCommandCtx, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import { INLINE_ROOT_ATTR, type InlineEditor, type InlineRange, type InlineRootElement, -} from '@blocksuite/block-std/inline'; +} from '@blocksuite/std/inline'; import { FORMAT_BLOCK_SUPPORT_FLAVOURS, diff --git a/blocksuite/affine/inlines/preset/src/default-inline-manager.ts b/blocksuite/affine/inlines/preset/src/default-inline-manager.ts index 1ea6501d7b..f589df0790 100644 --- a/blocksuite/affine/inlines/preset/src/default-inline-manager.ts +++ b/blocksuite/affine/inlines/preset/src/default-inline-manager.ts @@ -4,7 +4,7 @@ import { LinkInlineSpecExtension } from '@blocksuite/affine-inline-link'; import { MentionInlineSpecExtension } from '@blocksuite/affine-inline-mention'; import { ReferenceInlineSpecExtension } from '@blocksuite/affine-inline-reference'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { InlineManagerExtension } from '@blocksuite/block-std/inline'; +import { InlineManagerExtension } from '@blocksuite/std/inline'; import { BackgroundInlineSpecExtension, diff --git a/blocksuite/affine/inlines/preset/src/inline-spec.ts b/blocksuite/affine/inlines/preset/src/inline-spec.ts index 5281d0fde3..652f7e4e54 100644 --- a/blocksuite/affine/inlines/preset/src/inline-spec.ts +++ b/blocksuite/affine/inlines/preset/src/inline-spec.ts @@ -7,7 +7,7 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; import { type InlineRootElement, InlineSpecExtension, -} from '@blocksuite/block-std/inline'; +} from '@blocksuite/std/inline'; import type { ExtensionType } from '@blocksuite/store'; import { html } from 'lit'; import { z } from 'zod'; diff --git a/blocksuite/affine/inlines/preset/src/keymap/basic.ts b/blocksuite/affine/inlines/preset/src/keymap/basic.ts index 1f6af366af..209b1df2ab 100644 --- a/blocksuite/affine/inlines/preset/src/keymap/basic.ts +++ b/blocksuite/affine/inlines/preset/src/keymap/basic.ts @@ -8,7 +8,7 @@ import { type BlockStdScope, TextSelection, type UIEventHandler, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; export const textCommonKeymap = ( std: BlockStdScope diff --git a/blocksuite/affine/inlines/preset/src/keymap/bracket.ts b/blocksuite/affine/inlines/preset/src/keymap/bracket.ts index 1df9cee6f5..d551ec564e 100644 --- a/blocksuite/affine/inlines/preset/src/keymap/bracket.ts +++ b/blocksuite/affine/inlines/preset/src/keymap/bracket.ts @@ -7,8 +7,8 @@ import { type BlockStdScope, TextSelection, type UIEventHandler, -} from '@blocksuite/block-std'; -import type { InlineEditor } from '@blocksuite/block-std/inline'; +} from '@blocksuite/std'; +import type { InlineEditor } from '@blocksuite/std/inline'; export const bracketKeymap = ( std: BlockStdScope diff --git a/blocksuite/affine/inlines/preset/src/keymap/format.ts b/blocksuite/affine/inlines/preset/src/keymap/format.ts index 852867dfa7..3d620536ad 100644 --- a/blocksuite/affine/inlines/preset/src/keymap/format.ts +++ b/blocksuite/affine/inlines/preset/src/keymap/format.ts @@ -2,7 +2,7 @@ import { type BlockStdScope, TextSelection, type UIEventHandler, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import { textFormatConfigs } from '../command/index.js'; diff --git a/blocksuite/affine/inlines/preset/src/keymap/index.ts b/blocksuite/affine/inlines/preset/src/keymap/index.ts index 57e598f713..e61b8b0795 100644 --- a/blocksuite/affine/inlines/preset/src/keymap/index.ts +++ b/blocksuite/affine/inlines/preset/src/keymap/index.ts @@ -1,4 +1,4 @@ -import type { BlockStdScope, UIEventHandler } from '@blocksuite/block-std'; +import type { BlockStdScope, UIEventHandler } from '@blocksuite/std'; import { textCommonKeymap } from './basic.js'; import { bracketKeymap } from './bracket.js'; diff --git a/blocksuite/affine/inlines/preset/src/markdown.ts b/blocksuite/affine/inlines/preset/src/markdown.ts index 936559266c..b45d6ffb4e 100644 --- a/blocksuite/affine/inlines/preset/src/markdown.ts +++ b/blocksuite/affine/inlines/preset/src/markdown.ts @@ -1,7 +1,7 @@ import { LatexExtension } from '@blocksuite/affine-inline-latex'; import { LinkExtension } from '@blocksuite/affine-inline-link'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { InlineMarkdownExtension } from '@blocksuite/block-std/inline'; +import { InlineMarkdownExtension } from '@blocksuite/std/inline'; import type { ExtensionType } from '@blocksuite/store'; // inline markdown match rules: diff --git a/blocksuite/affine/inlines/preset/src/nodes/affine-text.ts b/blocksuite/affine/inlines/preset/src/nodes/affine-text.ts index 14aa158a26..8333e130e6 100644 --- a/blocksuite/affine/inlines/preset/src/nodes/affine-text.ts +++ b/blocksuite/affine/inlines/preset/src/nodes/affine-text.ts @@ -1,7 +1,7 @@ import { affineTextStyles } from '@blocksuite/affine-shared/styles'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { ShadowlessElement } from '@blocksuite/block-std'; -import { ZERO_WIDTH_SPACE } from '@blocksuite/block-std/inline'; +import { ShadowlessElement } from '@blocksuite/std'; +import { ZERO_WIDTH_SPACE } from '@blocksuite/std/inline'; import type { DeltaInsert } from '@blocksuite/store'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/blocksuite/affine/inlines/preset/tsconfig.json b/blocksuite/affine/inlines/preset/tsconfig.json index c1af92419b..c49452998a 100644 --- a/blocksuite/affine/inlines/preset/tsconfig.json +++ b/blocksuite/affine/inlines/preset/tsconfig.json @@ -16,8 +16,8 @@ { "path": "../../model" }, { "path": "../../rich-text" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/inlines/reference/package.json b/blocksuite/affine/inlines/reference/package.json index 41c8b2803e..135d41bb79 100644 --- a/blocksuite/affine/inlines/reference/package.json +++ b/blocksuite/affine/inlines/reference/package.json @@ -13,9 +13,9 @@ "@blocksuite/affine-components": "workspace:*", "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/inlines/reference/src/inline-spec.ts b/blocksuite/affine/inlines/reference/src/inline-spec.ts index 6f8ef9cdb9..73dab95dcc 100644 --- a/blocksuite/affine/inlines/reference/src/inline-spec.ts +++ b/blocksuite/affine/inlines/reference/src/inline-spec.ts @@ -1,7 +1,7 @@ import { ReferenceInfoSchema } from '@blocksuite/affine-model'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { StdIdentifier } from '@blocksuite/block-std'; -import { InlineSpecExtension } from '@blocksuite/block-std/inline'; +import { StdIdentifier } from '@blocksuite/std'; +import { InlineSpecExtension } from '@blocksuite/std/inline'; import { html } from 'lit'; import { z } from 'zod'; diff --git a/blocksuite/affine/inlines/reference/src/reference-node/configs/toolbar.ts b/blocksuite/affine/inlines/reference/src/reference-node/configs/toolbar.ts index 1a328df5f2..5d968f0ebf 100644 --- a/blocksuite/affine/inlines/reference/src/reference-node/configs/toolbar.ts +++ b/blocksuite/affine/inlines/reference/src/reference-node/configs/toolbar.ts @@ -9,8 +9,8 @@ import { cloneReferenceInfoWithoutAliases, isInsideBlockByFlavour, } from '@blocksuite/affine-shared/utils'; -import { BlockSelection } from '@blocksuite/block-std'; import { DeleteIcon } from '@blocksuite/icons/lit'; +import { BlockSelection } from '@blocksuite/std'; import { signal } from '@preact/signals-core'; import { html } from 'lit-html'; import { keyed } from 'lit-html/directives/keyed.js'; diff --git a/blocksuite/affine/inlines/reference/src/reference-node/reference-config.ts b/blocksuite/affine/inlines/reference/src/reference-node/reference-config.ts index 4e465a96ad..38faf9f08d 100644 --- a/blocksuite/affine/inlines/reference/src/reference-node/reference-config.ts +++ b/blocksuite/affine/inlines/reference/src/reference-node/reference-config.ts @@ -1,7 +1,4 @@ -import { - type BlockStdScope, - ConfigExtensionFactory, -} from '@blocksuite/block-std'; +import { type BlockStdScope, ConfigExtensionFactory } from '@blocksuite/std'; import type { TemplateResult } from 'lit'; import type { AffineReference } from './reference-node'; diff --git a/blocksuite/affine/inlines/reference/src/reference-node/reference-node-slots.ts b/blocksuite/affine/inlines/reference/src/reference-node/reference-node-slots.ts index 9ff2050e72..b3737a4892 100644 --- a/blocksuite/affine/inlines/reference/src/reference-node/reference-node-slots.ts +++ b/blocksuite/affine/inlines/reference/src/reference-node/reference-node-slots.ts @@ -1,7 +1,7 @@ import type { ReferenceInfo } from '@blocksuite/affine-model'; import type { OpenDocMode } from '@blocksuite/affine-shared/services'; -import type { EditorHost } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; +import type { EditorHost } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { Subject } from 'rxjs'; diff --git a/blocksuite/affine/inlines/reference/src/reference-node/reference-node.ts b/blocksuite/affine/inlines/reference/src/reference-node/reference-node.ts index e81a5a0b6c..923eb36c2c 100644 --- a/blocksuite/affine/inlines/reference/src/reference-node/reference-node.ts +++ b/blocksuite/affine/inlines/reference/src/reference-node/reference-node.ts @@ -15,16 +15,16 @@ import { cloneReferenceInfo, referenceToNode, } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent, BlockStdScope } from '@blocksuite/block-std'; -import { BLOCK_ID_ATTR, ShadowlessElement } from '@blocksuite/block-std'; +import { WithDisposable } from '@blocksuite/global/lit'; +import { LinkedPageIcon } from '@blocksuite/icons/lit'; +import type { BlockComponent, BlockStdScope } from '@blocksuite/std'; +import { BLOCK_ID_ATTR, ShadowlessElement } from '@blocksuite/std'; import { INLINE_ROOT_ATTR, type InlineRootElement, ZERO_WIDTH_NON_JOINER, ZERO_WIDTH_SPACE, -} from '@blocksuite/block-std/inline'; -import { WithDisposable } from '@blocksuite/global/lit'; -import { LinkedPageIcon } from '@blocksuite/icons/lit'; +} from '@blocksuite/std/inline'; import type { DeltaInsert, DocMeta, Store } from '@blocksuite/store'; import { css, html, nothing } from 'lit'; import { property, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/inlines/reference/src/reference-node/reference-popup/reference-popup.ts b/blocksuite/affine/inlines/reference/src/reference-node/reference-popup/reference-popup.ts index cd3aaa6d0e..7ab79fc009 100644 --- a/blocksuite/affine/inlines/reference/src/reference-node/reference-popup/reference-popup.ts +++ b/blocksuite/affine/inlines/reference/src/reference-node/reference-popup/reference-popup.ts @@ -9,10 +9,10 @@ import { import { FONT_XS, PANEL_BASE } from '@blocksuite/affine-shared/styles'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; import { stopPropagation } from '@blocksuite/affine-shared/utils'; -import { type BlockStdScope, ShadowlessElement } from '@blocksuite/block-std'; -import type { InlineEditor, InlineRange } from '@blocksuite/block-std/inline'; import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { DoneIcon, ResetIcon } from '@blocksuite/icons/lit'; +import { type BlockStdScope, ShadowlessElement } from '@blocksuite/std'; +import type { InlineEditor, InlineRange } from '@blocksuite/std/inline'; import { computePosition, inline, offset, shift } from '@floating-ui/dom'; import { signal } from '@preact/signals-core'; import { css, html } from 'lit'; diff --git a/blocksuite/affine/inlines/reference/src/reference-node/reference-popup/toggle-reference-popup.ts b/blocksuite/affine/inlines/reference/src/reference-node/reference-popup/toggle-reference-popup.ts index f6654e059f..3b781435e1 100644 --- a/blocksuite/affine/inlines/reference/src/reference-node/reference-popup/toggle-reference-popup.ts +++ b/blocksuite/affine/inlines/reference/src/reference-node/reference-popup/toggle-reference-popup.ts @@ -1,7 +1,7 @@ import type { ReferenceInfo } from '@blocksuite/affine-model'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import type { BlockStdScope } from '@blocksuite/block-std'; -import type { InlineEditor, InlineRange } from '@blocksuite/block-std/inline'; +import type { BlockStdScope } from '@blocksuite/std'; +import type { InlineEditor, InlineRange } from '@blocksuite/std/inline'; import { ReferencePopup } from './reference-popup'; diff --git a/blocksuite/affine/inlines/reference/src/reference-node/types.ts b/blocksuite/affine/inlines/reference/src/reference-node/types.ts index 24aa43dfb2..7eab02ccee 100644 --- a/blocksuite/affine/inlines/reference/src/reference-node/types.ts +++ b/blocksuite/affine/inlines/reference/src/reference-node/types.ts @@ -1,6 +1,6 @@ import type { ReferenceInfo } from '@blocksuite/affine-model'; import type { OpenDocMode } from '@blocksuite/affine-shared/services'; -import type { EditorHost } from '@blocksuite/block-std'; +import type { EditorHost } from '@blocksuite/std'; import type { Subject } from 'rxjs'; export type DocLinkClickedEvent = ReferenceInfo & { diff --git a/blocksuite/affine/inlines/reference/src/toolbar.ts b/blocksuite/affine/inlines/reference/src/toolbar.ts index eae3d7f704..df5d47fba2 100644 --- a/blocksuite/affine/inlines/reference/src/toolbar.ts +++ b/blocksuite/affine/inlines/reference/src/toolbar.ts @@ -1,5 +1,5 @@ import { ToolbarModuleExtension } from '@blocksuite/affine-shared/services'; -import { BlockFlavourIdentifier } from '@blocksuite/block-std'; +import { BlockFlavourIdentifier } from '@blocksuite/std'; import { builtinInlineReferenceToolbarConfig } from './reference-node/configs/toolbar'; diff --git a/blocksuite/affine/inlines/reference/tsconfig.json b/blocksuite/affine/inlines/reference/tsconfig.json index 1e2cb0da10..76a74f3404 100644 --- a/blocksuite/affine/inlines/reference/tsconfig.json +++ b/blocksuite/affine/inlines/reference/tsconfig.json @@ -10,8 +10,8 @@ { "path": "../../components" }, { "path": "../../model" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/model/package.json b/blocksuite/affine/model/package.json index 7a7806d83f..6342db49f7 100644 --- a/blocksuite/affine/model/package.json +++ b/blocksuite/affine/model/package.json @@ -10,8 +10,8 @@ "author": "toeverything", "license": "MIT", "dependencies": { - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@toeverything/theme": "^1.1.12", "@types/lodash-es": "^4.17.12", diff --git a/blocksuite/affine/model/src/blocks/attachment/attachment-model.ts b/blocksuite/affine/model/src/blocks/attachment/attachment-model.ts index 848ad030de..6cb36591a6 100644 --- a/blocksuite/affine/model/src/blocks/attachment/attachment-model.ts +++ b/blocksuite/affine/model/src/blocks/attachment/attachment-model.ts @@ -1,8 +1,8 @@ import type { GfxCommonBlockProps, GfxElementGeometry, -} from '@blocksuite/block-std/gfx'; -import { GfxCompatible } from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; +import { GfxCompatible } from '@blocksuite/std/gfx'; import { BlockModel, BlockSchemaExtension, diff --git a/blocksuite/affine/model/src/blocks/bookmark/bookmark-model.ts b/blocksuite/affine/model/src/blocks/bookmark/bookmark-model.ts index 4046143f99..fb198d5def 100644 --- a/blocksuite/affine/model/src/blocks/bookmark/bookmark-model.ts +++ b/blocksuite/affine/model/src/blocks/bookmark/bookmark-model.ts @@ -1,8 +1,8 @@ import type { GfxCommonBlockProps, GfxElementGeometry, -} from '@blocksuite/block-std/gfx'; -import { GfxCompatible } from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; +import { GfxCompatible } from '@blocksuite/std/gfx'; import { BlockModel, BlockSchemaExtension, diff --git a/blocksuite/affine/model/src/blocks/edgeless-text/edgeless-text-model.ts b/blocksuite/affine/model/src/blocks/edgeless-text/edgeless-text-model.ts index f2f26c81a4..bd8c0b7abf 100644 --- a/blocksuite/affine/model/src/blocks/edgeless-text/edgeless-text-model.ts +++ b/blocksuite/affine/model/src/blocks/edgeless-text/edgeless-text-model.ts @@ -1,8 +1,8 @@ import type { GfxCommonBlockProps, GfxElementGeometry, -} from '@blocksuite/block-std/gfx'; -import { GfxCompatible } from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; +import { GfxCompatible } from '@blocksuite/std/gfx'; import { BlockModel, BlockSchemaExtension, diff --git a/blocksuite/affine/model/src/blocks/embed/iframe/iframe-model.ts b/blocksuite/affine/model/src/blocks/embed/iframe/iframe-model.ts index 030001c318..a4b93685ae 100644 --- a/blocksuite/affine/model/src/blocks/embed/iframe/iframe-model.ts +++ b/blocksuite/affine/model/src/blocks/embed/iframe/iframe-model.ts @@ -2,7 +2,7 @@ import { type GfxCommonBlockProps, GfxCompatible, type GfxElementGeometry, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; import { BlockModel } from '@blocksuite/store'; import { type EmbedCardStyle } from '../../../utils/index.js'; diff --git a/blocksuite/affine/model/src/blocks/embed/types.ts b/blocksuite/affine/model/src/blocks/embed/types.ts index 5ff4cf53f2..d6f34a68be 100644 --- a/blocksuite/affine/model/src/blocks/embed/types.ts +++ b/blocksuite/affine/model/src/blocks/embed/types.ts @@ -1,4 +1,4 @@ -import type { GfxModel } from '@blocksuite/block-std/gfx'; +import type { GfxModel } from '@blocksuite/std/gfx'; import type { BlockModel } from '@blocksuite/store'; import { EmbedFigmaModel } from './figma'; diff --git a/blocksuite/affine/model/src/blocks/frame/frame-model.ts b/blocksuite/affine/model/src/blocks/frame/frame-model.ts index 0fe70af0f3..fe09ed49f1 100644 --- a/blocksuite/affine/model/src/blocks/frame/frame-model.ts +++ b/blocksuite/affine/model/src/blocks/frame/frame-model.ts @@ -1,3 +1,4 @@ +import { Bound } from '@blocksuite/global/gfx'; import type { GfxBlockElementModel, GfxCompatibleProps, @@ -5,7 +6,7 @@ import type { GfxGroupCompatibleInterface, GfxModel, PointTestOptions, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; import { canSafeAddToContainer, descendantElementsImpl, @@ -13,8 +14,7 @@ import { GfxCompatible, gfxGroupCompatibleSymbol, hasDescendantElementImpl, -} from '@blocksuite/block-std/gfx'; -import { Bound } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import { BlockModel, BlockSchemaExtension, diff --git a/blocksuite/affine/model/src/blocks/image/image-model.ts b/blocksuite/affine/model/src/blocks/image/image-model.ts index 342801f603..a7092b1ad5 100644 --- a/blocksuite/affine/model/src/blocks/image/image-model.ts +++ b/blocksuite/affine/model/src/blocks/image/image-model.ts @@ -1,8 +1,8 @@ import type { GfxCommonBlockProps, GfxElementGeometry, -} from '@blocksuite/block-std/gfx'; -import { GfxCompatible } from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; +import { GfxCompatible } from '@blocksuite/std/gfx'; import { BlockModel, BlockSchemaExtension, diff --git a/blocksuite/affine/model/src/blocks/latex/latex-model.ts b/blocksuite/affine/model/src/blocks/latex/latex-model.ts index ca5dc1226a..c7330dadcd 100644 --- a/blocksuite/affine/model/src/blocks/latex/latex-model.ts +++ b/blocksuite/affine/model/src/blocks/latex/latex-model.ts @@ -2,7 +2,7 @@ import { type GfxCommonBlockProps, GfxCompatible, type GfxElementGeometry, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; import { BlockModel, BlockSchemaExtension, diff --git a/blocksuite/affine/model/src/blocks/note/note-model.ts b/blocksuite/affine/model/src/blocks/note/note-model.ts index 46a0261daf..293d02b8c3 100644 --- a/blocksuite/affine/model/src/blocks/note/note-model.ts +++ b/blocksuite/affine/model/src/blocks/note/note-model.ts @@ -1,9 +1,9 @@ +import { Bound } from '@blocksuite/global/gfx'; import type { GfxCompatibleProps, GfxElementGeometry, -} from '@blocksuite/block-std/gfx'; -import { GfxCompatible } from '@blocksuite/block-std/gfx'; -import { Bound } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; +import { GfxCompatible } from '@blocksuite/std/gfx'; import { BlockModel, BlockSchemaExtension, diff --git a/blocksuite/affine/model/src/elements/brush/brush.ts b/blocksuite/affine/model/src/elements/brush/brush.ts index 6d6d9badbd..8c78e7238d 100644 --- a/blocksuite/affine/model/src/elements/brush/brush.ts +++ b/blocksuite/affine/model/src/elements/brush/brush.ts @@ -1,14 +1,3 @@ -import type { - BaseElementProps, - PointTestOptions, -} from '@blocksuite/block-std/gfx'; -import { - convert, - derive, - field, - GfxPrimitiveElementModel, - watch, -} from '@blocksuite/block-std/gfx'; import { Bound, getBoundFromPoints, @@ -27,6 +16,14 @@ import { transformPointsToNewBound, Vec, } from '@blocksuite/global/gfx'; +import type { BaseElementProps, PointTestOptions } from '@blocksuite/std/gfx'; +import { + convert, + derive, + field, + GfxPrimitiveElementModel, + watch, +} from '@blocksuite/std/gfx'; import { type Color, DefaultTheme } from '../../themes/index'; diff --git a/blocksuite/affine/model/src/elements/connector/connector.ts b/blocksuite/affine/model/src/elements/connector/connector.ts index d9b16056d3..4b5d5e343c 100644 --- a/blocksuite/affine/model/src/elements/connector/connector.ts +++ b/blocksuite/affine/model/src/elements/connector/connector.ts @@ -1,14 +1,3 @@ -import type { - BaseElementProps, - PointTestOptions, - SerializedElement, -} from '@blocksuite/block-std/gfx'; -import { - derive, - field, - GfxPrimitiveElementModel, - local, -} from '@blocksuite/block-std/gfx'; import type { IVec, SerializedXYWH, XYWH } from '@blocksuite/global/gfx'; import { Bound, @@ -23,6 +12,17 @@ import { polyLineNearestPoint, Vec, } from '@blocksuite/global/gfx'; +import type { + BaseElementProps, + PointTestOptions, + SerializedElement, +} from '@blocksuite/std/gfx'; +import { + derive, + field, + GfxPrimitiveElementModel, + local, +} from '@blocksuite/std/gfx'; import * as Y from 'yjs'; import { diff --git a/blocksuite/affine/model/src/elements/connector/local-connector.ts b/blocksuite/affine/model/src/elements/connector/local-connector.ts index bb13cc6695..cad5215971 100644 --- a/blocksuite/affine/model/src/elements/connector/local-connector.ts +++ b/blocksuite/affine/model/src/elements/connector/local-connector.ts @@ -1,5 +1,5 @@ -import { GfxLocalElementModel } from '@blocksuite/block-std/gfx'; import type { PointLocation } from '@blocksuite/global/gfx'; +import { GfxLocalElementModel } from '@blocksuite/std/gfx'; import { ConnectorMode, diff --git a/blocksuite/affine/model/src/elements/group/group.ts b/blocksuite/affine/model/src/elements/group/group.ts index 5f53b11437..cca324fe15 100644 --- a/blocksuite/affine/model/src/elements/group/group.ts +++ b/blocksuite/affine/model/src/elements/group/group.ts @@ -1,17 +1,17 @@ +import type { IVec, PointLocation } from '@blocksuite/global/gfx'; +import { Bound, linePolygonIntersects } from '@blocksuite/global/gfx'; import type { BaseElementProps, GfxModel, SerializedElement, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; import { canSafeAddToContainer, field, GfxGroupLikeElementModel, local, observe, -} from '@blocksuite/block-std/gfx'; -import type { IVec, PointLocation } from '@blocksuite/global/gfx'; -import { Bound, linePolygonIntersects } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import * as Y from 'yjs'; type GroupElementProps = BaseElementProps & { diff --git a/blocksuite/affine/model/src/elements/highlighter/highlighter.ts b/blocksuite/affine/model/src/elements/highlighter/highlighter.ts index bc867d2ad3..258093d85c 100644 --- a/blocksuite/affine/model/src/elements/highlighter/highlighter.ts +++ b/blocksuite/affine/model/src/elements/highlighter/highlighter.ts @@ -1,14 +1,3 @@ -import type { - BaseElementProps, - PointTestOptions, -} from '@blocksuite/block-std/gfx'; -import { - convert, - derive, - field, - GfxPrimitiveElementModel, - watch, -} from '@blocksuite/block-std/gfx'; import { Bound, getBoundFromPoints, @@ -27,6 +16,14 @@ import { transformPointsToNewBound, Vec, } from '@blocksuite/global/gfx'; +import type { BaseElementProps, PointTestOptions } from '@blocksuite/std/gfx'; +import { + convert, + derive, + field, + GfxPrimitiveElementModel, + watch, +} from '@blocksuite/std/gfx'; import { DEFAULT_HIGHLIGHTER_LINE_WIDTH } from '../../consts'; import { type Color, DefaultTheme } from '../../themes/index'; diff --git a/blocksuite/affine/model/src/elements/mindmap/mindmap.ts b/blocksuite/affine/model/src/elements/mindmap/mindmap.ts index 5a64321164..fe3cd36c57 100644 --- a/blocksuite/affine/model/src/elements/mindmap/mindmap.ts +++ b/blocksuite/affine/model/src/elements/mindmap/mindmap.ts @@ -1,20 +1,20 @@ +import type { Bound, SerializedXYWH, XYWH } from '@blocksuite/global/gfx'; +import { deserializeXYWH } from '@blocksuite/global/gfx'; +import { assertType, noop } from '@blocksuite/global/utils'; import type { BaseElementProps, GfxModel, GfxPrimitiveElementModel, PointTestOptions, SerializedElement, -} from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std/gfx'; import { convert, field, GfxGroupLikeElementModel, observe, watch, -} from '@blocksuite/block-std/gfx'; -import type { Bound, SerializedXYWH, XYWH } from '@blocksuite/global/gfx'; -import { deserializeXYWH } from '@blocksuite/global/gfx'; -import { assertType, noop } from '@blocksuite/global/utils'; +} from '@blocksuite/std/gfx'; import { generateKeyBetween } from 'fractional-indexing'; import last from 'lodash-es/last'; import pick from 'lodash-es/pick'; diff --git a/blocksuite/affine/model/src/elements/shape/api/diamond.ts b/blocksuite/affine/model/src/elements/shape/api/diamond.ts index 704c12fb3b..33634b8e08 100644 --- a/blocksuite/affine/model/src/elements/shape/api/diamond.ts +++ b/blocksuite/affine/model/src/elements/shape/api/diamond.ts @@ -1,4 +1,3 @@ -import type { PointTestOptions } from '@blocksuite/block-std/gfx'; import type { IBound, IVec } from '@blocksuite/global/gfx'; import { Bound, @@ -12,6 +11,7 @@ import { polygonNearestPoint, rotatePoints, } from '@blocksuite/global/gfx'; +import type { PointTestOptions } from '@blocksuite/std/gfx'; import { DEFAULT_CENTRAL_AREA_RATIO } from '../../../consts/index.js'; import type { ShapeElementModel } from '../shape.js'; diff --git a/blocksuite/affine/model/src/elements/shape/api/ellipse.ts b/blocksuite/affine/model/src/elements/shape/api/ellipse.ts index 8e397c7ff2..8577ef9b35 100644 --- a/blocksuite/affine/model/src/elements/shape/api/ellipse.ts +++ b/blocksuite/affine/model/src/elements/shape/api/ellipse.ts @@ -1,4 +1,3 @@ -import type { PointTestOptions } from '@blocksuite/block-std/gfx'; import { Bound, clamp, @@ -13,6 +12,7 @@ import { toRadian, Vec, } from '@blocksuite/global/gfx'; +import type { PointTestOptions } from '@blocksuite/std/gfx'; import { DEFAULT_CENTRAL_AREA_RATIO } from '../../../consts/index.js'; import type { ShapeElementModel } from '../shape.js'; diff --git a/blocksuite/affine/model/src/elements/shape/api/rect.ts b/blocksuite/affine/model/src/elements/shape/api/rect.ts index 4e8804edf9..723637f4de 100644 --- a/blocksuite/affine/model/src/elements/shape/api/rect.ts +++ b/blocksuite/affine/model/src/elements/shape/api/rect.ts @@ -1,4 +1,3 @@ -import type { PointTestOptions } from '@blocksuite/block-std/gfx'; import type { IBound, IVec } from '@blocksuite/global/gfx'; import { Bound, @@ -12,6 +11,7 @@ import { polygonNearestPoint, rotatePoints, } from '@blocksuite/global/gfx'; +import type { PointTestOptions } from '@blocksuite/std/gfx'; import { DEFAULT_CENTRAL_AREA_RATIO } from '../../../consts/index.js'; import type { ShapeElementModel } from '../shape.js'; diff --git a/blocksuite/affine/model/src/elements/shape/api/triangle.ts b/blocksuite/affine/model/src/elements/shape/api/triangle.ts index 2e8e6f514b..0145d90728 100644 --- a/blocksuite/affine/model/src/elements/shape/api/triangle.ts +++ b/blocksuite/affine/model/src/elements/shape/api/triangle.ts @@ -1,4 +1,3 @@ -import type { PointTestOptions } from '@blocksuite/block-std/gfx'; import type { IBound, IVec } from '@blocksuite/global/gfx'; import { Bound, @@ -12,6 +11,7 @@ import { polygonNearestPoint, rotatePoints, } from '@blocksuite/global/gfx'; +import type { PointTestOptions } from '@blocksuite/std/gfx'; import { DEFAULT_CENTRAL_AREA_RATIO } from '../../../consts/index.js'; import type { ShapeElementModel } from '../shape.js'; diff --git a/blocksuite/affine/model/src/elements/shape/shape.ts b/blocksuite/affine/model/src/elements/shape/shape.ts index 4ba356efa2..81446124a5 100644 --- a/blocksuite/affine/model/src/elements/shape/shape.ts +++ b/blocksuite/affine/model/src/elements/shape/shape.ts @@ -1,14 +1,3 @@ -import type { - BaseElementProps, - PointTestOptions, -} from '@blocksuite/block-std/gfx'; -import { - field, - GfxLocalElementModel, - GfxPrimitiveElementModel, - local, - prop, -} from '@blocksuite/block-std/gfx'; import type { Bound, IBound, @@ -16,6 +5,14 @@ import type { PointLocation, SerializedXYWH, } from '@blocksuite/global/gfx'; +import type { BaseElementProps, PointTestOptions } from '@blocksuite/std/gfx'; +import { + field, + GfxLocalElementModel, + GfxPrimitiveElementModel, + local, + prop, +} from '@blocksuite/std/gfx'; import * as Y from 'yjs'; import { diff --git a/blocksuite/affine/model/src/elements/text/text.ts b/blocksuite/affine/model/src/elements/text/text.ts index 10053a4e12..f14187a965 100644 --- a/blocksuite/affine/model/src/elements/text/text.ts +++ b/blocksuite/affine/model/src/elements/text/text.ts @@ -1,5 +1,3 @@ -import type { BaseElementProps } from '@blocksuite/block-std/gfx'; -import { field, GfxPrimitiveElementModel } from '@blocksuite/block-std/gfx'; import type { IVec, SerializedXYWH } from '@blocksuite/global/gfx'; import { Bound, @@ -8,6 +6,8 @@ import { pointInPolygon, polygonNearestPoint, } from '@blocksuite/global/gfx'; +import type { BaseElementProps } from '@blocksuite/std/gfx'; +import { field, GfxPrimitiveElementModel } from '@blocksuite/std/gfx'; import * as Y from 'yjs'; import { diff --git a/blocksuite/affine/model/src/utils/helper.ts b/blocksuite/affine/model/src/utils/helper.ts index 95f38d2c09..bdcbbe34a7 100644 --- a/blocksuite/affine/model/src/utils/helper.ts +++ b/blocksuite/affine/model/src/utils/helper.ts @@ -1,6 +1,6 @@ -import type { GfxCompatibleProps } from '@blocksuite/block-std/gfx'; -import { GfxCompatible } from '@blocksuite/block-std/gfx'; import type { Constructor } from '@blocksuite/global/utils'; +import type { GfxCompatibleProps } from '@blocksuite/std/gfx'; +import { GfxCompatible } from '@blocksuite/std/gfx'; import { type BaseBlockTransformer, type BlockModel, diff --git a/blocksuite/affine/model/src/utils/types.ts b/blocksuite/affine/model/src/utils/types.ts index 77574a9c0c..e696a5e644 100644 --- a/blocksuite/affine/model/src/utils/types.ts +++ b/blocksuite/affine/model/src/utils/types.ts @@ -1,4 +1,4 @@ -import type { GfxModel } from '@blocksuite/block-std/gfx'; +import type { GfxModel } from '@blocksuite/std/gfx'; import type { BrushElementModel, diff --git a/blocksuite/affine/model/tsconfig.json b/blocksuite/affine/model/tsconfig.json index 51a0df23f4..ed3dfb2341 100644 --- a/blocksuite/affine/model/tsconfig.json +++ b/blocksuite/affine/model/tsconfig.json @@ -7,8 +7,8 @@ }, "include": ["./src"], "references": [ - { "path": "../../framework/block-std" }, { "path": "../../framework/global" }, + { "path": "../../framework/std" }, { "path": "../../framework/store" } ] } diff --git a/blocksuite/affine/rich-text/package.json b/blocksuite/affine/rich-text/package.json index 02499558f9..0fcb305b22 100644 --- a/blocksuite/affine/rich-text/package.json +++ b/blocksuite/affine/rich-text/package.json @@ -13,9 +13,9 @@ "@blocksuite/affine-components": "workspace:*", "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/rich-text/src/dom.ts b/blocksuite/affine/rich-text/src/dom.ts index b78e16818a..2268a8a477 100644 --- a/blocksuite/affine/rich-text/src/dom.ts +++ b/blocksuite/affine/rich-text/src/dom.ts @@ -4,8 +4,8 @@ import { getCurrentNativeRange, matchModels, } from '@blocksuite/affine-shared/utils'; -import { type BlockStdScope, TextSelection } from '@blocksuite/block-std'; -import type { InlineEditor, InlineRange } from '@blocksuite/block-std/inline'; +import { type BlockStdScope, TextSelection } from '@blocksuite/std'; +import type { InlineEditor, InlineRange } from '@blocksuite/std/inline'; import { BlockModel } from '@blocksuite/store'; import type { RichText } from './rich-text.js'; diff --git a/blocksuite/affine/rich-text/src/hooks.ts b/blocksuite/affine/rich-text/src/hooks.ts index adaeaf3a55..9520c21639 100644 --- a/blocksuite/affine/rich-text/src/hooks.ts +++ b/blocksuite/affine/rich-text/src/hooks.ts @@ -4,7 +4,7 @@ import type { BeforeinputHookCtx, CompositionEndHookCtx, HookContext, -} from '@blocksuite/block-std/inline'; +} from '@blocksuite/std/inline'; const EDGE_IGNORED_ATTRIBUTES = ['code', 'link'] as const; const GLOBAL_IGNORED_ATTRIBUTES = [] as const; diff --git a/blocksuite/affine/rich-text/src/markdown/divider.ts b/blocksuite/affine/rich-text/src/markdown/divider.ts index 9d58143fb5..1a831e1cb4 100644 --- a/blocksuite/affine/rich-text/src/markdown/divider.ts +++ b/blocksuite/affine/rich-text/src/markdown/divider.ts @@ -3,7 +3,7 @@ import { ParagraphBlockModel, } from '@blocksuite/affine-model'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { focusTextModel } from '../dom.js'; diff --git a/blocksuite/affine/rich-text/src/markdown/list.ts b/blocksuite/affine/rich-text/src/markdown/list.ts index 25069518c5..57a325c631 100644 --- a/blocksuite/affine/rich-text/src/markdown/list.ts +++ b/blocksuite/affine/rich-text/src/markdown/list.ts @@ -4,7 +4,7 @@ import { ParagraphBlockModel, } from '@blocksuite/affine-model'; import { matchModels, toNumberedList } from '@blocksuite/affine-shared/utils'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { focusTextModel } from '../dom.js'; diff --git a/blocksuite/affine/rich-text/src/markdown/markdown-input.ts b/blocksuite/affine/rich-text/src/markdown/markdown-input.ts index d84f87543e..80c11cb9c0 100644 --- a/blocksuite/affine/rich-text/src/markdown/markdown-input.ts +++ b/blocksuite/affine/rich-text/src/markdown/markdown-input.ts @@ -8,7 +8,7 @@ import { isMarkdownPrefix, matchModels, } from '@blocksuite/affine-shared/utils'; -import { type BlockStdScope, TextSelection } from '@blocksuite/block-std'; +import { type BlockStdScope, TextSelection } from '@blocksuite/std'; import { getInlineEditorByModel } from '../dom.js'; import { toDivider } from './divider.js'; diff --git a/blocksuite/affine/rich-text/src/markdown/paragraph.ts b/blocksuite/affine/rich-text/src/markdown/paragraph.ts index c8a5466b7b..3ce9101086 100644 --- a/blocksuite/affine/rich-text/src/markdown/paragraph.ts +++ b/blocksuite/affine/rich-text/src/markdown/paragraph.ts @@ -3,7 +3,7 @@ import { type ParagraphType, } from '@blocksuite/affine-model'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { focusTextModel } from '../dom.js'; diff --git a/blocksuite/affine/rich-text/src/markdown/to-code.ts b/blocksuite/affine/rich-text/src/markdown/to-code.ts index b91dc5796f..a0aeca30e7 100644 --- a/blocksuite/affine/rich-text/src/markdown/to-code.ts +++ b/blocksuite/affine/rich-text/src/markdown/to-code.ts @@ -1,6 +1,6 @@ import { ParagraphBlockModel } from '@blocksuite/affine-model'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { focusTextModel } from '../dom.js'; diff --git a/blocksuite/affine/rich-text/src/markdown/utils.ts b/blocksuite/affine/rich-text/src/markdown/utils.ts index b21fb0a713..0f10d9e88a 100644 --- a/blocksuite/affine/rich-text/src/markdown/utils.ts +++ b/blocksuite/affine/rich-text/src/markdown/utils.ts @@ -1,5 +1,5 @@ -import type { BlockStdScope } from '@blocksuite/block-std'; -import type { InlineEditor } from '@blocksuite/block-std/inline'; +import type { BlockStdScope } from '@blocksuite/std'; +import type { InlineEditor } from '@blocksuite/std/inline'; import type { BlockModel } from '@blocksuite/store'; import { focusTextModel } from '../dom.js'; diff --git a/blocksuite/affine/rich-text/src/rich-text.ts b/blocksuite/affine/rich-text/src/rich-text.ts index 7870a5bbcd..0923e6ba07 100644 --- a/blocksuite/affine/rich-text/src/rich-text.ts +++ b/blocksuite/affine/rich-text/src/rich-text.ts @@ -2,7 +2,8 @@ import type { AffineInlineEditor, AffineTextAttributes, } from '@blocksuite/affine-shared/types'; -import { ShadowlessElement } from '@blocksuite/block-std'; +import { WithDisposable } from '@blocksuite/global/lit'; +import { ShadowlessElement } from '@blocksuite/std'; import { type AttributeRenderer, InlineEditor, @@ -10,8 +11,7 @@ import { type InlineRange, type InlineRangeProvider, type VLine, -} from '@blocksuite/block-std/inline'; -import { WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std/inline'; import type { DeltaInsert } from '@blocksuite/store'; import { Text } from '@blocksuite/store'; import { effect, signal } from '@preact/signals-core'; diff --git a/blocksuite/affine/rich-text/src/utils.ts b/blocksuite/affine/rich-text/src/utils.ts index 3a65ffd508..8f57377e06 100644 --- a/blocksuite/affine/rich-text/src/utils.ts +++ b/blocksuite/affine/rich-text/src/utils.ts @@ -1,6 +1,6 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import type { BlockStdScope } from '@blocksuite/block-std'; -import type { InlineEditor } from '@blocksuite/block-std/inline'; +import type { BlockStdScope } from '@blocksuite/std'; +import type { InlineEditor } from '@blocksuite/std/inline'; import type { BlockModel } from '@blocksuite/store'; import { effect } from '@preact/signals-core'; diff --git a/blocksuite/affine/rich-text/tsconfig.json b/blocksuite/affine/rich-text/tsconfig.json index 54fcdbee83..e7a265acd0 100644 --- a/blocksuite/affine/rich-text/tsconfig.json +++ b/blocksuite/affine/rich-text/tsconfig.json @@ -10,8 +10,8 @@ { "path": "../components" }, { "path": "../model" }, { "path": "../shared" }, - { "path": "../../framework/block-std" }, { "path": "../../framework/global" }, + { "path": "../../framework/std" }, { "path": "../../framework/store" } ] } diff --git a/blocksuite/affine/shared/package.json b/blocksuite/affine/shared/package.json index 5c3cd9f914..8ec98296ef 100644 --- a/blocksuite/affine/shared/package.json +++ b/blocksuite/affine/shared/package.json @@ -11,9 +11,9 @@ "license": "MIT", "dependencies": { "@blocksuite/affine-model": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/shared/src/__tests__/commands/selection/is-nothing-selected.unit.spec.ts b/blocksuite/affine/shared/src/__tests__/commands/selection/is-nothing-selected.unit.spec.ts index 550adfd57b..c374a90e5b 100644 --- a/blocksuite/affine/shared/src/__tests__/commands/selection/is-nothing-selected.unit.spec.ts +++ b/blocksuite/affine/shared/src/__tests__/commands/selection/is-nothing-selected.unit.spec.ts @@ -1,7 +1,7 @@ /** * @vitest-environment happy-dom */ -import { BlockSelection, TextSelection } from '@blocksuite/block-std'; +import { BlockSelection, TextSelection } from '@blocksuite/std'; import { describe, expect, it, vi } from 'vitest'; import { isNothingSelectedCommand } from '../../../commands/selection/is-nothing-selected'; diff --git a/blocksuite/affine/shared/src/__tests__/helpers/create-test-host.ts b/blocksuite/affine/shared/src/__tests__/helpers/create-test-host.ts index bfd999e83f..363cf89038 100644 --- a/blocksuite/affine/shared/src/__tests__/helpers/create-test-host.ts +++ b/blocksuite/affine/shared/src/__tests__/helpers/create-test-host.ts @@ -1,4 +1,4 @@ -import { CommandManager, type EditorHost } from '@blocksuite/block-std'; +import { CommandManager, type EditorHost } from '@blocksuite/std'; import type { Block, Store } from '@blocksuite/store'; import { Subject } from 'rxjs'; diff --git a/blocksuite/affine/shared/src/adapters/middlewares/copy.ts b/blocksuite/affine/shared/src/adapters/middlewares/copy.ts index c07d8fba51..9d217bab3c 100644 --- a/blocksuite/affine/shared/src/adapters/middlewares/copy.ts +++ b/blocksuite/affine/shared/src/adapters/middlewares/copy.ts @@ -4,7 +4,7 @@ import { type EditorHost, type TextRangePoint, TextSelection, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import type { BlockSnapshot, DraftModel, diff --git a/blocksuite/affine/shared/src/adapters/middlewares/paste.ts b/blocksuite/affine/shared/src/adapters/middlewares/paste.ts index a5073090f7..057ce81f5d 100644 --- a/blocksuite/affine/shared/src/adapters/middlewares/paste.ts +++ b/blocksuite/affine/shared/src/adapters/middlewares/paste.ts @@ -6,6 +6,7 @@ import { type ParagraphBlockModel, type ReferenceInfo, } from '@blocksuite/affine-model'; +import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; import { BLOCK_ID_ATTR, type BlockComponent, @@ -13,8 +14,7 @@ import { type EditorHost, type TextRangePoint, TextSelection, -} from '@blocksuite/block-std'; -import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +} from '@blocksuite/std'; import { type BlockModel, type BlockSnapshot, diff --git a/blocksuite/affine/shared/src/adapters/middlewares/surface-ref-to-embed.ts b/blocksuite/affine/shared/src/adapters/middlewares/surface-ref-to-embed.ts index 835a112155..6a96d07aae 100644 --- a/blocksuite/affine/shared/src/adapters/middlewares/surface-ref-to-embed.ts +++ b/blocksuite/affine/shared/src/adapters/middlewares/surface-ref-to-embed.ts @@ -1,4 +1,4 @@ -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import type { TransformerMiddleware } from '@blocksuite/store'; export const surfaceRefToEmbed = diff --git a/blocksuite/affine/shared/src/commands/block-crud/get-block-index.ts b/blocksuite/affine/shared/src/commands/block-crud/get-block-index.ts index 220b8f0de5..cdb697d7e5 100644 --- a/blocksuite/affine/shared/src/commands/block-crud/get-block-index.ts +++ b/blocksuite/affine/shared/src/commands/block-crud/get-block-index.ts @@ -1,4 +1,4 @@ -import type { BlockComponent, Command } from '@blocksuite/block-std'; +import type { BlockComponent, Command } from '@blocksuite/std'; export const getBlockIndexCommand: Command< { diff --git a/blocksuite/affine/shared/src/commands/block-crud/get-first-content-block.ts b/blocksuite/affine/shared/src/commands/block-crud/get-first-content-block.ts index 4d586f0c41..7f3fb242b4 100644 --- a/blocksuite/affine/shared/src/commands/block-crud/get-first-content-block.ts +++ b/blocksuite/affine/shared/src/commands/block-crud/get-first-content-block.ts @@ -1,4 +1,4 @@ -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; type Role = 'content' | 'hub'; diff --git a/blocksuite/affine/shared/src/commands/block-crud/get-last-content-block.ts b/blocksuite/affine/shared/src/commands/block-crud/get-last-content-block.ts index ae6eb89a64..f6cfd95773 100644 --- a/blocksuite/affine/shared/src/commands/block-crud/get-last-content-block.ts +++ b/blocksuite/affine/shared/src/commands/block-crud/get-last-content-block.ts @@ -1,4 +1,4 @@ -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; type Role = 'content' | 'hub'; diff --git a/blocksuite/affine/shared/src/commands/block-crud/get-next-block.ts b/blocksuite/affine/shared/src/commands/block-crud/get-next-block.ts index 40803bcda4..45bd31fbac 100644 --- a/blocksuite/affine/shared/src/commands/block-crud/get-next-block.ts +++ b/blocksuite/affine/shared/src/commands/block-crud/get-next-block.ts @@ -1,8 +1,4 @@ -import type { - BlockComponent, - BlockStdScope, - Command, -} from '@blocksuite/block-std'; +import type { BlockComponent, BlockStdScope, Command } from '@blocksuite/std'; import { getNextContentBlock } from '../../utils/index.js'; diff --git a/blocksuite/affine/shared/src/commands/block-crud/get-prev-block.ts b/blocksuite/affine/shared/src/commands/block-crud/get-prev-block.ts index 0220f5a7a2..04d3302d61 100644 --- a/blocksuite/affine/shared/src/commands/block-crud/get-prev-block.ts +++ b/blocksuite/affine/shared/src/commands/block-crud/get-prev-block.ts @@ -1,8 +1,4 @@ -import type { - BlockComponent, - BlockStdScope, - Command, -} from '@blocksuite/block-std'; +import type { BlockComponent, BlockStdScope, Command } from '@blocksuite/std'; import { getPrevContentBlock } from '../../utils/index.js'; diff --git a/blocksuite/affine/shared/src/commands/block-crud/get-selected-blocks.ts b/blocksuite/affine/shared/src/commands/block-crud/get-selected-blocks.ts index f64a052e40..d9a793f7ac 100644 --- a/blocksuite/affine/shared/src/commands/block-crud/get-selected-blocks.ts +++ b/blocksuite/affine/shared/src/commands/block-crud/get-selected-blocks.ts @@ -1,9 +1,5 @@ -import type { - BlockSelection, - Command, - TextSelection, -} from '@blocksuite/block-std'; -import { BlockComponent } from '@blocksuite/block-std'; +import type { BlockSelection, Command, TextSelection } from '@blocksuite/std'; +import { BlockComponent } from '@blocksuite/std'; import type { RoleType } from '@blocksuite/store'; import type { ImageSelection } from '../../selection/index.js'; diff --git a/blocksuite/affine/shared/src/commands/model-crud/clear-and-select-first-model.ts b/blocksuite/affine/shared/src/commands/model-crud/clear-and-select-first-model.ts index 39bce3dadf..e66140800e 100644 --- a/blocksuite/affine/shared/src/commands/model-crud/clear-and-select-first-model.ts +++ b/blocksuite/affine/shared/src/commands/model-crud/clear-and-select-first-model.ts @@ -1,4 +1,4 @@ -import { type Command, TextSelection } from '@blocksuite/block-std'; +import { type Command, TextSelection } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; export const clearAndSelectFirstModelCommand: Command<{ diff --git a/blocksuite/affine/shared/src/commands/model-crud/copy-selected-models.ts b/blocksuite/affine/shared/src/commands/model-crud/copy-selected-models.ts index 6d2663e210..97948f845c 100644 --- a/blocksuite/affine/shared/src/commands/model-crud/copy-selected-models.ts +++ b/blocksuite/affine/shared/src/commands/model-crud/copy-selected-models.ts @@ -1,4 +1,4 @@ -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import { type BlockModel, type DraftModel, Slice } from '@blocksuite/store'; export const copySelectedModelsCommand: Command<{ diff --git a/blocksuite/affine/shared/src/commands/model-crud/delete-selected-models.ts b/blocksuite/affine/shared/src/commands/model-crud/delete-selected-models.ts index 6e38e23a29..d8f60475f6 100644 --- a/blocksuite/affine/shared/src/commands/model-crud/delete-selected-models.ts +++ b/blocksuite/affine/shared/src/commands/model-crud/delete-selected-models.ts @@ -1,4 +1,4 @@ -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; export const deleteSelectedModelsCommand: Command<{ diff --git a/blocksuite/affine/shared/src/commands/model-crud/draft-selected-models.ts b/blocksuite/affine/shared/src/commands/model-crud/draft-selected-models.ts index 3117681359..cd5d9c66a7 100644 --- a/blocksuite/affine/shared/src/commands/model-crud/draft-selected-models.ts +++ b/blocksuite/affine/shared/src/commands/model-crud/draft-selected-models.ts @@ -1,4 +1,4 @@ -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import { type BlockModel, type DraftModel, diff --git a/blocksuite/affine/shared/src/commands/model-crud/duplicate-selected-model.ts b/blocksuite/affine/shared/src/commands/model-crud/duplicate-selected-model.ts index 8d900fe001..31b6f18747 100644 --- a/blocksuite/affine/shared/src/commands/model-crud/duplicate-selected-model.ts +++ b/blocksuite/affine/shared/src/commands/model-crud/duplicate-selected-model.ts @@ -1,4 +1,4 @@ -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import { type BlockModel, type DraftModel, Slice } from '@blocksuite/store'; export const duplicateSelectedModelsCommand: Command<{ diff --git a/blocksuite/affine/shared/src/commands/model-crud/get-selected-models.ts b/blocksuite/affine/shared/src/commands/model-crud/get-selected-models.ts index d9a1244a66..1664798ec8 100644 --- a/blocksuite/affine/shared/src/commands/model-crud/get-selected-models.ts +++ b/blocksuite/affine/shared/src/commands/model-crud/get-selected-models.ts @@ -1,4 +1,4 @@ -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { getSelectedBlocksCommand } from '../block-crud/get-selected-blocks'; diff --git a/blocksuite/affine/shared/src/commands/model-crud/retain-first-model.ts b/blocksuite/affine/shared/src/commands/model-crud/retain-first-model.ts index 0c886b6e94..c4d192b3af 100644 --- a/blocksuite/affine/shared/src/commands/model-crud/retain-first-model.ts +++ b/blocksuite/affine/shared/src/commands/model-crud/retain-first-model.ts @@ -1,4 +1,4 @@ -import type { Command } from '@blocksuite/block-std'; +import type { Command } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; export const retainFirstModelCommand: Command<{ diff --git a/blocksuite/affine/shared/src/commands/selection/focus-block-end.ts b/blocksuite/affine/shared/src/commands/selection/focus-block-end.ts index 88a736f2c1..098597afb0 100644 --- a/blocksuite/affine/shared/src/commands/selection/focus-block-end.ts +++ b/blocksuite/affine/shared/src/commands/selection/focus-block-end.ts @@ -2,7 +2,7 @@ import { type BlockComponent, type Command, TextSelection, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; /** * Focus the end of the block diff --git a/blocksuite/affine/shared/src/commands/selection/focus-block-start.ts b/blocksuite/affine/shared/src/commands/selection/focus-block-start.ts index e0e5609045..53b644e59a 100644 --- a/blocksuite/affine/shared/src/commands/selection/focus-block-start.ts +++ b/blocksuite/affine/shared/src/commands/selection/focus-block-start.ts @@ -2,7 +2,7 @@ import { type BlockComponent, type Command, TextSelection, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; export const focusBlockStart: Command<{ focusBlock?: BlockComponent; diff --git a/blocksuite/affine/shared/src/commands/selection/get-block-selections.ts b/blocksuite/affine/shared/src/commands/selection/get-block-selections.ts index cd0241d271..d04e96916e 100644 --- a/blocksuite/affine/shared/src/commands/selection/get-block-selections.ts +++ b/blocksuite/affine/shared/src/commands/selection/get-block-selections.ts @@ -1,4 +1,4 @@ -import { BlockSelection } from '@blocksuite/block-std'; +import { BlockSelection } from '@blocksuite/std'; import type { GetSelectionCommand } from './types'; diff --git a/blocksuite/affine/shared/src/commands/selection/get-selection-rects.ts b/blocksuite/affine/shared/src/commands/selection/get-selection-rects.ts index fedb02075f..8a489894fe 100644 --- a/blocksuite/affine/shared/src/commands/selection/get-selection-rects.ts +++ b/blocksuite/affine/shared/src/commands/selection/get-selection-rects.ts @@ -1,8 +1,4 @@ -import type { - BlockSelection, - Command, - TextSelection, -} from '@blocksuite/block-std'; +import type { BlockSelection, Command, TextSelection } from '@blocksuite/std'; import { getViewportElement } from '../../utils/index.js'; diff --git a/blocksuite/affine/shared/src/commands/selection/get-text-selection.ts b/blocksuite/affine/shared/src/commands/selection/get-text-selection.ts index 886f0fbd78..4a426aa8de 100644 --- a/blocksuite/affine/shared/src/commands/selection/get-text-selection.ts +++ b/blocksuite/affine/shared/src/commands/selection/get-text-selection.ts @@ -1,4 +1,4 @@ -import { TextSelection } from '@blocksuite/block-std'; +import { TextSelection } from '@blocksuite/std'; import type { GetSelectionCommand } from './types'; diff --git a/blocksuite/affine/shared/src/commands/selection/is-nothing-selected.ts b/blocksuite/affine/shared/src/commands/selection/is-nothing-selected.ts index 0c31c9da24..b02ade1910 100644 --- a/blocksuite/affine/shared/src/commands/selection/is-nothing-selected.ts +++ b/blocksuite/affine/shared/src/commands/selection/is-nothing-selected.ts @@ -1,8 +1,4 @@ -import { - BlockSelection, - type Command, - TextSelection, -} from '@blocksuite/block-std'; +import { BlockSelection, type Command, TextSelection } from '@blocksuite/std'; import { ImageSelection } from '../../selection'; diff --git a/blocksuite/affine/shared/src/commands/selection/types.ts b/blocksuite/affine/shared/src/commands/selection/types.ts index 20e0f0204b..d60b1bac12 100644 --- a/blocksuite/affine/shared/src/commands/selection/types.ts +++ b/blocksuite/affine/shared/src/commands/selection/types.ts @@ -1,8 +1,4 @@ -import type { - BlockSelection, - Command, - TextSelection, -} from '@blocksuite/block-std'; +import type { BlockSelection, Command, TextSelection } from '@blocksuite/std'; import type { ImageSelection } from '../../selection/image'; diff --git a/blocksuite/affine/shared/src/services/doc-display-meta-service.ts b/blocksuite/affine/shared/src/services/doc-display-meta-service.ts index 29c2a26f4d..415b31f224 100644 --- a/blocksuite/affine/shared/src/services/doc-display-meta-service.ts +++ b/blocksuite/affine/shared/src/services/doc-display-meta-service.ts @@ -1,5 +1,4 @@ import type { AliasInfo, ReferenceParams } from '@blocksuite/affine-model'; -import { LifeCycleWatcher, StdIdentifier } from '@blocksuite/block-std'; import { type Container, createIdentifier } from '@blocksuite/global/di'; import { type DisposableMember, @@ -14,6 +13,7 @@ import { LinkedPageIcon, PageIcon, } from '@blocksuite/icons/lit'; +import { LifeCycleWatcher, StdIdentifier } from '@blocksuite/std'; import type { Store } from '@blocksuite/store'; import { computed, type Signal, signal } from '@preact/signals-core'; import type { TemplateResult } from 'lit'; diff --git a/blocksuite/affine/shared/src/services/drag-handle-config.ts b/blocksuite/affine/shared/src/services/drag-handle-config.ts index 457135552e..07e7f38585 100644 --- a/blocksuite/affine/shared/src/services/drag-handle-config.ts +++ b/blocksuite/affine/shared/src/services/drag-handle-config.ts @@ -1,5 +1,5 @@ -import { type BlockStdScope, StdIdentifier } from '@blocksuite/block-std'; import { type Container, createIdentifier } from '@blocksuite/global/di'; +import { type BlockStdScope, StdIdentifier } from '@blocksuite/std'; import { Extension, Slice, type SliceSnapshot } from '@blocksuite/store'; export const DndApiExtensionIdentifier = createIdentifier( diff --git a/blocksuite/affine/shared/src/services/edit-props-store.ts b/blocksuite/affine/shared/src/services/edit-props-store.ts index 699f8f4979..cea07c55d4 100644 --- a/blocksuite/affine/shared/src/services/edit-props-store.ts +++ b/blocksuite/affine/shared/src/services/edit-props-store.ts @@ -1,8 +1,8 @@ import { ColorSchema } from '@blocksuite/affine-model'; -import { type BlockStdScope, LifeCycleWatcher } from '@blocksuite/block-std'; import { DisposableGroup } from '@blocksuite/global/disposable'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; import type { DeepPartial } from '@blocksuite/global/utils'; +import { type BlockStdScope, LifeCycleWatcher } from '@blocksuite/std'; import { computed, type Signal, signal } from '@preact/signals-core'; import clonedeep from 'lodash-es/cloneDeep'; import mergeWith from 'lodash-es/mergeWith'; diff --git a/blocksuite/affine/shared/src/services/embed-option-service.ts b/blocksuite/affine/shared/src/services/embed-option-service.ts index 1dd0a12373..d73ea06fce 100644 --- a/blocksuite/affine/shared/src/services/embed-option-service.ts +++ b/blocksuite/affine/shared/src/services/embed-option-service.ts @@ -1,7 +1,7 @@ import type { EmbedCardStyle } from '@blocksuite/affine-model'; -import { type BlockStdScope, StdIdentifier } from '@blocksuite/block-std'; import type { Container } from '@blocksuite/global/di'; import { createIdentifier } from '@blocksuite/global/di'; +import { type BlockStdScope, StdIdentifier } from '@blocksuite/std'; import { Extension, type ExtensionType } from '@blocksuite/store'; export type EmbedOptions = { diff --git a/blocksuite/affine/shared/src/services/font-loader/font-loader-service.ts b/blocksuite/affine/shared/src/services/font-loader/font-loader-service.ts index 6e52b4e69a..1c9411cbaa 100644 --- a/blocksuite/affine/shared/src/services/font-loader/font-loader-service.ts +++ b/blocksuite/affine/shared/src/services/font-loader/font-loader-service.ts @@ -1,6 +1,6 @@ -import { LifeCycleWatcher } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; import { IS_FIREFOX } from '@blocksuite/global/env'; +import { LifeCycleWatcher } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import type { FontConfig } from './config.js'; diff --git a/blocksuite/affine/shared/src/services/theme-service.ts b/blocksuite/affine/shared/src/services/theme-service.ts index 170d5abcdb..5860e61d10 100644 --- a/blocksuite/affine/shared/src/services/theme-service.ts +++ b/blocksuite/affine/shared/src/services/theme-service.ts @@ -4,8 +4,8 @@ import { DefaultTheme, resolveColor, } from '@blocksuite/affine-model'; -import { type BlockStdScope, StdIdentifier } from '@blocksuite/block-std'; import { type Container, createIdentifier } from '@blocksuite/global/di'; +import { type BlockStdScope, StdIdentifier } from '@blocksuite/std'; import { Extension, type ExtensionType } from '@blocksuite/store'; import { type Signal, signal } from '@preact/signals-core'; import { diff --git a/blocksuite/affine/shared/src/services/toolbar-service/context.ts b/blocksuite/affine/shared/src/services/toolbar-service/context.ts index b417342df9..44f4a48de3 100644 --- a/blocksuite/affine/shared/src/services/toolbar-service/context.ts +++ b/blocksuite/affine/shared/src/services/toolbar-service/context.ts @@ -1,15 +1,15 @@ +import { nextTick } from '@blocksuite/global/utils'; import { BlockComponent, BlockSelection, type BlockStdScope, SurfaceSelection, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import { GfxControllerIdentifier, type GfxElementModelView, type GfxModel, -} from '@blocksuite/block-std/gfx'; -import { nextTick } from '@blocksuite/global/utils'; +} from '@blocksuite/std/gfx'; import type { BaseSelection, BlockModel, diff --git a/blocksuite/affine/shared/src/services/toolbar-service/module.ts b/blocksuite/affine/shared/src/services/toolbar-service/module.ts index 3892fc3f98..442b26517f 100644 --- a/blocksuite/affine/shared/src/services/toolbar-service/module.ts +++ b/blocksuite/affine/shared/src/services/toolbar-service/module.ts @@ -1,4 +1,4 @@ -import type { BlockFlavourIdentifier } from '@blocksuite/block-std'; +import type { BlockFlavourIdentifier } from '@blocksuite/std'; import type { ToolbarModuleConfig } from './config'; diff --git a/blocksuite/affine/shared/src/services/toolbar-service/registry.ts b/blocksuite/affine/shared/src/services/toolbar-service/registry.ts index 0697cf1744..f1742c0d40 100644 --- a/blocksuite/affine/shared/src/services/toolbar-service/registry.ts +++ b/blocksuite/affine/shared/src/services/toolbar-service/registry.ts @@ -1,6 +1,6 @@ -import { type BlockStdScope, StdIdentifier } from '@blocksuite/block-std'; -import type { GfxModel } from '@blocksuite/block-std/gfx'; import { type Container, createIdentifier } from '@blocksuite/global/di'; +import { type BlockStdScope, StdIdentifier } from '@blocksuite/std'; +import type { GfxModel } from '@blocksuite/std/gfx'; import { Extension, type ExtensionType } from '@blocksuite/store'; import { signal } from '@preact/signals-core'; diff --git a/blocksuite/affine/shared/src/types/index.ts b/blocksuite/affine/shared/src/types/index.ts index 95d794dc10..996b7edb89 100644 --- a/blocksuite/affine/shared/src/types/index.ts +++ b/blocksuite/affine/shared/src/types/index.ts @@ -3,8 +3,8 @@ import type { FootNote, ReferenceInfo, } from '@blocksuite/affine-model'; -import type { BlockComponent } from '@blocksuite/block-std'; -import type { InlineEditor } from '@blocksuite/block-std/inline'; +import type { BlockComponent } from '@blocksuite/std'; +import type { InlineEditor } from '@blocksuite/std/inline'; import type { BlockModel } from '@blocksuite/store'; export * from './uni-component'; export interface EditingState { diff --git a/blocksuite/affine/shared/src/utils/dnd/calc-drop-target.ts b/blocksuite/affine/shared/src/utils/dnd/calc-drop-target.ts index 44b67d9925..8e3995fd8d 100644 --- a/blocksuite/affine/shared/src/utils/dnd/calc-drop-target.ts +++ b/blocksuite/affine/shared/src/utils/dnd/calc-drop-target.ts @@ -1,6 +1,6 @@ import { DatabaseBlockModel, ListBlockModel } from '@blocksuite/affine-model'; -import type { BlockComponent } from '@blocksuite/block-std'; import { type Point, Rect } from '@blocksuite/global/gfx'; +import type { BlockComponent } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { BLOCK_CHILDREN_CONTAINER_PADDING_LEFT } from '../../consts/index.js'; diff --git a/blocksuite/affine/shared/src/utils/dnd/get-drop-rect-by-point.ts b/blocksuite/affine/shared/src/utils/dnd/get-drop-rect-by-point.ts index 825a6bbc9e..8bf218e6ff 100644 --- a/blocksuite/affine/shared/src/utils/dnd/get-drop-rect-by-point.ts +++ b/blocksuite/affine/shared/src/utils/dnd/get-drop-rect-by-point.ts @@ -1,6 +1,6 @@ import { DatabaseBlockModel } from '@blocksuite/affine-model'; -import { BLOCK_ID_ATTR } from '@blocksuite/block-std'; import type { Point } from '@blocksuite/global/gfx'; +import { BLOCK_ID_ATTR } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { getRectByBlockComponent } from '../dom/index.js'; diff --git a/blocksuite/affine/shared/src/utils/dnd/types.ts b/blocksuite/affine/shared/src/utils/dnd/types.ts index 8456a8ac56..3f61bf00e0 100644 --- a/blocksuite/affine/shared/src/utils/dnd/types.ts +++ b/blocksuite/affine/shared/src/utils/dnd/types.ts @@ -1,5 +1,5 @@ -import type { BlockComponent } from '@blocksuite/block-std'; import type { Rect } from '@blocksuite/global/gfx'; +import type { BlockComponent } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; export interface EditingState { diff --git a/blocksuite/affine/shared/src/utils/dom/checker.ts b/blocksuite/affine/shared/src/utils/dom/checker.ts index fee17459d7..ec86e77b67 100644 --- a/blocksuite/affine/shared/src/utils/dom/checker.ts +++ b/blocksuite/affine/shared/src/utils/dom/checker.ts @@ -1,4 +1,4 @@ -import type { EditorHost } from '@blocksuite/block-std'; +import type { EditorHost } from '@blocksuite/std'; export function isInsidePageEditor(host: EditorHost) { return Array.from(host.children).some( diff --git a/blocksuite/affine/shared/src/utils/dom/point-to-block.ts b/blocksuite/affine/shared/src/utils/dom/point-to-block.ts index cf910bb0e6..18bf89aa23 100644 --- a/blocksuite/affine/shared/src/utils/dom/point-to-block.ts +++ b/blocksuite/affine/shared/src/utils/dom/point-to-block.ts @@ -1,7 +1,7 @@ import { NoteBlockModel, RootBlockModel } from '@blocksuite/affine-model'; -import { BLOCK_ID_ATTR, type BlockComponent } from '@blocksuite/block-std'; -import { SurfaceBlockModel } from '@blocksuite/block-std/gfx'; import { clamp, type Point, type Rect } from '@blocksuite/global/gfx'; +import { BLOCK_ID_ATTR, type BlockComponent } from '@blocksuite/std'; +import { SurfaceBlockModel } from '@blocksuite/std/gfx'; import type { BlockModel } from '@blocksuite/store'; import { BLOCK_CHILDREN_CONTAINER_PADDING_LEFT } from '../../consts/index.js'; diff --git a/blocksuite/affine/shared/src/utils/dom/query.ts b/blocksuite/affine/shared/src/utils/dom/query.ts index 42acf7a91e..f630fe4c6f 100644 --- a/blocksuite/affine/shared/src/utils/dom/query.ts +++ b/blocksuite/affine/shared/src/utils/dom/query.ts @@ -1,5 +1,5 @@ import type { RootBlockModel } from '@blocksuite/affine-model'; -import { BLOCK_ID_ATTR, type BlockComponent } from '@blocksuite/block-std'; +import { BLOCK_ID_ATTR, type BlockComponent } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; const ATTR_SELECTOR = `[${BLOCK_ID_ATTR}]`; diff --git a/blocksuite/affine/shared/src/utils/dom/viewport.ts b/blocksuite/affine/shared/src/utils/dom/viewport.ts index e05d958ae9..228bc6f912 100644 --- a/blocksuite/affine/shared/src/utils/dom/viewport.ts +++ b/blocksuite/affine/shared/src/utils/dom/viewport.ts @@ -1,4 +1,4 @@ -import type { EditorHost } from '@blocksuite/block-std'; +import type { EditorHost } from '@blocksuite/std'; /** * Get editor viewport element. diff --git a/blocksuite/affine/shared/src/utils/edgeless.ts b/blocksuite/affine/shared/src/utils/edgeless.ts index 93f3e11596..88eabc7748 100644 --- a/blocksuite/affine/shared/src/utils/edgeless.ts +++ b/blocksuite/affine/shared/src/utils/edgeless.ts @@ -1,9 +1,9 @@ import { FrameBlockModel, GroupElementModel } from '@blocksuite/affine-model'; -import type { GfxBlockElementModel, GfxModel } from '@blocksuite/block-std/gfx'; import { deserializeXYWH, getQuadBoundWithRotation, } from '@blocksuite/global/gfx'; +import type { GfxBlockElementModel, GfxModel } from '@blocksuite/std/gfx'; import type { BlockModel } from '@blocksuite/store'; export function getSelectedRect(selected: GfxModel[]): DOMRect { diff --git a/blocksuite/affine/shared/src/utils/model/get-content-block.ts b/blocksuite/affine/shared/src/utils/model/get-content-block.ts index b1a413dab0..d7251fdb66 100644 --- a/blocksuite/affine/shared/src/utils/model/get-content-block.ts +++ b/blocksuite/affine/shared/src/utils/model/get-content-block.ts @@ -1,5 +1,5 @@ import { FrameBlockModel } from '@blocksuite/affine-model'; -import type { EditorHost } from '@blocksuite/block-std'; +import type { EditorHost } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import { DocModeProvider } from '../../services/doc-mode-service.js'; diff --git a/blocksuite/affine/shared/src/utils/model/getter.ts b/blocksuite/affine/shared/src/utils/model/getter.ts index 93a298ce28..7fa388a813 100644 --- a/blocksuite/affine/shared/src/utils/model/getter.ts +++ b/blocksuite/affine/shared/src/utils/model/getter.ts @@ -1,5 +1,5 @@ import { NoteBlockModel, NoteDisplayMode } from '@blocksuite/affine-model'; -import type { BlockComponent, BlockStdScope } from '@blocksuite/block-std'; +import type { BlockComponent, BlockStdScope } from '@blocksuite/std'; import type { BlockModel, Store } from '@blocksuite/store'; import { matchModels } from './checker.js'; diff --git a/blocksuite/affine/shared/src/utils/model/list.ts b/blocksuite/affine/shared/src/utils/model/list.ts index d54084bcd1..88411b3bd7 100644 --- a/blocksuite/affine/shared/src/utils/model/list.ts +++ b/blocksuite/affine/shared/src/utils/model/list.ts @@ -1,5 +1,5 @@ import { ListBlockModel } from '@blocksuite/affine-model'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import type { BlockModel, Store } from '@blocksuite/store'; import { matchModels } from './checker.js'; diff --git a/blocksuite/affine/shared/src/utils/title.ts b/blocksuite/affine/shared/src/utils/title.ts index db678da88d..876cbf773e 100644 --- a/blocksuite/affine/shared/src/utils/title.ts +++ b/blocksuite/affine/shared/src/utils/title.ts @@ -1,5 +1,5 @@ -import type { EditorHost } from '@blocksuite/block-std'; -import type { InlineEditor } from '@blocksuite/block-std/inline'; +import type { EditorHost } from '@blocksuite/std'; +import type { InlineEditor } from '@blocksuite/std/inline'; function getDocTitleByEditorHost(editorHost: EditorHost): HTMLElement | null { const docViewport = editorHost.closest('.affine-page-viewport'); diff --git a/blocksuite/affine/shared/src/utils/virtual-padding.ts b/blocksuite/affine/shared/src/utils/virtual-padding.ts index 35720939fe..d03b1c3c20 100644 --- a/blocksuite/affine/shared/src/utils/virtual-padding.ts +++ b/blocksuite/affine/shared/src/utils/virtual-padding.ts @@ -1,4 +1,4 @@ -import type { BlockComponent } from '@blocksuite/block-std'; +import type { BlockComponent } from '@blocksuite/std'; import { autoUpdate } from '@floating-ui/dom'; import { signal } from '@preact/signals-core'; import type { ReactiveController } from 'lit'; diff --git a/blocksuite/affine/shared/tsconfig.json b/blocksuite/affine/shared/tsconfig.json index 745caa73de..91120b17ce 100644 --- a/blocksuite/affine/shared/tsconfig.json +++ b/blocksuite/affine/shared/tsconfig.json @@ -8,8 +8,8 @@ "include": ["./src"], "references": [ { "path": "../model" }, - { "path": "../../framework/block-std" }, { "path": "../../framework/global" }, + { "path": "../../framework/std" }, { "path": "../../framework/store" } ] } diff --git a/blocksuite/affine/widgets/widget-drag-handle/package.json b/blocksuite/affine/widgets/widget-drag-handle/package.json index b8f3f12dd8..0bb8adfd5e 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/package.json +++ b/blocksuite/affine/widgets/widget-drag-handle/package.json @@ -18,9 +18,9 @@ "@blocksuite/affine-components": "workspace:*", "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", diff --git a/blocksuite/affine/widgets/widget-drag-handle/src/drag-handle.ts b/blocksuite/affine/widgets/widget-drag-handle/src/drag-handle.ts index 26c1bf4f74..51900509da 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/src/drag-handle.ts +++ b/blocksuite/affine/widgets/widget-drag-handle/src/drag-handle.ts @@ -5,10 +5,10 @@ import { isInsideEdgelessEditor, isInsidePageEditor, } from '@blocksuite/affine-shared/utils'; -import { type BlockComponent, WidgetComponent } from '@blocksuite/block-std'; -import type { GfxModel } from '@blocksuite/block-std/gfx'; import { DisposableGroup } from '@blocksuite/global/disposable'; import type { IVec, Point, Rect } from '@blocksuite/global/gfx'; +import { type BlockComponent, WidgetComponent } from '@blocksuite/std'; +import type { GfxModel } from '@blocksuite/std/gfx'; import { computed, type ReadonlySignal, signal } from '@preact/signals-core'; import { html, nothing } from 'lit'; import { query, state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/widgets/widget-drag-handle/src/helpers/preview-helper.ts b/blocksuite/affine/widgets/widget-drag-handle/src/helpers/preview-helper.ts index 50ebc87efb..430f8ff858 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/src/helpers/preview-helper.ts +++ b/blocksuite/affine/widgets/widget-drag-handle/src/helpers/preview-helper.ts @@ -12,8 +12,8 @@ import { BlockStdScope, BlockViewIdentifier, LifeCycleWatcher, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import type { BlockModel, BlockViewType, diff --git a/blocksuite/affine/widgets/widget-drag-handle/src/helpers/rect-helper.ts b/blocksuite/affine/widgets/widget-drag-handle/src/helpers/rect-helper.ts index 5429c19629..03a5c021e7 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/src/helpers/rect-helper.ts +++ b/blocksuite/affine/widgets/widget-drag-handle/src/helpers/rect-helper.ts @@ -1,6 +1,6 @@ import { getCurrentNativeRange } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent } from '@blocksuite/block-std'; import { Rect } from '@blocksuite/global/gfx'; +import type { BlockComponent } from '@blocksuite/std'; import { DRAG_HANDLE_CONTAINER_WIDTH, diff --git a/blocksuite/affine/widgets/widget-drag-handle/src/helpers/selection-helper.ts b/blocksuite/affine/widgets/widget-drag-handle/src/helpers/selection-helper.ts index 8399df3fca..cd1eda0bc7 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/src/helpers/selection-helper.ts +++ b/blocksuite/affine/widgets/widget-drag-handle/src/helpers/selection-helper.ts @@ -4,7 +4,7 @@ import { BlockSelection, SurfaceSelection, TextSelection, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import type { AffineDragHandleWidget } from '../drag-handle.js'; diff --git a/blocksuite/affine/widgets/widget-drag-handle/src/index.ts b/blocksuite/affine/widgets/widget-drag-handle/src/index.ts index e6882a6849..261e6b5740 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/src/index.ts +++ b/blocksuite/affine/widgets/widget-drag-handle/src/index.ts @@ -1,4 +1,4 @@ -import { WidgetViewExtension } from '@blocksuite/block-std'; +import { WidgetViewExtension } from '@blocksuite/std'; import { literal, unsafeStatic } from 'lit/static-html.js'; import { AFFINE_DRAG_HANDLE_WIDGET } from './consts'; diff --git a/blocksuite/affine/widgets/widget-drag-handle/src/middleware/blocks-filter.ts b/blocksuite/affine/widgets/widget-drag-handle/src/middleware/blocks-filter.ts index 30128d0866..a5526df49a 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/src/middleware/blocks-filter.ts +++ b/blocksuite/affine/widgets/widget-drag-handle/src/middleware/blocks-filter.ts @@ -1,13 +1,13 @@ import type { SurfaceBlockModel } from '@blocksuite/affine-block-surface'; import type { ConnectorElementModel } from '@blocksuite/affine-model'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { IVec, SerializedXYWH } from '@blocksuite/global/gfx'; +import { assertType } from '@blocksuite/global/utils'; +import type { BlockStdScope } from '@blocksuite/std'; import { GfxController, type GfxModel, isGfxGroupCompatibleModel, -} from '@blocksuite/block-std/gfx'; -import type { IVec, SerializedXYWH } from '@blocksuite/global/gfx'; -import { assertType } from '@blocksuite/global/utils'; +} from '@blocksuite/std/gfx'; import type { TransformerMiddleware } from '@blocksuite/store'; /** diff --git a/blocksuite/affine/widgets/widget-drag-handle/src/middleware/new-id-cross-doc.ts b/blocksuite/affine/widgets/widget-drag-handle/src/middleware/new-id-cross-doc.ts index 755277d597..0bebf4b0d0 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/src/middleware/new-id-cross-doc.ts +++ b/blocksuite/affine/widgets/widget-drag-handle/src/middleware/new-id-cross-doc.ts @@ -1,6 +1,6 @@ import { DatabaseBlockModel } from '@blocksuite/affine-model'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import type { TransformerMiddleware } from '@blocksuite/store'; export const newIdCrossDoc = diff --git a/blocksuite/affine/widgets/widget-drag-handle/src/middleware/reorder-list.ts b/blocksuite/affine/widgets/widget-drag-handle/src/middleware/reorder-list.ts index 865fb279f6..7a8406bea3 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/src/middleware/reorder-list.ts +++ b/blocksuite/affine/widgets/widget-drag-handle/src/middleware/reorder-list.ts @@ -1,7 +1,7 @@ import { correctNumberedListsOrderToPrev } from '@blocksuite/affine-block-list'; import { ListBlockModel } from '@blocksuite/affine-model'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import type { TransformerMiddleware } from '@blocksuite/store'; export const reorderList = diff --git a/blocksuite/affine/widgets/widget-drag-handle/src/utils.ts b/blocksuite/affine/widgets/widget-drag-handle/src/utils.ts index dfe1ad62a0..350bc5ddd6 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/src/utils.ts +++ b/blocksuite/affine/widgets/widget-drag-handle/src/utils.ts @@ -18,13 +18,13 @@ import { getClosestBlockComponentByPoint, matchModels, } from '@blocksuite/affine-shared/utils'; -import type { BlockComponent, EditorHost } from '@blocksuite/block-std'; import { Bound, Point, Rect, type SerializedXYWH, } from '@blocksuite/global/gfx'; +import type { BlockComponent, EditorHost } from '@blocksuite/std'; import type { BaseSelection, BlockModel, diff --git a/blocksuite/affine/widgets/widget-drag-handle/src/watchers/drag-event-watcher.ts b/blocksuite/affine/widgets/widget-drag-handle/src/watchers/drag-event-watcher.ts index 8a0dea12c7..5e316bad4b 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/src/watchers/drag-event-watcher.ts +++ b/blocksuite/affine/widgets/widget-drag-handle/src/watchers/drag-event-watcher.ts @@ -30,13 +30,21 @@ import { getScrollContainer, matchModels, } from '@blocksuite/affine-shared/utils'; +import { + Bound, + type IVec, + Point, + Rect, + type SerializedXYWH, +} from '@blocksuite/global/gfx'; +import { assertType } from '@blocksuite/global/utils'; import { BlockComponent, type BlockStdScope, type DragFromBlockSuite, type DragPayload, type DropPayload, -} from '@blocksuite/block-std'; +} from '@blocksuite/std'; import { GfxBlockElementModel, GfxControllerIdentifier, @@ -46,15 +54,7 @@ import { isGfxGroupCompatibleModel, SURFACE_YMAP_UNIQ_IDENTIFIER, SurfaceBlockModel, -} from '@blocksuite/block-std/gfx'; -import { - Bound, - type IVec, - Point, - Rect, - type SerializedXYWH, -} from '@blocksuite/global/gfx'; -import { assertType } from '@blocksuite/global/utils'; +} from '@blocksuite/std/gfx'; import { type BlockModel, type BlockSnapshot, @@ -92,7 +92,7 @@ export type DragBlockEntity = { export type DragBlockPayload = DragPayload; -declare module '@blocksuite/block-std' { +declare module '@blocksuite/std' { interface DNDEntity { blocks: DragBlockPayload; } diff --git a/blocksuite/affine/widgets/widget-drag-handle/src/watchers/edgeless-watcher.ts b/blocksuite/affine/widgets/widget-drag-handle/src/watchers/edgeless-watcher.ts index 72ffca543a..377338b6f3 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/src/watchers/edgeless-watcher.ts +++ b/blocksuite/affine/widgets/widget-drag-handle/src/watchers/edgeless-watcher.ts @@ -3,11 +3,11 @@ import { type SurfaceBlockComponent, } from '@blocksuite/affine-block-surface'; import { getSelectedRect } from '@blocksuite/affine-shared/utils'; +import { type IVec, Rect } from '@blocksuite/global/gfx'; import { GfxControllerIdentifier, type GfxToolsFullOptionValue, -} from '@blocksuite/block-std/gfx'; -import { type IVec, Rect } from '@blocksuite/global/gfx'; +} from '@blocksuite/std/gfx'; import { effect } from '@preact/signals-core'; import { diff --git a/blocksuite/affine/widgets/widget-drag-handle/src/watchers/keyboard-event-watcher.ts b/blocksuite/affine/widgets/widget-drag-handle/src/watchers/keyboard-event-watcher.ts index 80ab9b1278..9bca885ff1 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/src/watchers/keyboard-event-watcher.ts +++ b/blocksuite/affine/widgets/widget-drag-handle/src/watchers/keyboard-event-watcher.ts @@ -1,4 +1,4 @@ -import type { UIEventHandler } from '@blocksuite/block-std'; +import type { UIEventHandler } from '@blocksuite/std'; import type { AffineDragHandleWidget } from '../drag-handle.js'; diff --git a/blocksuite/affine/widgets/widget-drag-handle/src/watchers/pointer-event-watcher.ts b/blocksuite/affine/widgets/widget-drag-handle/src/watchers/pointer-event-watcher.ts index 39284bc7db..44ed734a5c 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/src/watchers/pointer-event-watcher.ts +++ b/blocksuite/affine/widgets/widget-drag-handle/src/watchers/pointer-event-watcher.ts @@ -1,13 +1,13 @@ import type { NoteBlockComponent } from '@blocksuite/affine-block-note'; import { captureEventTarget } from '@blocksuite/affine-shared/utils'; +import { Point } from '@blocksuite/global/gfx'; import { BLOCK_ID_ATTR, type BlockComponent, type PointerEventState, type UIEventHandler, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; -import { Point } from '@blocksuite/global/gfx'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { computed } from '@preact/signals-core'; import throttle from 'lodash-es/throttle'; diff --git a/blocksuite/affine/widgets/widget-drag-handle/tsconfig.json b/blocksuite/affine/widgets/widget-drag-handle/tsconfig.json index f31059d0b8..e83cee1b32 100644 --- a/blocksuite/affine/widgets/widget-drag-handle/tsconfig.json +++ b/blocksuite/affine/widgets/widget-drag-handle/tsconfig.json @@ -15,8 +15,8 @@ { "path": "../../components" }, { "path": "../../model" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/widgets/widget-edgeless-auto-connect/package.json b/blocksuite/affine/widgets/widget-edgeless-auto-connect/package.json index d8a3566655..6925ef85bb 100644 --- a/blocksuite/affine/widgets/widget-edgeless-auto-connect/package.json +++ b/blocksuite/affine/widgets/widget-edgeless-auto-connect/package.json @@ -15,9 +15,9 @@ "@blocksuite/affine-components": "workspace:*", "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@preact/signals-core": "^1.8.0", "@toeverything/theme": "^1.1.12", "lit": "^3.2.0", diff --git a/blocksuite/affine/widgets/widget-edgeless-auto-connect/src/index.ts b/blocksuite/affine/widgets/widget-edgeless-auto-connect/src/index.ts index 3a93557f58..364630c15b 100644 --- a/blocksuite/affine/widgets/widget-edgeless-auto-connect/src/index.ts +++ b/blocksuite/affine/widgets/widget-edgeless-auto-connect/src/index.ts @@ -13,17 +13,17 @@ import { } from '@blocksuite/affine-model'; import { FeatureFlagService } from '@blocksuite/affine-shared/services'; import { matchModels, stopPropagation } from '@blocksuite/affine-shared/utils'; -import { WidgetComponent, WidgetViewExtension } from '@blocksuite/block-std'; -import { - type GfxController, - GfxControllerIdentifier, -} from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; import { ArrowLeftSmallIcon, ArrowRightSmallIcon, InvisibleIcon, } from '@blocksuite/icons/lit'; +import { WidgetComponent, WidgetViewExtension } from '@blocksuite/std'; +import { + type GfxController, + GfxControllerIdentifier, +} from '@blocksuite/std/gfx'; import { css, html, nothing, type TemplateResult } from 'lit'; import { state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; diff --git a/blocksuite/affine/widgets/widget-edgeless-auto-connect/tsconfig.json b/blocksuite/affine/widgets/widget-edgeless-auto-connect/tsconfig.json index 394cb1f173..517eee6a0c 100644 --- a/blocksuite/affine/widgets/widget-edgeless-auto-connect/tsconfig.json +++ b/blocksuite/affine/widgets/widget-edgeless-auto-connect/tsconfig.json @@ -12,7 +12,7 @@ { "path": "../../components" }, { "path": "../../model" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, - { "path": "../../../framework/global" } + { "path": "../../../framework/global" }, + { "path": "../../../framework/std" } ] } diff --git a/blocksuite/affine/widgets/widget-edgeless-toolbar/package.json b/blocksuite/affine/widgets/widget-edgeless-toolbar/package.json index 4b4aef0538..34d6ed31d8 100644 --- a/blocksuite/affine/widgets/widget-edgeless-toolbar/package.json +++ b/blocksuite/affine/widgets/widget-edgeless-toolbar/package.json @@ -15,9 +15,9 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@floating-ui/dom": "^1.6.13", "@lit/context": "^1.1.2", "@preact/signals-core": "^1.8.0", diff --git a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/text-common.ts b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/text-common.ts index 6bc1df7fb6..644ad662b8 100644 --- a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/text-common.ts +++ b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/text-common.ts @@ -25,12 +25,12 @@ import { getMostCommonResolvedValue, getMostCommonValue, } from '@blocksuite/affine-shared/utils'; -import type { GfxModel } from '@blocksuite/block-std/gfx'; import { TextAlignCenterIcon, TextAlignLeftIcon, TextAlignRightIcon, } from '@blocksuite/icons/lit'; +import type { GfxModel } from '@blocksuite/std/gfx'; import { signal } from '@preact/signals-core'; import { html } from 'lit'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/types.ts b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/types.ts index cfc968dea4..19dd1017ad 100644 --- a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/types.ts +++ b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/types.ts @@ -1,6 +1,6 @@ import type { MenuConfig } from '@blocksuite/affine-components/context-menu'; -import type { BlockComponent } from '@blocksuite/block-std'; -import type { GfxController } from '@blocksuite/block-std/gfx'; +import type { BlockComponent } from '@blocksuite/std'; +import type { GfxController } from '@blocksuite/std/gfx'; import type { TemplateResult } from 'lit'; export type MenuItem = { diff --git a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/utils.ts b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/utils.ts index e882214bd5..3d35d2ff16 100644 --- a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/utils.ts +++ b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/utils.ts @@ -1,6 +1,6 @@ import { EditorChevronDown } from '@blocksuite/affine-components/toolbar'; import type { ToolbarContext } from '@blocksuite/affine-shared/services'; -import type { BlockComponent } from '@blocksuite/block-std'; +import type { BlockComponent } from '@blocksuite/std'; import { html } from 'lit'; import { ifDefined } from 'lit/directives/if-defined.js'; import { repeat } from 'lit/directives/repeat.js'; diff --git a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/draggable/draggable-element.controller.ts b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/draggable/draggable-element.controller.ts index 369ddc94d2..c112c49a29 100644 --- a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/draggable/draggable-element.controller.ts +++ b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/draggable/draggable-element.controller.ts @@ -4,8 +4,8 @@ import { ThemeProvider, ViewportElementProvider, } from '@blocksuite/affine-shared/services'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { type ReactiveController, type ReactiveControllerHost, diff --git a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/draggable/types.ts b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/draggable/types.ts index 32577522ab..1a6a8359e1 100644 --- a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/draggable/types.ts +++ b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/draggable/types.ts @@ -1,6 +1,6 @@ -import type { BlockComponent } from '@blocksuite/block-std'; import type { Bound } from '@blocksuite/global/gfx'; import type { DisposableClass } from '@blocksuite/global/lit'; +import type { BlockComponent } from '@blocksuite/std'; import type { TemplateResult } from 'lit'; export interface EdgelessDraggableElementHost extends DisposableClass {} diff --git a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/edgeless-toolbar.ts b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/edgeless-toolbar.ts index 180451bd29..e9998e5d5e 100644 --- a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/edgeless-toolbar.ts +++ b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/edgeless-toolbar.ts @@ -15,13 +15,13 @@ import { ThemeProvider, } from '@blocksuite/affine-shared/services'; import { stopPropagation } from '@blocksuite/affine-shared/utils'; -import { WidgetComponent, WidgetViewExtension } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { ArrowLeftSmallIcon, ArrowRightSmallIcon, MoreHorizontalIcon, } from '@blocksuite/icons/lit'; +import { WidgetComponent, WidgetViewExtension } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { autoPlacement, offset } from '@floating-ui/dom'; import { ContextProvider } from '@lit/context'; import { computed } from '@preact/signals-core'; diff --git a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/extension/index.ts b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/extension/index.ts index 2aab0e7bdb..df8a34cd87 100644 --- a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/extension/index.ts +++ b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/extension/index.ts @@ -1,7 +1,7 @@ import type { MenuConfig } from '@blocksuite/affine-components/context-menu'; -import type { BlockComponent } from '@blocksuite/block-std'; -import type { GfxController, GfxToolsMap } from '@blocksuite/block-std/gfx'; import { createIdentifier } from '@blocksuite/global/di'; +import type { BlockComponent } from '@blocksuite/std'; +import type { GfxController, GfxToolsMap } from '@blocksuite/std/gfx'; import type { ExtensionType } from '@blocksuite/store'; import { type TemplateResult } from 'lit'; diff --git a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/mixins/tool.mixin.ts b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/mixins/tool.mixin.ts index 5219867088..e7b0e5441c 100644 --- a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/mixins/tool.mixin.ts +++ b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/mixins/tool.mixin.ts @@ -1,18 +1,18 @@ import type { ColorScheme } from '@blocksuite/affine-model'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { - type GfxController, - GfxControllerIdentifier, - type GfxToolsFullOption, - type GfxToolsFullOptionValue, - type ToolController, -} from '@blocksuite/block-std/gfx'; import { // oxlint-disable-next-line no-unused-vars type DisposableClass, WithDisposable, } from '@blocksuite/global/lit'; import type { Constructor } from '@blocksuite/global/utils'; +import type { BlockComponent } from '@blocksuite/std'; +import { + type GfxController, + GfxControllerIdentifier, + type GfxToolsFullOption, + type GfxToolsFullOptionValue, + type ToolController, +} from '@blocksuite/std/gfx'; import { consume } from '@lit/context'; import { effect } from '@preact/signals-core'; import { cssVar } from '@toeverything/theme'; diff --git a/blocksuite/affine/widgets/widget-edgeless-toolbar/tsconfig.json b/blocksuite/affine/widgets/widget-edgeless-toolbar/tsconfig.json index fb0366ff6c..38f2853bad 100644 --- a/blocksuite/affine/widgets/widget-edgeless-toolbar/tsconfig.json +++ b/blocksuite/affine/widgets/widget-edgeless-toolbar/tsconfig.json @@ -12,7 +12,7 @@ { "path": "../../model" }, { "path": "../../rich-text" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, - { "path": "../../../framework/global" } + { "path": "../../../framework/global" }, + { "path": "../../../framework/std" } ] } diff --git a/blocksuite/affine/widgets/widget-frame-title/package.json b/blocksuite/affine/widgets/widget-frame-title/package.json index 8178546214..d9c2a607b3 100644 --- a/blocksuite/affine/widgets/widget-frame-title/package.json +++ b/blocksuite/affine/widgets/widget-frame-title/package.json @@ -14,8 +14,8 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", + "@blocksuite/std": "workspace:*", "@lit/context": "^1.1.2", "@preact/signals-core": "^1.8.0", "@toeverything/theme": "^1.1.12", diff --git a/blocksuite/affine/widgets/widget-frame-title/src/affine-frame-title-widget.ts b/blocksuite/affine/widgets/widget-frame-title/src/affine-frame-title-widget.ts index 71915716d4..75608275ca 100644 --- a/blocksuite/affine/widgets/widget-frame-title/src/affine-frame-title-widget.ts +++ b/blocksuite/affine/widgets/widget-frame-title/src/affine-frame-title-widget.ts @@ -1,5 +1,5 @@ import { FrameBlockModel, type RootBlockModel } from '@blocksuite/affine-model'; -import { WidgetComponent, WidgetViewExtension } from '@blocksuite/block-std'; +import { WidgetComponent, WidgetViewExtension } from '@blocksuite/std'; import { html } from 'lit'; import { repeat } from 'lit/directives/repeat.js'; import { literal, unsafeStatic } from 'lit/static-html.js'; diff --git a/blocksuite/affine/widgets/widget-frame-title/src/edgeless-frame-title-editor.ts b/blocksuite/affine/widgets/widget-frame-title/src/edgeless-frame-title-editor.ts index b5ed654ef6..d0cf22b4a4 100644 --- a/blocksuite/affine/widgets/widget-frame-title/src/edgeless-frame-title-editor.ts +++ b/blocksuite/affine/widgets/widget-frame-title/src/edgeless-frame-title-editor.ts @@ -1,10 +1,10 @@ import { FrameBlockModel } from '@blocksuite/affine-model'; import type { RichText } from '@blocksuite/affine-rich-text'; -import { type BlockComponent, ShadowlessElement } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; -import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline'; import { Bound } from '@blocksuite/global/gfx'; import { WithDisposable } from '@blocksuite/global/lit'; +import { type BlockComponent, ShadowlessElement } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; +import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/std/inline'; import { cssVarV2 } from '@toeverything/theme/v2'; import { css, html, nothing } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/blocksuite/affine/widgets/widget-frame-title/src/frame-title.ts b/blocksuite/affine/widgets/widget-frame-title/src/frame-title.ts index da7a67cca3..dde14611d5 100644 --- a/blocksuite/affine/widgets/widget-frame-title/src/frame-title.ts +++ b/blocksuite/affine/widgets/widget-frame-title/src/frame-title.ts @@ -6,15 +6,15 @@ import { } from '@blocksuite/affine-model'; import { ThemeProvider } from '@blocksuite/affine-shared/services'; import { on } from '@blocksuite/affine-shared/utils'; +import { Bound, type SerializedXYWH } from '@blocksuite/global/gfx'; +import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; import { type BlockStdScope, PropTypes, requiredProperties, stdContext, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; -import { Bound, type SerializedXYWH } from '@blocksuite/global/gfx'; -import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { consume } from '@lit/context'; import { themeToVar } from '@toeverything/theme/v2'; import { LitElement } from 'lit'; diff --git a/blocksuite/affine/widgets/widget-frame-title/src/mount-frame-title-editor.ts b/blocksuite/affine/widgets/widget-frame-title/src/mount-frame-title-editor.ts index 558a9958da..324424b324 100644 --- a/blocksuite/affine/widgets/widget-frame-title/src/mount-frame-title-editor.ts +++ b/blocksuite/affine/widgets/widget-frame-title/src/mount-frame-title-editor.ts @@ -1,7 +1,7 @@ import type { FrameBlockModel } from '@blocksuite/affine-model'; -import type { BlockComponent } from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { BlockSuiteError } from '@blocksuite/global/exceptions'; +import type { BlockComponent } from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import { EdgelessFrameTitleEditor } from './edgeless-frame-title-editor'; diff --git a/blocksuite/affine/widgets/widget-frame-title/tsconfig.json b/blocksuite/affine/widgets/widget-frame-title/tsconfig.json index bd24c274a5..61f3ba15ea 100644 --- a/blocksuite/affine/widgets/widget-frame-title/tsconfig.json +++ b/blocksuite/affine/widgets/widget-frame-title/tsconfig.json @@ -11,7 +11,7 @@ { "path": "../../model" }, { "path": "../../rich-text" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, - { "path": "../../../framework/global" } + { "path": "../../../framework/global" }, + { "path": "../../../framework/std" } ] } diff --git a/blocksuite/affine/widgets/widget-remote-selection/package.json b/blocksuite/affine/widgets/widget-remote-selection/package.json index 7056b27dfd..8133dae098 100644 --- a/blocksuite/affine/widgets/widget-remote-selection/package.json +++ b/blocksuite/affine/widgets/widget-remote-selection/package.json @@ -14,9 +14,9 @@ "@blocksuite/affine-components": "workspace:*", "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@preact/signals-core": "^1.8.0", "@toeverything/theme": "^1.1.12", "@types/lodash-es": "^4.17.12", diff --git a/blocksuite/affine/widgets/widget-remote-selection/src/doc/doc-remote-selection.ts b/blocksuite/affine/widgets/widget-remote-selection/src/doc/doc-remote-selection.ts index 8d52bee02e..69a088f09e 100644 --- a/blocksuite/affine/widgets/widget-remote-selection/src/doc/doc-remote-selection.ts +++ b/blocksuite/affine/widgets/widget-remote-selection/src/doc/doc-remote-selection.ts @@ -13,8 +13,8 @@ import { BlockSelection, TextSelection, WidgetComponent, -} from '@blocksuite/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; +} from '@blocksuite/std'; +import { GfxControllerIdentifier } from '@blocksuite/std/gfx'; import type { BaseSelection, UserInfo } from '@blocksuite/store'; import { computed, effect } from '@preact/signals-core'; import { css, html, nothing, type PropertyValues } from 'lit'; diff --git a/blocksuite/affine/widgets/widget-remote-selection/src/edgeless/index.ts b/blocksuite/affine/widgets/widget-remote-selection/src/edgeless/index.ts index 90216a33e4..e5b1118a6c 100644 --- a/blocksuite/affine/widgets/widget-remote-selection/src/edgeless/index.ts +++ b/blocksuite/affine/widgets/widget-remote-selection/src/edgeless/index.ts @@ -5,12 +5,9 @@ import { isTopLevelBlock, requestThrottledConnectedFrame, } from '@blocksuite/affine-shared/utils'; -import { WidgetComponent } from '@blocksuite/block-std'; -import { - GfxControllerIdentifier, - type GfxModel, -} from '@blocksuite/block-std/gfx'; import { MultiCursorDuotoneIcon } from '@blocksuite/icons/lit'; +import { WidgetComponent } from '@blocksuite/std'; +import { GfxControllerIdentifier, type GfxModel } from '@blocksuite/std/gfx'; import type { UserInfo } from '@blocksuite/store'; import { css, html, nothing } from 'lit'; import { state } from 'lit/decorators.js'; diff --git a/blocksuite/affine/widgets/widget-remote-selection/src/index.ts b/blocksuite/affine/widgets/widget-remote-selection/src/index.ts index 92a9b7d6a9..5baf796140 100644 --- a/blocksuite/affine/widgets/widget-remote-selection/src/index.ts +++ b/blocksuite/affine/widgets/widget-remote-selection/src/index.ts @@ -1,4 +1,4 @@ -import { WidgetViewExtension } from '@blocksuite/block-std'; +import { WidgetViewExtension } from '@blocksuite/std'; import { literal, unsafeStatic } from 'lit/static-html.js'; import { AFFINE_DOC_REMOTE_SELECTION_WIDGET } from './doc'; diff --git a/blocksuite/affine/widgets/widget-remote-selection/src/manager/remote-color-manager.ts b/blocksuite/affine/widgets/widget-remote-selection/src/manager/remote-color-manager.ts index b90e5b7845..0697d4ff2c 100644 --- a/blocksuite/affine/widgets/widget-remote-selection/src/manager/remote-color-manager.ts +++ b/blocksuite/affine/widgets/widget-remote-selection/src/manager/remote-color-manager.ts @@ -1,5 +1,5 @@ import { EditPropsStore } from '@blocksuite/affine-shared/services'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import { multiPlayersColor } from './color-picker'; diff --git a/blocksuite/affine/widgets/widget-remote-selection/tsconfig.json b/blocksuite/affine/widgets/widget-remote-selection/tsconfig.json index 78faf035a2..1a8d83137c 100644 --- a/blocksuite/affine/widgets/widget-remote-selection/tsconfig.json +++ b/blocksuite/affine/widgets/widget-remote-selection/tsconfig.json @@ -11,7 +11,7 @@ { "path": "../../components" }, { "path": "../../model" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, - { "path": "../../../framework/global" } + { "path": "../../../framework/global" }, + { "path": "../../../framework/std" } ] } diff --git a/blocksuite/affine/widgets/widget-scroll-anchoring/package.json b/blocksuite/affine/widgets/widget-scroll-anchoring/package.json index b9f9a2bcb0..e0814971ea 100644 --- a/blocksuite/affine/widgets/widget-scroll-anchoring/package.json +++ b/blocksuite/affine/widgets/widget-scroll-anchoring/package.json @@ -12,8 +12,8 @@ "dependencies": { "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", + "@blocksuite/std": "workspace:*", "@preact/signals-core": "^1.8.0", "@toeverything/theme": "^1.1.12", "lit": "^3.2.0", diff --git a/blocksuite/affine/widgets/widget-scroll-anchoring/src/index.ts b/blocksuite/affine/widgets/widget-scroll-anchoring/src/index.ts index 90513a8c78..a88e887198 100644 --- a/blocksuite/affine/widgets/widget-scroll-anchoring/src/index.ts +++ b/blocksuite/affine/widgets/widget-scroll-anchoring/src/index.ts @@ -1,4 +1,4 @@ -import { WidgetViewExtension } from '@blocksuite/block-std'; +import { WidgetViewExtension } from '@blocksuite/std'; import { literal, unsafeStatic } from 'lit/static-html.js'; import { AFFINE_SCROLL_ANCHORING_WIDGET } from './scroll-anchoring.js'; diff --git a/blocksuite/affine/widgets/widget-scroll-anchoring/src/scroll-anchoring.ts b/blocksuite/affine/widgets/widget-scroll-anchoring/src/scroll-anchoring.ts index edecdee830..8368894ef7 100644 --- a/blocksuite/affine/widgets/widget-scroll-anchoring/src/scroll-anchoring.ts +++ b/blocksuite/affine/widgets/widget-scroll-anchoring/src/scroll-anchoring.ts @@ -1,11 +1,8 @@ import type { DocMode } from '@blocksuite/affine-model'; import { HighlightSelection } from '@blocksuite/affine-shared/selection'; -import { WidgetComponent } from '@blocksuite/block-std'; -import { - GfxControllerIdentifier, - type GfxModel, -} from '@blocksuite/block-std/gfx'; import { Bound, deserializeXYWH } from '@blocksuite/global/gfx'; +import { WidgetComponent } from '@blocksuite/std'; +import { GfxControllerIdentifier, type GfxModel } from '@blocksuite/std/gfx'; import { computed, signal } from '@preact/signals-core'; import { cssVarV2 } from '@toeverything/theme/v2'; import { css, html, nothing, unsafeCSS } from 'lit'; diff --git a/blocksuite/affine/widgets/widget-scroll-anchoring/tsconfig.json b/blocksuite/affine/widgets/widget-scroll-anchoring/tsconfig.json index 84c720c863..88bc41212d 100644 --- a/blocksuite/affine/widgets/widget-scroll-anchoring/tsconfig.json +++ b/blocksuite/affine/widgets/widget-scroll-anchoring/tsconfig.json @@ -9,7 +9,7 @@ "references": [ { "path": "../../model" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, - { "path": "../../../framework/global" } + { "path": "../../../framework/global" }, + { "path": "../../../framework/std" } ] } diff --git a/blocksuite/affine/widgets/widget-slash-menu/package.json b/blocksuite/affine/widgets/widget-slash-menu/package.json index 8fdf332a19..36cd56e078 100644 --- a/blocksuite/affine/widgets/widget-slash-menu/package.json +++ b/blocksuite/affine/widgets/widget-slash-menu/package.json @@ -13,9 +13,9 @@ "@blocksuite/affine-components": "workspace:*", "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@blocksuite/store": "workspace:*", "@floating-ui/dom": "^1.6.13", "@preact/signals-core": "^1.8.0", diff --git a/blocksuite/affine/widgets/widget-slash-menu/src/extensions.ts b/blocksuite/affine/widgets/widget-slash-menu/src/extensions.ts index f510d4876c..ed67110954 100644 --- a/blocksuite/affine/widgets/widget-slash-menu/src/extensions.ts +++ b/blocksuite/affine/widgets/widget-slash-menu/src/extensions.ts @@ -1,9 +1,9 @@ +import { type Container, createIdentifier } from '@blocksuite/global/di'; import { type BlockStdScope, StdIdentifier, WidgetViewExtension, -} from '@blocksuite/block-std'; -import { type Container, createIdentifier } from '@blocksuite/global/di'; +} from '@blocksuite/std'; import { Extension, type ExtensionType } from '@blocksuite/store'; import { literal, unsafeStatic } from 'lit/static-html.js'; diff --git a/blocksuite/affine/widgets/widget-slash-menu/src/types.ts b/blocksuite/affine/widgets/widget-slash-menu/src/types.ts index 60a3045cf7..6d696934b9 100644 --- a/blocksuite/affine/widgets/widget-slash-menu/src/types.ts +++ b/blocksuite/affine/widgets/widget-slash-menu/src/types.ts @@ -1,4 +1,4 @@ -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import type { BlockModel } from '@blocksuite/store'; import type { TemplateResult } from 'lit'; diff --git a/blocksuite/affine/widgets/widget-slash-menu/src/widget.ts b/blocksuite/affine/widgets/widget-slash-menu/src/widget.ts index 4015104b7e..7cd6bbf5d6 100644 --- a/blocksuite/affine/widgets/widget-slash-menu/src/widget.ts +++ b/blocksuite/affine/widgets/widget-slash-menu/src/widget.ts @@ -1,9 +1,9 @@ import { getInlineEditorByModel } from '@blocksuite/affine-rich-text'; import type { AffineInlineEditor } from '@blocksuite/affine-shared/types'; -import type { UIEventStateContext } from '@blocksuite/block-std'; -import { TextSelection, WidgetComponent } from '@blocksuite/block-std'; -import { InlineEditor } from '@blocksuite/block-std/inline'; import { DisposableGroup } from '@blocksuite/global/disposable'; +import type { UIEventStateContext } from '@blocksuite/std'; +import { TextSelection, WidgetComponent } from '@blocksuite/std'; +import { InlineEditor } from '@blocksuite/std/inline'; import debounce from 'lodash-es/debounce'; import { AFFINE_SLASH_MENU_TRIGGER_KEY } from './consts'; diff --git a/blocksuite/affine/widgets/widget-slash-menu/tsconfig.json b/blocksuite/affine/widgets/widget-slash-menu/tsconfig.json index 91c1dd04ad..0b35973cdd 100644 --- a/blocksuite/affine/widgets/widget-slash-menu/tsconfig.json +++ b/blocksuite/affine/widgets/widget-slash-menu/tsconfig.json @@ -10,8 +10,8 @@ { "path": "../../components" }, { "path": "../../rich-text" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, { "path": "../../../framework/global" }, + { "path": "../../../framework/std" }, { "path": "../../../framework/store" } ] } diff --git a/blocksuite/affine/widgets/widget-toolbar/package.json b/blocksuite/affine/widgets/widget-toolbar/package.json index 4d6e876466..35519e2714 100644 --- a/blocksuite/affine/widgets/widget-toolbar/package.json +++ b/blocksuite/affine/widgets/widget-toolbar/package.json @@ -16,9 +16,9 @@ "@blocksuite/affine-components": "workspace:*", "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/block-std": "workspace:*", "@blocksuite/global": "workspace:*", "@blocksuite/icons": "^2.2.8", + "@blocksuite/std": "workspace:*", "@floating-ui/dom": "^1.6.13", "@preact/signals-core": "^1.8.0", "@toeverything/theme": "^1.1.12", diff --git a/blocksuite/affine/widgets/widget-toolbar/src/index.ts b/blocksuite/affine/widgets/widget-toolbar/src/index.ts index dcddd4cf33..b09cbed239 100644 --- a/blocksuite/affine/widgets/widget-toolbar/src/index.ts +++ b/blocksuite/affine/widgets/widget-toolbar/src/index.ts @@ -1,4 +1,4 @@ -import { WidgetViewExtension } from '@blocksuite/block-std'; +import { WidgetViewExtension } from '@blocksuite/std'; import { literal, unsafeStatic } from 'lit/static-html.js'; import { AFFINE_TOOLBAR_WIDGET } from './toolbar'; diff --git a/blocksuite/affine/widgets/widget-toolbar/src/toolbar.ts b/blocksuite/affine/widgets/widget-toolbar/src/toolbar.ts index 9732834df8..b422966e01 100644 --- a/blocksuite/affine/widgets/widget-toolbar/src/toolbar.ts +++ b/blocksuite/affine/widgets/widget-toolbar/src/toolbar.ts @@ -19,24 +19,24 @@ import { } from '@blocksuite/affine-shared/services'; import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme'; import { matchModels } from '@blocksuite/affine-shared/utils'; -import { - type BlockComponent, - BlockSelection, - TextSelection, - WidgetComponent, -} from '@blocksuite/block-std'; -import { - GfxBlockElementModel, - type GfxController, - type GfxModel, - GfxPrimitiveElementModel, -} from '@blocksuite/block-std/gfx'; import { Bound, getCommonBound, getCommonBoundWithRotation, } from '@blocksuite/global/gfx'; import { nextTick } from '@blocksuite/global/utils'; +import { + type BlockComponent, + BlockSelection, + TextSelection, + WidgetComponent, +} from '@blocksuite/std'; +import { + GfxBlockElementModel, + type GfxController, + type GfxModel, + GfxPrimitiveElementModel, +} from '@blocksuite/std/gfx'; import type { ReferenceElement, SideObject } from '@floating-ui/dom'; import { batch, effect, signal } from '@preact/signals-core'; import { css, unsafeCSS } from 'lit'; diff --git a/blocksuite/affine/widgets/widget-toolbar/tsconfig.json b/blocksuite/affine/widgets/widget-toolbar/tsconfig.json index 1fafca22dc..6ebfc103fe 100644 --- a/blocksuite/affine/widgets/widget-toolbar/tsconfig.json +++ b/blocksuite/affine/widgets/widget-toolbar/tsconfig.json @@ -13,7 +13,7 @@ { "path": "../../components" }, { "path": "../../model" }, { "path": "../../shared" }, - { "path": "../../../framework/block-std" }, - { "path": "../../../framework/global" } + { "path": "../../../framework/global" }, + { "path": "../../../framework/std" } ] } diff --git a/blocksuite/docs/api/@blocksuite/block-std/README.md b/blocksuite/docs/api/@blocksuite/std/README.md similarity index 55% rename from blocksuite/docs/api/@blocksuite/block-std/README.md rename to blocksuite/docs/api/@blocksuite/std/README.md index 4c0f45b7b1..5e3515ce75 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/README.md +++ b/blocksuite/docs/api/@blocksuite/std/README.md @@ -2,9 +2,9 @@ *** -[BlockSuite API Documentation](../../README.md) / @blocksuite/block-std +[BlockSuite API Documentation](../../README.md) / @blocksuite/std -# @blocksuite/block-std +# @blocksuite/std ## Modules diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/README.md b/blocksuite/docs/api/@blocksuite/std/gfx/README.md similarity index 97% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/README.md rename to blocksuite/docs/api/@blocksuite/std/gfx/README.md index e67560e500..0361c3e3f5 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/README.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/README.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../README.md) / [@blocksuite/block-std](../README.md) / gfx +[BlockSuite API Documentation](../../../README.md) / [@blocksuite/std](../README.md) / gfx # gfx diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/classes/GfxBlockElementModel.md b/blocksuite/docs/api/@blocksuite/std/gfx/classes/GfxBlockElementModel.md similarity index 98% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/classes/GfxBlockElementModel.md rename to blocksuite/docs/api/@blocksuite/std/gfx/classes/GfxBlockElementModel.md index 5c9ea029ea..1649684454 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/classes/GfxBlockElementModel.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/classes/GfxBlockElementModel.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / GfxBlockElementModel +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / GfxBlockElementModel # Class: GfxBlockElementModel\ diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/classes/GfxSelectionManager.md b/blocksuite/docs/api/@blocksuite/std/gfx/classes/GfxSelectionManager.md similarity index 91% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/classes/GfxSelectionManager.md rename to blocksuite/docs/api/@blocksuite/std/gfx/classes/GfxSelectionManager.md index 71874a577b..751224ba46 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/classes/GfxSelectionManager.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/classes/GfxSelectionManager.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / GfxSelectionManager +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / GfxSelectionManager # Class: GfxSelectionManager diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/GfxCompatible.md b/blocksuite/docs/api/@blocksuite/std/gfx/functions/GfxCompatible.md similarity index 92% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/functions/GfxCompatible.md rename to blocksuite/docs/api/@blocksuite/std/gfx/functions/GfxCompatible.md index 2421e300aa..04c7479422 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/GfxCompatible.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/functions/GfxCompatible.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / GfxCompatible +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / GfxCompatible # Function: GfxCompatible() diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/canSafeAddToContainer.md b/blocksuite/docs/api/@blocksuite/std/gfx/functions/canSafeAddToContainer.md similarity index 85% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/functions/canSafeAddToContainer.md rename to blocksuite/docs/api/@blocksuite/std/gfx/functions/canSafeAddToContainer.md index 00f4b1965e..eb273cc6ed 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/canSafeAddToContainer.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/functions/canSafeAddToContainer.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / canSafeAddToContainer +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / canSafeAddToContainer # Function: canSafeAddToContainer() diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/compareLayer.md b/blocksuite/docs/api/@blocksuite/std/gfx/functions/compareLayer.md similarity index 86% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/functions/compareLayer.md rename to blocksuite/docs/api/@blocksuite/std/gfx/functions/compareLayer.md index c2ce16d3ba..defd3ba03c 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/compareLayer.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/functions/compareLayer.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / compareLayer +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / compareLayer # Function: compareLayer() diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/convert.md b/blocksuite/docs/api/@blocksuite/std/gfx/functions/convert.md similarity index 91% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/functions/convert.md rename to blocksuite/docs/api/@blocksuite/std/gfx/functions/convert.md index 8f9928031d..a48446f8e9 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/convert.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/functions/convert.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / convert +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / convert # Function: convert() diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/derive.md b/blocksuite/docs/api/@blocksuite/std/gfx/functions/derive.md similarity index 95% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/functions/derive.md rename to blocksuite/docs/api/@blocksuite/std/gfx/functions/derive.md index f10a0833d5..bc633e3446 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/derive.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/functions/derive.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / derive +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / derive # Function: derive() diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/generateKeyBetween.md b/blocksuite/docs/api/@blocksuite/std/gfx/functions/generateKeyBetween.md similarity index 82% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/functions/generateKeyBetween.md rename to blocksuite/docs/api/@blocksuite/std/gfx/functions/generateKeyBetween.md index 77de0ed4ed..17d9411908 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/generateKeyBetween.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/functions/generateKeyBetween.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / generateKeyBetween +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / generateKeyBetween # Function: generateKeyBetween() diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/generateKeyBetweenV2.md b/blocksuite/docs/api/@blocksuite/std/gfx/functions/generateKeyBetweenV2.md similarity index 87% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/functions/generateKeyBetweenV2.md rename to blocksuite/docs/api/@blocksuite/std/gfx/functions/generateKeyBetweenV2.md index a13c58b9e3..7e5fd1799e 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/generateKeyBetweenV2.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/functions/generateKeyBetweenV2.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / generateKeyBetweenV2 +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / generateKeyBetweenV2 # Function: generateKeyBetweenV2() diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/generateNKeysBetween.md b/blocksuite/docs/api/@blocksuite/std/gfx/functions/generateNKeysBetween.md similarity index 89% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/functions/generateNKeysBetween.md rename to blocksuite/docs/api/@blocksuite/std/gfx/functions/generateNKeysBetween.md index f504a662c3..5117f66aca 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/generateNKeysBetween.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/functions/generateNKeysBetween.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / generateNKeysBetween +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / generateNKeysBetween # Function: generateNKeysBetween() diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/getTopElements.md b/blocksuite/docs/api/@blocksuite/std/gfx/functions/getTopElements.md similarity index 90% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/functions/getTopElements.md rename to blocksuite/docs/api/@blocksuite/std/gfx/functions/getTopElements.md index 21bc085b32..657850f339 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/getTopElements.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/functions/getTopElements.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / getTopElements +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / getTopElements # Function: getTopElements() diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/isGfxGroupCompatibleModel.md b/blocksuite/docs/api/@blocksuite/std/gfx/functions/isGfxGroupCompatibleModel.md similarity index 80% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/functions/isGfxGroupCompatibleModel.md rename to blocksuite/docs/api/@blocksuite/std/gfx/functions/isGfxGroupCompatibleModel.md index 252f65b2d9..34ae757730 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/isGfxGroupCompatibleModel.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/functions/isGfxGroupCompatibleModel.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / isGfxGroupCompatibleModel +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / isGfxGroupCompatibleModel # Function: isGfxGroupCompatibleModel() diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/local.md b/blocksuite/docs/api/@blocksuite/std/gfx/functions/local.md similarity index 92% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/functions/local.md rename to blocksuite/docs/api/@blocksuite/std/gfx/functions/local.md index bfa1711fe6..8d48721a85 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/local.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/functions/local.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / local +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / local # Function: local() diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/observe.md b/blocksuite/docs/api/@blocksuite/std/gfx/functions/observe.md similarity index 93% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/functions/observe.md rename to blocksuite/docs/api/@blocksuite/std/gfx/functions/observe.md index 1f55927d8e..bb88958052 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/observe.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/functions/observe.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / observe +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / observe # Function: observe() diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/watch.md b/blocksuite/docs/api/@blocksuite/std/gfx/functions/watch.md similarity index 92% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/functions/watch.md rename to blocksuite/docs/api/@blocksuite/std/gfx/functions/watch.md index a31184bb1b..95303d0ff3 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/functions/watch.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/functions/watch.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / watch +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / watch # Function: watch() diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/interfaces/GfxCompatibleInterface.md b/blocksuite/docs/api/@blocksuite/std/gfx/interfaces/GfxCompatibleInterface.md similarity index 95% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/interfaces/GfxCompatibleInterface.md rename to blocksuite/docs/api/@blocksuite/std/gfx/interfaces/GfxCompatibleInterface.md index 2d0fa9727f..1c17285ca0 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/interfaces/GfxCompatibleInterface.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/interfaces/GfxCompatibleInterface.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / GfxCompatibleInterface +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / GfxCompatibleInterface # Interface: GfxCompatibleInterface diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/interfaces/GfxElementGeometry.md b/blocksuite/docs/api/@blocksuite/std/gfx/interfaces/GfxElementGeometry.md similarity index 82% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/interfaces/GfxElementGeometry.md rename to blocksuite/docs/api/@blocksuite/std/gfx/interfaces/GfxElementGeometry.md index 7c4b642ce4..9a1013345b 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/interfaces/GfxElementGeometry.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/interfaces/GfxElementGeometry.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / GfxElementGeometry +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / GfxElementGeometry # Interface: GfxElementGeometry diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/interfaces/GfxGroupCompatibleInterface.md b/blocksuite/docs/api/@blocksuite/std/gfx/interfaces/GfxGroupCompatibleInterface.md similarity index 97% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/interfaces/GfxGroupCompatibleInterface.md rename to blocksuite/docs/api/@blocksuite/std/gfx/interfaces/GfxGroupCompatibleInterface.md index e6dc8a38c6..6d4e2059f5 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/interfaces/GfxGroupCompatibleInterface.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/interfaces/GfxGroupCompatibleInterface.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / GfxGroupCompatibleInterface +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / GfxGroupCompatibleInterface # Interface: GfxGroupCompatibleInterface diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/interfaces/PointTestOptions.md b/blocksuite/docs/api/@blocksuite/std/gfx/interfaces/PointTestOptions.md similarity index 93% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/interfaces/PointTestOptions.md rename to blocksuite/docs/api/@blocksuite/std/gfx/interfaces/PointTestOptions.md index ed5b44d73a..d211bcaef7 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/interfaces/PointTestOptions.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/interfaces/PointTestOptions.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / PointTestOptions +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / PointTestOptions # Interface: PointTestOptions diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/type-aliases/GfxCommonBlockProps.md b/blocksuite/docs/api/@blocksuite/std/gfx/type-aliases/GfxCommonBlockProps.md similarity index 86% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/type-aliases/GfxCommonBlockProps.md rename to blocksuite/docs/api/@blocksuite/std/gfx/type-aliases/GfxCommonBlockProps.md index 49d1fc23a4..f081b9d7d1 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/type-aliases/GfxCommonBlockProps.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/type-aliases/GfxCommonBlockProps.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / GfxCommonBlockProps +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / GfxCommonBlockProps # Type Alias: GfxCommonBlockProps diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/type-aliases/GfxCompatibleProps.md b/blocksuite/docs/api/@blocksuite/std/gfx/type-aliases/GfxCompatibleProps.md similarity index 76% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/type-aliases/GfxCompatibleProps.md rename to blocksuite/docs/api/@blocksuite/std/gfx/type-aliases/GfxCompatibleProps.md index 5ba5e12e11..a88283a4d9 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/type-aliases/GfxCompatibleProps.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/type-aliases/GfxCompatibleProps.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / GfxCompatibleProps +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / GfxCompatibleProps # Type Alias: GfxCompatibleProps diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/variables/SURFACE_TEXT_UNIQ_IDENTIFIER.md b/blocksuite/docs/api/@blocksuite/std/gfx/variables/SURFACE_TEXT_UNIQ_IDENTIFIER.md similarity index 76% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/variables/SURFACE_TEXT_UNIQ_IDENTIFIER.md rename to blocksuite/docs/api/@blocksuite/std/gfx/variables/SURFACE_TEXT_UNIQ_IDENTIFIER.md index afb6b916cf..959bf33a62 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/variables/SURFACE_TEXT_UNIQ_IDENTIFIER.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/variables/SURFACE_TEXT_UNIQ_IDENTIFIER.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / SURFACE\_TEXT\_UNIQ\_IDENTIFIER +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / SURFACE\_TEXT\_UNIQ\_IDENTIFIER # Variable: SURFACE\_TEXT\_UNIQ\_IDENTIFIER diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/variables/SURFACE_YMAP_UNIQ_IDENTIFIER.md b/blocksuite/docs/api/@blocksuite/std/gfx/variables/SURFACE_YMAP_UNIQ_IDENTIFIER.md similarity index 78% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/variables/SURFACE_YMAP_UNIQ_IDENTIFIER.md rename to blocksuite/docs/api/@blocksuite/std/gfx/variables/SURFACE_YMAP_UNIQ_IDENTIFIER.md index d2e509643c..658c48f53b 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/variables/SURFACE_YMAP_UNIQ_IDENTIFIER.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/variables/SURFACE_YMAP_UNIQ_IDENTIFIER.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / SURFACE\_YMAP\_UNIQ\_IDENTIFIER +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / SURFACE\_YMAP\_UNIQ\_IDENTIFIER # Variable: SURFACE\_YMAP\_UNIQ\_IDENTIFIER diff --git a/blocksuite/docs/api/@blocksuite/block-std/gfx/variables/gfxGroupCompatibleSymbol.md b/blocksuite/docs/api/@blocksuite/std/gfx/variables/gfxGroupCompatibleSymbol.md similarity index 77% rename from blocksuite/docs/api/@blocksuite/block-std/gfx/variables/gfxGroupCompatibleSymbol.md rename to blocksuite/docs/api/@blocksuite/std/gfx/variables/gfxGroupCompatibleSymbol.md index 88f556b830..d1e823e39a 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/gfx/variables/gfxGroupCompatibleSymbol.md +++ b/blocksuite/docs/api/@blocksuite/std/gfx/variables/gfxGroupCompatibleSymbol.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [gfx](../README.md) / gfxGroupCompatibleSymbol +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [gfx](../README.md) / gfxGroupCompatibleSymbol # Variable: gfxGroupCompatibleSymbol diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/README.md b/blocksuite/docs/api/@blocksuite/std/index/README.md similarity index 94% rename from blocksuite/docs/api/@blocksuite/block-std/index/README.md rename to blocksuite/docs/api/@blocksuite/std/index/README.md index 2df3b2f408..cfb6f88b97 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/index/README.md +++ b/blocksuite/docs/api/@blocksuite/std/index/README.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../README.md) / [@blocksuite/block-std](../README.md) / index +[BlockSuite API Documentation](../../../README.md) / [@blocksuite/std](../README.md) / index # index diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/classes/BlockService.md b/blocksuite/docs/api/@blocksuite/std/index/classes/BlockService.md similarity index 88% rename from blocksuite/docs/api/@blocksuite/block-std/index/classes/BlockService.md rename to blocksuite/docs/api/@blocksuite/std/index/classes/BlockService.md index 52abaa0ee4..629c5cdaaf 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/index/classes/BlockService.md +++ b/blocksuite/docs/api/@blocksuite/std/index/classes/BlockService.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [index](../README.md) / BlockService +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [index](../README.md) / BlockService # Class: ~~`abstract` BlockService~~ diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/classes/CommandManager.md b/blocksuite/docs/api/@blocksuite/std/index/classes/CommandManager.md similarity index 98% rename from blocksuite/docs/api/@blocksuite/block-std/index/classes/CommandManager.md rename to blocksuite/docs/api/@blocksuite/std/index/classes/CommandManager.md index e397f0ebb6..73ad844b05 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/index/classes/CommandManager.md +++ b/blocksuite/docs/api/@blocksuite/std/index/classes/CommandManager.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [index](../README.md) / CommandManager +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [index](../README.md) / CommandManager # Class: CommandManager diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/classes/LifeCycleWatcher.md b/blocksuite/docs/api/@blocksuite/std/index/classes/LifeCycleWatcher.md similarity index 95% rename from blocksuite/docs/api/@blocksuite/block-std/index/classes/LifeCycleWatcher.md rename to blocksuite/docs/api/@blocksuite/std/index/classes/LifeCycleWatcher.md index c22adf4e75..b6914c13ac 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/index/classes/LifeCycleWatcher.md +++ b/blocksuite/docs/api/@blocksuite/std/index/classes/LifeCycleWatcher.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [index](../README.md) / LifeCycleWatcher +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [index](../README.md) / LifeCycleWatcher # Class: `abstract` LifeCycleWatcher diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/functions/BlockViewExtension.md b/blocksuite/docs/api/@blocksuite/std/index/functions/BlockViewExtension.md similarity index 82% rename from blocksuite/docs/api/@blocksuite/block-std/index/functions/BlockViewExtension.md rename to blocksuite/docs/api/@blocksuite/std/index/functions/BlockViewExtension.md index c0f2241062..a7ec7f856c 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/index/functions/BlockViewExtension.md +++ b/blocksuite/docs/api/@blocksuite/std/index/functions/BlockViewExtension.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [index](../README.md) / BlockViewExtension +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [index](../README.md) / BlockViewExtension # Function: BlockViewExtension() @@ -33,7 +33,7 @@ The view is a lit template that is used to render the block. ## Example ```ts -import { BlockViewExtension } from '@blocksuite/block-std'; +import { BlockViewExtension } from '@blocksuite/std'; const MyListBlockViewExtension = BlockViewExtension( 'affine:list', diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/functions/ConfigExtensionFactory.md b/blocksuite/docs/api/@blocksuite/std/index/functions/ConfigExtensionFactory.md similarity index 86% rename from blocksuite/docs/api/@blocksuite/block-std/index/functions/ConfigExtensionFactory.md rename to blocksuite/docs/api/@blocksuite/std/index/functions/ConfigExtensionFactory.md index 7ec2240124..b7452e8f4e 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/index/functions/ConfigExtensionFactory.md +++ b/blocksuite/docs/api/@blocksuite/std/index/functions/ConfigExtensionFactory.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [index](../README.md) / ConfigExtensionFactory +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [index](../README.md) / ConfigExtensionFactory # Function: ConfigExtensionFactory() @@ -36,7 +36,7 @@ The id of the config. Should be unique for each config. ## Example ```ts -import { ConfigExtensionFactory } from '@blocksuite/block-std'; +import { ConfigExtensionFactory } from '@blocksuite/std'; const MyConfigExtensionFactory = ConfigExtensionFactory('my-flavour'); const MyConfigExtension = MyConfigExtensionFactory({ option1: 'value1', diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/functions/FlavourExtension.md b/blocksuite/docs/api/@blocksuite/std/index/functions/FlavourExtension.md similarity index 76% rename from blocksuite/docs/api/@blocksuite/block-std/index/functions/FlavourExtension.md rename to blocksuite/docs/api/@blocksuite/std/index/functions/FlavourExtension.md index 9fdae35928..d26e64487a 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/index/functions/FlavourExtension.md +++ b/blocksuite/docs/api/@blocksuite/std/index/functions/FlavourExtension.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [index](../README.md) / FlavourExtension +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [index](../README.md) / FlavourExtension # Function: FlavourExtension() @@ -25,7 +25,7 @@ The flavour of the block that the extension is for. ## Example ```ts -import { FlavourExtension } from '@blocksuite/block-std'; +import { FlavourExtension } from '@blocksuite/std'; const MyFlavourExtension = FlavourExtension('my-flavour'); ``` diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/functions/KeymapExtension.md b/blocksuite/docs/api/@blocksuite/std/index/functions/KeymapExtension.md similarity index 85% rename from blocksuite/docs/api/@blocksuite/block-std/index/functions/KeymapExtension.md rename to blocksuite/docs/api/@blocksuite/std/index/functions/KeymapExtension.md index cad38f64d9..b78af328c4 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/index/functions/KeymapExtension.md +++ b/blocksuite/docs/api/@blocksuite/std/index/functions/KeymapExtension.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [index](../README.md) / KeymapExtension +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [index](../README.md) / KeymapExtension # Function: KeymapExtension() @@ -34,7 +34,7 @@ It should return an object with `keymap` and `options`. ## Example ```ts -import { KeymapExtension } from '@blocksuite/block-std'; +import { KeymapExtension } from '@blocksuite/std'; const MyKeymapExtension = KeymapExtension(std => { return { diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/functions/WidgetViewExtension.md b/blocksuite/docs/api/@blocksuite/std/index/functions/WidgetViewExtension.md similarity index 84% rename from blocksuite/docs/api/@blocksuite/block-std/index/functions/WidgetViewExtension.md rename to blocksuite/docs/api/@blocksuite/std/index/functions/WidgetViewExtension.md index 4a1bdc27eb..0b8a7e4c6c 100644 --- a/blocksuite/docs/api/@blocksuite/block-std/index/functions/WidgetViewExtension.md +++ b/blocksuite/docs/api/@blocksuite/std/index/functions/WidgetViewExtension.md @@ -2,7 +2,7 @@ *** -[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [index](../README.md) / WidgetViewExtension +[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/std](../../README.md) / [index](../README.md) / WidgetViewExtension # Function: WidgetViewExtension() @@ -40,6 +40,6 @@ For every target block, it's view will be rendered with the widget view. ## Example ```ts -import { WidgetViewExtension } from '@blocksuite/block-std'; +import { WidgetViewExtension } from '@blocksuite/std'; const MyWidgetViewExtension = WidgetViewExtension('my-flavour', 'my-widget', literal`my-widget-view`); diff --git a/blocksuite/docs/api/@blocksuite/store/classes/Extension.md b/blocksuite/docs/api/@blocksuite/store/classes/Extension.md index 7e8402b5c3..e296b5d317 100644 --- a/blocksuite/docs/api/@blocksuite/store/classes/Extension.md +++ b/blocksuite/docs/api/@blocksuite/store/classes/Extension.md @@ -129,5 +129,5 @@ and many other extensible components. The pattern remains the same regardless of ## Extended by - [`StoreExtension`](StoreExtension.md) -- [`BlockService`](../../block-std/index/classes/BlockService.md) -- [`LifeCycleWatcher`](../../block-std/index/classes/LifeCycleWatcher.md) +- [`BlockService`](../../std/index/classes/BlockService.md) +- [`LifeCycleWatcher`](../../std/index/classes/LifeCycleWatcher.md) diff --git a/blocksuite/docs/api/README.md b/blocksuite/docs/api/README.md index 6a61e0a1fa..f8279db2eb 100644 --- a/blocksuite/docs/api/README.md +++ b/blocksuite/docs/api/README.md @@ -7,4 +7,4 @@ ## Packages - [@blocksuite/store](@blocksuite/store/README.md) -- [@blocksuite/block-std](@blocksuite/block-std/README.md) +- [@blocksuite/std](@blocksuite/std/README.md) diff --git a/blocksuite/docs/typedoc.json b/blocksuite/docs/typedoc.json index 9432de0e08..14b21cef22 100644 --- a/blocksuite/docs/typedoc.json +++ b/blocksuite/docs/typedoc.json @@ -1,5 +1,5 @@ { - "entryPoints": ["../framework/store", "../framework/block-std"], + "entryPoints": ["../framework/store", "../framework/std"], "packageOptions": { "readme": "none", "categorizeByGroup": false, diff --git a/blocksuite/framework/block-std/src/scope/index.ts b/blocksuite/framework/block-std/src/scope/index.ts deleted file mode 100644 index f077ade791..0000000000 --- a/blocksuite/framework/block-std/src/scope/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './block-std-scope.js'; diff --git a/blocksuite/framework/block-std/package.json b/blocksuite/framework/std/package.json similarity index 97% rename from blocksuite/framework/block-std/package.json rename to blocksuite/framework/std/package.json index 89498d193a..d34365b8d8 100644 --- a/blocksuite/framework/block-std/package.json +++ b/blocksuite/framework/std/package.json @@ -1,5 +1,5 @@ { - "name": "@blocksuite/block-std", + "name": "@blocksuite/std", "description": "Std for blocksuite blocks", "type": "module", "scripts": { diff --git a/blocksuite/framework/block-std/src/__tests__/__screenshots__/command.unit.spec.ts/CommandManager-can-execute-a-single-command-with--exec--1.png b/blocksuite/framework/std/src/__tests__/__screenshots__/command.unit.spec.ts/CommandManager-can-execute-a-single-command-with--exec--1.png similarity index 100% rename from blocksuite/framework/block-std/src/__tests__/__screenshots__/command.unit.spec.ts/CommandManager-can-execute-a-single-command-with--exec--1.png rename to blocksuite/framework/std/src/__tests__/__screenshots__/command.unit.spec.ts/CommandManager-can-execute-a-single-command-with--exec--1.png diff --git a/blocksuite/framework/block-std/src/__tests__/__screenshots__/editor-host.unit.spec.ts/editor-host-editor-host-should-rerender-model-when-view-changes-1.png b/blocksuite/framework/std/src/__tests__/__screenshots__/editor-host.unit.spec.ts/editor-host-editor-host-should-rerender-model-when-view-changes-1.png similarity index 100% rename from blocksuite/framework/block-std/src/__tests__/__screenshots__/editor-host.unit.spec.ts/editor-host-editor-host-should-rerender-model-when-view-changes-1.png rename to blocksuite/framework/std/src/__tests__/__screenshots__/editor-host.unit.spec.ts/editor-host-editor-host-should-rerender-model-when-view-changes-1.png diff --git a/blocksuite/framework/block-std/src/__tests__/command.unit.spec.ts b/blocksuite/framework/std/src/__tests__/command.unit.spec.ts similarity index 99% rename from blocksuite/framework/block-std/src/__tests__/command.unit.spec.ts rename to blocksuite/framework/std/src/__tests__/command.unit.spec.ts index 992979445a..ab4747e908 100644 --- a/blocksuite/framework/block-std/src/__tests__/command.unit.spec.ts +++ b/blocksuite/framework/std/src/__tests__/command.unit.spec.ts @@ -2,7 +2,7 @@ import { beforeEach, describe, expect, test, vi } from 'vitest'; import type { Command } from '../command/index.js'; import { CommandManager } from '../command/index.js'; -import type { BlockStdScope } from '../scope/block-std-scope.js'; +import type { BlockStdScope } from '../scope/std-scope.js'; type Command1 = Command< { diff --git a/blocksuite/framework/block-std/src/__tests__/editor-host.unit.spec.ts b/blocksuite/framework/std/src/__tests__/editor-host.unit.spec.ts similarity index 100% rename from blocksuite/framework/block-std/src/__tests__/editor-host.unit.spec.ts rename to blocksuite/framework/std/src/__tests__/editor-host.unit.spec.ts diff --git a/blocksuite/framework/block-std/src/__tests__/hast.unit.spec.ts b/blocksuite/framework/std/src/__tests__/hast.unit.spec.ts similarity index 100% rename from blocksuite/framework/block-std/src/__tests__/hast.unit.spec.ts rename to blocksuite/framework/std/src/__tests__/hast.unit.spec.ts diff --git a/blocksuite/framework/block-std/src/__tests__/inline/convert.unit.spec.ts b/blocksuite/framework/std/src/__tests__/inline/convert.unit.spec.ts similarity index 100% rename from blocksuite/framework/block-std/src/__tests__/inline/convert.unit.spec.ts rename to blocksuite/framework/std/src/__tests__/inline/convert.unit.spec.ts diff --git a/blocksuite/framework/block-std/src/__tests__/inline/editor.unit.spec.ts b/blocksuite/framework/std/src/__tests__/inline/editor.unit.spec.ts similarity index 100% rename from blocksuite/framework/block-std/src/__tests__/inline/editor.unit.spec.ts rename to blocksuite/framework/std/src/__tests__/inline/editor.unit.spec.ts diff --git a/blocksuite/framework/block-std/src/__tests__/inline/inline-range.unit.spec.ts b/blocksuite/framework/std/src/__tests__/inline/inline-range.unit.spec.ts similarity index 100% rename from blocksuite/framework/block-std/src/__tests__/inline/inline-range.unit.spec.ts rename to blocksuite/framework/std/src/__tests__/inline/inline-range.unit.spec.ts diff --git a/blocksuite/framework/block-std/src/__tests__/inline/utils.ts b/blocksuite/framework/std/src/__tests__/inline/utils.ts similarity index 100% rename from blocksuite/framework/block-std/src/__tests__/inline/utils.ts rename to blocksuite/framework/std/src/__tests__/inline/utils.ts diff --git a/blocksuite/framework/block-std/src/__tests__/test-block.ts b/blocksuite/framework/std/src/__tests__/test-block.ts similarity index 100% rename from blocksuite/framework/block-std/src/__tests__/test-block.ts rename to blocksuite/framework/std/src/__tests__/test-block.ts diff --git a/blocksuite/framework/block-std/src/__tests__/test-editor.ts b/blocksuite/framework/std/src/__tests__/test-editor.ts similarity index 100% rename from blocksuite/framework/block-std/src/__tests__/test-editor.ts rename to blocksuite/framework/std/src/__tests__/test-editor.ts diff --git a/blocksuite/framework/block-std/src/__tests__/test-schema.ts b/blocksuite/framework/std/src/__tests__/test-schema.ts similarity index 100% rename from blocksuite/framework/block-std/src/__tests__/test-schema.ts rename to blocksuite/framework/std/src/__tests__/test-schema.ts diff --git a/blocksuite/framework/block-std/src/__tests__/test-spec.ts b/blocksuite/framework/std/src/__tests__/test-spec.ts similarity index 100% rename from blocksuite/framework/block-std/src/__tests__/test-spec.ts rename to blocksuite/framework/std/src/__tests__/test-spec.ts diff --git a/blocksuite/framework/block-std/src/clipboard/clipboard-adapter.ts b/blocksuite/framework/std/src/clipboard/clipboard-adapter.ts similarity index 100% rename from blocksuite/framework/block-std/src/clipboard/clipboard-adapter.ts rename to blocksuite/framework/std/src/clipboard/clipboard-adapter.ts diff --git a/blocksuite/framework/block-std/src/clipboard/clipboard.ts b/blocksuite/framework/std/src/clipboard/clipboard.ts similarity index 100% rename from blocksuite/framework/block-std/src/clipboard/clipboard.ts rename to blocksuite/framework/std/src/clipboard/clipboard.ts diff --git a/blocksuite/framework/block-std/src/clipboard/index.ts b/blocksuite/framework/std/src/clipboard/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/clipboard/index.ts rename to blocksuite/framework/std/src/clipboard/index.ts diff --git a/blocksuite/framework/block-std/src/clipboard/utils.ts b/blocksuite/framework/std/src/clipboard/utils.ts similarity index 100% rename from blocksuite/framework/block-std/src/clipboard/utils.ts rename to blocksuite/framework/std/src/clipboard/utils.ts diff --git a/blocksuite/framework/block-std/src/command/consts.ts b/blocksuite/framework/std/src/command/consts.ts similarity index 100% rename from blocksuite/framework/block-std/src/command/consts.ts rename to blocksuite/framework/std/src/command/consts.ts diff --git a/blocksuite/framework/block-std/src/command/index.ts b/blocksuite/framework/std/src/command/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/command/index.ts rename to blocksuite/framework/std/src/command/index.ts diff --git a/blocksuite/framework/block-std/src/command/manager.ts b/blocksuite/framework/std/src/command/manager.ts similarity index 100% rename from blocksuite/framework/block-std/src/command/manager.ts rename to blocksuite/framework/std/src/command/manager.ts diff --git a/blocksuite/framework/block-std/src/command/types.ts b/blocksuite/framework/std/src/command/types.ts similarity index 95% rename from blocksuite/framework/block-std/src/command/types.ts rename to blocksuite/framework/std/src/command/types.ts index 11967e05eb..6409ca8b08 100644 --- a/blocksuite/framework/block-std/src/command/types.ts +++ b/blocksuite/framework/std/src/command/types.ts @@ -4,7 +4,7 @@ // type TestA = MakeOptionalIfEmpty; // void | {} // type TestB = MakeOptionalIfEmpty; // void | { prop?: string } // type TestC = MakeOptionalIfEmpty; // { prop: string } -import type { BlockStdScope } from '../scope/block-std-scope.js'; +import type { BlockStdScope } from '../scope/std-scope.js'; import type { cmdSymbol } from './consts.js'; export interface InitCommandCtx { diff --git a/blocksuite/framework/block-std/src/effects.ts b/blocksuite/framework/std/src/effects.ts similarity index 100% rename from blocksuite/framework/block-std/src/effects.ts rename to blocksuite/framework/std/src/effects.ts diff --git a/blocksuite/framework/block-std/src/event/base.ts b/blocksuite/framework/std/src/event/base.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/base.ts rename to blocksuite/framework/std/src/event/base.ts diff --git a/blocksuite/framework/block-std/src/event/control/clipboard.ts b/blocksuite/framework/std/src/event/control/clipboard.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/control/clipboard.ts rename to blocksuite/framework/std/src/event/control/clipboard.ts diff --git a/blocksuite/framework/block-std/src/event/control/keyboard.ts b/blocksuite/framework/std/src/event/control/keyboard.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/control/keyboard.ts rename to blocksuite/framework/std/src/event/control/keyboard.ts diff --git a/blocksuite/framework/block-std/src/event/control/pointer.ts b/blocksuite/framework/std/src/event/control/pointer.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/control/pointer.ts rename to blocksuite/framework/std/src/event/control/pointer.ts diff --git a/blocksuite/framework/block-std/src/event/control/range.ts b/blocksuite/framework/std/src/event/control/range.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/control/range.ts rename to blocksuite/framework/std/src/event/control/range.ts diff --git a/blocksuite/framework/block-std/src/event/dispatcher.ts b/blocksuite/framework/std/src/event/dispatcher.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/dispatcher.ts rename to blocksuite/framework/std/src/event/dispatcher.ts diff --git a/blocksuite/framework/block-std/src/event/index.ts b/blocksuite/framework/std/src/event/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/index.ts rename to blocksuite/framework/std/src/event/index.ts diff --git a/blocksuite/framework/block-std/src/event/keymap.ts b/blocksuite/framework/std/src/event/keymap.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/keymap.ts rename to blocksuite/framework/std/src/event/keymap.ts diff --git a/blocksuite/framework/block-std/src/event/state/clipboard.ts b/blocksuite/framework/std/src/event/state/clipboard.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/state/clipboard.ts rename to blocksuite/framework/std/src/event/state/clipboard.ts diff --git a/blocksuite/framework/block-std/src/event/state/dnd.ts b/blocksuite/framework/std/src/event/state/dnd.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/state/dnd.ts rename to blocksuite/framework/std/src/event/state/dnd.ts diff --git a/blocksuite/framework/block-std/src/event/state/index.ts b/blocksuite/framework/std/src/event/state/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/state/index.ts rename to blocksuite/framework/std/src/event/state/index.ts diff --git a/blocksuite/framework/block-std/src/event/state/keyboard.ts b/blocksuite/framework/std/src/event/state/keyboard.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/state/keyboard.ts rename to blocksuite/framework/std/src/event/state/keyboard.ts diff --git a/blocksuite/framework/block-std/src/event/state/pointer.ts b/blocksuite/framework/std/src/event/state/pointer.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/state/pointer.ts rename to blocksuite/framework/std/src/event/state/pointer.ts diff --git a/blocksuite/framework/block-std/src/event/state/source.ts b/blocksuite/framework/std/src/event/state/source.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/state/source.ts rename to blocksuite/framework/std/src/event/state/source.ts diff --git a/blocksuite/framework/block-std/src/event/utils.ts b/blocksuite/framework/std/src/event/utils.ts similarity index 100% rename from blocksuite/framework/block-std/src/event/utils.ts rename to blocksuite/framework/std/src/event/utils.ts diff --git a/blocksuite/framework/block-std/src/extension/block-view.ts b/blocksuite/framework/std/src/extension/block-view.ts similarity index 92% rename from blocksuite/framework/block-std/src/extension/block-view.ts rename to blocksuite/framework/std/src/extension/block-view.ts index d714667824..a33940b652 100644 --- a/blocksuite/framework/block-std/src/extension/block-view.ts +++ b/blocksuite/framework/std/src/extension/block-view.ts @@ -13,7 +13,7 @@ import type { BlockViewType } from '../spec/type.js'; * * @example * ```ts - * import { BlockViewExtension } from '@blocksuite/block-std'; + * import { BlockViewExtension } from '@blocksuite/std'; * * const MyListBlockViewExtension = BlockViewExtension( * 'affine:list', diff --git a/blocksuite/framework/block-std/src/extension/config.ts b/blocksuite/framework/std/src/extension/config.ts similarity index 95% rename from blocksuite/framework/block-std/src/extension/config.ts rename to blocksuite/framework/std/src/extension/config.ts index e59bb0e8eb..39740b566b 100644 --- a/blocksuite/framework/block-std/src/extension/config.ts +++ b/blocksuite/framework/std/src/extension/config.ts @@ -20,7 +20,7 @@ export interface ConfigFactory> { * * @example * ```ts - * import { ConfigExtensionFactory } from '@blocksuite/block-std'; + * import { ConfigExtensionFactory } from '@blocksuite/std'; * const MyConfigExtensionFactory = ConfigExtensionFactory('my-flavour'); * const MyConfigExtension = MyConfigExtensionFactory({ * option1: 'value1', diff --git a/blocksuite/framework/block-std/src/extension/dnd/index.ts b/blocksuite/framework/std/src/extension/dnd/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/extension/dnd/index.ts rename to blocksuite/framework/std/src/extension/dnd/index.ts diff --git a/blocksuite/framework/block-std/src/extension/dnd/types.ts b/blocksuite/framework/std/src/extension/dnd/types.ts similarity index 100% rename from blocksuite/framework/block-std/src/extension/dnd/types.ts rename to blocksuite/framework/std/src/extension/dnd/types.ts diff --git a/blocksuite/framework/block-std/src/extension/editor-life-cycle.ts b/blocksuite/framework/std/src/extension/editor-life-cycle.ts similarity index 94% rename from blocksuite/framework/block-std/src/extension/editor-life-cycle.ts rename to blocksuite/framework/std/src/extension/editor-life-cycle.ts index 5ef68fccb5..87a3e8b631 100644 --- a/blocksuite/framework/block-std/src/extension/editor-life-cycle.ts +++ b/blocksuite/framework/std/src/extension/editor-life-cycle.ts @@ -1,7 +1,7 @@ import { DisposableGroup } from '@blocksuite/global/disposable'; import { Subject } from 'rxjs'; -import type { BlockStdScope } from '../scope/block-std-scope'; +import type { BlockStdScope } from '../scope/std-scope'; import { LifeCycleWatcher } from './lifecycle-watcher'; export class EditorLifeCycleExtension extends LifeCycleWatcher { diff --git a/blocksuite/framework/block-std/src/extension/flavour.ts b/blocksuite/framework/std/src/extension/flavour.ts similarity index 89% rename from blocksuite/framework/block-std/src/extension/flavour.ts rename to blocksuite/framework/std/src/extension/flavour.ts index 6fd4a1d506..cc4ba40b89 100644 --- a/blocksuite/framework/block-std/src/extension/flavour.ts +++ b/blocksuite/framework/std/src/extension/flavour.ts @@ -10,7 +10,7 @@ import { BlockFlavourIdentifier } from '../identifier.js'; * * @example * ```ts - * import { FlavourExtension } from '@blocksuite/block-std'; + * import { FlavourExtension } from '@blocksuite/std'; * * const MyFlavourExtension = FlavourExtension('my-flavour'); * ``` diff --git a/blocksuite/framework/block-std/src/extension/index.ts b/blocksuite/framework/std/src/extension/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/extension/index.ts rename to blocksuite/framework/std/src/extension/index.ts diff --git a/blocksuite/framework/block-std/src/extension/keymap.ts b/blocksuite/framework/std/src/extension/keymap.ts similarity index 94% rename from blocksuite/framework/block-std/src/extension/keymap.ts rename to blocksuite/framework/std/src/extension/keymap.ts index 801b8a1698..df4976a8b3 100644 --- a/blocksuite/framework/block-std/src/extension/keymap.ts +++ b/blocksuite/framework/std/src/extension/keymap.ts @@ -20,7 +20,7 @@ let id = 1; * * @example * ```ts - * import { KeymapExtension } from '@blocksuite/block-std'; + * import { KeymapExtension } from '@blocksuite/std'; * * const MyKeymapExtension = KeymapExtension(std => { * return { diff --git a/blocksuite/framework/block-std/src/extension/lifecycle-watcher.ts b/blocksuite/framework/std/src/extension/lifecycle-watcher.ts similarity index 100% rename from blocksuite/framework/block-std/src/extension/lifecycle-watcher.ts rename to blocksuite/framework/std/src/extension/lifecycle-watcher.ts diff --git a/blocksuite/framework/block-std/src/extension/service-manager.ts b/blocksuite/framework/std/src/extension/service-manager.ts similarity index 100% rename from blocksuite/framework/block-std/src/extension/service-manager.ts rename to blocksuite/framework/std/src/extension/service-manager.ts diff --git a/blocksuite/framework/block-std/src/extension/service.ts b/blocksuite/framework/std/src/extension/service.ts similarity index 100% rename from blocksuite/framework/block-std/src/extension/service.ts rename to blocksuite/framework/std/src/extension/service.ts diff --git a/blocksuite/framework/block-std/src/extension/widget-view-map.ts b/blocksuite/framework/std/src/extension/widget-view-map.ts similarity index 94% rename from blocksuite/framework/block-std/src/extension/widget-view-map.ts rename to blocksuite/framework/std/src/extension/widget-view-map.ts index b71f16e430..d9f1d9b81b 100644 --- a/blocksuite/framework/block-std/src/extension/widget-view-map.ts +++ b/blocksuite/framework/std/src/extension/widget-view-map.ts @@ -15,7 +15,7 @@ import type { WidgetViewType } from '../spec/type.js'; * * @example * ```ts - * import { WidgetViewExtension } from '@blocksuite/block-std'; + * import { WidgetViewExtension } from '@blocksuite/std'; * * const MyWidgetViewExtension = WidgetViewExtension('my-flavour', 'my-widget', literal`my-widget-view`); */ diff --git a/blocksuite/framework/block-std/src/gfx/controller.ts b/blocksuite/framework/std/src/gfx/controller.ts similarity index 99% rename from blocksuite/framework/block-std/src/gfx/controller.ts rename to blocksuite/framework/std/src/gfx/controller.ts index a2209b1810..a5f3f34194 100644 --- a/blocksuite/framework/block-std/src/gfx/controller.ts +++ b/blocksuite/framework/std/src/gfx/controller.ts @@ -11,7 +11,7 @@ import { Signal } from '@preact/signals-core'; import last from 'lodash-es/last'; import { LifeCycleWatcher } from '../extension/lifecycle-watcher.js'; -import type { BlockStdScope } from '../scope/block-std-scope.js'; +import type { BlockStdScope } from '../scope/std-scope.js'; import { onSurfaceAdded } from '../utils/gfx.js'; import type { BlockComponent } from '../view/index.js'; import type { CursorType } from './cursor.js'; diff --git a/blocksuite/framework/block-std/src/gfx/cursor.ts b/blocksuite/framework/std/src/gfx/cursor.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/cursor.ts rename to blocksuite/framework/std/src/gfx/cursor.ts diff --git a/blocksuite/framework/block-std/src/gfx/element-transform/drag.ts b/blocksuite/framework/std/src/gfx/element-transform/drag.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/element-transform/drag.ts rename to blocksuite/framework/std/src/gfx/element-transform/drag.ts diff --git a/blocksuite/framework/block-std/src/gfx/element-transform/extension/canvas-event-handler.ts b/blocksuite/framework/std/src/gfx/element-transform/extension/canvas-event-handler.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/element-transform/extension/canvas-event-handler.ts rename to blocksuite/framework/std/src/gfx/element-transform/extension/canvas-event-handler.ts diff --git a/blocksuite/framework/block-std/src/gfx/element-transform/transform-manager.ts b/blocksuite/framework/std/src/gfx/element-transform/transform-manager.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/element-transform/transform-manager.ts rename to blocksuite/framework/std/src/gfx/element-transform/transform-manager.ts diff --git a/blocksuite/framework/block-std/src/gfx/element-transform/view-transform.ts b/blocksuite/framework/std/src/gfx/element-transform/view-transform.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/element-transform/view-transform.ts rename to blocksuite/framework/std/src/gfx/element-transform/view-transform.ts diff --git a/blocksuite/framework/block-std/src/gfx/extension.ts b/blocksuite/framework/std/src/gfx/extension.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/extension.ts rename to blocksuite/framework/std/src/gfx/extension.ts diff --git a/blocksuite/framework/block-std/src/gfx/grid.ts b/blocksuite/framework/std/src/gfx/grid.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/grid.ts rename to blocksuite/framework/std/src/gfx/grid.ts diff --git a/blocksuite/framework/block-std/src/gfx/identifiers.ts b/blocksuite/framework/std/src/gfx/identifiers.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/identifiers.ts rename to blocksuite/framework/std/src/gfx/identifiers.ts diff --git a/blocksuite/framework/block-std/src/gfx/index.ts b/blocksuite/framework/std/src/gfx/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/index.ts rename to blocksuite/framework/std/src/gfx/index.ts diff --git a/blocksuite/framework/block-std/src/gfx/keyboard.ts b/blocksuite/framework/std/src/gfx/keyboard.ts similarity index 94% rename from blocksuite/framework/block-std/src/gfx/keyboard.ts rename to blocksuite/framework/std/src/gfx/keyboard.ts index 98459b489d..e62eac2ea8 100644 --- a/blocksuite/framework/block-std/src/gfx/keyboard.ts +++ b/blocksuite/framework/std/src/gfx/keyboard.ts @@ -1,7 +1,7 @@ import { DisposableGroup } from '@blocksuite/global/disposable'; import { Signal } from '@preact/signals-core'; -import type { BlockStdScope } from '../scope/block-std-scope.js'; +import type { BlockStdScope } from '../scope/std-scope.js'; export class KeyboardController { private readonly _disposable = new DisposableGroup(); diff --git a/blocksuite/framework/block-std/src/gfx/layer.ts b/blocksuite/framework/std/src/gfx/layer.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/layer.ts rename to blocksuite/framework/std/src/gfx/layer.ts diff --git a/blocksuite/framework/block-std/src/gfx/model/base.ts b/blocksuite/framework/std/src/gfx/model/base.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/model/base.ts rename to blocksuite/framework/std/src/gfx/model/base.ts diff --git a/blocksuite/framework/block-std/src/gfx/model/gfx-block-model.ts b/blocksuite/framework/std/src/gfx/model/gfx-block-model.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/model/gfx-block-model.ts rename to blocksuite/framework/std/src/gfx/model/gfx-block-model.ts diff --git a/blocksuite/framework/block-std/src/gfx/model/model.ts b/blocksuite/framework/std/src/gfx/model/model.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/model/model.ts rename to blocksuite/framework/std/src/gfx/model/model.ts diff --git a/blocksuite/framework/block-std/src/gfx/model/surface/decorators/common.ts b/blocksuite/framework/std/src/gfx/model/surface/decorators/common.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/model/surface/decorators/common.ts rename to blocksuite/framework/std/src/gfx/model/surface/decorators/common.ts diff --git a/blocksuite/framework/block-std/src/gfx/model/surface/decorators/convert.ts b/blocksuite/framework/std/src/gfx/model/surface/decorators/convert.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/model/surface/decorators/convert.ts rename to blocksuite/framework/std/src/gfx/model/surface/decorators/convert.ts diff --git a/blocksuite/framework/block-std/src/gfx/model/surface/decorators/derive.ts b/blocksuite/framework/std/src/gfx/model/surface/decorators/derive.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/model/surface/decorators/derive.ts rename to blocksuite/framework/std/src/gfx/model/surface/decorators/derive.ts diff --git a/blocksuite/framework/block-std/src/gfx/model/surface/decorators/field.ts b/blocksuite/framework/std/src/gfx/model/surface/decorators/field.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/model/surface/decorators/field.ts rename to blocksuite/framework/std/src/gfx/model/surface/decorators/field.ts diff --git a/blocksuite/framework/block-std/src/gfx/model/surface/decorators/index.ts b/blocksuite/framework/std/src/gfx/model/surface/decorators/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/model/surface/decorators/index.ts rename to blocksuite/framework/std/src/gfx/model/surface/decorators/index.ts diff --git a/blocksuite/framework/block-std/src/gfx/model/surface/decorators/local.ts b/blocksuite/framework/std/src/gfx/model/surface/decorators/local.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/model/surface/decorators/local.ts rename to blocksuite/framework/std/src/gfx/model/surface/decorators/local.ts diff --git a/blocksuite/framework/block-std/src/gfx/model/surface/decorators/observer.ts b/blocksuite/framework/std/src/gfx/model/surface/decorators/observer.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/model/surface/decorators/observer.ts rename to blocksuite/framework/std/src/gfx/model/surface/decorators/observer.ts diff --git a/blocksuite/framework/block-std/src/gfx/model/surface/decorators/watch.ts b/blocksuite/framework/std/src/gfx/model/surface/decorators/watch.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/model/surface/decorators/watch.ts rename to blocksuite/framework/std/src/gfx/model/surface/decorators/watch.ts diff --git a/blocksuite/framework/block-std/src/gfx/model/surface/element-model.ts b/blocksuite/framework/std/src/gfx/model/surface/element-model.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/model/surface/element-model.ts rename to blocksuite/framework/std/src/gfx/model/surface/element-model.ts diff --git a/blocksuite/framework/block-std/src/gfx/model/surface/local-element-model.ts b/blocksuite/framework/std/src/gfx/model/surface/local-element-model.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/model/surface/local-element-model.ts rename to blocksuite/framework/std/src/gfx/model/surface/local-element-model.ts diff --git a/blocksuite/framework/block-std/src/gfx/model/surface/surface-model.ts b/blocksuite/framework/std/src/gfx/model/surface/surface-model.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/model/surface/surface-model.ts rename to blocksuite/framework/std/src/gfx/model/surface/surface-model.ts diff --git a/blocksuite/framework/block-std/src/gfx/selection.ts b/blocksuite/framework/std/src/gfx/selection.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/selection.ts rename to blocksuite/framework/std/src/gfx/selection.ts diff --git a/blocksuite/framework/block-std/src/gfx/surface-middleware.ts b/blocksuite/framework/std/src/gfx/surface-middleware.ts similarity index 96% rename from blocksuite/framework/block-std/src/gfx/surface-middleware.ts rename to blocksuite/framework/std/src/gfx/surface-middleware.ts index ed5ecd705f..9904b054eb 100644 --- a/blocksuite/framework/block-std/src/gfx/surface-middleware.ts +++ b/blocksuite/framework/std/src/gfx/surface-middleware.ts @@ -4,7 +4,7 @@ import { Extension } from '@blocksuite/store'; import { LifeCycleWatcher } from '../extension/lifecycle-watcher.js'; import { StdIdentifier } from '../identifier.js'; -import type { BlockStdScope } from '../scope/block-std-scope.js'; +import type { BlockStdScope } from '../scope/std-scope.js'; import { onSurfaceAdded } from '../utils/gfx.js'; import { GfxControllerIdentifier } from './identifiers.js'; import type { SurfaceMiddleware } from './model/surface/surface-model.js'; diff --git a/blocksuite/framework/block-std/src/gfx/tool/tool-controller.ts b/blocksuite/framework/std/src/gfx/tool/tool-controller.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/tool/tool-controller.ts rename to blocksuite/framework/std/src/gfx/tool/tool-controller.ts diff --git a/blocksuite/framework/block-std/src/gfx/tool/tool.ts b/blocksuite/framework/std/src/gfx/tool/tool.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/tool/tool.ts rename to blocksuite/framework/std/src/gfx/tool/tool.ts diff --git a/blocksuite/framework/block-std/src/gfx/view/view-manager.ts b/blocksuite/framework/std/src/gfx/view/view-manager.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/view/view-manager.ts rename to blocksuite/framework/std/src/gfx/view/view-manager.ts diff --git a/blocksuite/framework/block-std/src/gfx/view/view.ts b/blocksuite/framework/std/src/gfx/view/view.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/view/view.ts rename to blocksuite/framework/std/src/gfx/view/view.ts diff --git a/blocksuite/framework/block-std/src/gfx/viewport-element.ts b/blocksuite/framework/std/src/gfx/viewport-element.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/viewport-element.ts rename to blocksuite/framework/std/src/gfx/viewport-element.ts diff --git a/blocksuite/framework/block-std/src/gfx/viewport.ts b/blocksuite/framework/std/src/gfx/viewport.ts similarity index 100% rename from blocksuite/framework/block-std/src/gfx/viewport.ts rename to blocksuite/framework/std/src/gfx/viewport.ts diff --git a/blocksuite/framework/block-std/src/identifier.ts b/blocksuite/framework/std/src/identifier.ts similarity index 100% rename from blocksuite/framework/block-std/src/identifier.ts rename to blocksuite/framework/std/src/identifier.ts diff --git a/blocksuite/framework/block-std/src/index.ts b/blocksuite/framework/std/src/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/index.ts rename to blocksuite/framework/std/src/index.ts diff --git a/blocksuite/framework/block-std/src/inline/components/embed-gap.ts b/blocksuite/framework/std/src/inline/components/embed-gap.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/components/embed-gap.ts rename to blocksuite/framework/std/src/inline/components/embed-gap.ts diff --git a/blocksuite/framework/block-std/src/inline/components/index.ts b/blocksuite/framework/std/src/inline/components/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/components/index.ts rename to blocksuite/framework/std/src/inline/components/index.ts diff --git a/blocksuite/framework/block-std/src/inline/components/v-element.ts b/blocksuite/framework/std/src/inline/components/v-element.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/components/v-element.ts rename to blocksuite/framework/std/src/inline/components/v-element.ts diff --git a/blocksuite/framework/block-std/src/inline/components/v-line.ts b/blocksuite/framework/std/src/inline/components/v-line.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/components/v-line.ts rename to blocksuite/framework/std/src/inline/components/v-line.ts diff --git a/blocksuite/framework/block-std/src/inline/components/v-text.ts b/blocksuite/framework/std/src/inline/components/v-text.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/components/v-text.ts rename to blocksuite/framework/std/src/inline/components/v-text.ts diff --git a/blocksuite/framework/block-std/src/inline/consts.ts b/blocksuite/framework/std/src/inline/consts.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/consts.ts rename to blocksuite/framework/std/src/inline/consts.ts diff --git a/blocksuite/framework/block-std/src/inline/extensions/index.ts b/blocksuite/framework/std/src/inline/extensions/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/extensions/index.ts rename to blocksuite/framework/std/src/inline/extensions/index.ts diff --git a/blocksuite/framework/block-std/src/inline/extensions/inline-manager.ts b/blocksuite/framework/std/src/inline/extensions/inline-manager.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/extensions/inline-manager.ts rename to blocksuite/framework/std/src/inline/extensions/inline-manager.ts diff --git a/blocksuite/framework/block-std/src/inline/extensions/inline-spec.ts b/blocksuite/framework/std/src/inline/extensions/inline-spec.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/extensions/inline-spec.ts rename to blocksuite/framework/std/src/inline/extensions/inline-spec.ts diff --git a/blocksuite/framework/block-std/src/inline/extensions/markdown-matcher.ts b/blocksuite/framework/std/src/inline/extensions/markdown-matcher.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/extensions/markdown-matcher.ts rename to blocksuite/framework/std/src/inline/extensions/markdown-matcher.ts diff --git a/blocksuite/framework/block-std/src/inline/extensions/type.ts b/blocksuite/framework/std/src/inline/extensions/type.ts similarity index 96% rename from blocksuite/framework/block-std/src/inline/extensions/type.ts rename to blocksuite/framework/std/src/inline/extensions/type.ts index ee2d364eea..b7def05745 100644 --- a/blocksuite/framework/block-std/src/inline/extensions/type.ts +++ b/blocksuite/framework/std/src/inline/extensions/type.ts @@ -2,7 +2,7 @@ import type { AttributeRenderer, InlineEditor, InlineRange, -} from '@blocksuite/block-std/inline'; +} from '@blocksuite/std/inline'; import type { BaseTextAttributes, DeltaInsert } from '@blocksuite/store'; import type * as Y from 'yjs'; import type { ZodTypeAny } from 'zod'; diff --git a/blocksuite/framework/block-std/src/inline/index.ts b/blocksuite/framework/std/src/inline/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/index.ts rename to blocksuite/framework/std/src/inline/index.ts diff --git a/blocksuite/framework/block-std/src/inline/inline-editor.ts b/blocksuite/framework/std/src/inline/inline-editor.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/inline-editor.ts rename to blocksuite/framework/std/src/inline/inline-editor.ts diff --git a/blocksuite/framework/block-std/src/inline/range/active.ts b/blocksuite/framework/std/src/inline/range/active.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/range/active.ts rename to blocksuite/framework/std/src/inline/range/active.ts diff --git a/blocksuite/framework/block-std/src/inline/range/consts.ts b/blocksuite/framework/std/src/inline/range/consts.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/range/consts.ts rename to blocksuite/framework/std/src/inline/range/consts.ts diff --git a/blocksuite/framework/block-std/src/inline/range/index.ts b/blocksuite/framework/std/src/inline/range/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/range/index.ts rename to blocksuite/framework/std/src/inline/range/index.ts diff --git a/blocksuite/framework/block-std/src/inline/range/inline-range-provider.ts b/blocksuite/framework/std/src/inline/range/inline-range-provider.ts similarity index 96% rename from blocksuite/framework/block-std/src/inline/range/inline-range-provider.ts rename to blocksuite/framework/std/src/inline/range/inline-range-provider.ts index cbb2b899fd..69d6816a84 100644 --- a/blocksuite/framework/block-std/src/inline/range/inline-range-provider.ts +++ b/blocksuite/framework/std/src/inline/range/inline-range-provider.ts @@ -1,7 +1,4 @@ -import type { - InlineRange, - InlineRangeProvider, -} from '@blocksuite/block-std/inline'; +import type { InlineRange, InlineRangeProvider } from '@blocksuite/std/inline'; import { signal } from '@preact/signals-core'; import { TextSelection } from '../../selection/index.js'; diff --git a/blocksuite/framework/block-std/src/inline/range/range-binding.ts b/blocksuite/framework/std/src/inline/range/range-binding.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/range/range-binding.ts rename to blocksuite/framework/std/src/inline/range/range-binding.ts diff --git a/blocksuite/framework/block-std/src/inline/range/range-manager.ts b/blocksuite/framework/std/src/inline/range/range-manager.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/range/range-manager.ts rename to blocksuite/framework/std/src/inline/range/range-manager.ts diff --git a/blocksuite/framework/block-std/src/inline/services/attribute.ts b/blocksuite/framework/std/src/inline/services/attribute.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/services/attribute.ts rename to blocksuite/framework/std/src/inline/services/attribute.ts diff --git a/blocksuite/framework/block-std/src/inline/services/delta.ts b/blocksuite/framework/std/src/inline/services/delta.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/services/delta.ts rename to blocksuite/framework/std/src/inline/services/delta.ts diff --git a/blocksuite/framework/block-std/src/inline/services/event.ts b/blocksuite/framework/std/src/inline/services/event.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/services/event.ts rename to blocksuite/framework/std/src/inline/services/event.ts diff --git a/blocksuite/framework/block-std/src/inline/services/hook.ts b/blocksuite/framework/std/src/inline/services/hook.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/services/hook.ts rename to blocksuite/framework/std/src/inline/services/hook.ts diff --git a/blocksuite/framework/block-std/src/inline/services/index.ts b/blocksuite/framework/std/src/inline/services/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/services/index.ts rename to blocksuite/framework/std/src/inline/services/index.ts diff --git a/blocksuite/framework/block-std/src/inline/services/range.ts b/blocksuite/framework/std/src/inline/services/range.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/services/range.ts rename to blocksuite/framework/std/src/inline/services/range.ts diff --git a/blocksuite/framework/block-std/src/inline/services/render.ts b/blocksuite/framework/std/src/inline/services/render.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/services/render.ts rename to blocksuite/framework/std/src/inline/services/render.ts diff --git a/blocksuite/framework/block-std/src/inline/services/text.ts b/blocksuite/framework/std/src/inline/services/text.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/services/text.ts rename to blocksuite/framework/std/src/inline/services/text.ts diff --git a/blocksuite/framework/block-std/src/inline/types.ts b/blocksuite/framework/std/src/inline/types.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/types.ts rename to blocksuite/framework/std/src/inline/types.ts diff --git a/blocksuite/framework/block-std/src/inline/utils/attribute-renderer.ts b/blocksuite/framework/std/src/inline/utils/attribute-renderer.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/utils/attribute-renderer.ts rename to blocksuite/framework/std/src/inline/utils/attribute-renderer.ts diff --git a/blocksuite/framework/block-std/src/inline/utils/delta-convert.ts b/blocksuite/framework/std/src/inline/utils/delta-convert.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/utils/delta-convert.ts rename to blocksuite/framework/std/src/inline/utils/delta-convert.ts diff --git a/blocksuite/framework/block-std/src/inline/utils/embed.ts b/blocksuite/framework/std/src/inline/utils/embed.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/utils/embed.ts rename to blocksuite/framework/std/src/inline/utils/embed.ts diff --git a/blocksuite/framework/block-std/src/inline/utils/guard.ts b/blocksuite/framework/std/src/inline/utils/guard.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/utils/guard.ts rename to blocksuite/framework/std/src/inline/utils/guard.ts diff --git a/blocksuite/framework/block-std/src/inline/utils/index.ts b/blocksuite/framework/std/src/inline/utils/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/utils/index.ts rename to blocksuite/framework/std/src/inline/utils/index.ts diff --git a/blocksuite/framework/block-std/src/inline/utils/inline-range.ts b/blocksuite/framework/std/src/inline/utils/inline-range.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/utils/inline-range.ts rename to blocksuite/framework/std/src/inline/utils/inline-range.ts diff --git a/blocksuite/framework/block-std/src/inline/utils/point-conversion.ts b/blocksuite/framework/std/src/inline/utils/point-conversion.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/utils/point-conversion.ts rename to blocksuite/framework/std/src/inline/utils/point-conversion.ts diff --git a/blocksuite/framework/block-std/src/inline/utils/query.ts b/blocksuite/framework/std/src/inline/utils/query.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/utils/query.ts rename to blocksuite/framework/std/src/inline/utils/query.ts diff --git a/blocksuite/framework/block-std/src/inline/utils/range-conversion.ts b/blocksuite/framework/std/src/inline/utils/range-conversion.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/utils/range-conversion.ts rename to blocksuite/framework/std/src/inline/utils/range-conversion.ts diff --git a/blocksuite/framework/block-std/src/inline/utils/renderer.ts b/blocksuite/framework/std/src/inline/utils/renderer.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/utils/renderer.ts rename to blocksuite/framework/std/src/inline/utils/renderer.ts diff --git a/blocksuite/framework/block-std/src/inline/utils/text.ts b/blocksuite/framework/std/src/inline/utils/text.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/utils/text.ts rename to blocksuite/framework/std/src/inline/utils/text.ts diff --git a/blocksuite/framework/block-std/src/inline/utils/transform-input.ts b/blocksuite/framework/std/src/inline/utils/transform-input.ts similarity index 100% rename from blocksuite/framework/block-std/src/inline/utils/transform-input.ts rename to blocksuite/framework/std/src/inline/utils/transform-input.ts diff --git a/blocksuite/framework/std/src/scope/index.ts b/blocksuite/framework/std/src/scope/index.ts new file mode 100644 index 0000000000..c01b3751e5 --- /dev/null +++ b/blocksuite/framework/std/src/scope/index.ts @@ -0,0 +1 @@ +export * from './std-scope.js'; diff --git a/blocksuite/framework/block-std/src/scope/block-std-scope.ts b/blocksuite/framework/std/src/scope/std-scope.ts similarity index 100% rename from blocksuite/framework/block-std/src/scope/block-std-scope.ts rename to blocksuite/framework/std/src/scope/std-scope.ts diff --git a/blocksuite/framework/block-std/src/selection/block.ts b/blocksuite/framework/std/src/selection/block.ts similarity index 100% rename from blocksuite/framework/block-std/src/selection/block.ts rename to blocksuite/framework/std/src/selection/block.ts diff --git a/blocksuite/framework/block-std/src/selection/cursor.ts b/blocksuite/framework/std/src/selection/cursor.ts similarity index 100% rename from blocksuite/framework/block-std/src/selection/cursor.ts rename to blocksuite/framework/std/src/selection/cursor.ts diff --git a/blocksuite/framework/block-std/src/selection/index.ts b/blocksuite/framework/std/src/selection/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/selection/index.ts rename to blocksuite/framework/std/src/selection/index.ts diff --git a/blocksuite/framework/block-std/src/selection/surface.ts b/blocksuite/framework/std/src/selection/surface.ts similarity index 100% rename from blocksuite/framework/block-std/src/selection/surface.ts rename to blocksuite/framework/std/src/selection/surface.ts diff --git a/blocksuite/framework/block-std/src/selection/text.ts b/blocksuite/framework/std/src/selection/text.ts similarity index 100% rename from blocksuite/framework/block-std/src/selection/text.ts rename to blocksuite/framework/std/src/selection/text.ts diff --git a/blocksuite/framework/block-std/src/spec/index.ts b/blocksuite/framework/std/src/spec/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/spec/index.ts rename to blocksuite/framework/std/src/spec/index.ts diff --git a/blocksuite/framework/block-std/src/spec/type.ts b/blocksuite/framework/std/src/spec/type.ts similarity index 100% rename from blocksuite/framework/block-std/src/spec/type.ts rename to blocksuite/framework/std/src/spec/type.ts diff --git a/blocksuite/framework/block-std/src/utils/fractional-indexing.ts b/blocksuite/framework/std/src/utils/fractional-indexing.ts similarity index 100% rename from blocksuite/framework/block-std/src/utils/fractional-indexing.ts rename to blocksuite/framework/std/src/utils/fractional-indexing.ts diff --git a/blocksuite/framework/block-std/src/utils/gfx.ts b/blocksuite/framework/std/src/utils/gfx.ts similarity index 100% rename from blocksuite/framework/block-std/src/utils/gfx.ts rename to blocksuite/framework/std/src/utils/gfx.ts diff --git a/blocksuite/framework/block-std/src/utils/layer.ts b/blocksuite/framework/std/src/utils/layer.ts similarity index 100% rename from blocksuite/framework/block-std/src/utils/layer.ts rename to blocksuite/framework/std/src/utils/layer.ts diff --git a/blocksuite/framework/block-std/src/utils/tree.ts b/blocksuite/framework/std/src/utils/tree.ts similarity index 100% rename from blocksuite/framework/block-std/src/utils/tree.ts rename to blocksuite/framework/std/src/utils/tree.ts diff --git a/blocksuite/framework/block-std/src/view/decorators/index.ts b/blocksuite/framework/std/src/view/decorators/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/view/decorators/index.ts rename to blocksuite/framework/std/src/view/decorators/index.ts diff --git a/blocksuite/framework/block-std/src/view/decorators/required.ts b/blocksuite/framework/std/src/view/decorators/required.ts similarity index 100% rename from blocksuite/framework/block-std/src/view/decorators/required.ts rename to blocksuite/framework/std/src/view/decorators/required.ts diff --git a/blocksuite/framework/block-std/src/view/element/block-component.ts b/blocksuite/framework/std/src/view/element/block-component.ts similarity index 100% rename from blocksuite/framework/block-std/src/view/element/block-component.ts rename to blocksuite/framework/std/src/view/element/block-component.ts diff --git a/blocksuite/framework/block-std/src/view/element/consts.ts b/blocksuite/framework/std/src/view/element/consts.ts similarity index 100% rename from blocksuite/framework/block-std/src/view/element/consts.ts rename to blocksuite/framework/std/src/view/element/consts.ts diff --git a/blocksuite/framework/block-std/src/view/element/gfx-block-component.ts b/blocksuite/framework/std/src/view/element/gfx-block-component.ts similarity index 100% rename from blocksuite/framework/block-std/src/view/element/gfx-block-component.ts rename to blocksuite/framework/std/src/view/element/gfx-block-component.ts diff --git a/blocksuite/framework/block-std/src/view/element/index.ts b/blocksuite/framework/std/src/view/element/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/view/element/index.ts rename to blocksuite/framework/std/src/view/element/index.ts diff --git a/blocksuite/framework/block-std/src/view/element/lit-host.ts b/blocksuite/framework/std/src/view/element/lit-host.ts similarity index 98% rename from blocksuite/framework/block-std/src/view/element/lit-host.ts rename to blocksuite/framework/std/src/view/element/lit-host.ts index dfc39be782..10aedbb0fa 100644 --- a/blocksuite/framework/block-std/src/view/element/lit-host.ts +++ b/blocksuite/framework/std/src/view/element/lit-host.ts @@ -19,7 +19,7 @@ import type { CommandManager } from '../../command/index.js'; import type { UIEventDispatcher } from '../../event/index.js'; import { WidgetViewIdentifier } from '../../identifier.js'; import type { RangeManager } from '../../inline/index.js'; -import type { BlockStdScope } from '../../scope/block-std-scope.js'; +import type { BlockStdScope } from '../../scope/std-scope.js'; import { PropTypes, requiredProperties } from '../decorators/index.js'; import type { ViewStore } from '../view-store.js'; import { BLOCK_ID_ATTR, WIDGET_ID_ATTR } from './consts.js'; diff --git a/blocksuite/framework/block-std/src/view/element/shadowless-element.ts b/blocksuite/framework/std/src/view/element/shadowless-element.ts similarity index 100% rename from blocksuite/framework/block-std/src/view/element/shadowless-element.ts rename to blocksuite/framework/std/src/view/element/shadowless-element.ts diff --git a/blocksuite/framework/block-std/src/view/element/widget-component.ts b/blocksuite/framework/std/src/view/element/widget-component.ts similarity index 100% rename from blocksuite/framework/block-std/src/view/element/widget-component.ts rename to blocksuite/framework/std/src/view/element/widget-component.ts diff --git a/blocksuite/framework/block-std/src/view/index.ts b/blocksuite/framework/std/src/view/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/view/index.ts rename to blocksuite/framework/std/src/view/index.ts diff --git a/blocksuite/framework/block-std/src/view/view-store.ts b/blocksuite/framework/std/src/view/view-store.ts similarity index 100% rename from blocksuite/framework/block-std/src/view/view-store.ts rename to blocksuite/framework/std/src/view/view-store.ts diff --git a/blocksuite/framework/block-std/tsconfig.json b/blocksuite/framework/std/tsconfig.json similarity index 100% rename from blocksuite/framework/block-std/tsconfig.json rename to blocksuite/framework/std/tsconfig.json diff --git a/blocksuite/framework/block-std/typedoc.json b/blocksuite/framework/std/typedoc.json similarity index 100% rename from blocksuite/framework/block-std/typedoc.json rename to blocksuite/framework/std/typedoc.json diff --git a/blocksuite/framework/block-std/vitest.config.ts b/blocksuite/framework/std/vitest.config.ts similarity index 89% rename from blocksuite/framework/block-std/vitest.config.ts rename to blocksuite/framework/std/vitest.config.ts index e1f297c280..5bfeaf0148 100644 --- a/blocksuite/framework/block-std/vitest.config.ts +++ b/blocksuite/framework/std/vitest.config.ts @@ -18,7 +18,7 @@ export default defineConfig({ coverage: { provider: 'istanbul', // or 'c8' reporter: ['lcov'], - reportsDirectory: '../../../.coverage/block-std', + reportsDirectory: '../../../.coverage/std', }, restoreMocks: true, }, diff --git a/blocksuite/framework/tsconfig.json b/blocksuite/framework/tsconfig.json index ff7f2caac1..0fe47e737d 100644 --- a/blocksuite/framework/tsconfig.json +++ b/blocksuite/framework/tsconfig.json @@ -9,7 +9,7 @@ "path": "./inline" }, { - "path": "./block-std" + "path": "./std" }, { "path": "./store" diff --git a/blocksuite/integration-test/src/__tests__/edgeless/last-props.spec.ts b/blocksuite/integration-test/src/__tests__/edgeless/last-props.spec.ts index f94907d63e..dedc3c6d1e 100644 --- a/blocksuite/integration-test/src/__tests__/edgeless/last-props.spec.ts +++ b/blocksuite/integration-test/src/__tests__/edgeless/last-props.spec.ts @@ -18,7 +18,7 @@ import { type TextElementModel, } from '@blocksuite/affine/model'; import { EditPropsStore } from '@blocksuite/affine/shared/services'; -import type { BlockStdScope } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/std'; import { beforeEach, describe, expect, test } from 'vitest'; import { getDocRootBlock } from '../utils/edgeless.js'; diff --git a/blocksuite/integration-test/src/__tests__/edgeless/layer.spec.ts b/blocksuite/integration-test/src/__tests__/edgeless/layer.spec.ts index 29e651b06d..d8080e1af7 100644 --- a/blocksuite/integration-test/src/__tests__/edgeless/layer.spec.ts +++ b/blocksuite/integration-test/src/__tests__/edgeless/layer.spec.ts @@ -1,4 +1,3 @@ -import { generateKeyBetween } from '@blocksuite/affine/block-std/gfx'; import type { EdgelessRootBlockComponent } from '@blocksuite/affine/blocks/root'; import type { SurfaceElementModel } from '@blocksuite/affine/blocks/surface'; import { ungroupCommand } from '@blocksuite/affine/gfx/group'; @@ -6,7 +5,8 @@ import type { GroupElementModel, NoteBlockModel, } from '@blocksuite/affine/model'; -import type { BlockComponent } from '@blocksuite/block-std'; +import { generateKeyBetween } from '@blocksuite/affine/std/gfx'; +import type { BlockComponent } from '@blocksuite/std'; import type { BlockModel, Store } from '@blocksuite/store'; import { beforeEach, describe, expect, test } from 'vitest'; import * as Y from 'yjs'; diff --git a/blocksuite/integration-test/src/__tests__/edgeless/mindmap.spec.ts b/blocksuite/integration-test/src/__tests__/edgeless/mindmap.spec.ts index 8e5d0b1143..a4649697b7 100644 --- a/blocksuite/integration-test/src/__tests__/edgeless/mindmap.spec.ts +++ b/blocksuite/integration-test/src/__tests__/edgeless/mindmap.spec.ts @@ -1,7 +1,7 @@ import type { MindMapView } from '@blocksuite/affine/gfx/mindmap'; import { LayoutType, type MindmapElementModel } from '@blocksuite/affine-model'; -import type { GfxController } from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; +import type { GfxController } from '@blocksuite/std/gfx'; import { beforeEach, describe, expect, test } from 'vitest'; import { click, pointermove, wait } from '../utils/common.js'; diff --git a/blocksuite/integration-test/src/editors/editor-container.ts b/blocksuite/integration-test/src/editors/editor-container.ts index d0ea654123..35a6fc6a4b 100644 --- a/blocksuite/integration-test/src/editors/editor-container.ts +++ b/blocksuite/integration-test/src/editors/editor-container.ts @@ -1,7 +1,7 @@ -import { BlockStdScope, ShadowlessElement } from '@blocksuite/affine/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; import type { DocMode } from '@blocksuite/affine/model'; import { ThemeProvider } from '@blocksuite/affine/shared/services'; +import { BlockStdScope, ShadowlessElement } from '@blocksuite/affine/std'; import { type BlockModel, type ExtensionType, diff --git a/blocksuite/playground/apps/_common/components/adapters-panel.ts b/blocksuite/playground/apps/_common/components/adapters-panel.ts index af00f4aff2..99d881317b 100644 --- a/blocksuite/playground/apps/_common/components/adapters-panel.ts +++ b/blocksuite/playground/apps/_common/components/adapters-panel.ts @@ -1,7 +1,6 @@ /* eslint-disable @typescript-eslint/no-restricted-imports */ import '@shoelace-style/shoelace/dist/components/tab-panel/tab-panel.js'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { defaultImageProxyMiddleware } from '@blocksuite/affine/blocks/image'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { @@ -15,6 +14,7 @@ import { PlainTextAdapterFactoryIdentifier, titleMiddleware, } from '@blocksuite/affine/shared/adapters'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import type { DocSnapshot } from '@blocksuite/affine/store'; import type { TestAffineEditorContainer } from '@blocksuite/integration-test'; import { effect } from '@preact/signals-core'; diff --git a/blocksuite/playground/apps/_common/components/custom-frame-panel.ts b/blocksuite/playground/apps/_common/components/custom-frame-panel.ts index eb74d024cd..c452448231 100644 --- a/blocksuite/playground/apps/_common/components/custom-frame-panel.ts +++ b/blocksuite/playground/apps/_common/components/custom-frame-panel.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import type { TestAffineEditorContainer } from '@blocksuite/integration-test'; import { effect } from '@preact/signals-core'; import { css, html, nothing } from 'lit'; diff --git a/blocksuite/playground/apps/_common/components/custom-outline-panel.ts b/blocksuite/playground/apps/_common/components/custom-outline-panel.ts index 40611d42c6..448a460fd6 100644 --- a/blocksuite/playground/apps/_common/components/custom-outline-panel.ts +++ b/blocksuite/playground/apps/_common/components/custom-outline-panel.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import type { TestAffineEditorContainer } from '@blocksuite/integration-test'; import { css, html, nothing } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; diff --git a/blocksuite/playground/apps/_common/components/docs-panel.ts b/blocksuite/playground/apps/_common/components/docs-panel.ts index 4efcc9dccb..5b789afe36 100644 --- a/blocksuite/playground/apps/_common/components/docs-panel.ts +++ b/blocksuite/playground/apps/_common/components/docs-panel.ts @@ -1,7 +1,7 @@ -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { GenerateDocUrlProvider } from '@blocksuite/affine/shared/services'; import { createDefaultDoc } from '@blocksuite/affine/shared/utils'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import type { Doc, Workspace } from '@blocksuite/affine/store'; import { CloseIcon } from '@blocksuite/icons/lit'; import type { TestAffineEditorContainer } from '@blocksuite/integration-test'; diff --git a/blocksuite/playground/apps/_common/components/left-side-panel.ts b/blocksuite/playground/apps/_common/components/left-side-panel.ts index 7175f8a4e8..9b6058d520 100644 --- a/blocksuite/playground/apps/_common/components/left-side-panel.ts +++ b/blocksuite/playground/apps/_common/components/left-side-panel.ts @@ -1,4 +1,4 @@ -import { ShadowlessElement } from '@blocksuite/affine/block-std'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { css, html } from 'lit'; import { customElement } from 'lit/decorators.js'; diff --git a/blocksuite/playground/apps/_common/components/starter-debug-menu.ts b/blocksuite/playground/apps/_common/components/starter-debug-menu.ts index 706cc19bb4..b1658c0205 100644 --- a/blocksuite/playground/apps/_common/components/starter-debug-menu.ts +++ b/blocksuite/playground/apps/_common/components/starter-debug-menu.ts @@ -16,8 +16,6 @@ import '@shoelace-style/shoelace/dist/themes/light.css'; import '@shoelace-style/shoelace/dist/themes/dark.css'; import './left-side-panel.js'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; import { defaultImageProxyMiddleware } from '@blocksuite/affine/blocks/image'; import { createAssetsArchive, @@ -50,6 +48,8 @@ import { StyleVariables, } from '@blocksuite/affine/shared/theme'; import { openFileOrFiles, printToPdf } from '@blocksuite/affine/shared/utils'; +import { ShadowlessElement } from '@blocksuite/affine/std'; +import { GfxControllerIdentifier } from '@blocksuite/affine/std/gfx'; import { type DeltaInsert, Text, diff --git a/blocksuite/playground/apps/comment/comment-input.ts b/blocksuite/playground/apps/comment/comment-input.ts index f09d3ab734..801145239d 100644 --- a/blocksuite/playground/apps/comment/comment-input.ts +++ b/blocksuite/playground/apps/comment/comment-input.ts @@ -1,6 +1,6 @@ -import { ShadowlessElement, TextSelection } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import type { RichText } from '@blocksuite/affine/rich-text'; +import { ShadowlessElement, TextSelection } from '@blocksuite/affine/std'; import { css, html, nothing } from 'lit'; import { property, query } from 'lit/decorators.js'; import * as Y from 'yjs'; diff --git a/blocksuite/playground/apps/comment/comment-manager.ts b/blocksuite/playground/apps/comment/comment-manager.ts index 67c6e3ed3b..c3e94c4c8b 100644 --- a/blocksuite/playground/apps/comment/comment-manager.ts +++ b/blocksuite/playground/apps/comment/comment-manager.ts @@ -1,4 +1,4 @@ -import type { EditorHost, TextSelection } from '@blocksuite/affine/block-std'; +import type { EditorHost, TextSelection } from '@blocksuite/affine/std'; import { getSelectedBlocksCommand } from '@blocksuite/affine-shared/commands'; import * as Y from 'yjs'; diff --git a/blocksuite/playground/apps/comment/comment-panel.ts b/blocksuite/playground/apps/comment/comment-panel.ts index 9dfb356f93..0fb2ea7082 100644 --- a/blocksuite/playground/apps/comment/comment-panel.ts +++ b/blocksuite/playground/apps/comment/comment-panel.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement, TextSelection } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import { ShadowlessElement, TextSelection } from '@blocksuite/affine/std'; import type { TestAffineEditorContainer } from '@blocksuite/integration-test'; import { css, html } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/blocksuite/playground/apps/starter/main.ts b/blocksuite/playground/apps/starter/main.ts index 5479b64ac8..dc50ec2643 100644 --- a/blocksuite/playground/apps/starter/main.ts +++ b/blocksuite/playground/apps/starter/main.ts @@ -1,11 +1,11 @@ import '../../style.css'; -import * as blockStd from '@blocksuite/affine/block-std'; import * as databaseBlocks from '@blocksuite/affine/blocks/database'; import * as noteBlocks from '@blocksuite/affine/blocks/note'; import { effects as blocksEffects } from '@blocksuite/affine/effects'; import * as globalUtils from '@blocksuite/affine/global/utils'; import * as services from '@blocksuite/affine/shared/services'; +import * as blockStd from '@blocksuite/affine/std'; import * as store from '@blocksuite/affine/store'; import * as editor from '@blocksuite/integration-test'; import { effects as presetsEffects } from '@blocksuite/integration-test/effects'; diff --git a/blocksuite/playground/examples/inline/test-page.ts b/blocksuite/playground/examples/inline/test-page.ts index c63fc9e249..626a27854a 100644 --- a/blocksuite/playground/examples/inline/test-page.ts +++ b/blocksuite/playground/examples/inline/test-page.ts @@ -1,12 +1,12 @@ import '@shoelace-style/shoelace'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; -import { effects } from '@blocksuite/affine/block-std/effects'; +import { ShadowlessElement } from '@blocksuite/affine/std'; +import { effects } from '@blocksuite/affine/std/effects'; import { type AttributeRenderer, InlineEditor, ZERO_WIDTH_NON_JOINER, -} from '@blocksuite/affine/block-std/inline'; +} from '@blocksuite/affine/std/inline'; import { type BaseTextAttributes, baseTextAttributes, diff --git a/packages/frontend/core/src/blocksuite/ai/_common/chat-actions-handle.ts b/packages/frontend/core/src/blocksuite/ai/_common/chat-actions-handle.ts index c62d713314..44604ef088 100644 --- a/packages/frontend/core/src/blocksuite/ai/_common/chat-actions-handle.ts +++ b/packages/frontend/core/src/blocksuite/ai/_common/chat-actions-handle.ts @@ -1,12 +1,4 @@ import { ChatHistoryOrder } from '@affine/graphql'; -import { - type BlockComponent, - type BlockSelection, - type BlockStdScope, - type EditorHost, - type TextSelection, -} from '@blocksuite/affine/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; import { EdgelessCRUDIdentifier } from '@blocksuite/affine/blocks/surface'; import { Bound, @@ -31,6 +23,14 @@ import { NotificationProvider, TelemetryProvider, } from '@blocksuite/affine/shared/services'; +import { + type BlockComponent, + type BlockSelection, + type BlockStdScope, + type EditorHost, + type TextSelection, +} from '@blocksuite/affine/std'; +import { GfxControllerIdentifier } from '@blocksuite/affine/std/gfx'; import type { Store } from '@blocksuite/affine/store'; import { BlockIcon, diff --git a/packages/frontend/core/src/blocksuite/ai/_common/config.ts b/packages/frontend/core/src/blocksuite/ai/_common/config.ts index 3a236320ec..8a161f68bd 100644 --- a/packages/frontend/core/src/blocksuite/ai/_common/config.ts +++ b/packages/frontend/core/src/blocksuite/ai/_common/config.ts @@ -1,4 +1,3 @@ -import type { Chain, InitCommandCtx } from '@blocksuite/affine/block-std'; import { CodeBlockModel, ImageBlockModel, @@ -7,6 +6,7 @@ import { } from '@blocksuite/affine/model'; import { getSelectedModelsCommand } from '@blocksuite/affine/shared/commands'; import { matchModels } from '@blocksuite/affine/shared/utils'; +import type { Chain, InitCommandCtx } from '@blocksuite/affine/std'; import { CommentIcon, DoneIcon, diff --git a/packages/frontend/core/src/blocksuite/ai/actions/answer-renderer.ts b/packages/frontend/core/src/blocksuite/ai/actions/answer-renderer.ts index 0f4cef6cdc..7ee5375e96 100644 --- a/packages/frontend/core/src/blocksuite/ai/actions/answer-renderer.ts +++ b/packages/frontend/core/src/blocksuite/ai/actions/answer-renderer.ts @@ -1,5 +1,5 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import type { MindmapElementModel } from '@blocksuite/affine/model'; +import type { EditorHost } from '@blocksuite/affine/std'; import { createAIScrollableTextRenderer } from '../components/ai-scrollable-text-renderer'; import { diff --git a/packages/frontend/core/src/blocksuite/ai/actions/doc-handler.ts b/packages/frontend/core/src/blocksuite/ai/actions/doc-handler.ts index f6e47fefb7..cbc6eef265 100644 --- a/packages/frontend/core/src/blocksuite/ai/actions/doc-handler.ts +++ b/packages/frontend/core/src/blocksuite/ai/actions/doc-handler.ts @@ -1,6 +1,6 @@ -import { type EditorHost, TextSelection } from '@blocksuite/affine/block-std'; import { AIStarIconWithAnimation } from '@blocksuite/affine/components/icons'; import { createLitPortal } from '@blocksuite/affine/components/portal'; +import { type EditorHost, TextSelection } from '@blocksuite/affine/std'; import { flip, offset } from '@floating-ui/dom'; import { html, type TemplateResult } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/ai/actions/edgeless-handler.ts b/packages/frontend/core/src/blocksuite/ai/actions/edgeless-handler.ts index 443d89aab5..96854bd527 100644 --- a/packages/frontend/core/src/blocksuite/ai/actions/edgeless-handler.ts +++ b/packages/frontend/core/src/blocksuite/ai/actions/edgeless-handler.ts @@ -1,8 +1,3 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { - GfxControllerIdentifier, - type GfxModel, -} from '@blocksuite/affine/block-std/gfx'; import { splitElements } from '@blocksuite/affine/blocks/root'; import { CodeBlockModel, @@ -15,6 +10,11 @@ import { TextElementModel, } from '@blocksuite/affine/model'; import { matchModels } from '@blocksuite/affine/shared/utils'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { + GfxControllerIdentifier, + type GfxModel, +} from '@blocksuite/affine/std/gfx'; import { type BlockModel, Slice } from '@blocksuite/affine/store'; import type { TemplateResult } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/ai/actions/edgeless-response.ts b/packages/frontend/core/src/blocksuite/ai/actions/edgeless-response.ts index 7a826c7c2f..c594caa360 100644 --- a/packages/frontend/core/src/blocksuite/ai/actions/edgeless-response.ts +++ b/packages/frontend/core/src/blocksuite/ai/actions/edgeless-response.ts @@ -1,5 +1,3 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; import { EDGELESS_TEXT_BLOCK_MIN_HEIGHT, EDGELESS_TEXT_BLOCK_MIN_WIDTH, @@ -19,6 +17,8 @@ import { NoteDisplayMode, } from '@blocksuite/affine/model'; import { TelemetryProvider } from '@blocksuite/affine/shared/services'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { GfxControllerIdentifier } from '@blocksuite/affine/std/gfx'; import { AFFINE_TOOLBAR_WIDGET, type AffineToolbarWidget, diff --git a/packages/frontend/core/src/blocksuite/ai/actions/page-response.ts b/packages/frontend/core/src/blocksuite/ai/actions/page-response.ts index b62c52cb28..8ec11376df 100644 --- a/packages/frontend/core/src/blocksuite/ai/actions/page-response.ts +++ b/packages/frontend/core/src/blocksuite/ai/actions/page-response.ts @@ -1,9 +1,3 @@ -import { type EditorHost, TextSelection } from '@blocksuite/affine/block-std'; -import { - GfxBlockElementModel, - type GfxModel, - LayerManager, -} from '@blocksuite/affine/block-std/gfx'; import { uploadBlobForImage } from '@blocksuite/affine/blocks/image'; import { fitContent, @@ -16,6 +10,12 @@ import type { ShapeElementModel, } from '@blocksuite/affine/model'; import { TelemetryProvider } from '@blocksuite/affine/shared/services'; +import { type EditorHost, TextSelection } from '@blocksuite/affine/std'; +import { + GfxBlockElementModel, + type GfxModel, + LayerManager, +} from '@blocksuite/affine/std/gfx'; import { type BlockProps, Text } from '@blocksuite/affine/store'; import * as Y from 'yjs'; diff --git a/packages/frontend/core/src/blocksuite/ai/actions/types.ts b/packages/frontend/core/src/blocksuite/ai/actions/types.ts index 8f17bc36c3..febc97e902 100644 --- a/packages/frontend/core/src/blocksuite/ai/actions/types.ts +++ b/packages/frontend/core/src/blocksuite/ai/actions/types.ts @@ -9,8 +9,8 @@ import type { getCopilotHistoriesQuery, RequestOptions, } from '@affine/graphql'; -import type { EditorHost } from '@blocksuite/affine/block-std'; -import type { GfxModel } from '@blocksuite/affine/block-std/gfx'; +import type { EditorHost } from '@blocksuite/affine/std'; +import type { GfxModel } from '@blocksuite/affine/std/gfx'; import type { BlockModel } from '@blocksuite/affine/store'; import type { DocContext, FileContext } from '../chat-panel/chat-context'; diff --git a/packages/frontend/core/src/blocksuite/ai/ai-panel.ts b/packages/frontend/core/src/blocksuite/ai/ai-panel.ts index 10a91c8a80..f40d9f29a7 100644 --- a/packages/frontend/core/src/blocksuite/ai/ai-panel.ts +++ b/packages/frontend/core/src/blocksuite/ai/ai-panel.ts @@ -1,6 +1,4 @@ import { AINetworkSearchService } from '@affine/core/modules/ai-button/services/network-search'; -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; import { Bound } from '@blocksuite/affine/global/gfx'; import { ImageBlockModel, @@ -11,6 +9,8 @@ import { isInsideEdgelessEditor, matchModels, } from '@blocksuite/affine/shared/utils'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { GfxControllerIdentifier } from '@blocksuite/affine/std/gfx'; import { ChatWithAiIcon, DeleteIcon, diff --git a/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-chat-block.ts b/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-chat-block.ts index 902f7ad45f..1df20ef219 100644 --- a/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-chat-block.ts +++ b/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-chat-block.ts @@ -1,5 +1,5 @@ -import { BlockComponent } from '@blocksuite/affine/block-std'; import { Peekable } from '@blocksuite/affine/components/peek'; +import { BlockComponent } from '@blocksuite/affine/std'; import { computed } from '@preact/signals-core'; import { html } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-chat-edgeless-block.ts b/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-chat-edgeless-block.ts index 8e4726127e..e4644b5b21 100644 --- a/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-chat-edgeless-block.ts +++ b/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-chat-edgeless-block.ts @@ -1,5 +1,5 @@ -import { toGfxBlockComponent } from '@blocksuite/affine/block-std'; import { Bound } from '@blocksuite/affine/global/gfx'; +import { toGfxBlockComponent } from '@blocksuite/affine/std'; import { html } from 'lit'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-chat-spec.ts b/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-chat-spec.ts index 88bf0275b2..f72e61f3a3 100644 --- a/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-chat-spec.ts +++ b/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-chat-spec.ts @@ -1,4 +1,4 @@ -import { BlockViewExtension } from '@blocksuite/affine/block-std'; +import { BlockViewExtension } from '@blocksuite/affine/std'; import type { ExtensionType } from '@blocksuite/affine/store'; import { literal } from 'lit/static-html.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-transcription-block.ts b/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-transcription-block.ts index eeb037c834..36b53a3afd 100644 --- a/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-transcription-block.ts +++ b/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/ai-transcription-block.ts @@ -1,8 +1,5 @@ -import { - BlockComponent, - BlockViewExtension, -} from '@blocksuite/affine/block-std'; import type { TranscriptionBlockModel } from '@blocksuite/affine/model'; +import { BlockComponent, BlockViewExtension } from '@blocksuite/affine/std'; import type { ExtensionType } from '@blocksuite/affine/store'; import { css, type PropertyValues } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/components/ai-chat-messages.ts b/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/components/ai-chat-messages.ts index 5a621b4741..f52ff1d310 100644 --- a/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/components/ai-chat-messages.ts +++ b/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/components/ai-chat-messages.ts @@ -1,6 +1,6 @@ import type { TextRendererOptions } from '@affine/core/blocksuite/ai/components/text-renderer'; import type { AffineAIPanelState } from '@affine/core/blocksuite/ai/widgets/ai-panel/type'; -import type { EditorHost } from '@blocksuite/affine/block-std'; +import type { EditorHost } from '@blocksuite/affine/std'; import { css, html, LitElement } from 'lit'; import { property } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/model/ai-chat-model.ts b/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/model/ai-chat-model.ts index 48165496b5..daf7fb2b12 100644 --- a/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/model/ai-chat-model.ts +++ b/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/model/ai-chat-model.ts @@ -1,7 +1,7 @@ import { type GfxCommonBlockProps, GfxCompatible, -} from '@blocksuite/affine/block-std/gfx'; +} from '@blocksuite/affine/std/gfx'; import { BlockModel, BlockSchemaExtension, diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/action-wrapper.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/action-wrapper.ts index 0c776ebb30..911e5a574a 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/action-wrapper.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/action-wrapper.ts @@ -1,6 +1,6 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme'; +import type { EditorHost } from '@blocksuite/affine/std'; import { ArrowDownBigIcon as ArrowDownIcon, ArrowUpBigIcon as ArrowUpIcon, diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image-to-text.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image-to-text.ts index f69d81b711..7584dac215 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image-to-text.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image-to-text.ts @@ -1,9 +1,9 @@ import './action-wrapper'; import '../content/images'; -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { html, nothing } from 'lit'; import { property } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image.ts index de3cd86202..8cf4d4e7e2 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/image.ts @@ -1,9 +1,9 @@ import './action-wrapper'; import '../content/images'; -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { html, nothing } from 'lit'; import { property } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/make-real.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/make-real.ts index 6081a626f6..7699635c65 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/make-real.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/make-real.ts @@ -1,8 +1,8 @@ import './action-wrapper'; -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/mindmap.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/mindmap.ts index 87df531b77..dcc72a911e 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/mindmap.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/mindmap.ts @@ -1,8 +1,8 @@ import './action-wrapper'; -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/slides.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/slides.ts index 7925c3da18..38a224018c 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/slides.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/slides.ts @@ -1,9 +1,9 @@ import './action-wrapper'; import '../../messages/slides-renderer'; -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { html, nothing } from 'lit'; import { property } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/text.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/text.ts index 52c6347e9e..253eb9999d 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/text.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/actions/text.ts @@ -1,8 +1,8 @@ import './action-wrapper'; -import type { EditorHost } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { unsafeCSSVar } from '@blocksuite/affine/shared/theme'; +import type { EditorHost } from '@blocksuite/affine/std'; import { css, html, LitElement } from 'lit'; import { property } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-chips.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-chips.ts index 8f22650f65..6ffeb8a342 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-chips.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-chips.ts @@ -1,12 +1,9 @@ import type { TagMeta } from '@affine/core/components/page-list'; import type { Collection } from '@affine/env/filter'; -import { - type EditorHost, - ShadowlessElement, -} from '@blocksuite/affine/block-std'; import { createLitPortal } from '@blocksuite/affine/components/portal'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; import { unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme'; +import { type EditorHost, ShadowlessElement } from '@blocksuite/affine/std'; import { MoreVerticalIcon, PlusIcon } from '@blocksuite/icons/lit'; import { flip, offset } from '@floating-ui/dom'; import { computed, type Signal, signal } from '@preact/signals-core'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-input.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-input.ts index 0a4142d448..2884fcf02d 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-input.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-input.ts @@ -1,8 +1,8 @@ import { stopPropagation } from '@affine/core/utils'; -import type { EditorHost } from '@blocksuite/affine/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; import { unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme'; import { openFileOrFiles } from '@blocksuite/affine/shared/utils'; +import type { EditorHost } from '@blocksuite/affine/std'; import { BroomIcon, CloseIcon, diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts index 48ccf9865c..2e9d57b4f6 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts @@ -1,11 +1,11 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { DocModeProvider, FeatureFlagService, } from '@blocksuite/affine/shared/services'; import { type SpecBuilder } from '@blocksuite/affine/shared/utils'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import type { BaseSelection } from '@blocksuite/affine/store'; import { ArrowDownBigIcon as ArrowDownIcon } from '@blocksuite/icons/lit'; import { css, html, nothing, type PropertyValues } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/add-popover.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/add-popover.ts index 90c5c938a5..628991b7b9 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/add-popover.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/add-popover.ts @@ -3,11 +3,11 @@ import type { CollectionMeta, TagMeta, } from '@affine/core/components/page-list'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; import { scrollbarStyle } from '@blocksuite/affine/shared/styles'; import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme'; import { openFileOrFiles } from '@blocksuite/affine/shared/utils'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { CollectionsIcon, MoreHorizontalIcon, diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/candidates-popover.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/candidates-popover.ts index 20236b7378..d2e868eeb3 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/candidates-popover.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/candidates-popover.ts @@ -1,7 +1,7 @@ -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; import { scrollbarStyle } from '@blocksuite/affine/shared/styles'; import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { PlusIcon } from '@blocksuite/icons/lit'; import { type Signal, signal } from '@preact/signals-core'; import { css, html } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/chip.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/chip.ts index 97365bff29..5e03548403 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/chip.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/chip.ts @@ -1,6 +1,6 @@ -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; import { unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { CloseIcon, PlusIcon } from '@blocksuite/icons/lit'; import { css, html, type TemplateResult } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/collection-chip.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/collection-chip.ts index 3567daa080..d17cd85ded 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/collection-chip.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/collection-chip.ts @@ -1,6 +1,6 @@ import type { Collection } from '@affine/env/filter'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { CollectionsIcon } from '@blocksuite/icons/lit'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/doc-chip.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/doc-chip.ts index a60a2797e1..0337ed8902 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/doc-chip.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/doc-chip.ts @@ -1,8 +1,5 @@ -import { - type EditorHost, - ShadowlessElement, -} from '@blocksuite/affine/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; +import { type EditorHost, ShadowlessElement } from '@blocksuite/affine/std'; import { Signal } from '@preact/signals-core'; import { html, type PropertyValues } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/file-chip.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/file-chip.ts index 9ec37deaf9..a24e69cd09 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/file-chip.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/file-chip.ts @@ -1,6 +1,6 @@ -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { getAttachmentFileIcon } from '@blocksuite/affine/components/icons'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/tag-chip.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/tag-chip.ts index b8e6906e55..71b42fc5ea 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/tag-chip.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/tag-chip.ts @@ -1,7 +1,7 @@ import type { TagMeta } from '@affine/core/components/page-list'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; import { unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { css, html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/content/assistant-avatar.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/content/assistant-avatar.ts index 8214c21596..a87c33e8bd 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/content/assistant-avatar.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/content/assistant-avatar.ts @@ -1,4 +1,4 @@ -import { ShadowlessElement } from '@blocksuite/affine/block-std'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { AiIcon } from '@blocksuite/icons/lit'; import { css, html } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/content/images.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/content/images.ts index ba03bf1429..5b8e4bc469 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/content/images.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/content/images.ts @@ -1,6 +1,6 @@ -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { unsafeCSSVar } from '@blocksuite/affine/shared/theme'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { css, html, nothing } from 'lit'; import { property } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/content/pure-text.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/content/pure-text.ts index 5866d89f95..5d43c3d227 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/content/pure-text.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/content/pure-text.ts @@ -1,5 +1,5 @@ -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { css, html, nothing } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/content/rich-text.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/content/rich-text.ts index 26a111482e..0668154f24 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/content/rich-text.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/content/rich-text.ts @@ -1,7 +1,7 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import type { SpecBuilder } from '@blocksuite/affine/shared/utils'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/index.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/index.ts index bc98d2f1b6..2259df3216 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/index.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/index.ts @@ -7,11 +7,11 @@ import type { CopilotContextFile, CopilotDocType, } from '@affine/graphql'; -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; import { NotificationProvider } from '@blocksuite/affine/shared/services'; import type { SpecBuilder } from '@blocksuite/affine/shared/utils'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import type { Store } from '@blocksuite/affine/store'; import { HelpIcon, InformationIcon } from '@blocksuite/icons/lit'; import { type Signal, signal } from '@preact/signals-core'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/message/action.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/message/action.ts index 8cd290f2c7..7e1499c487 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/message/action.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/message/action.ts @@ -1,8 +1,8 @@ import '../content/assistant-avatar'; -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/message/assistant.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/message/assistant.ts index 32d7535489..c6ccffa81c 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/message/assistant.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/message/assistant.ts @@ -1,10 +1,10 @@ import '../content/assistant-avatar'; import '../content/rich-text'; -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { isInsidePageEditor } from '@blocksuite/affine/shared/utils'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { css, html, nothing } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/message/user.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/message/user.ts index ef3c632c91..15abe5cf14 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/message/user.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/message/user.ts @@ -1,8 +1,8 @@ import '../content/images'; import '../content/pure-text'; -import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import { ShadowlessElement } from '@blocksuite/affine/std'; import { css, html, nothing } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item-list.ts b/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item-list.ts index d8bb166b4a..20907f4bb5 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item-list.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item-list.ts @@ -1,10 +1,10 @@ +import { createLitPortal } from '@blocksuite/affine/components/portal'; +import { WithDisposable } from '@blocksuite/affine/global/lit'; import { EditorHost, PropTypes, requiredProperties, -} from '@blocksuite/affine/block-std'; -import { createLitPortal } from '@blocksuite/affine/components/portal'; -import { WithDisposable } from '@blocksuite/affine/global/lit'; +} from '@blocksuite/affine/std'; import { flip, offset } from '@floating-ui/dom'; import { baseTheme } from '@toeverything/theme'; import { css, html, LitElement, nothing, unsafeCSS } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item.ts b/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item.ts index d856cec88b..2dace65185 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-item.ts @@ -1,10 +1,10 @@ +import { ArrowRightIcon, EnterIcon } from '@blocksuite/affine/components/icons'; +import { WithDisposable } from '@blocksuite/affine/global/lit'; import { EditorHost, PropTypes, requiredProperties, -} from '@blocksuite/affine/block-std'; -import { ArrowRightIcon, EnterIcon } from '@blocksuite/affine/components/icons'; -import { WithDisposable } from '@blocksuite/affine/global/lit'; +} from '@blocksuite/affine/std'; import { css, html, LitElement, nothing } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-sub-item-list.ts b/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-sub-item-list.ts index 9b86a61e92..25ff617017 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-sub-item-list.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/ai-item/ai-sub-item-list.ts @@ -1,11 +1,11 @@ +import { EnterIcon } from '@blocksuite/affine/components/icons'; +import { WithDisposable } from '@blocksuite/affine/global/lit'; +import { stopPropagation } from '@blocksuite/affine/shared/utils'; import { EditorHost, PropTypes, requiredProperties, -} from '@blocksuite/affine/block-std'; -import { EnterIcon } from '@blocksuite/affine/components/icons'; -import { WithDisposable } from '@blocksuite/affine/global/lit'; -import { stopPropagation } from '@blocksuite/affine/shared/utils'; +} from '@blocksuite/affine/std'; import { baseTheme } from '@toeverything/theme'; import { css, html, LitElement, nothing, unsafeCSS } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/components/ai-item/types.ts b/packages/frontend/core/src/blocksuite/ai/components/ai-item/types.ts index 25bcd0de88..93ebebcb71 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/ai-item/types.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/ai-item/types.ts @@ -1,9 +1,5 @@ -import type { - Chain, - EditorHost, - InitCommandCtx, -} from '@blocksuite/affine/block-std'; import type { DocMode } from '@blocksuite/affine/model'; +import type { Chain, EditorHost, InitCommandCtx } from '@blocksuite/affine/std'; import type { TemplateResult } from 'lit'; export interface AIItemGroupConfig { diff --git a/packages/frontend/core/src/blocksuite/ai/components/ai-scrollable-text-renderer.ts b/packages/frontend/core/src/blocksuite/ai/components/ai-scrollable-text-renderer.ts index 0054568605..8dab3b0ec7 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/ai-scrollable-text-renderer.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/ai-scrollable-text-renderer.ts @@ -1,9 +1,6 @@ -import { - type EditorHost, - ShadowlessElement, -} from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { scrollbarStyle } from '@blocksuite/affine/shared/styles'; +import { type EditorHost, ShadowlessElement } from '@blocksuite/affine/std'; import type { PropertyValues } from 'lit'; import { css, html } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/components/ask-ai-button.ts b/packages/frontend/core/src/blocksuite/ai/components/ask-ai-button.ts index d67aefd499..08c61b1d97 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/ask-ai-button.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/ask-ai-button.ts @@ -1,9 +1,9 @@ import './ask-ai-panel'; -import { type EditorHost } from '@blocksuite/affine/block-std'; import { HoverController } from '@blocksuite/affine/components/hover'; import { createLitPortal } from '@blocksuite/affine/components/portal'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import { type EditorHost } from '@blocksuite/affine/std'; import { flip, offset } from '@floating-ui/dom'; import { css, html, LitElement, nothing } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/components/ask-ai-panel.ts b/packages/frontend/core/src/blocksuite/ai/components/ask-ai-panel.ts index a77b403f58..2d9e4777df 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/ask-ai-panel.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/ask-ai-panel.ts @@ -1,7 +1,7 @@ -import { type EditorHost } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { DocModeProvider } from '@blocksuite/affine/shared/services'; import { scrollbarStyle } from '@blocksuite/affine/shared/styles'; +import { type EditorHost } from '@blocksuite/affine/std'; import { cssVar } from '@toeverything/theme'; import { css, html, LitElement, unsafeCSS } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/components/ask-ai-toolbar.ts b/packages/frontend/core/src/blocksuite/ai/components/ask-ai-toolbar.ts index 97386b6c56..cfdec954fe 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/ask-ai-toolbar.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/ask-ai-toolbar.ts @@ -1,10 +1,10 @@ +import { createLitPortal } from '@blocksuite/affine/components/portal'; +import { WithDisposable } from '@blocksuite/affine/global/lit'; import { BlockSelection, type EditorHost, TextSelection, -} from '@blocksuite/affine/block-std'; -import { createLitPortal } from '@blocksuite/affine/components/portal'; -import { WithDisposable } from '@blocksuite/affine/global/lit'; +} from '@blocksuite/affine/std'; import { flip, offset } from '@floating-ui/dom'; import { css, html, LitElement } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/components/chat-action-list.ts b/packages/frontend/core/src/blocksuite/ai/components/chat-action-list.ts index 0fc977a4b6..aea9872a6a 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/chat-action-list.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/chat-action-list.ts @@ -1,10 +1,10 @@ +import type { ImageSelection } from '@blocksuite/affine/shared/selection'; +import { NotificationProvider } from '@blocksuite/affine/shared/services'; import type { BlockSelection, EditorHost, TextSelection, -} from '@blocksuite/affine/block-std'; -import type { ImageSelection } from '@blocksuite/affine/shared/selection'; -import { NotificationProvider } from '@blocksuite/affine/shared/services'; +} from '@blocksuite/affine/std'; import { css, html, LitElement, nothing } from 'lit'; import { property } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/components/copy-more.ts b/packages/frontend/core/src/blocksuite/ai/components/copy-more.ts index 99f4988864..990d745795 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/copy-more.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/copy-more.ts @@ -1,14 +1,14 @@ -import type { - BlockSelection, - EditorHost, - TextSelection, -} from '@blocksuite/affine/block-std'; import { Tooltip } from '@blocksuite/affine/components/toolbar'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { noop } from '@blocksuite/affine/global/utils'; import { NotificationProvider } from '@blocksuite/affine/shared/services'; import { unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme'; import { createButtonPopper } from '@blocksuite/affine/shared/utils'; +import type { + BlockSelection, + EditorHost, + TextSelection, +} from '@blocksuite/affine/std'; import { CopyIcon, MoreHorizontalIcon, ResetIcon } from '@blocksuite/icons/lit'; import { css, html, LitElement, nothing, type PropertyValues } from 'lit'; import { property, query, state } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/components/text-renderer.ts b/packages/frontend/core/src/blocksuite/ai/components/text-renderer.ts index 61763ca7cb..da0de549ec 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/text-renderer.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/text-renderer.ts @@ -1,11 +1,5 @@ import { createReactComponentFromLit } from '@affine/component'; import { defaultBlockMarkdownAdapterMatchers } from '@blocksuite/affine/adapters'; -import { - BlockStdScope, - BlockViewIdentifier, - type EditorHost, - ShadowlessElement, -} from '@blocksuite/affine/block-std'; import { defaultImageProxyMiddleware, ImageProxyService, @@ -19,6 +13,12 @@ import { } from '@blocksuite/affine/inlines/preset'; import { codeBlockWrapMiddleware } from '@blocksuite/affine/shared/adapters'; import { LinkPreviewerService } from '@blocksuite/affine/shared/services'; +import { + BlockStdScope, + BlockViewIdentifier, + type EditorHost, + ShadowlessElement, +} from '@blocksuite/affine/std'; import type { ExtensionType, Query, diff --git a/packages/frontend/core/src/blocksuite/ai/entries/code-toolbar/setup-code-toolbar.ts b/packages/frontend/core/src/blocksuite/ai/entries/code-toolbar/setup-code-toolbar.ts index 34772f1eb7..b600d1a998 100644 --- a/packages/frontend/core/src/blocksuite/ai/entries/code-toolbar/setup-code-toolbar.ts +++ b/packages/frontend/core/src/blocksuite/ai/entries/code-toolbar/setup-code-toolbar.ts @@ -8,8 +8,8 @@ const buttonOptions: AskAIButtonOptions = { panelWidth: 240, }; -import { BlockSelection } from '@blocksuite/affine/block-std'; import type { AffineCodeToolbarWidget } from '@blocksuite/affine/blocks/code'; +import { BlockSelection } from '@blocksuite/affine/std'; import { buildAICodeItemGroups } from '../../_common/config'; import type { AskAIButtonOptions } from '../../components/ask-ai-button'; diff --git a/packages/frontend/core/src/blocksuite/ai/entries/space/setup-space.ts b/packages/frontend/core/src/blocksuite/ai/entries/space/setup-space.ts index 9d17759b97..461a1d6d33 100644 --- a/packages/frontend/core/src/blocksuite/ai/entries/space/setup-space.ts +++ b/packages/frontend/core/src/blocksuite/ai/entries/space/setup-space.ts @@ -1,4 +1,4 @@ -import { TextSelection } from '@blocksuite/affine/block-std'; +import { TextSelection } from '@blocksuite/affine/std'; import { handleInlineAskAIAction } from '../../actions/doc-handler'; import { AIProvider } from '../../provider'; diff --git a/packages/frontend/core/src/blocksuite/ai/extensions/ai-code.ts b/packages/frontend/core/src/blocksuite/ai/extensions/ai-code.ts index 91dba9d8b4..5d27584bcd 100644 --- a/packages/frontend/core/src/blocksuite/ai/extensions/ai-code.ts +++ b/packages/frontend/core/src/blocksuite/ai/extensions/ai-code.ts @@ -1,8 +1,8 @@ -import { LifeCycleWatcher } from '@blocksuite/affine/block-std'; import { AffineCodeToolbarWidget, CodeBlockSpec, } from '@blocksuite/affine/blocks/code'; +import { LifeCycleWatcher } from '@blocksuite/affine/std'; import type { ExtensionType } from '@blocksuite/affine/store'; import { setupCodeToolbarAIEntry } from '../entries/code-toolbar/setup-code-toolbar'; diff --git a/packages/frontend/core/src/blocksuite/ai/extensions/ai-edgeless-root.ts b/packages/frontend/core/src/blocksuite/ai/extensions/ai-edgeless-root.ts index 08960d1751..d2f8bbcf62 100644 --- a/packages/frontend/core/src/blocksuite/ai/extensions/ai-edgeless-root.ts +++ b/packages/frontend/core/src/blocksuite/ai/extensions/ai-edgeless-root.ts @@ -1,9 +1,9 @@ +import { EdgelessRootBlockSpec } from '@blocksuite/affine/blocks/root'; +import { ToolbarModuleExtension } from '@blocksuite/affine/shared/services'; import { BlockFlavourIdentifier, LifeCycleWatcher, -} from '@blocksuite/affine/block-std'; -import { EdgelessRootBlockSpec } from '@blocksuite/affine/blocks/root'; -import { ToolbarModuleExtension } from '@blocksuite/affine/shared/services'; +} from '@blocksuite/affine/std'; import type { ExtensionType } from '@blocksuite/affine/store'; import type { FrameworkProvider } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/blocksuite/ai/extensions/ai-image.ts b/packages/frontend/core/src/blocksuite/ai/extensions/ai-image.ts index 7180525284..a3f0b65d33 100644 --- a/packages/frontend/core/src/blocksuite/ai/extensions/ai-image.ts +++ b/packages/frontend/core/src/blocksuite/ai/extensions/ai-image.ts @@ -1,6 +1,6 @@ -import { LifeCycleWatcher } from '@blocksuite/affine/block-std'; import { ImageBlockSpec } from '@blocksuite/affine/blocks/image'; import { AffineImageToolbarWidget } from '@blocksuite/affine/blocks/root'; +import { LifeCycleWatcher } from '@blocksuite/affine/std'; import type { ExtensionType } from '@blocksuite/affine/store'; import { setupImageToolbarAIEntry } from '../entries/image-toolbar/setup-image-toolbar'; diff --git a/packages/frontend/core/src/blocksuite/ai/extensions/ai-page-root.ts b/packages/frontend/core/src/blocksuite/ai/extensions/ai-page-root.ts index ff820b030c..b221fdc7af 100644 --- a/packages/frontend/core/src/blocksuite/ai/extensions/ai-page-root.ts +++ b/packages/frontend/core/src/blocksuite/ai/extensions/ai-page-root.ts @@ -1,9 +1,9 @@ +import { PageRootBlockSpec } from '@blocksuite/affine/blocks/root'; +import { ToolbarModuleExtension } from '@blocksuite/affine/shared/services'; import { BlockFlavourIdentifier, LifeCycleWatcher, -} from '@blocksuite/affine/block-std'; -import { PageRootBlockSpec } from '@blocksuite/affine/blocks/root'; -import { ToolbarModuleExtension } from '@blocksuite/affine/shared/services'; +} from '@blocksuite/affine/std'; import type { ExtensionType } from '@blocksuite/affine/store'; import type { FrameworkProvider } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/blocksuite/ai/messages/error.ts b/packages/frontend/core/src/blocksuite/ai/messages/error.ts index 41320cce31..4c93a3d2b5 100644 --- a/packages/frontend/core/src/blocksuite/ai/messages/error.ts +++ b/packages/frontend/core/src/blocksuite/ai/messages/error.ts @@ -1,7 +1,7 @@ -import { type EditorHost } from '@blocksuite/affine/block-std'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; import { scrollbarStyle } from '@blocksuite/affine/shared/styles'; import { unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme'; +import { type EditorHost } from '@blocksuite/affine/std'; import { InformationIcon, ToggleDownIcon } from '@blocksuite/icons/lit'; import { signal } from '@preact/signals-core'; import { baseTheme } from '@toeverything/theme'; diff --git a/packages/frontend/core/src/blocksuite/ai/messages/mindmap.ts b/packages/frontend/core/src/blocksuite/ai/messages/mindmap.ts index 7638257158..c3e70f9491 100644 --- a/packages/frontend/core/src/blocksuite/ai/messages/mindmap.ts +++ b/packages/frontend/core/src/blocksuite/ai/messages/mindmap.ts @@ -1,5 +1,5 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import type { MindmapStyle } from '@blocksuite/affine/model'; +import type { EditorHost } from '@blocksuite/affine/std'; import { html, nothing } from 'lit'; import { markdownToMindmap } from '../mini-mindmap'; diff --git a/packages/frontend/core/src/blocksuite/ai/messages/slides-renderer.ts b/packages/frontend/core/src/blocksuite/ai/messages/slides-renderer.ts index 3cafb44c53..ad7aaf93b9 100644 --- a/packages/frontend/core/src/blocksuite/ai/messages/slides-renderer.ts +++ b/packages/frontend/core/src/blocksuite/ai/messages/slides-renderer.ts @@ -1,7 +1,7 @@ import { WorkspaceImpl } from '@affine/core/modules/workspace/impls/workspace'; -import { BlockStdScope, type EditorHost } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { SpecProvider } from '@blocksuite/affine/shared/utils'; +import { BlockStdScope, type EditorHost } from '@blocksuite/affine/std'; import type { Store } from '@blocksuite/affine/store'; import { css, html, LitElement, nothing } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/messages/wrapper.ts b/packages/frontend/core/src/blocksuite/ai/messages/wrapper.ts index b1a827fc63..2b9b057145 100644 --- a/packages/frontend/core/src/blocksuite/ai/messages/wrapper.ts +++ b/packages/frontend/core/src/blocksuite/ai/messages/wrapper.ts @@ -1,4 +1,4 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; +import type { EditorHost } from '@blocksuite/affine/std'; import { css, html, LitElement, nothing } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-preview.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-preview.ts index 2c6ea0c7ab..d90073db74 100644 --- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-preview.ts +++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-preview.ts @@ -1,5 +1,4 @@ import { WorkspaceImpl } from '@affine/core/modules/workspace/impls/workspace.js'; -import { BlockStdScope, type EditorHost } from '@blocksuite/affine/block-std'; import type { SurfaceBlockModel } from '@blocksuite/affine/blocks/surface'; import { MindmapStyleFour, @@ -14,6 +13,7 @@ import { MindmapStyle, } from '@blocksuite/affine/model'; import { MarkdownAdapter } from '@blocksuite/affine/shared/adapters'; +import { BlockStdScope, type EditorHost } from '@blocksuite/affine/std'; import { Schema, type Store } from '@blocksuite/affine/store'; import { css, html, LitElement, nothing } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-root-block.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-root-block.ts index 9e564ca4f0..67026989d0 100644 --- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-root-block.ts +++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-root-block.ts @@ -1,5 +1,5 @@ -import { BlockComponent } from '@blocksuite/affine/block-std'; import type { RootBlockModel } from '@blocksuite/affine/model'; +import { BlockComponent } from '@blocksuite/affine/std'; import { html } from 'lit'; export class MindmapRootBlock extends BlockComponent { diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-service.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-service.ts index b878bf4ba2..aa14183aa4 100644 --- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-service.ts +++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-service.ts @@ -1,5 +1,5 @@ -import { BlockService } from '@blocksuite/affine/block-std'; import { RootBlockSchema } from '@blocksuite/affine/model'; +import { BlockService } from '@blocksuite/affine/std'; import { Subject } from 'rxjs'; export class MindmapService extends BlockService { diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/spec.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/spec.ts index 66b67850f9..d0b93005fa 100644 --- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/spec.ts +++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/spec.ts @@ -1,7 +1,3 @@ -import { - BlockViewExtension, - FlavourExtension, -} from '@blocksuite/affine/block-std'; import { SurfaceBlockSchema } from '@blocksuite/affine/blocks/surface'; import { MindMapView } from '@blocksuite/affine/gfx/mindmap'; import { RootBlockSchema } from '@blocksuite/affine/model'; @@ -9,6 +5,7 @@ import { DocModeService, ThemeService, } from '@blocksuite/affine/shared/services'; +import { BlockViewExtension, FlavourExtension } from '@blocksuite/affine/std'; import type { BlockSchema, ExtensionType } from '@blocksuite/affine/store'; import { literal } from 'lit/static-html.js'; import type { z } from 'zod'; diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-block.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-block.ts index 6f59ed4647..3147c374cc 100644 --- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-block.ts +++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-block.ts @@ -1,6 +1,4 @@ /* oxlint-disable @typescript-eslint/no-non-null-assertion */ -import { BlockComponent } from '@blocksuite/affine/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; import { CanvasRenderer, elementRenderers, @@ -10,6 +8,8 @@ import { import type { Bound } from '@blocksuite/affine/global/gfx'; import type { Color, ShapeElementModel } from '@blocksuite/affine/model'; import { ThemeProvider } from '@blocksuite/affine/shared/services'; +import { BlockComponent } from '@blocksuite/affine/std'; +import { GfxControllerIdentifier } from '@blocksuite/affine/std/gfx'; import { html } from 'lit'; import { query } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-service.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-service.ts index 5b97a93922..123436ad62 100644 --- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-service.ts +++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-service.ts @@ -1,5 +1,5 @@ -import { BlockService } from '@blocksuite/affine/block-std'; import { SurfaceBlockSchema } from '@blocksuite/affine/blocks/surface'; +import { BlockService } from '@blocksuite/affine/std'; export class MindmapSurfaceBlockService extends BlockService { static override readonly flavour = SurfaceBlockSchema.model.flavour; diff --git a/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-input.ts b/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-input.ts index 29812faff5..2801fafed3 100644 --- a/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-input.ts +++ b/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-input.ts @@ -1,7 +1,7 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import { SignalWatcher } from '@blocksuite/affine/global/lit'; import { unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme'; import { openFileOrFiles } from '@blocksuite/affine/shared/utils'; +import type { EditorHost } from '@blocksuite/affine/std'; import { BroomIcon, ImageIcon, PublishIcon } from '@blocksuite/icons/lit'; import { css, html, LitElement, nothing } from 'lit'; import { property, query, state } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-peek-view.ts b/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-peek-view.ts index d24ed94236..ecb86a2764 100644 --- a/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-peek-view.ts +++ b/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-peek-view.ts @@ -1,4 +1,3 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import { CanvasElementType, EdgelessCRUDIdentifier, @@ -11,6 +10,7 @@ import { TelemetryProvider, } from '@blocksuite/affine/shared/services'; import type { SpecBuilder } from '@blocksuite/affine/shared/utils'; +import type { EditorHost } from '@blocksuite/affine/std'; import { InformationIcon } from '@blocksuite/icons/lit'; import { html, LitElement, nothing } from 'lit'; import { property, query, state } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/peek-view/utils.ts b/packages/frontend/core/src/blocksuite/ai/peek-view/utils.ts index bdc8e0d3a1..45ace5fa26 100644 --- a/packages/frontend/core/src/blocksuite/ai/peek-view/utils.ts +++ b/packages/frontend/core/src/blocksuite/ai/peek-view/utils.ts @@ -1,9 +1,9 @@ -import type { BlockStdScope } from '@blocksuite/affine/block-std'; import { EdgelessCRUDIdentifier, getSurfaceBlock, } from '@blocksuite/affine/blocks/surface'; import { Bound } from '@blocksuite/affine/global/gfx'; +import type { BlockStdScope } from '@blocksuite/affine/std'; import { type AIChatBlockModel, diff --git a/packages/frontend/core/src/blocksuite/ai/provider/ai-provider.ts b/packages/frontend/core/src/blocksuite/ai/provider/ai-provider.ts index 44123ed659..c52f10c5b1 100644 --- a/packages/frontend/core/src/blocksuite/ai/provider/ai-provider.ts +++ b/packages/frontend/core/src/blocksuite/ai/provider/ai-provider.ts @@ -1,4 +1,4 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; +import type { EditorHost } from '@blocksuite/affine/std'; import { captureException } from '@sentry/react'; import { Subject } from 'rxjs'; diff --git a/packages/frontend/core/src/blocksuite/ai/provider/tracker.ts b/packages/frontend/core/src/blocksuite/ai/provider/tracker.ts index 7bcdd639d7..1afca86535 100644 --- a/packages/frontend/core/src/blocksuite/ai/provider/tracker.ts +++ b/packages/frontend/core/src/blocksuite/ai/provider/tracker.ts @@ -1,6 +1,6 @@ import { mixpanel, track } from '@affine/track'; -import type { EditorHost } from '@blocksuite/affine/block-std'; -import type { GfxPrimitiveElementModel } from '@blocksuite/affine/block-std/gfx'; +import type { EditorHost } from '@blocksuite/affine/std'; +import type { GfxPrimitiveElementModel } from '@blocksuite/affine/std/gfx'; import type { BlockModel } from '@blocksuite/affine/store'; import { lowerCase, omit } from 'lodash-es'; import type { Subject } from 'rxjs'; diff --git a/packages/frontend/core/src/blocksuite/ai/slides/index.ts b/packages/frontend/core/src/blocksuite/ai/slides/index.ts index 7517a65321..c1ae39c1b8 100644 --- a/packages/frontend/core/src/blocksuite/ai/slides/index.ts +++ b/packages/frontend/core/src/blocksuite/ai/slides/index.ts @@ -1,5 +1,5 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { GfxControllerIdentifier } from '@blocksuite/affine/std/gfx'; import type { BlockSnapshot } from '@blocksuite/affine/store'; import { markdownToSnapshot } from '../../utils'; diff --git a/packages/frontend/core/src/blocksuite/ai/tool/copilot-tool.ts b/packages/frontend/core/src/blocksuite/ai/tool/copilot-tool.ts index 04ce322985..6984abc9d1 100644 --- a/packages/frontend/core/src/blocksuite/ai/tool/copilot-tool.ts +++ b/packages/frontend/core/src/blocksuite/ai/tool/copilot-tool.ts @@ -1,15 +1,15 @@ /* oxlint-disable @typescript-eslint/no-non-null-assertion */ -import type { PointerEventState } from '@blocksuite/affine/block-std'; -import { - BaseTool, - type GfxModel, - MouseButton, -} from '@blocksuite/affine/block-std/gfx'; import { IS_MAC } from '@blocksuite/affine/global/env'; import { Bound, getCommonBoundWithRotation, } from '@blocksuite/affine/global/gfx'; +import type { PointerEventState } from '@blocksuite/affine/std'; +import { + BaseTool, + type GfxModel, + MouseButton, +} from '@blocksuite/affine/std/gfx'; import { Subject } from 'rxjs'; import { @@ -172,7 +172,7 @@ export class CopilotTool extends BaseTool { } } -declare module '@blocksuite/block-std/gfx' { +declare module '@blocksuite/std/gfx' { interface GfxToolsMap { copilot: CopilotTool; } diff --git a/packages/frontend/core/src/blocksuite/ai/utils/ai-widgets.ts b/packages/frontend/core/src/blocksuite/ai/utils/ai-widgets.ts index 04ea194219..cec6ccbf41 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/ai-widgets.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/ai-widgets.ts @@ -1,4 +1,4 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; +import type { EditorHost } from '@blocksuite/affine/std'; import { AFFINE_AI_PANEL_WIDGET, diff --git a/packages/frontend/core/src/blocksuite/ai/utils/context.ts b/packages/frontend/core/src/blocksuite/ai/utils/context.ts index caea674e16..cf6346fe3b 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/context.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/context.ts @@ -1,6 +1,6 @@ -import type { GfxModel } from '@blocksuite/affine/block-std/gfx'; import type { SerializedXYWH } from '@blocksuite/affine/global/gfx'; import type { MindmapStyle } from '@blocksuite/affine/model'; +import type { GfxModel } from '@blocksuite/affine/std/gfx'; import type { TemplateImage } from '../slides/template'; diff --git a/packages/frontend/core/src/blocksuite/ai/utils/edgeless.ts b/packages/frontend/core/src/blocksuite/ai/utils/edgeless.ts index 808d0e7494..744dd76a96 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/edgeless.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/edgeless.ts @@ -1,5 +1,3 @@ -import type { BlockComponent, EditorHost } from '@blocksuite/affine/block-std'; -import type { GfxModel } from '@blocksuite/affine/block-std/gfx'; import { SurfaceBlockModel } from '@blocksuite/affine/blocks/surface'; import { MindmapElementModel, @@ -8,6 +6,8 @@ import { type ShapeElementModel, } from '@blocksuite/affine/model'; import { matchModels } from '@blocksuite/affine/shared/utils'; +import type { BlockComponent, EditorHost } from '@blocksuite/affine/std'; +import type { GfxModel } from '@blocksuite/affine/std/gfx'; import { AFFINE_EDGELESS_COPILOT_WIDGET, diff --git a/packages/frontend/core/src/blocksuite/ai/utils/editor-actions.ts b/packages/frontend/core/src/blocksuite/ai/utils/editor-actions.ts index 8955ecde61..9f6ab7c2e1 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/editor-actions.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/editor-actions.ts @@ -1,13 +1,13 @@ +import { defaultImageProxyMiddleware } from '@blocksuite/affine/blocks/image'; +import { deleteTextCommand } from '@blocksuite/affine/inlines/preset'; +import { isInsideEdgelessEditor } from '@blocksuite/affine/shared/utils'; import { type BlockComponent, BlockSelection, type EditorHost, SurfaceSelection, type TextSelection, -} from '@blocksuite/affine/block-std'; -import { defaultImageProxyMiddleware } from '@blocksuite/affine/blocks/image'; -import { deleteTextCommand } from '@blocksuite/affine/inlines/preset'; -import { isInsideEdgelessEditor } from '@blocksuite/affine/shared/utils'; +} from '@blocksuite/affine/std'; import { type BlockModel, Slice } from '@blocksuite/affine/store'; import { diff --git a/packages/frontend/core/src/blocksuite/ai/utils/extract.ts b/packages/frontend/core/src/blocksuite/ai/utils/extract.ts index 5b891e2f6c..1ea27fdba4 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/extract.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/extract.ts @@ -1,4 +1,3 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import type { ServiceProvider } from '@blocksuite/affine/global/di'; import { DatabaseBlockModel, @@ -20,6 +19,7 @@ import { isInsideEdgelessEditor, matchModels, } from '@blocksuite/affine/shared/utils'; +import type { EditorHost } from '@blocksuite/affine/std'; import type { BlockModel, Store } from '@blocksuite/affine/store'; import { Slice, toDraftModel } from '@blocksuite/affine/store'; diff --git a/packages/frontend/core/src/blocksuite/ai/utils/selection-utils.ts b/packages/frontend/core/src/blocksuite/ai/utils/selection-utils.ts index 0040e25d21..0ca1741947 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/selection-utils.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/selection-utils.ts @@ -1,8 +1,3 @@ -import { type EditorHost, TextSelection } from '@blocksuite/affine/block-std'; -import { - GfxControllerIdentifier, - type GfxModel, -} from '@blocksuite/affine/block-std/gfx'; import { EdgelessClipboardController, isCanvasElement, @@ -25,6 +20,11 @@ import { getTextSelectionCommand, } from '@blocksuite/affine/shared/commands'; import { matchModels } from '@blocksuite/affine/shared/utils'; +import { type EditorHost, TextSelection } from '@blocksuite/affine/std'; +import { + GfxControllerIdentifier, + type GfxModel, +} from '@blocksuite/affine/std/gfx'; import { type BlockModel, type DraftModel, diff --git a/packages/frontend/core/src/blocksuite/ai/utils/template-job.ts b/packages/frontend/core/src/blocksuite/ai/utils/template-job.ts index 3832675960..189a51e3fd 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/template-job.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/template-job.ts @@ -1,11 +1,11 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { GfxController, LayerManager } from '@blocksuite/affine/block-std/gfx'; import { TemplateJob, TemplateMiddlewares, } from '@blocksuite/affine/blocks/root'; import { getSurfaceBlock } from '@blocksuite/affine/blocks/surface'; import { Bound, getCommonBound } from '@blocksuite/affine/global/gfx'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { GfxController, LayerManager } from '@blocksuite/affine/std/gfx'; export function createTemplateJob(host: EditorHost) { const surface = getSurfaceBlock(host.doc); diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/ai-panel.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/ai-panel.ts index e22e662884..4cce1c5f57 100644 --- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/ai-panel.ts +++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/ai-panel.ts @@ -1,8 +1,3 @@ -import { - WidgetComponent, - WidgetViewExtension, -} from '@blocksuite/affine/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; import { AFFINE_VIEWPORT_OVERLAY_WIDGET, type AffineViewportOverlayWidget, @@ -18,6 +13,8 @@ import { getPageRootByElement, stopPropagation, } from '@blocksuite/affine/shared/utils'; +import { WidgetComponent, WidgetViewExtension } from '@blocksuite/affine/std'; +import { GfxControllerIdentifier } from '@blocksuite/affine/std/gfx'; import type { BaseSelection } from '@blocksuite/affine/store'; import { autoPlacement, diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/finish-tip.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/finish-tip.ts index a923d46236..402a719813 100644 --- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/finish-tip.ts +++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/finish-tip.ts @@ -1,4 +1,3 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import { AIDoneIcon, CopyIcon, @@ -6,6 +5,7 @@ import { } from '@blocksuite/affine/components/icons'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { NotificationProvider } from '@blocksuite/affine/shared/services'; +import type { EditorHost } from '@blocksuite/affine/std'; import { baseTheme } from '@toeverything/theme'; import { css, html, LitElement, nothing, unsafeCSS } from 'lit'; import { property, state } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/answer.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/answer.ts index 228586657e..05483c6d20 100644 --- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/answer.ts +++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/answer.ts @@ -1,5 +1,5 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import type { EditorHost } from '@blocksuite/affine/std'; import { baseTheme } from '@toeverything/theme'; import { css, html, LitElement, nothing, unsafeCSS } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/error.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/error.ts index 4702173ddd..c65f4976a2 100644 --- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/error.ts +++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/error.ts @@ -1,5 +1,5 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import type { EditorHost } from '@blocksuite/affine/std'; import { baseTheme } from '@toeverything/theme'; import { css, html, LitElement, nothing, unsafeCSS } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/utils.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/utils.ts index e94f1176b3..809a82b155 100644 --- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/utils.ts +++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/utils.ts @@ -1,5 +1,5 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import { isInsidePageEditor } from '@blocksuite/affine/shared/utils'; +import type { EditorHost } from '@blocksuite/affine/std'; import type { AIItemGroupConfig } from '../../components/ai-item/types'; diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/index.ts b/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/index.ts index 85acf82947..90b448d720 100644 --- a/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/index.ts +++ b/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/index.ts @@ -1,7 +1,7 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { scrollbarStyle } from '@blocksuite/affine/shared/styles'; import { on, stopPropagation } from '@blocksuite/affine/shared/utils'; +import type { EditorHost } from '@blocksuite/affine/std'; import { css, html, LitElement, nothing } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/toolbar-entry.ts b/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/toolbar-entry.ts index e88b3b6185..b00c75e458 100644 --- a/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/toolbar-entry.ts +++ b/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/toolbar-entry.ts @@ -1,11 +1,11 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { - GfxControllerIdentifier, - isGfxGroupCompatibleModel, -} from '@blocksuite/affine/block-std/gfx'; import { sortEdgelessElements } from '@blocksuite/affine/blocks/root'; import { AIStarIcon } from '@blocksuite/affine/components/icons'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { + GfxControllerIdentifier, + isGfxGroupCompatibleModel, +} from '@blocksuite/affine/std/gfx'; import { css, html, LitElement } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot/index.ts b/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot/index.ts index bdc3f9d12a..0c31a4e6b2 100644 --- a/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot/index.ts +++ b/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot/index.ts @@ -1,8 +1,3 @@ -import { - WidgetComponent, - WidgetViewExtension, -} from '@blocksuite/affine/block-std'; -import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; import { EdgelessLegacySlotIdentifier } from '@blocksuite/affine/blocks/surface'; import { Bound, @@ -13,6 +8,8 @@ import { MOUSE_BUTTON, requestConnectedFrame, } from '@blocksuite/affine/shared/utils'; +import { WidgetComponent, WidgetViewExtension } from '@blocksuite/affine/std'; +import { GfxControllerIdentifier } from '@blocksuite/affine/std/gfx'; import { autoUpdate, computePosition, diff --git a/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor-container.tsx b/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor-container.tsx index 8a01e86ef9..da4d446096 100644 --- a/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor-container.tsx +++ b/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor-container.tsx @@ -3,12 +3,12 @@ import type { PageEditor, } from '@affine/core/blocksuite/editors'; import { FeatureFlagService } from '@affine/core/modules/feature-flag'; -import type { BlockStdScope, EditorHost } from '@blocksuite/affine/block-std'; import { appendParagraphCommand } from '@blocksuite/affine/blocks/paragraph'; import type { DocTitle } from '@blocksuite/affine/fragments/doc-title'; import type { DocMode, RootBlockModel } from '@blocksuite/affine/model'; import { focusBlockEnd } from '@blocksuite/affine/shared/commands'; import { getLastNoteBlock } from '@blocksuite/affine/shared/utils'; +import type { BlockStdScope, EditorHost } from '@blocksuite/affine/std'; import { type Store } from '@blocksuite/affine/store'; import { useLiveData, useService } from '@toeverything/infra'; import clsx from 'clsx'; diff --git a/packages/frontend/core/src/blocksuite/editors/edgeless-editor.ts b/packages/frontend/core/src/blocksuite/editors/edgeless-editor.ts index 414c24e2f0..2113f29f71 100644 --- a/packages/frontend/core/src/blocksuite/editors/edgeless-editor.ts +++ b/packages/frontend/core/src/blocksuite/editors/edgeless-editor.ts @@ -1,7 +1,7 @@ -import { BlockStdScope, ShadowlessElement } from '@blocksuite/affine/block-std'; import { EdgelessEditorBlockSpecs } from '@blocksuite/affine/extensions'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; import { ThemeProvider } from '@blocksuite/affine/shared/services'; +import { BlockStdScope, ShadowlessElement } from '@blocksuite/affine/std'; import type { Store } from '@blocksuite/affine/store'; import { css, html, nothing, type TemplateResult } from 'lit'; import { property, state } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/editors/page-editor.ts b/packages/frontend/core/src/blocksuite/editors/page-editor.ts index 911acc5883..c8ae3052ce 100644 --- a/packages/frontend/core/src/blocksuite/editors/page-editor.ts +++ b/packages/frontend/core/src/blocksuite/editors/page-editor.ts @@ -1,12 +1,12 @@ -import { - BlockStdScope, - EditorHost, - ShadowlessElement, -} from '@blocksuite/affine/block-std'; import { PageEditorBlockSpecs } from '@blocksuite/affine/extensions'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; import { noop } from '@blocksuite/affine/global/utils'; import { ThemeProvider } from '@blocksuite/affine/shared/services'; +import { + BlockStdScope, + EditorHost, + ShadowlessElement, +} from '@blocksuite/affine/std'; import type { Store } from '@blocksuite/affine/store'; import { css, html, nothing } from 'lit'; import { property, state } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/extensions/display-meta.ts b/packages/frontend/core/src/blocksuite/extensions/display-meta.ts index d967201910..da0c5a42f1 100644 --- a/packages/frontend/core/src/blocksuite/extensions/display-meta.ts +++ b/packages/frontend/core/src/blocksuite/extensions/display-meta.ts @@ -1,5 +1,4 @@ import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta'; -import { LifeCycleWatcher, StdIdentifier } from '@blocksuite/affine/block-std'; import type { Container } from '@blocksuite/affine/global/di'; import type { DocDisplayMetaExtension, @@ -11,6 +10,7 @@ import { referenceToNode, type Signal, } from '@blocksuite/affine/shared/utils'; +import { LifeCycleWatcher, StdIdentifier } from '@blocksuite/affine/std'; import { LinkedPageIcon, PageIcon } from '@blocksuite/icons/lit'; import { type FrameworkProvider } from '@toeverything/infra'; import type { TemplateResult } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/copy-as-image.ts b/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/copy-as-image.ts index ad7e70d1e4..5c143e4266 100644 --- a/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/copy-as-image.ts +++ b/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/copy-as-image.ts @@ -3,16 +3,16 @@ import { isMindmapChild, isMindMapRoot } from '@affine/core/blocksuite/ai'; import { EditorService } from '@affine/core/modules/editor'; import { apis } from '@affine/electron-api'; import { I18n } from '@affine/i18n'; -import type { BlockStdScope } from '@blocksuite/affine/block-std'; +import type { MenuContext } from '@blocksuite/affine/components/toolbar'; +import { Bound, getCommonBound } from '@blocksuite/affine/global/gfx'; +import type { BlockStdScope } from '@blocksuite/affine/std'; import { type GfxBlockElementModel, GfxControllerIdentifier, type GfxModel, GfxPrimitiveElementModel, isGfxGroupCompatibleModel, -} from '@blocksuite/affine/block-std/gfx'; -import type { MenuContext } from '@blocksuite/affine/components/toolbar'; -import { Bound, getCommonBound } from '@blocksuite/affine/global/gfx'; +} from '@blocksuite/affine/std/gfx'; import { CopyAsImgaeIcon } from '@blocksuite/icons/lit'; import type { FrameworkProvider } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/index.ts b/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/index.ts index 640846d79a..77820e3de8 100644 --- a/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/index.ts +++ b/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/index.ts @@ -9,15 +9,6 @@ import type { EditorSettingExt } from '@affine/core/modules/editor-setting/entit import { copyLinkToBlockStdScopeClipboard } from '@affine/core/utils/clipboard'; import { I18n, i18nTime } from '@affine/i18n'; import { track } from '@affine/track'; -import { - BlockFlavourIdentifier, - BlockSelection, - TextSelection, -} from '@blocksuite/affine/block-std'; -import { - GfxBlockElementModel, - GfxPrimitiveElementModel, -} from '@blocksuite/affine/block-std/gfx'; import { BookmarkBlockComponent } from '@blocksuite/affine/blocks/bookmark'; import { EmbedFigmaBlockComponent, @@ -70,6 +61,15 @@ import { UserProvider, } from '@blocksuite/affine/shared/services'; import { matchModels } from '@blocksuite/affine/shared/utils'; +import { + BlockFlavourIdentifier, + BlockSelection, + TextSelection, +} from '@blocksuite/affine/std'; +import { + GfxBlockElementModel, + GfxPrimitiveElementModel, +} from '@blocksuite/affine/std/gfx'; import type { ExtensionType } from '@blocksuite/affine/store'; import { ArrowDownSmallIcon, diff --git a/packages/frontend/core/src/blocksuite/extensions/entry/enable-mobile.ts b/packages/frontend/core/src/blocksuite/extensions/entry/enable-mobile.ts index 36d9799c1c..5dad9bc140 100644 --- a/packages/frontend/core/src/blocksuite/extensions/entry/enable-mobile.ts +++ b/packages/frontend/core/src/blocksuite/extensions/entry/enable-mobile.ts @@ -1,9 +1,4 @@ import { VirtualKeyboardProvider } from '@affine/core/mobile/modules/virtual-keyboard'; -import { - type BlockStdScope, - LifeCycleWatcher, - LifeCycleWatcherIdentifier, -} from '@blocksuite/affine/block-std'; import { CodeBlockConfigExtension, codeToolbarWidget, @@ -21,6 +16,11 @@ import { VirtualKeyboardProvider as BSVirtualKeyboardProvider, } from '@blocksuite/affine/shared/services'; import type { SpecBuilder } from '@blocksuite/affine/shared/utils'; +import { + type BlockStdScope, + LifeCycleWatcher, + LifeCycleWatcherIdentifier, +} from '@blocksuite/affine/std'; import type { ExtensionType } from '@blocksuite/affine/store'; import { SlashMenuExtension } from '@blocksuite/affine/widgets/slash-menu'; import { toolbarWidget } from '@blocksuite/affine/widgets/toolbar'; diff --git a/packages/frontend/core/src/blocksuite/extensions/entry/enable-preview.ts b/packages/frontend/core/src/blocksuite/extensions/entry/enable-preview.ts index 610a4971a5..cdefad5ec4 100644 --- a/packages/frontend/core/src/blocksuite/extensions/entry/enable-preview.ts +++ b/packages/frontend/core/src/blocksuite/extensions/entry/enable-preview.ts @@ -1,10 +1,5 @@ import { PeekViewService } from '@affine/core/modules/peek-view/services/peek-view'; import { AppThemeService } from '@affine/core/modules/theme'; -import { - type BlockStdScope, - LifeCycleWatcher, - StdIdentifier, -} from '@blocksuite/affine/block-std'; import type { Container } from '@blocksuite/affine/global/di'; import { ColorScheme } from '@blocksuite/affine/model'; import { @@ -16,6 +11,11 @@ import { type Signal, SpecProvider, } from '@blocksuite/affine/shared/utils'; +import { + type BlockStdScope, + LifeCycleWatcher, + StdIdentifier, +} from '@blocksuite/affine/std'; import type { ExtensionType } from '@blocksuite/affine/store'; import type { FrameworkProvider } from '@toeverything/infra'; import type { Observable } from 'rxjs'; diff --git a/packages/frontend/core/src/blocksuite/extensions/note-config/edgeless-note-header.tsx b/packages/frontend/core/src/blocksuite/extensions/note-config/edgeless-note-header.tsx index 5ffd1a82d5..62fa65fb46 100644 --- a/packages/frontend/core/src/blocksuite/extensions/note-config/edgeless-note-header.tsx +++ b/packages/frontend/core/src/blocksuite/extensions/note-config/edgeless-note-header.tsx @@ -8,9 +8,9 @@ import { WorkspaceService } from '@affine/core/modules/workspace'; import { extractEmojiIcon } from '@affine/core/utils'; import { useI18n } from '@affine/i18n'; import { track } from '@affine/track'; -import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; import { Bound } from '@blocksuite/affine/global/gfx'; import { type NoteBlockModel } from '@blocksuite/affine/model'; +import { GfxControllerIdentifier } from '@blocksuite/affine/std/gfx'; import { InformationIcon, LinkedPageIcon, diff --git a/packages/frontend/core/src/blocksuite/extensions/note-config/index.tsx b/packages/frontend/core/src/blocksuite/extensions/note-config/index.tsx index 44176401ae..76e9b2b73b 100644 --- a/packages/frontend/core/src/blocksuite/extensions/note-config/index.tsx +++ b/packages/frontend/core/src/blocksuite/extensions/note-config/index.tsx @@ -1,6 +1,5 @@ import type { ElementOrFactory } from '@affine/component'; import { JournalService } from '@affine/core/modules/journal'; -import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; import { NoteConfigExtension } from '@blocksuite/affine/blocks/note'; import { EDGELESS_BLOCK_CHILD_PADDING } from '@blocksuite/affine/blocks/root'; import { Bound, Vec } from '@blocksuite/affine/global/gfx'; @@ -8,6 +7,7 @@ import { DocModeProvider, EditPropsStore, } from '@blocksuite/affine/shared/services'; +import { GfxControllerIdentifier } from '@blocksuite/affine/std/gfx'; import type { FrameworkProvider } from '@toeverything/infra'; import { html, type TemplateResult } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/extensions/theme.ts b/packages/frontend/core/src/blocksuite/extensions/theme.ts index f5e5f41d6e..2ee25ae72b 100644 --- a/packages/frontend/core/src/blocksuite/extensions/theme.ts +++ b/packages/frontend/core/src/blocksuite/extensions/theme.ts @@ -1,6 +1,5 @@ import { DocService, DocsService } from '@affine/core/modules/doc'; import { AppThemeService } from '@affine/core/modules/theme'; -import { LifeCycleWatcher, StdIdentifier } from '@blocksuite/affine/block-std'; import type { Container } from '@blocksuite/affine/global/di'; import { ColorScheme } from '@blocksuite/affine/model'; import { @@ -11,6 +10,7 @@ import { createSignalFromObservable, type Signal, } from '@blocksuite/affine/shared/utils'; +import { LifeCycleWatcher, StdIdentifier } from '@blocksuite/affine/std'; import { type FrameworkProvider } from '@toeverything/infra'; import type { Observable } from 'rxjs'; import { combineLatest, map } from 'rxjs'; diff --git a/packages/frontend/core/src/blocksuite/initialization/index.ts b/packages/frontend/core/src/blocksuite/initialization/index.ts index 6e79c3b753..8551e6f8f7 100644 --- a/packages/frontend/core/src/blocksuite/initialization/index.ts +++ b/packages/frontend/core/src/blocksuite/initialization/index.ts @@ -1,10 +1,10 @@ -import type { SurfaceBlockProps } from '@blocksuite/affine/block-std/gfx'; import { NoteDisplayMode, type NoteProps, type ParagraphProps, type RootBlockProps, } from '@blocksuite/affine/model'; +import type { SurfaceBlockProps } from '@blocksuite/affine/std/gfx'; import { type Store, Text } from '@blocksuite/affine/store'; export interface DocProps { diff --git a/packages/frontend/core/src/blocksuite/outline-viewer/index.tsx b/packages/frontend/core/src/blocksuite/outline-viewer/index.tsx index c2eeb1b1ea..d50e808048 100644 --- a/packages/frontend/core/src/blocksuite/outline-viewer/index.tsx +++ b/packages/frontend/core/src/blocksuite/outline-viewer/index.tsx @@ -1,5 +1,5 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import { OutlineViewer } from '@blocksuite/affine/fragments/outline'; +import type { EditorHost } from '@blocksuite/affine/std'; import { useCallback, useRef } from 'react'; import * as styles from './outline-viewer.css'; diff --git a/packages/frontend/core/src/blocksuite/utils/markdown-utils.ts b/packages/frontend/core/src/blocksuite/utils/markdown-utils.ts index 5f7c08b38b..5e2c64e737 100644 --- a/packages/frontend/core/src/blocksuite/utils/markdown-utils.ts +++ b/packages/frontend/core/src/blocksuite/utils/markdown-utils.ts @@ -1,9 +1,4 @@ import { WorkspaceImpl } from '@affine/core/modules/workspace/impls/workspace'; -import { - type EditorHost, - type TextRangePoint, - TextSelection, -} from '@blocksuite/affine/block-std'; import { defaultImageProxyMiddleware } from '@blocksuite/affine/blocks/image'; import type { ServiceProvider } from '@blocksuite/affine/global/di'; import { @@ -14,6 +9,11 @@ import { PlainTextAdapter, titleMiddleware, } from '@blocksuite/affine/shared/adapters'; +import { + type EditorHost, + type TextRangePoint, + TextSelection, +} from '@blocksuite/affine/std'; import type { BlockModel, BlockSnapshot, diff --git a/packages/frontend/core/src/components/hooks/affine/use-export-page.ts b/packages/frontend/core/src/components/hooks/affine/use-export-page.ts index 99e000ac5a..7b6afd0071 100644 --- a/packages/frontend/core/src/components/hooks/affine/use-export-page.ts +++ b/packages/frontend/core/src/components/hooks/affine/use-export-page.ts @@ -7,7 +7,6 @@ import { EditorService } from '@affine/core/modules/editor'; import { getAFFiNEWorkspaceSchema } from '@affine/core/modules/workspace/global-schema'; import { useI18n } from '@affine/i18n'; import { track } from '@affine/track'; -import type { BlockStdScope } from '@blocksuite/affine/block-std'; import { createAssetsArchive, download, @@ -24,6 +23,7 @@ import { titleMiddleware, } from '@blocksuite/affine/shared/adapters'; import { printToPdf } from '@blocksuite/affine/shared/utils'; +import type { BlockStdScope } from '@blocksuite/affine/std'; import { type Store, Transformer } from '@blocksuite/affine/store'; import { useLiveData, useService } from '@toeverything/infra'; import { useSetAtom } from 'jotai'; diff --git a/packages/frontend/core/src/components/hooks/affine/use-share-url.ts b/packages/frontend/core/src/components/hooks/affine/use-share-url.ts index 86e7fc4883..ebb45e5534 100644 --- a/packages/frontend/core/src/components/hooks/affine/use-share-url.ts +++ b/packages/frontend/core/src/components/hooks/affine/use-share-url.ts @@ -4,11 +4,6 @@ import { toURLSearchParams } from '@affine/core/modules/navigation'; import { copyTextToClipboard } from '@affine/core/utils/clipboard'; import { useI18n } from '@affine/i18n'; import { track } from '@affine/track'; -import { type EditorHost } from '@blocksuite/affine/block-std'; -import { - GfxBlockElementModel, - GfxControllerIdentifier, -} from '@blocksuite/affine/block-std/gfx'; import { type DocMode } from '@blocksuite/affine/model'; import { getBlockSelectionsCommand, @@ -16,6 +11,11 @@ import { getSelectedModelsCommand, getTextSelectionCommand, } from '@blocksuite/affine/shared/commands'; +import { type EditorHost } from '@blocksuite/affine/std'; +import { + GfxBlockElementModel, + GfxControllerIdentifier, +} from '@blocksuite/affine/std/gfx'; import { useService } from '@toeverything/infra'; import { useCallback } from 'react'; diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/shape.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/shape.tsx index 78771a9aa5..283fc7f5b5 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/shape.tsx +++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/shape.tsx @@ -8,7 +8,6 @@ import { import { SettingRow } from '@affine/component/setting-components'; import { EditorSettingService } from '@affine/core/modules/editor-setting'; import { useI18n } from '@affine/i18n'; -import type { EditorHost } from '@blocksuite/affine/block-std'; import { EdgelessCRUDIdentifier, getSurfaceBlock, @@ -26,6 +25,7 @@ import { StrokeStyle, TextAlign, } from '@blocksuite/affine/model'; +import type { EditorHost } from '@blocksuite/affine/std'; import type { Store } from '@blocksuite/affine/store'; import { useFramework, useLiveData } from '@toeverything/infra'; import { isEqual } from 'lodash-es'; diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/snapshot.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/snapshot.tsx index 0fe0bd878e..cb98c170c5 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/snapshot.tsx +++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/snapshot.tsx @@ -1,16 +1,16 @@ import { Skeleton } from '@affine/component'; import type { EditorSettingSchema } from '@affine/core/modules/editor-setting'; import { EditorSettingService } from '@affine/core/modules/editor-setting'; -import type { EditorHost } from '@blocksuite/affine/block-std'; -import { BlockStdScope } from '@blocksuite/affine/block-std'; -import { - GfxControllerIdentifier, - type GfxPrimitiveElementModel, -} from '@blocksuite/affine/block-std/gfx'; import { EdgelessCRUDIdentifier } from '@blocksuite/affine/blocks/surface'; import { Bound } from '@blocksuite/affine/global/gfx'; import { ViewportElementExtension } from '@blocksuite/affine/shared/services'; import { SpecProvider } from '@blocksuite/affine/shared/utils'; +import type { EditorHost } from '@blocksuite/affine/std'; +import { BlockStdScope } from '@blocksuite/affine/std'; +import { + GfxControllerIdentifier, + type GfxPrimitiveElementModel, +} from '@blocksuite/affine/std/gfx'; import type { Block, Store } from '@blocksuite/affine/store'; import { useFramework } from '@toeverything/infra'; import { isEqual } from 'lodash-es'; diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/frame.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/frame.tsx index 5cfb29dd0c..d7f7ffc32a 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/frame.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/frame.tsx @@ -1,5 +1,5 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import { FramePanel } from '@blocksuite/affine/fragments/frame-panel'; +import type { EditorHost } from '@blocksuite/affine/std'; import { useCallback, useEffect, useRef } from 'react'; import * as styles from './frame.css'; diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/outline.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/outline.tsx index c2bf9b70e0..0c7727155a 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/outline.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/outline.tsx @@ -1,5 +1,5 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import { OutlinePanel } from '@blocksuite/affine/fragments/outline'; +import type { EditorHost } from '@blocksuite/affine/std'; import { useCallback, useEffect, useRef } from 'react'; import * as styles from './outline.css'; diff --git a/packages/frontend/core/src/mobile/components/toc-menu/index.tsx b/packages/frontend/core/src/mobile/components/toc-menu/index.tsx index 8c8f634616..86aad16843 100644 --- a/packages/frontend/core/src/mobile/components/toc-menu/index.tsx +++ b/packages/frontend/core/src/mobile/components/toc-menu/index.tsx @@ -1,5 +1,5 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import { MobileOutlineMenu } from '@blocksuite/affine/fragments/outline'; +import type { EditorHost } from '@blocksuite/affine/std'; import { useCallback, useRef } from 'react'; export const MobileTocMenu = ({ editor }: { editor: EditorHost | null }) => { diff --git a/packages/frontend/core/src/modules/at-menu-config/services/index.ts b/packages/frontend/core/src/modules/at-menu-config/services/index.ts index a8aae452b5..d4dabe4357 100644 --- a/packages/frontend/core/src/modules/at-menu-config/services/index.ts +++ b/packages/frontend/core/src/modules/at-menu-config/services/index.ts @@ -3,11 +3,6 @@ import { UserFriendlyError } from '@affine/error'; import { type DocMode as GraphqlDocMode } from '@affine/graphql'; import { I18n, i18nTime } from '@affine/i18n'; import track from '@affine/track'; -import { - BLOCK_ID_ATTR, - type BlockComponent, - type EditorHost, -} from '@blocksuite/affine/block-std'; import { type LinkedMenuGroup, type LinkedMenuItem, @@ -17,6 +12,11 @@ import { import type { DocMode } from '@blocksuite/affine/model'; import { DocModeProvider } from '@blocksuite/affine/shared/services'; import type { AffineInlineEditor } from '@blocksuite/affine/shared/types'; +import { + BLOCK_ID_ATTR, + type BlockComponent, + type EditorHost, +} from '@blocksuite/affine/std'; import type { DocMeta } from '@blocksuite/affine/store'; import { Text } from '@blocksuite/affine/store'; import { diff --git a/packages/frontend/core/src/modules/dnd/services/index.ts b/packages/frontend/core/src/modules/dnd/services/index.ts index 4a46ccf85a..0c6170dd4d 100644 --- a/packages/frontend/core/src/modules/dnd/services/index.ts +++ b/packages/frontend/core/src/modules/dnd/services/index.ts @@ -6,11 +6,11 @@ import { type toExternalData, } from '@affine/component'; import type { AffineDNDData } from '@affine/core/types/dnd'; -import { BlockStdScope } from '@blocksuite/affine/block-std'; import { DNDAPIExtension, DndApiExtensionIdentifier, } from '@blocksuite/affine/shared/services'; +import { BlockStdScope } from '@blocksuite/affine/std'; import type { SliceSnapshot } from '@blocksuite/affine/store'; import type { DragBlockPayload } from '@blocksuite/affine/widgets/drag-handle'; import { Service } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/modules/doc-info/utils.ts b/packages/frontend/core/src/modules/doc-info/utils.ts index 1778dc6d45..64627ebb2f 100644 --- a/packages/frontend/core/src/modules/doc-info/utils.ts +++ b/packages/frontend/core/src/modules/doc-info/utils.ts @@ -1,6 +1,6 @@ import { DebugLogger } from '@affine/debug'; -import { BlockStdScope } from '@blocksuite/affine/block-std'; import { PageEditorBlockSpecs } from '@blocksuite/affine/extensions'; +import { BlockStdScope } from '@blocksuite/affine/std'; import type { Store } from '@blocksuite/affine/store'; import { useEffect, useMemo, useState } from 'react'; import { Observable } from 'rxjs'; diff --git a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/rich-text.tsx b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/rich-text.tsx index 0aa9d8c853..fab1763bdd 100644 --- a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/rich-text.tsx +++ b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/rich-text.tsx @@ -1,8 +1,8 @@ import { PropertyValue } from '@affine/component'; import { ConfigModal } from '@affine/core/components/mobile'; -import type { BlockStdScope } from '@blocksuite/affine/block-std'; import { DefaultInlineManagerExtension } from '@blocksuite/affine/inlines/preset'; import { RichText } from '@blocksuite/affine/rich-text'; +import type { BlockStdScope } from '@blocksuite/affine/std'; import type { Store } from '@blocksuite/affine/store'; import { TextIcon } from '@blocksuite/icons/rc'; import { type LiveData, useLiveData } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/modules/editor/entities/editor.ts b/packages/frontend/core/src/modules/editor/entities/editor.ts index 8ccd788db1..9c406faf79 100644 --- a/packages/frontend/core/src/modules/editor/entities/editor.ts +++ b/packages/frontend/core/src/modules/editor/entities/editor.ts @@ -1,11 +1,11 @@ import type { AffineEditorContainer } from '@affine/core/blocksuite/block-suite-editor'; import type { DefaultOpenProperty } from '@affine/core/components/doc-properties'; -import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; import type { DocTitle } from '@blocksuite/affine/fragments/doc-title'; import type { DocMode, ReferenceParams } from '@blocksuite/affine/model'; import { HighlightSelection } from '@blocksuite/affine/shared/selection'; import { FeatureFlagService as BSFeatureFlagService } from '@blocksuite/affine/shared/services'; -import type { InlineEditor } from '@blocksuite/block-std/inline'; +import { GfxControllerIdentifier } from '@blocksuite/affine/std/gfx'; +import type { InlineEditor } from '@blocksuite/std/inline'; import { effect } from '@preact/signals-core'; import { Entity, LiveData } from '@toeverything/infra'; import { defaults, isEqual, omit } from 'lodash-es'; diff --git a/packages/frontend/core/src/modules/peek-view/entities/peek-view.ts b/packages/frontend/core/src/modules/peek-view/entities/peek-view.ts index 18bf7fd235..f06d9917eb 100644 --- a/packages/frontend/core/src/modules/peek-view/entities/peek-view.ts +++ b/packages/frontend/core/src/modules/peek-view/entities/peek-view.ts @@ -1,4 +1,3 @@ -import type { BlockComponent, EditorHost } from '@blocksuite/affine/block-std'; import type { SurfaceRefBlockComponent } from '@blocksuite/affine/blocks/surface-ref'; import { AffineReference } from '@blocksuite/affine/inlines/reference'; import type { @@ -9,6 +8,7 @@ import type { ImageBlockModel, SurfaceRefBlockModel, } from '@blocksuite/affine/model'; +import type { BlockComponent, EditorHost } from '@blocksuite/affine/std'; import type { Block, BlockModel } from '@blocksuite/affine/store'; import { Entity, LiveData } from '@toeverything/infra'; import type { TemplateResult } from 'lit'; diff --git a/packages/frontend/core/src/modules/peek-view/view/ai-chat-block-peek-view/index.tsx b/packages/frontend/core/src/modules/peek-view/view/ai-chat-block-peek-view/index.tsx index 6fec071b1f..6124645c65 100644 --- a/packages/frontend/core/src/modules/peek-view/view/ai-chat-block-peek-view/index.tsx +++ b/packages/frontend/core/src/modules/peek-view/view/ai-chat-block-peek-view/index.tsx @@ -3,8 +3,8 @@ import { AIChatBlockPeekViewTemplate } from '@affine/core/blocksuite/ai'; import type { AIChatBlockModel } from '@affine/core/blocksuite/ai/blocks/ai-chat-block/model/ai-chat-model'; import { enableFootnoteConfigExtension } from '@affine/core/blocksuite/extensions'; import { AINetworkSearchService } from '@affine/core/modules/ai-button/services/network-search'; -import type { EditorHost } from '@blocksuite/affine/block-std'; import { SpecProvider } from '@blocksuite/affine/shared/utils'; +import type { EditorHost } from '@blocksuite/affine/std'; import { useFramework } from '@toeverything/infra'; import { useMemo } from 'react'; diff --git a/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx b/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx index 0aeb8d7929..cf35a0fc7b 100644 --- a/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx +++ b/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx @@ -8,10 +8,10 @@ import { useGuard } from '@affine/core/components/guard'; import { PageNotFound } from '@affine/core/desktop/pages/404'; import { EditorService } from '@affine/core/modules/editor'; import { DebugLogger } from '@affine/debug'; -import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; import { DisposableGroup } from '@blocksuite/affine/global/disposable'; import { Bound } from '@blocksuite/affine/global/gfx'; import { RefNodeSlotsProvider } from '@blocksuite/affine/inlines/reference'; +import { GfxControllerIdentifier } from '@blocksuite/affine/std/gfx'; import { FrameworkScope, useLiveData, diff --git a/packages/frontend/core/src/modules/peek-view/view/peek-view-manager.tsx b/packages/frontend/core/src/modules/peek-view/view/peek-view-manager.tsx index c2aa7798cc..da002ffe68 100644 --- a/packages/frontend/core/src/modules/peek-view/view/peek-view-manager.tsx +++ b/packages/frontend/core/src/modules/peek-view/view/peek-view-manager.tsx @@ -1,5 +1,5 @@ import { toReactNode } from '@affine/component'; -import { BlockComponent } from '@blocksuite/affine/block-std'; +import { BlockComponent } from '@blocksuite/affine/std'; import { useLiveData, useService } from '@toeverything/infra'; import { useCallback, useEffect, useMemo, useState } from 'react'; diff --git a/packages/frontend/core/src/utils/clipboard/index.ts b/packages/frontend/core/src/utils/clipboard/index.ts index aa60ded16d..88f2049ea0 100644 --- a/packages/frontend/core/src/utils/clipboard/index.ts +++ b/packages/frontend/core/src/utils/clipboard/index.ts @@ -1,4 +1,4 @@ -import { type Clipboard as BlockStdScopeClipboard } from '@blocksuite/affine/block-std'; +import { type Clipboard as BlockStdScopeClipboard } from '@blocksuite/affine/std'; import { fakeCopyAction } from './fake'; diff --git a/tests/blocksuite/e2e/inline/inline-editor.spec.ts b/tests/blocksuite/e2e/inline/inline-editor.spec.ts index 3707876a73..6762f30d1a 100644 --- a/tests/blocksuite/e2e/inline/inline-editor.spec.ts +++ b/tests/blocksuite/e2e/inline/inline-editor.spec.ts @@ -1,7 +1,4 @@ -import type { - InlineEditor, - InlineRange, -} from '@blocksuite/affine/block-std/inline'; +import type { InlineEditor, InlineRange } from '@blocksuite/affine/std/inline'; import type { DeltaInsert } from '@blocksuite/affine/store'; import { expect, type Page, test } from '@playwright/test'; diff --git a/tests/blocksuite/e2e/utils/actions/misc.ts b/tests/blocksuite/e2e/utils/actions/misc.ts index 4ed50950d2..20bc9ce438 100644 --- a/tests/blocksuite/e2e/utils/actions/misc.ts +++ b/tests/blocksuite/e2e/utils/actions/misc.ts @@ -1,11 +1,11 @@ import '../declare-test-window.js'; +import type { DatabaseBlockModel, ListType } from '@blocksuite/affine/model'; +import type { RichText } from '@blocksuite/affine/rich-text'; import type { InlineRange, InlineRootElement, -} from '@blocksuite/affine/block-std/inline'; -import type { DatabaseBlockModel, ListType } from '@blocksuite/affine/model'; -import type { RichText } from '@blocksuite/affine/rich-text'; +} from '@blocksuite/affine/std/inline'; import type { BlockModel } from '@blocksuite/affine/store'; import { uuidv4 } from '@blocksuite/affine/store'; import type { TestAffineEditorContainer } from '@blocksuite/integration-test'; diff --git a/tests/blocksuite/e2e/utils/asserts.ts b/tests/blocksuite/e2e/utils/asserts.ts index f227d2465c..4c02d35b1d 100644 --- a/tests/blocksuite/e2e/utils/asserts.ts +++ b/tests/blocksuite/e2e/utils/asserts.ts @@ -1,15 +1,15 @@ import './declare-test-window.js'; -import type { - BlockComponent, - EditorHost, - TextSelection, -} from '@blocksuite/affine/block-std'; -import type { InlineRootElement } from '@blocksuite/affine/block-std/inline'; import type { EdgelessNoteBackground } from '@blocksuite/affine/blocks/note'; import type { NoteBlockModel, RootBlockModel } from '@blocksuite/affine/model'; import type { RichText } from '@blocksuite/affine/rich-text'; import type { AffineInlineEditor } from '@blocksuite/affine/shared/types'; +import type { + BlockComponent, + EditorHost, + TextSelection, +} from '@blocksuite/affine/std'; +import type { InlineRootElement } from '@blocksuite/affine/std/inline'; import type { BlockModel } from '@blocksuite/affine/store'; import { expect, type Locator, type Page } from '@playwright/test'; diff --git a/tests/blocksuite/e2e/utils/declare-test-window.ts b/tests/blocksuite/e2e/utils/declare-test-window.ts index 07e0cb5307..a1f6bc5480 100644 --- a/tests/blocksuite/e2e/utils/declare-test-window.ts +++ b/tests/blocksuite/e2e/utils/declare-test-window.ts @@ -1,7 +1,7 @@ -import type { EditorHost } from '@blocksuite/affine/block-std'; import type * as Effects from '@blocksuite/affine/effects'; import type * as ConnectorToolEffect from '@blocksuite/affine/gfx/connector'; import type * as ShapeToolEffect from '@blocksuite/affine/gfx/shape'; +import type { EditorHost } from '@blocksuite/affine/std'; import type { Store, Transformer, Workspace } from '@blocksuite/affine/store'; import type { TestAffineEditorContainer } from '@blocksuite/integration-test'; @@ -26,7 +26,7 @@ declare global { }; services: typeof import('@blocksuite/affine/shared/services'); editor: typeof import('@blocksuite/integration-test'); - blockStd: typeof import('@blocksuite/affine/block-std'); + blockStd: typeof import('@blocksuite/affine/std'); }; collection: Workspace; doc: Store; diff --git a/tests/blocksuite/e2e/utils/inline-editor.ts b/tests/blocksuite/e2e/utils/inline-editor.ts index b82a8edee4..ae625ac78c 100644 --- a/tests/blocksuite/e2e/utils/inline-editor.ts +++ b/tests/blocksuite/e2e/utils/inline-editor.ts @@ -21,7 +21,7 @@ export async function getStringFromRichText( ); } -// Why? we can't import from `@blocksuite/affine/block-std/inline` because playwright will throw an error +// Why? we can't import from `@blocksuite/affine/std/inline` because playwright will throw an error export const ZERO_WIDTH_SPACE = /Apple Computer/.test( globalThis.navigator?.vendor ) diff --git a/tools/utils/src/workspace.gen.ts b/tools/utils/src/workspace.gen.ts index df89a694c0..867b446b8c 100644 --- a/tools/utils/src/workspace.gen.ts +++ b/tools/utils/src/workspace.gen.ts @@ -53,9 +53,9 @@ export const PackageList = [ 'blocksuite/affine/widgets/widget-scroll-anchoring', 'blocksuite/affine/widgets/widget-slash-menu', 'blocksuite/affine/widgets/widget-toolbar', - 'blocksuite/framework/block-std', 'blocksuite/affine/data-view', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', 'blocksuite/framework/sync', ], @@ -70,8 +70,8 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-slash-menu', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -85,8 +85,8 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-slash-menu', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -100,8 +100,8 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-slash-menu', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -117,8 +117,8 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-slash-menu', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -131,9 +131,9 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-slash-menu', - 'blocksuite/framework/block-std', 'blocksuite/affine/data-view', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -149,9 +149,9 @@ export const PackageList = [ 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-drag-handle', 'blocksuite/affine/widgets/widget-slash-menu', - 'blocksuite/framework/block-std', 'blocksuite/affine/data-view', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -162,8 +162,8 @@ export const PackageList = [ 'blocksuite/affine/components', 'blocksuite/affine/model', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -178,8 +178,8 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-edgeless-toolbar', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -194,8 +194,8 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-slash-menu', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -209,8 +209,8 @@ export const PackageList = [ 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-edgeless-toolbar', 'blocksuite/affine/widgets/widget-frame-title', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -224,8 +224,8 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-slash-menu', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -240,8 +240,8 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-slash-menu', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -254,8 +254,8 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -272,8 +272,8 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-slash-menu', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -287,8 +287,8 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -335,9 +335,9 @@ export const PackageList = [ 'blocksuite/affine/widgets/widget-scroll-anchoring', 'blocksuite/affine/widgets/widget-slash-menu', 'blocksuite/affine/widgets/widget-toolbar', - 'blocksuite/framework/block-std', 'blocksuite/affine/data-view', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -349,8 +349,8 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -365,8 +365,8 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-slash-menu', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -380,9 +380,9 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-slash-menu', - 'blocksuite/framework/block-std', 'blocksuite/affine/data-view', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -392,8 +392,8 @@ export const PackageList = [ workspaceDependencies: [ 'blocksuite/affine/model', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -403,8 +403,8 @@ export const PackageList = [ workspaceDependencies: [ 'blocksuite/affine/components', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -418,8 +418,8 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -433,8 +433,8 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -448,8 +448,8 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -463,8 +463,8 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-edgeless-toolbar', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -478,8 +478,8 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-edgeless-toolbar', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -493,8 +493,8 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-edgeless-toolbar', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -512,8 +512,8 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-edgeless-toolbar', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -530,8 +530,8 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-edgeless-toolbar', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -546,8 +546,8 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-edgeless-toolbar', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -562,8 +562,8 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/widget-edgeless-toolbar', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -571,8 +571,8 @@ export const PackageList = [ location: 'blocksuite/affine/gfx/turbo-renderer', name: '@blocksuite/affine-gfx-turbo-renderer', workspaceDependencies: [ - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -584,8 +584,8 @@ export const PackageList = [ 'blocksuite/affine/inlines/reference', 'blocksuite/affine/model', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -598,8 +598,8 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -611,8 +611,8 @@ export const PackageList = [ 'blocksuite/affine/inlines/reference', 'blocksuite/affine/model', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -623,8 +623,8 @@ export const PackageList = [ 'blocksuite/affine/components', 'blocksuite/affine/model', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -641,8 +641,8 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -653,8 +653,8 @@ export const PackageList = [ 'blocksuite/affine/components', 'blocksuite/affine/model', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -662,8 +662,8 @@ export const PackageList = [ location: 'blocksuite/affine/model', name: '@blocksuite/affine-model', workspaceDependencies: [ - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -674,8 +674,8 @@ export const PackageList = [ 'blocksuite/affine/components', 'blocksuite/affine/model', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -684,8 +684,8 @@ export const PackageList = [ name: '@blocksuite/affine-shared', workspaceDependencies: [ 'blocksuite/affine/model', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -701,8 +701,8 @@ export const PackageList = [ 'blocksuite/affine/components', 'blocksuite/affine/model', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -715,8 +715,8 @@ export const PackageList = [ 'blocksuite/affine/components', 'blocksuite/affine/model', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', ], }, { @@ -728,8 +728,8 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', ], }, { @@ -740,8 +740,8 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', ], }, { @@ -752,8 +752,8 @@ export const PackageList = [ 'blocksuite/affine/components', 'blocksuite/affine/model', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', ], }, { @@ -762,8 +762,8 @@ export const PackageList = [ workspaceDependencies: [ 'blocksuite/affine/model', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', ], }, { @@ -773,8 +773,8 @@ export const PackageList = [ 'blocksuite/affine/components', 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', 'blocksuite/framework/store', ], }, @@ -788,8 +788,8 @@ export const PackageList = [ 'blocksuite/affine/components', 'blocksuite/affine/model', 'blocksuite/affine/shared', - 'blocksuite/framework/block-std', 'blocksuite/framework/global', + 'blocksuite/framework/std', ], }, { @@ -798,18 +798,18 @@ export const PackageList = [ workspaceDependencies: ['blocksuite/affine/all'], }, { - location: 'blocksuite/framework/block-std', - name: '@blocksuite/block-std', + location: 'blocksuite/framework/global', + name: '@blocksuite/global', + workspaceDependencies: [], + }, + { + location: 'blocksuite/framework/std', + name: '@blocksuite/std', workspaceDependencies: [ 'blocksuite/framework/global', 'blocksuite/framework/store', ], }, - { - location: 'blocksuite/framework/global', - name: '@blocksuite/global', - workspaceDependencies: [], - }, { location: 'blocksuite/framework/store', name: '@blocksuite/store', @@ -1192,8 +1192,8 @@ export type PackageName = | '@blocksuite/affine-widget-slash-menu' | '@blocksuite/affine-widget-toolbar' | '@blocksuite/bs-docs' - | '@blocksuite/block-std' | '@blocksuite/global' + | '@blocksuite/std' | '@blocksuite/store' | '@blocksuite/sync' | '@blocksuite/integration-test' diff --git a/tsconfig.json b/tsconfig.json index 161a76487a..a7a18649c7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -101,8 +101,8 @@ { "path": "./blocksuite/affine/widgets/widget-slash-menu" }, { "path": "./blocksuite/affine/widgets/widget-toolbar" }, { "path": "./blocksuite/docs" }, - { "path": "./blocksuite/framework/block-std" }, { "path": "./blocksuite/framework/global" }, + { "path": "./blocksuite/framework/std" }, { "path": "./blocksuite/framework/store" }, { "path": "./blocksuite/framework/sync" }, { "path": "./blocksuite/integration-test" }, diff --git a/yarn.lock b/yarn.lock index 0c3b060b1e..dd38bc475a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2318,9 +2318,9 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2344,9 +2344,9 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@lit/context": "npm:^1.1.2" "@preact/signals-core": "npm:^1.8.0" @@ -2369,9 +2369,9 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@emoji-mart/data": "npm:^1.2.1" "@floating-ui/dom": "npm:^1.6.10" @@ -2399,9 +2399,9 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2425,10 +2425,10 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/data-view": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2454,10 +2454,10 @@ __metadata: "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-drag-handle": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/data-view": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2481,8 +2481,8 @@ __metadata: "@blocksuite/affine-components": "workspace:*" "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2507,9 +2507,9 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2533,9 +2533,9 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2562,9 +2562,9 @@ __metadata: "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*" "@blocksuite/affine-widget-frame-title": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2589,9 +2589,9 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2616,9 +2616,9 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2644,9 +2644,9 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2674,9 +2674,9 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@lit/context": "npm:^1.1.2" "@preact/signals-core": "npm:^1.8.0" @@ -2702,8 +2702,8 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2760,10 +2760,10 @@ __metadata: "@blocksuite/affine-widget-scroll-anchoring": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*" "@blocksuite/affine-widget-toolbar": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/data-view": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2796,9 +2796,9 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2822,8 +2822,8 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@lit/context": "npm:^1.1.2" "@preact/signals-core": "npm:^1.8.0" @@ -2853,10 +2853,10 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/data-view": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@preact/signals-core": "npm:^1.8.0" @@ -2874,9 +2874,9 @@ __metadata: dependencies: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2911,9 +2911,9 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2936,9 +2936,9 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2963,9 +2963,9 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -2989,9 +2989,9 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.6" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@lit/context": "npm:^1.1.2" "@preact/signals-core": "npm:^1.8.0" @@ -3016,9 +3016,9 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@lit/context": "npm:^1.1.2" "@preact/signals-core": "npm:^1.8.0" @@ -3043,9 +3043,9 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.6" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@lit/context": "npm:^1.1.2" "@preact/signals-core": "npm:^1.8.0" @@ -3074,9 +3074,9 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@lit/context": "npm:^1.1.2" "@preact/signals-core": "npm:^1.8.0" @@ -3105,9 +3105,9 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@lit/context": "npm:^1.1.2" "@preact/signals-core": "npm:^1.8.0" @@ -3133,9 +3133,9 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@lit/context": "npm:^1.1.2" "@preact/signals-core": "npm:^1.8.0" @@ -3161,9 +3161,9 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@lit/context": "npm:^1.1.2" "@preact/signals-core": "npm:^1.8.0" @@ -3182,8 +3182,8 @@ __metadata: version: 0.0.0-use.local resolution: "@blocksuite/affine-gfx-turbo-renderer@workspace:blocksuite/affine/gfx/turbo-renderer" dependencies: - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" rxjs: "npm:^7.8.1" languageName: unknown @@ -3197,9 +3197,9 @@ __metadata: "@blocksuite/affine-inline-reference": "workspace:*" "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -3226,9 +3226,9 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -3259,9 +3259,9 @@ __metadata: "@blocksuite/affine-inline-reference": "workspace:*" "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -3286,9 +3286,9 @@ __metadata: "@blocksuite/affine-components": "workspace:*" "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -3319,9 +3319,9 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -3352,9 +3352,9 @@ __metadata: "@blocksuite/affine-components": "workspace:*" "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -3376,8 +3376,8 @@ __metadata: version: 0.0.0-use.local resolution: "@blocksuite/affine-model@workspace:blocksuite/affine/model" dependencies: - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@toeverything/theme": "npm:^1.1.12" "@types/lodash-es": "npm:^4.17.12" @@ -3396,9 +3396,9 @@ __metadata: "@blocksuite/affine-components": "workspace:*" "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -3421,9 +3421,9 @@ __metadata: resolution: "@blocksuite/affine-shared@workspace:blocksuite/affine/shared" dependencies: "@blocksuite/affine-model": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -3473,9 +3473,9 @@ __metadata: "@blocksuite/affine-components": "workspace:*" "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" @@ -3499,9 +3499,9 @@ __metadata: "@blocksuite/affine-components": "workspace:*" "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@preact/signals-core": "npm:^1.8.0" "@toeverything/theme": "npm:^1.1.12" lit: "npm:^3.2.0" @@ -3518,9 +3518,9 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@lit/context": "npm:^1.1.2" "@preact/signals-core": "npm:^1.8.0" @@ -3540,8 +3540,8 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" + "@blocksuite/std": "workspace:*" "@lit/context": "npm:^1.1.2" "@preact/signals-core": "npm:^1.8.0" "@toeverything/theme": "npm:^1.1.12" @@ -3558,9 +3558,9 @@ __metadata: "@blocksuite/affine-components": "workspace:*" "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@preact/signals-core": "npm:^1.8.0" "@toeverything/theme": "npm:^1.1.12" "@types/lodash-es": "npm:^4.17.12" @@ -3576,8 +3576,8 @@ __metadata: dependencies: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" + "@blocksuite/std": "workspace:*" "@preact/signals-core": "npm:^1.8.0" "@toeverything/theme": "npm:^1.1.12" lit: "npm:^3.2.0" @@ -3592,9 +3592,9 @@ __metadata: "@blocksuite/affine-components": "workspace:*" "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@preact/signals-core": "npm:^1.8.0" @@ -3616,9 +3616,9 @@ __metadata: "@blocksuite/affine-components": "workspace:*" "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@floating-ui/dom": "npm:^1.6.13" "@preact/signals-core": "npm:^1.8.0" "@toeverything/theme": "npm:^1.1.12" @@ -3686,9 +3686,9 @@ __metadata: "@blocksuite/affine-widget-scroll-anchoring": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*" "@blocksuite/affine-widget-toolbar": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/data-view": "workspace:*" "@blocksuite/global": "workspace:*" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@blocksuite/sync": "workspace:*" "@vanilla-extract/vite-plugin": "npm:^5.0.0" @@ -3697,35 +3697,6 @@ __metadata: languageName: unknown linkType: soft -"@blocksuite/block-std@workspace:*, @blocksuite/block-std@workspace:blocksuite/framework/block-std": - version: 0.0.0-use.local - resolution: "@blocksuite/block-std@workspace:blocksuite/framework/block-std" - dependencies: - "@atlaskit/pragmatic-drag-and-drop": "npm:^1.4.0" - "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "npm:^2.1.0" - "@atlaskit/pragmatic-drag-and-drop-hitbox": "npm:^1.0.3" - "@blocksuite/global": "workspace:*" - "@blocksuite/store": "workspace:*" - "@lit/context": "npm:^1.1.2" - "@preact/signals-core": "npm:^1.8.0" - "@types/hast": "npm:^3.0.4" - "@types/lodash-es": "npm:^4.17.12" - dompurify: "npm:^3.2.4" - fractional-indexing: "npm:^3.2.0" - lib0: "npm:^0.2.97" - lit: "npm:^3.2.0" - lodash-es: "npm:^4.17.21" - lz-string: "npm:^1.5.0" - rehype-parse: "npm:^9.0.0" - rxjs: "npm:^7.8.1" - unified: "npm:^11.0.5" - vitest: "npm:3.0.9" - w3c-keyname: "npm:^2.2.8" - yjs: "npm:^13.6.21" - zod: "npm:^3.23.8" - languageName: unknown - linkType: soft - "@blocksuite/bs-docs@workspace:blocksuite/docs": version: 0.0.0-use.local resolution: "@blocksuite/bs-docs@workspace:blocksuite/docs" @@ -3742,9 +3713,9 @@ __metadata: dependencies: "@blocksuite/affine-components": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/block-std": "workspace:*" "@blocksuite/global": "workspace:*" "@blocksuite/icons": "npm:^2.2.8" + "@blocksuite/std": "workspace:*" "@blocksuite/store": "workspace:*" "@emotion/hash": "npm:^0.9.2" "@floating-ui/dom": "npm:^1.6.13" @@ -3855,6 +3826,35 @@ __metadata: languageName: unknown linkType: soft +"@blocksuite/std@workspace:*, @blocksuite/std@workspace:blocksuite/framework/std": + version: 0.0.0-use.local + resolution: "@blocksuite/std@workspace:blocksuite/framework/std" + dependencies: + "@atlaskit/pragmatic-drag-and-drop": "npm:^1.4.0" + "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "npm:^2.1.0" + "@atlaskit/pragmatic-drag-and-drop-hitbox": "npm:^1.0.3" + "@blocksuite/global": "workspace:*" + "@blocksuite/store": "workspace:*" + "@lit/context": "npm:^1.1.2" + "@preact/signals-core": "npm:^1.8.0" + "@types/hast": "npm:^3.0.4" + "@types/lodash-es": "npm:^4.17.12" + dompurify: "npm:^3.2.4" + fractional-indexing: "npm:^3.2.0" + lib0: "npm:^0.2.97" + lit: "npm:^3.2.0" + lodash-es: "npm:^4.17.21" + lz-string: "npm:^1.5.0" + rehype-parse: "npm:^9.0.0" + rxjs: "npm:^7.8.1" + unified: "npm:^11.0.5" + vitest: "npm:3.0.9" + w3c-keyname: "npm:^2.2.8" + yjs: "npm:^13.6.21" + zod: "npm:^3.23.8" + languageName: unknown + linkType: soft + "@blocksuite/store@workspace:*, @blocksuite/store@workspace:blocksuite/framework/store": version: 0.0.0-use.local resolution: "@blocksuite/store@workspace:blocksuite/framework/store"