Skip to content

There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.

feat: migrate to blocksuite/affine (#8332)

Saul-Mirone35e232c61cb2
diff --git a/packages/common/env/package.json b/packages/common/env/package.json
index 58478cfd90..7b0e83a306 100644
--- a/packages/common/env/package.json
+++ b/packages/common/env/package.json
@@ -3,8 +3,7 @@
"private": true,
"type": "module",
"devDependencies": {
- "@blocksuite/global": "0.17.14",
- "@blocksuite/store": "0.17.14",
+ "@blocksuite/affine": "0.17.14",
"vitest": "2.1.1"
},
"exports": {
@@ -17,8 +16,7 @@
"./blocksuite": "./src/blocksuite/index.ts"
},
"peerDependencies": {
- "@affine/templates": "workspace:*",
- "@blocksuite/global": "0.11.0-nightly-202401020419-752a5b8"
+ "@affine/templates": "workspace:*"
},
"dependencies": {
"zod": "^3.22.4"
diff --git a/packages/common/env/src/constant.ts b/packages/common/env/src/constant.ts
index 802b073670..13b2fdd714 100644
--- a/packages/common/env/src/constant.ts
+++ b/packages/common/env/src/constant.ts
@@ -1,5 +1,5 @@
// This file should has not side effect
-import type { DocCollection } from '@blocksuite/store';
+import type { DocCollection } from '@blocksuite/affine/store';
declare global {
// eslint-disable-next-line no-var
diff --git a/packages/common/env/src/filter.ts b/packages/common/env/src/filter.ts
index 55c60bb6f9..db2d1a5e24 100644
--- a/packages/common/env/src/filter.ts
+++ b/packages/common/env/src/filter.ts
@@ -1,4 +1,4 @@
-import type { DocCollection } from '@blocksuite/store';
+import type { DocCollection } from '@blocksuite/affine/store';
import { z } from 'zod';
export const literalValueSchema: z.ZodType<LiteralValue, z.ZodTypeDef> =
diff --git a/packages/common/infra/package.json b/packages/common/infra/package.json
index 6614c09df7..b796ad82b1 100644
--- a/packages/common/infra/package.json
+++ b/packages/common/infra/package.json
@@ -14,10 +14,7 @@
"@affine/debug": "workspace:*",
"@affine/env": "workspace:*",
"@affine/templates": "workspace:*",
- "@blocksuite/blocks": "0.17.14",
- "@blocksuite/global": "0.17.14",
- "@blocksuite/presets": "0.17.14",
- "@blocksuite/store": "0.17.14",
+ "@blocksuite/affine": "0.17.14",
"@datastructures-js/binary-search-tree": "^5.3.2",
"foxact": "^0.2.33",
"fuse.js": "^7.0.0",
@@ -34,7 +31,6 @@
"devDependencies": {
"@affine-test/fixtures": "workspace:*",
"@affine/templates": "workspace:*",
- "@blocksuite/presets": "0.17.14",
"@testing-library/react": "^16.0.0",
"fake-indexeddb": "^6.0.0",
"react": "^18.2.0",
@@ -43,7 +39,6 @@
},
"peerDependencies": {
"@affine/templates": "*",
- "@blocksuite/presets": "*",
"electron": "*",
"react": "*",
"yjs": "^13"
@@ -52,9 +47,6 @@
"@affine/templates": {
"optional": true
},
- "@blocksuite/presets": {
- "optional": true
- },
"electron": {
"optional": true
},
diff --git a/packages/common/infra/src/blocksuite/migration/blocksuite.ts b/packages/common/infra/src/blocksuite/migration/blocksuite.ts
index f07a55cd7d..cb891abb97 100644
--- a/packages/common/infra/src/blocksuite/migration/blocksuite.ts
+++ b/packages/common/infra/src/blocksuite/migration/blocksuite.ts
@@ -1,4 +1,4 @@
-import type { Schema } from '@blocksuite/store';
+import type { Schema } from '@blocksuite/affine/store';
import type { Array as YArray } from 'yjs';
import {
applyUpdate,
diff --git a/packages/common/infra/src/blocksuite/migration/workspace.ts b/packages/common/infra/src/blocksuite/migration/workspace.ts
index 79b6f4700e..1b36b5e525 100644
--- a/packages/common/infra/src/blocksuite/migration/workspace.ts
+++ b/packages/common/infra/src/blocksuite/migration/workspace.ts
@@ -1,4 +1,4 @@
-import type { DocCollection } from '@blocksuite/store';
+import type { DocCollection } from '@blocksuite/affine/store';
import type { Array as YArray, Doc as YDoc, Map as YMap } from 'yjs';
/**
diff --git a/packages/common/infra/src/initialization/index.ts b/packages/common/infra/src/initialization/index.ts
index c120ecee07..6051345d0f 100644
--- a/packages/common/infra/src/initialization/index.ts
+++ b/packages/common/infra/src/initialization/index.ts
@@ -1,11 +1,11 @@
-import type { SurfaceBlockProps } from '@blocksuite/block-std/gfx';
+import type { SurfaceBlockProps } from '@blocksuite/affine/block-std/gfx';
import {
NoteDisplayMode,
type NoteProps,
type ParagraphProps,
type RootBlockProps,
-} from '@blocksuite/blocks';
-import { type Doc, Text } from '@blocksuite/store';
+} from '@blocksuite/affine/blocks';
+import { type Doc, Text } from '@blocksuite/affine/store';
export interface DocProps {
page?: Partial<RootBlockProps>;
diff --git a/packages/common/infra/src/modules/doc/entities/doc.ts b/packages/common/infra/src/modules/doc/entities/doc.ts
index ba14c73f05..f08af61a6a 100644
--- a/packages/common/infra/src/modules/doc/entities/doc.ts
+++ b/packages/common/infra/src/modules/doc/entities/doc.ts
@@ -1,4 +1,4 @@
-import type { DocMode, RootBlockModel } from '@blocksuite/blocks';
+import type { DocMode, RootBlockModel } from '@blocksuite/affine/blocks';
import { Entity } from '../../../framework';
import type { WorkspaceService } from '../../workspace';
diff --git a/packages/common/infra/src/modules/doc/entities/record-list.ts b/packages/common/infra/src/modules/doc/entities/record-list.ts
index 1caa94f7aa..2cdfcb556f 100644
--- a/packages/common/infra/src/modules/doc/entities/record-list.ts
+++ b/packages/common/infra/src/modules/doc/entities/record-list.ts
@@ -1,4 +1,4 @@
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import { map } from 'rxjs';
import { Entity } from '../../../framework';
diff --git a/packages/common/infra/src/modules/doc/entities/record.ts b/packages/common/infra/src/modules/doc/entities/record.ts
index c07c6cc636..6afe1876d1 100644
--- a/packages/common/infra/src/modules/doc/entities/record.ts
+++ b/packages/common/infra/src/modules/doc/entities/record.ts
@@ -1,5 +1,5 @@
-import type { DocMode } from '@blocksuite/blocks';
-import type { DocMeta } from '@blocksuite/store';
+import type { DocMode } from '@blocksuite/affine/blocks';
+import type { DocMeta } from '@blocksuite/affine/store';
import { Entity } from '../../../framework';
import { LiveData } from '../../../livedata';
diff --git a/packages/common/infra/src/modules/doc/scopes/doc.ts b/packages/common/infra/src/modules/doc/scopes/doc.ts
index d49f0ddf8f..6ef46871d0 100644
--- a/packages/common/infra/src/modules/doc/scopes/doc.ts
+++ b/packages/common/infra/src/modules/doc/scopes/doc.ts
@@ -1,4 +1,4 @@
-import type { Doc as BlockSuiteDoc } from '@blocksuite/store';
+import type { Doc as BlockSuiteDoc } from '@blocksuite/affine/store';
import { Scope } from '../../../framework';
import type { DocRecord } from '../entities/record';
diff --git a/packages/common/infra/src/modules/doc/services/docs.ts b/packages/common/infra/src/modules/doc/services/docs.ts
index 1d1f33f5c3..5485301b3a 100644
--- a/packages/common/infra/src/modules/doc/services/docs.ts
+++ b/packages/common/infra/src/modules/doc/services/docs.ts
@@ -1,5 +1,5 @@
import { Unreachable } from '@affine/env/constant';
-import { type DocMode } from '@blocksuite/blocks';
+import { type DocMode } from '@blocksuite/affine/blocks';
import { Service } from '../../../framework';
import { type DocProps, initDocFromProps } from '../../../initialization';
diff --git a/packages/common/infra/src/modules/doc/stores/docs.ts b/packages/common/infra/src/modules/doc/stores/docs.ts
index 272a589aa4..0647a0a50e 100644
--- a/packages/common/infra/src/modules/doc/stores/docs.ts
+++ b/packages/common/infra/src/modules/doc/stores/docs.ts
@@ -1,5 +1,5 @@
-import type { DocMode } from '@blocksuite/blocks';
-import type { DocMeta } from '@blocksuite/store';
+import type { DocMode } from '@blocksuite/affine/blocks';
+import type { DocMeta } from '@blocksuite/affine/store';
import { isEqual } from 'lodash-es';
import { distinctUntilChanged, Observable } from 'rxjs';
diff --git a/packages/common/infra/src/modules/feature-flag/types.ts b/packages/common/infra/src/modules/feature-flag/types.ts
index 3a9bf0a4fd..665377bcd9 100644
--- a/packages/common/infra/src/modules/feature-flag/types.ts
+++ b/packages/common/infra/src/modules/feature-flag/types.ts
@@ -1,4 +1,4 @@
-import type { BlockSuiteFlags } from '@blocksuite/global/types';
+import type { BlockSuiteFlags } from '@blocksuite/affine/global/types';
type FeedbackType = 'discord' | 'email' | 'github';
diff --git a/packages/common/infra/src/modules/global-context/entities/global-context.ts b/packages/common/infra/src/modules/global-context/entities/global-context.ts
index e350da46ec..37f0bedfd9 100644
--- a/packages/common/infra/src/modules/global-context/entities/global-context.ts
+++ b/packages/common/infra/src/modules/global-context/entities/global-context.ts
@@ -1,4 +1,4 @@
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import { Entity } from '../../../framework';
import { LiveData } from '../../../livedata';
diff --git a/packages/common/infra/src/modules/workspace/entities/workspace.ts b/packages/common/infra/src/modules/workspace/entities/workspace.ts
index d32148b441..bf61729b95 100644
--- a/packages/common/infra/src/modules/workspace/entities/workspace.ts
+++ b/packages/common/infra/src/modules/workspace/entities/workspace.ts
@@ -1,4 +1,4 @@
-import { DocCollection } from '@blocksuite/store';
+import { DocCollection } from '@blocksuite/affine/store';
import { nanoid } from 'nanoid';
import { Observable } from 'rxjs';
import type { Awareness } from 'y-protocols/awareness.js';
diff --git a/packages/common/infra/src/modules/workspace/global-schema.ts b/packages/common/infra/src/modules/workspace/global-schema.ts
index 9be14d4286..4466ece1cb 100644
--- a/packages/common/infra/src/modules/workspace/global-schema.ts
+++ b/packages/common/infra/src/modules/workspace/global-schema.ts
@@ -1,6 +1,6 @@
-import { AffineSchemas } from '@blocksuite/blocks/schemas';
-import { AIChatBlockSchema } from '@blocksuite/presets';
-import { Schema } from '@blocksuite/store';
+import { AffineSchemas } from '@blocksuite/affine/blocks/schemas';
+import { AIChatBlockSchema } from '@blocksuite/affine/presets';
+import { Schema } from '@blocksuite/affine/store';
let _schema: Schema | null = null;
export function getAFFiNEWorkspaceSchema() {
diff --git a/packages/common/infra/src/modules/workspace/providers/flavour.ts b/packages/common/infra/src/modules/workspace/providers/flavour.ts
index e00fd850e0..c75ffd8115 100644
--- a/packages/common/infra/src/modules/workspace/providers/flavour.ts
+++ b/packages/common/infra/src/modules/workspace/providers/flavour.ts
@@ -1,5 +1,5 @@
import type { WorkspaceFlavour } from '@affine/env/workspace';
-import type { DocCollection } from '@blocksuite/store';
+import type { DocCollection } from '@blocksuite/affine/store';
import { createIdentifier } from '../../../framework';
import type { LiveData } from '../../../livedata';
diff --git a/packages/common/infra/src/modules/workspace/scopes/workspace.ts b/packages/common/infra/src/modules/workspace/scopes/workspace.ts
index 6371139231..934eee8ebd 100644
--- a/packages/common/infra/src/modules/workspace/scopes/workspace.ts
+++ b/packages/common/infra/src/modules/workspace/scopes/workspace.ts
@@ -2,7 +2,7 @@ import { Scope } from '../../../framework';
import type { WorkspaceOpenOptions } from '../open-options';
import type { WorkspaceEngineProvider } from '../providers/flavour';
-export type { DocCollection } from '@blocksuite/store';
+export type { DocCollection } from '@blocksuite/affine/store';
export class WorkspaceScope extends Scope<{
openOptions: WorkspaceOpenOptions;
diff --git a/packages/common/infra/src/modules/workspace/services/factory.ts b/packages/common/infra/src/modules/workspace/services/factory.ts
index 171f4bc0b0..5b87046495 100644
--- a/packages/common/infra/src/modules/workspace/services/factory.ts
+++ b/packages/common/infra/src/modules/workspace/services/factory.ts
@@ -1,5 +1,5 @@
import type { WorkspaceFlavour } from '@affine/env/workspace';
-import type { DocCollection } from '@blocksuite/store';
+import type { DocCollection } from '@blocksuite/affine/store';
import { Service } from '../../../framework';
import type { BlobStorage, DocStorage } from '../../../sync';
diff --git a/packages/common/infra/src/modules/workspace/services/transform.ts b/packages/common/infra/src/modules/workspace/services/transform.ts
index 9c2351299e..690a506c82 100644
--- a/packages/common/infra/src/modules/workspace/services/transform.ts
+++ b/packages/common/infra/src/modules/workspace/services/transform.ts
@@ -1,5 +1,5 @@
import { WorkspaceFlavour } from '@affine/env/workspace';
-import { assertEquals } from '@blocksuite/global/utils';
+import { assertEquals } from '@blocksuite/affine/global/utils';
import { applyUpdate, encodeStateAsUpdate } from 'yjs';
import { Service } from '../../../framework';
diff --git a/packages/common/infra/src/modules/workspace/testing/testing-provider.ts b/packages/common/infra/src/modules/workspace/testing/testing-provider.ts
index 9e8707be5e..11468860a4 100644
--- a/packages/common/infra/src/modules/workspace/testing/testing-provider.ts
+++ b/packages/common/infra/src/modules/workspace/testing/testing-provider.ts
@@ -1,5 +1,5 @@
import { WorkspaceFlavour } from '@affine/env/workspace';
-import { DocCollection, nanoid } from '@blocksuite/store';
+import { DocCollection, nanoid } from '@blocksuite/affine/store';
import { map } from 'rxjs';
import { applyUpdate, encodeStateAsUpdate } from 'yjs';
diff --git a/packages/common/infra/src/sync/blob/blob.ts b/packages/common/infra/src/sync/blob/blob.ts
index 658e9989b9..7e7b35a0a6 100644
--- a/packages/common/infra/src/sync/blob/blob.ts
+++ b/packages/common/infra/src/sync/blob/blob.ts
@@ -1,5 +1,5 @@
import { DebugLogger } from '@affine/debug';
-import { Slot } from '@blocksuite/global/utils';
+import { Slot } from '@blocksuite/affine/global/utils';
import { difference } from 'lodash-es';
import { LiveData } from '../../livedata';
diff --git a/packages/frontend/apps/electron/package.json b/packages/frontend/apps/electron/package.json
index 00570dbef5..871a85080e 100644
--- a/packages/frontend/apps/electron/package.json
+++ b/packages/frontend/apps/electron/package.json
@@ -28,7 +28,7 @@
"@affine/core": "workspace:*",
"@affine/i18n": "workspace:*",
"@affine/native": "workspace:*",
- "@blocksuite/global": "0.17.14",
+ "@blocksuite/affine": "0.17.14",
"@electron-forge/cli": "^7.3.0",
"@electron-forge/core": "^7.3.0",
"@electron-forge/core-utils": "^7.3.0",
diff --git a/packages/frontend/apps/electron/src/helper/main-rpc.ts b/packages/frontend/apps/electron/src/helper/main-rpc.ts
index 64862e44c9..419970f296 100644
--- a/packages/frontend/apps/electron/src/helper/main-rpc.ts
+++ b/packages/frontend/apps/electron/src/helper/main-rpc.ts
@@ -1,4 +1,4 @@
-import { assertExists } from '@blocksuite/global/utils';
+import { assertExists } from '@blocksuite/affine/global/utils';
import { AsyncCall } from 'async-call-rpc';
import type { HelperToMain, MainToHelper } from '../shared/type';
diff --git a/packages/frontend/apps/mobile/package.json b/packages/frontend/apps/mobile/package.json
index 498b8c1cf0..ffb5dc1770 100644
--- a/packages/frontend/apps/mobile/package.json
+++ b/packages/frontend/apps/mobile/package.json
@@ -13,7 +13,7 @@
"@affine/component": "workspace:*",
"@affine/core": "workspace:*",
"@affine/i18n": "workspace:*",
- "@blocksuite/blocks": "0.17.14",
+ "@blocksuite/affine": "0.17.14",
"@blocksuite/icons": "^2.1.67",
"@sentry/react": "^8.0.0",
"react": "^18.2.0",
diff --git a/packages/frontend/component/package.json b/packages/frontend/component/package.json
index e2a6e2975e..07375df96a 100644
--- a/packages/frontend/component/package.json
+++ b/packages/frontend/component/package.json
@@ -13,11 +13,8 @@
"build:storybook": "storybook build"
},
"peerDependencies": {
- "@blocksuite/blocks": "*",
- "@blocksuite/global": "*",
- "@blocksuite/icons": "2.1.67",
- "@blocksuite/presets": "*",
- "@blocksuite/store": "*"
+ "@blocksuite/affine": "*",
+ "@blocksuite/icons": "2.1.67"
},
"dependencies": {
"@affine/cli": "workspace:*",
@@ -63,7 +60,7 @@
"zod": "^3.22.4"
},
"devDependencies": {
- "@blocksuite/global": "0.17.14",
+ "@blocksuite/affine": "0.17.14",
"@blocksuite/icons": "2.1.67",
"@chromatic-com/storybook": "^2.0.0",
"@storybook/addon-essentials": "^8.2.9",
diff --git a/packages/frontend/component/src/components/resize-panel/resize-panel.tsx b/packages/frontend/component/src/components/resize-panel/resize-panel.tsx
index 5c9d38b487..73e68eff29 100644
--- a/packages/frontend/component/src/components/resize-panel/resize-panel.tsx
+++ b/packages/frontend/component/src/components/resize-panel/resize-panel.tsx
@@ -1,4 +1,4 @@
-import { assertExists } from '@blocksuite/global/utils';
+import { assertExists } from '@blocksuite/affine/global/utils';
import { assignInlineVars } from '@vanilla-extract/dynamic';
import clsx from 'clsx';
import {
diff --git a/packages/frontend/core/package.json b/packages/frontend/core/package.json
index 6cce66a191..fd6a39631e 100644
--- a/packages/frontend/core/package.json
+++ b/packages/frontend/core/package.json
@@ -16,13 +16,8 @@
"@affine/i18n": "workspace:*",
"@affine/templates": "workspace:*",
"@affine/track": "workspace:*",
- "@blocksuite/block-std": "0.17.14",
- "@blocksuite/blocks": "0.17.14",
- "@blocksuite/global": "0.17.14",
+ "@blocksuite/affine": "0.17.14",
"@blocksuite/icons": "2.1.67",
- "@blocksuite/inline": "0.17.14",
- "@blocksuite/presets": "0.17.14",
- "@blocksuite/store": "0.17.14",
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/modifiers": "^7.0.0",
"@dnd-kit/sortable": "^8.0.0",
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/_common/chat-actions-handle.ts b/packages/frontend/core/src/blocksuite/presets/ai/_common/chat-actions-handle.ts
index fa95460cfe..26849edba2 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/_common/chat-actions-handle.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/_common/chat-actions-handle.ts
@@ -3,13 +3,13 @@ import type {
BlockSelection,
EditorHost,
TextSelection,
-} from '@blocksuite/block-std';
+} from '@blocksuite/affine/block-std';
import type {
DocMode,
EdgelessRootService,
ImageSelection,
RootService,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import {
BlocksUtils,
DocModeProvider,
@@ -18,14 +18,14 @@ import {
NotificationProvider,
RefNodeSlotsProvider,
TelemetryProvider,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import {
Bound,
getElementsBound,
type SerializedXYWH,
-} from '@blocksuite/global/utils';
-import { type ChatMessage } from '@blocksuite/presets';
-import type { Doc } from '@blocksuite/store';
+} from '@blocksuite/affine/global/utils';
+import { type ChatMessage } from '@blocksuite/affine/presets';
+import type { Doc } from '@blocksuite/affine/store';
import type { TemplateResult } from 'lit';
import { AIProvider, type AIUserInfo } from '../provider';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/_common/components/ask-ai-button.ts b/packages/frontend/core/src/blocksuite/presets/ai/_common/components/ask-ai-button.ts
index 22ea6438ac..70fd1ff323 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/_common/components/ask-ai-button.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/_common/components/ask-ai-button.ts
@@ -1,13 +1,13 @@
import './ask-ai-panel';
-import { type EditorHost } from '@blocksuite/block-std';
+import { type EditorHost } from '@blocksuite/affine/block-std';
import {
type AIItemGroupConfig,
AIStarIcon,
EdgelessRootService,
-} from '@blocksuite/blocks';
-import { createLitPortal, HoverController } from '@blocksuite/blocks';
-import { assertExists, WithDisposable } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import { createLitPortal, HoverController } from '@blocksuite/affine/blocks';
+import { assertExists, WithDisposable } from '@blocksuite/affine/global/utils';
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/presets/ai/_common/components/ask-ai-panel.ts b/packages/frontend/core/src/blocksuite/presets/ai/_common/components/ask-ai-panel.ts
index d787e97937..18171b8689 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/_common/components/ask-ai-panel.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/_common/components/ask-ai-panel.ts
@@ -1,10 +1,10 @@
-import { type EditorHost } from '@blocksuite/block-std';
+import { type EditorHost } from '@blocksuite/affine/block-std';
import {
type AIItemGroupConfig,
EdgelessRootService,
scrollbarStyle,
-} from '@blocksuite/blocks';
-import { WithDisposable } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import { WithDisposable } from '@blocksuite/affine/global/utils';
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/presets/ai/_common/components/chat-action-list.ts b/packages/frontend/core/src/blocksuite/presets/ai/_common/components/chat-action-list.ts
index e3e29df335..9742143104 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/_common/components/chat-action-list.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/_common/components/chat-action-list.ts
@@ -2,8 +2,11 @@ import type {
BlockSelection,
EditorHost,
TextSelection,
-} from '@blocksuite/block-std';
-import { type ImageSelection, NotificationProvider } from '@blocksuite/blocks';
+} from '@blocksuite/affine/block-std';
+import {
+ type ImageSelection,
+ NotificationProvider,
+} from '@blocksuite/affine/blocks';
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/presets/ai/_common/components/copy-more.ts b/packages/frontend/core/src/blocksuite/presets/ai/_common/components/copy-more.ts
index e3854046da..dae309d4a1 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/_common/components/copy-more.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/_common/components/copy-more.ts
@@ -2,13 +2,13 @@ import type {
BlockSelection,
EditorHost,
TextSelection,
-} from '@blocksuite/block-std';
+} from '@blocksuite/affine/block-std';
import {
createButtonPopper,
NotificationProvider,
Tooltip,
-} from '@blocksuite/blocks';
-import { noop, WithDisposable } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import { noop, WithDisposable } from '@blocksuite/affine/global/utils';
import { css, html, LitElement, nothing, type PropertyValues } from 'lit';
import { property, query, state } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/_common/config.ts b/packages/frontend/core/src/blocksuite/presets/ai/_common/config.ts
index 297ef05585..73713ee886 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/_common/config.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/_common/config.ts
@@ -1,4 +1,8 @@
-import type { Chain, EditorHost, InitCommandCtx } from '@blocksuite/block-std';
+import type {
+ Chain,
+ EditorHost,
+ InitCommandCtx,
+} from '@blocksuite/affine/block-std';
import {
type AIItemGroupConfig,
type AISubItemConfig,
@@ -6,7 +10,7 @@ import {
EDGELESS_ELEMENT_TOOLBAR_WIDGET,
type EdgelessElementToolbarWidget,
matchFlavours,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import type { TemplateResult } from 'lit';
import { actionToHandler } from '../actions/doc-handler';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/actions/doc-handler.ts b/packages/frontend/core/src/blocksuite/presets/ai/actions/doc-handler.ts
index 7af487228d..48b483d6c5 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/actions/doc-handler.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/actions/doc-handler.ts
@@ -1,10 +1,10 @@
-import type { EditorHost } from '@blocksuite/block-std';
+import type { EditorHost } from '@blocksuite/affine/block-std';
import type {
AffineAIPanelWidget,
AffineAIPanelWidgetConfig,
AIError,
-} from '@blocksuite/blocks';
-import { assertExists } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import { assertExists } from '@blocksuite/affine/global/utils';
import type { TemplateResult } from 'lit';
import {
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/actions/edgeless-handler.ts b/packages/frontend/core/src/blocksuite/presets/ai/actions/edgeless-handler.ts
index 27523ae305..9865812699 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/actions/edgeless-handler.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/actions/edgeless-handler.ts
@@ -1,10 +1,10 @@
-import type { EditorHost } from '@blocksuite/block-std';
+import type { EditorHost } from '@blocksuite/affine/block-std';
import type {
AffineAIPanelWidget,
AIError,
EdgelessCopilotWidget,
MindmapElementModel,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import {
BlocksUtils,
EdgelessTextBlockModel,
@@ -13,10 +13,10 @@ import {
NoteBlockModel,
ShapeElementModel,
TextElementModel,
-} from '@blocksuite/blocks';
-import { assertExists } from '@blocksuite/global/utils';
-import { AIChatBlockModel } from '@blocksuite/presets';
-import { Slice } from '@blocksuite/store';
+} from '@blocksuite/affine/blocks';
+import { assertExists } from '@blocksuite/affine/global/utils';
+import { AIChatBlockModel } from '@blocksuite/affine/presets';
+import { Slice } from '@blocksuite/affine/store';
import type { TemplateResult } from 'lit';
import { getAIPanel } from '../ai-panel';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/actions/edgeless-response.ts b/packages/frontend/core/src/blocksuite/presets/ai/actions/edgeless-response.ts
index d186eef801..32ae66672a 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/actions/edgeless-response.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/actions/edgeless-response.ts
@@ -1,4 +1,4 @@
-import type { EditorHost } from '@blocksuite/block-std';
+import type { EditorHost } from '@blocksuite/affine/block-std';
import type {
AffineAIPanelWidget,
AIItemConfig,
@@ -8,7 +8,7 @@ import type {
MindmapElementModel,
ShapeElementModel,
SurfaceBlockModel,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import {
DeleteIcon,
EDGELESS_ELEMENT_TOOLBAR_WIDGET,
@@ -23,8 +23,8 @@ import {
NoteDisplayMode,
ResetIcon,
TelemetryProvider,
-} from '@blocksuite/blocks';
-import { assertExists, Bound } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import { assertExists, Bound } from '@blocksuite/affine/global/utils';
import { html, type TemplateResult } from 'lit';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/actions/types.ts b/packages/frontend/core/src/blocksuite/presets/ai/actions/types.ts
index d11918ba51..051fdc41c1 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/actions/types.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/actions/types.ts
@@ -1,6 +1,6 @@
import type { getCopilotHistoriesQuery, RequestOptions } from '@affine/graphql';
-import type { EditorHost } from '@blocksuite/block-std';
-import type { BlockModel } from '@blocksuite/store';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import type { BlockModel } from '@blocksuite/affine/store';
export const translateLangs = [
'English',
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/ai-panel.ts b/packages/frontend/core/src/blocksuite/presets/ai/ai-panel.ts
index 2e5a5d7945..047fc97d1a 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/ai-panel.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/ai-panel.ts
@@ -1,4 +1,4 @@
-import type { EditorHost } from '@blocksuite/block-std';
+import type { EditorHost } from '@blocksuite/affine/block-std';
import {
AFFINE_AI_PANEL_WIDGET,
AffineAIPanelWidget,
@@ -8,8 +8,8 @@ import {
isInsideEdgelessEditor,
matchFlavours,
NoteDisplayMode,
-} from '@blocksuite/blocks';
-import { assertExists, Bound } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import { assertExists, Bound } from '@blocksuite/affine/global/utils';
import type { TemplateResult } from 'lit';
import {
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/ai-spec.ts b/packages/frontend/core/src/blocksuite/presets/ai/ai-spec.ts
index 66c12f74ca..0f8eadd546 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/ai-spec.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/ai-spec.ts
@@ -2,7 +2,7 @@ import {
BlockServiceWatcher,
type ExtensionType,
WidgetViewMapIdentifier,
-} from '@blocksuite/block-std';
+} from '@blocksuite/affine/block-std';
import {
AFFINE_AI_PANEL_WIDGET,
AFFINE_EDGELESS_COPILOT_WIDGET,
@@ -21,8 +21,8 @@ import {
pageRootWidgetViewMap,
ParagraphBlockService,
ParagraphBlockSpec,
-} from '@blocksuite/blocks';
-import { assertInstanceOf } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import { assertInstanceOf } from '@blocksuite/affine/global/utils';
import { literal, unsafeStatic } from 'lit/static-html.js';
import { buildAIPanelConfig } from './ai-panel';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/action-wrapper.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/action-wrapper.ts
index 0487fb63bd..78c10d542a 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/action-wrapper.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/action-wrapper.ts
@@ -1,5 +1,5 @@
-import type { EditorHost } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import { WithDisposable } from '@blocksuite/affine/global/utils';
import { css, html, LitElement, nothing, type TemplateResult } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/chat-text.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/chat-text.ts
index 39d19362fd..b84a553faf 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/chat-text.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/chat-text.ts
@@ -1,8 +1,8 @@
import './action-wrapper';
-import type { EditorHost } from '@blocksuite/block-std';
-import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import { ShadowlessElement } from '@blocksuite/affine/block-std';
+import { WithDisposable } from '@blocksuite/affine/global/utils';
import { html, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/image-to-text.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/image-to-text.ts
index cdfcd44256..cb6cca8a9e 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/image-to-text.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/image-to-text.ts
@@ -1,8 +1,8 @@
import './action-wrapper';
-import type { EditorHost } from '@blocksuite/block-std';
-import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import { ShadowlessElement } from '@blocksuite/affine/block-std';
+import { WithDisposable } from '@blocksuite/affine/global/utils';
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/presets/ai/chat-panel/actions/image.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/image.ts
index efd0aedb1c..097acf0950 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/image.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/image.ts
@@ -1,8 +1,8 @@
import './action-wrapper';
-import type { EditorHost } from '@blocksuite/block-std';
-import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import { ShadowlessElement } from '@blocksuite/affine/block-std';
+import { WithDisposable } from '@blocksuite/affine/global/utils';
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/presets/ai/chat-panel/actions/make-real.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/make-real.ts
index 740994a8d5..c64ab750f7 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/make-real.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/make-real.ts
@@ -1,8 +1,8 @@
import './action-wrapper';
-import type { EditorHost } from '@blocksuite/block-std';
-import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import { ShadowlessElement } from '@blocksuite/affine/block-std';
+import { WithDisposable } from '@blocksuite/affine/global/utils';
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/presets/ai/chat-panel/actions/mindmap.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/mindmap.ts
index 84a283d4a7..15e69b3530 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/mindmap.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/mindmap.ts
@@ -1,9 +1,9 @@
import './action-wrapper';
-import type { EditorHost } from '@blocksuite/block-std';
-import { ShadowlessElement } from '@blocksuite/block-std';
-import { MiniMindmapPreview } from '@blocksuite/blocks';
-import { noop, WithDisposable } from '@blocksuite/global/utils';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import { ShadowlessElement } from '@blocksuite/affine/block-std';
+import { MiniMindmapPreview } from '@blocksuite/affine/blocks';
+import { noop, WithDisposable } from '@blocksuite/affine/global/utils';
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/presets/ai/chat-panel/actions/slides.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/slides.ts
index 3ce2fc9634..b50920a47a 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/slides.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/slides.ts
@@ -1,9 +1,9 @@
import './action-wrapper';
import '../../messages/slides-renderer';
-import type { EditorHost } from '@blocksuite/block-std';
-import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import { ShadowlessElement } from '@blocksuite/affine/block-std';
+import { WithDisposable } from '@blocksuite/affine/global/utils';
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/presets/ai/chat-panel/actions/text.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/text.ts
index f449465291..36f0eccbb8 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/text.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/text.ts
@@ -1,7 +1,7 @@
import './action-wrapper';
-import type { EditorHost } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/utils';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import { WithDisposable } from '@blocksuite/affine/global/utils';
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/presets/ai/chat-panel/ai-loading.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/ai-loading.ts
index e67dfe81b1..a15096a3f7 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/ai-loading.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/ai-loading.ts
@@ -1,4 +1,4 @@
-import { WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/affine/global/utils';
import { css, html, LitElement } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-cards.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-cards.ts
index c50f336069..41f2343c80 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-cards.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-cards.ts
@@ -1,12 +1,12 @@
-import type { EditorHost } from '@blocksuite/block-std';
+import type { EditorHost } from '@blocksuite/affine/block-std';
import {
type ImageBlockModel,
isInsideEdgelessEditor,
type NoteBlockModel,
NoteDisplayMode,
-} from '@blocksuite/blocks';
-import { WithDisposable } from '@blocksuite/global/utils';
-import type { BlockModel } from '@blocksuite/store';
+} from '@blocksuite/affine/blocks';
+import { WithDisposable } from '@blocksuite/affine/global/utils';
+import type { BlockModel } from '@blocksuite/affine/store';
import {
css,
html,
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-context.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-context.ts
index bc3b1316cd..41b49c5060 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-context.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-context.ts
@@ -1,4 +1,4 @@
-import type { AIError } from '@blocksuite/blocks';
+import type { AIError } from '@blocksuite/affine/blocks';
export type ChatMessage = {
id: string;
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-panel-input.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-panel-input.ts
index 5451c2e69c..48649e6455 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-panel-input.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-panel-input.ts
@@ -1,6 +1,6 @@
-import type { EditorHost } from '@blocksuite/block-std';
-import { type AIError, openFileOrFiles } from '@blocksuite/blocks';
-import { assertExists, WithDisposable } from '@blocksuite/global/utils';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import { type AIError, openFileOrFiles } from '@blocksuite/affine/blocks';
+import { assertExists, WithDisposable } from '@blocksuite/affine/global/utils';
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/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-panel-messages.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-panel-messages.ts
index 37ee429de6..993c05dfe5 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-panel-messages.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-panel-messages.ts
@@ -13,16 +13,16 @@ import './chat-cards';
import '../_common/components/chat-action-list';
import '../_common/components/copy-more';
-import type { BaseSelection, EditorHost } from '@blocksuite/block-std';
-import { ShadowlessElement } from '@blocksuite/block-std';
+import type { BaseSelection, EditorHost } from '@blocksuite/affine/block-std';
+import { ShadowlessElement } from '@blocksuite/affine/block-std';
import {
type AIError,
DocModeProvider,
isInsidePageEditor,
PaymentRequiredError,
UnauthorizedError,
-} from '@blocksuite/blocks';
-import { WithDisposable } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import { WithDisposable } from '@blocksuite/affine/global/utils';
import { css, html, nothing, type PropertyValues } from 'lit';
import { property, query, state } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/index.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/index.ts
index f59c0a6155..37a6ef3259 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/index.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/index.ts
@@ -1,11 +1,11 @@
import './chat-panel-input';
import './chat-panel-messages';
-import type { EditorHost } from '@blocksuite/block-std';
-import { ShadowlessElement } from '@blocksuite/block-std';
-import { NotificationProvider } from '@blocksuite/blocks';
-import { debounce, WithDisposable } from '@blocksuite/global/utils';
-import type { Doc } from '@blocksuite/store';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import { ShadowlessElement } from '@blocksuite/affine/block-std';
+import { NotificationProvider } from '@blocksuite/affine/blocks';
+import { debounce, WithDisposable } from '@blocksuite/affine/global/utils';
+import type { Doc } from '@blocksuite/affine/store';
import { css, html, type PropertyValues } from 'lit';
import { property, state } from 'lit/decorators.js';
import { createRef, type Ref, ref } from 'lit/directives/ref.js';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/entries/code-toolbar/setup-code-toolbar.ts b/packages/frontend/core/src/blocksuite/presets/ai/entries/code-toolbar/setup-code-toolbar.ts
index c531c547cf..109379e3c8 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/entries/code-toolbar/setup-code-toolbar.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/entries/code-toolbar/setup-code-toolbar.ts
@@ -1,6 +1,6 @@
import '../../_common/components/ask-ai-button';
-import type { AffineCodeToolbarWidget } from '@blocksuite/blocks';
+import type { AffineCodeToolbarWidget } from '@blocksuite/affine/blocks';
import { html } from 'lit';
const AICodeItemGroups = buildAICodeItemGroups();
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/entries/edgeless/actions-config.ts b/packages/frontend/core/src/blocksuite/presets/ai/entries/edgeless/actions-config.ts
index d4baedc1b3..0c9b933e2a 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/entries/edgeless/actions-config.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/entries/edgeless/actions-config.ts
@@ -5,7 +5,7 @@ import {
MindmapElementModel,
ShapeElementModel,
TextElementModel,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import {
AIExpandMindMapIcon,
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/entries/edgeless/index.ts b/packages/frontend/core/src/blocksuite/presets/ai/entries/edgeless/index.ts
index 7cd5bb92bc..0d9e7ad2bf 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/entries/edgeless/index.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/entries/edgeless/index.ts
@@ -4,9 +4,9 @@ import type {
EdgelessCopilotWidget,
EdgelessElementToolbarWidget,
EdgelessRootBlockComponent,
-} from '@blocksuite/blocks';
-import { EdgelessCopilotToolbarEntry } from '@blocksuite/blocks';
-import { noop } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import { EdgelessCopilotToolbarEntry } from '@blocksuite/affine/blocks';
+import { noop } from '@blocksuite/affine/global/utils';
import { html } from 'lit';
import { edgelessActionGroups } from './actions-config';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/entries/format-bar/setup-format-bar.ts b/packages/frontend/core/src/blocksuite/presets/ai/entries/format-bar/setup-format-bar.ts
index 9061f40c08..6c102d94b3 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/entries/format-bar/setup-format-bar.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/entries/format-bar/setup-format-bar.ts
@@ -3,7 +3,7 @@ import '../../_common/components/ask-ai-button';
import {
type AffineFormatBarWidget,
toolbarDefaultConfig,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import { html, type TemplateResult } from 'lit';
import { AIItemGroups } from '../../_common/config';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/entries/image-toolbar/setup-image-toolbar.ts b/packages/frontend/core/src/blocksuite/presets/ai/entries/image-toolbar/setup-image-toolbar.ts
index 54e219568d..00e5269b84 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/entries/image-toolbar/setup-image-toolbar.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/entries/image-toolbar/setup-image-toolbar.ts
@@ -1,6 +1,6 @@
import '../../_common/components/ask-ai-button';
-import type { AffineImageToolbarWidget } from '@blocksuite/blocks';
+import type { AffineImageToolbarWidget } from '@blocksuite/affine/blocks';
import { html } from 'lit';
import type { AskAIButtonOptions } from '../../_common/components/ask-ai-button';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/entries/slash-menu/setup-slash-menu.ts b/packages/frontend/core/src/blocksuite/presets/ai/entries/slash-menu/setup-slash-menu.ts
index 0e8fcc7725..7add7bbd62 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/entries/slash-menu/setup-slash-menu.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/entries/slash-menu/setup-slash-menu.ts
@@ -6,14 +6,14 @@ import {
type AffineSlashSubMenu,
type AIItemConfig,
DocModeProvider,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import {
AFFINE_AI_PANEL_WIDGET,
AffineSlashMenuWidget,
AIStarIcon,
MoreHorizontalIcon,
-} from '@blocksuite/blocks';
-import { assertExists } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import { assertExists } from '@blocksuite/affine/global/utils';
import { html } from 'lit';
import { AIItemGroups } from '../../_common/config';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/entries/space/setup-space.ts b/packages/frontend/core/src/blocksuite/presets/ai/entries/space/setup-space.ts
index e394a1b395..57b7aa8f85 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/entries/space/setup-space.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/entries/space/setup-space.ts
@@ -1,4 +1,4 @@
-import type { AffineAIPanelWidget } from '@blocksuite/blocks';
+import type { AffineAIPanelWidget } from '@blocksuite/affine/blocks';
import { handleInlineAskAIAction } from '../../actions/doc-handler';
import { AIProvider } from '../../provider';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/messages/error.ts b/packages/frontend/core/src/blocksuite/presets/ai/messages/error.ts
index dfe0e63ec5..90f9b04ee9 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/messages/error.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/messages/error.ts
@@ -1,10 +1,10 @@
-import { type EditorHost } from '@blocksuite/block-std';
+import { type EditorHost } from '@blocksuite/affine/block-std';
import {
type AIError,
PaymentRequiredError,
UnauthorizedError,
-} from '@blocksuite/blocks';
-import { WithDisposable } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import { WithDisposable } from '@blocksuite/affine/global/utils';
import { html, LitElement, nothing, type TemplateResult } from 'lit';
import { property } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/messages/mindmap.ts b/packages/frontend/core/src/blocksuite/presets/ai/messages/mindmap.ts
index be3c15d5c3..73cc59fc72 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/messages/mindmap.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/messages/mindmap.ts
@@ -1,10 +1,13 @@
-import type { EditorHost } from '@blocksuite/block-std';
+import type { EditorHost } from '@blocksuite/affine/block-std';
import type {
AffineAIPanelWidgetConfig,
MindmapStyle,
-} from '@blocksuite/blocks';
-import { markdownToMindmap, MiniMindmapPreview } from '@blocksuite/blocks';
-import { noop } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import {
+ markdownToMindmap,
+ MiniMindmapPreview,
+} from '@blocksuite/affine/blocks';
+import { noop } from '@blocksuite/affine/global/utils';
import { html, nothing } from 'lit';
import { getAIPanel } from '../ai-panel';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/messages/slides-renderer.ts b/packages/frontend/core/src/blocksuite/presets/ai/messages/slides-renderer.ts
index e583a3ab2d..5cf4834b0c 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/messages/slides-renderer.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/messages/slides-renderer.ts
@@ -1,12 +1,12 @@
-import { BlockStdScope, type EditorHost } from '@blocksuite/block-std';
+import { BlockStdScope, type EditorHost } from '@blocksuite/affine/block-std';
import {
type AffineAIPanelWidgetConfig,
EdgelessEditorBlockSpecs,
-} from '@blocksuite/blocks';
-import { AffineSchemas } from '@blocksuite/blocks/schemas';
-import { WithDisposable } from '@blocksuite/global/utils';
-import type { Doc } from '@blocksuite/store';
-import { DocCollection, Schema } from '@blocksuite/store';
+} from '@blocksuite/affine/blocks';
+import { AffineSchemas } from '@blocksuite/affine/blocks/schemas';
+import { WithDisposable } from '@blocksuite/affine/global/utils';
+import type { Doc } from '@blocksuite/affine/store';
+import { DocCollection, Schema } from '@blocksuite/affine/store';
import { css, html, LitElement, nothing } from 'lit';
import { property, query } from 'lit/decorators.js';
import { createRef, type Ref, ref } from 'lit/directives/ref.js';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/messages/text.ts b/packages/frontend/core/src/blocksuite/presets/ai/messages/text.ts
index 457d984178..27ed1f0298 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/messages/text.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/messages/text.ts
@@ -1,16 +1,16 @@
-import { BlockStdScope, type EditorHost } from '@blocksuite/block-std';
+import { BlockStdScope, type EditorHost } from '@blocksuite/affine/block-std';
import {
type AffineAIPanelState,
type AffineAIPanelWidgetConfig,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import {
CodeBlockComponent,
DividerBlockComponent,
ListBlockComponent,
ParagraphBlockComponent,
-} from '@blocksuite/blocks';
-import { WithDisposable } from '@blocksuite/global/utils';
-import { BlockViewType, type Doc, type Query } from '@blocksuite/store';
+} from '@blocksuite/affine/blocks';
+import { WithDisposable } from '@blocksuite/affine/global/utils';
+import { BlockViewType, type Doc, type Query } from '@blocksuite/affine/store';
import { css, html, LitElement, type PropertyValues } from 'lit';
import { property, query } from 'lit/decorators.js';
import { classMap } from 'lit/directives/class-map.js';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/messages/wrapper.ts b/packages/frontend/core/src/blocksuite/presets/ai/messages/wrapper.ts
index 7e115746be..fb955c3138 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/messages/wrapper.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/messages/wrapper.ts
@@ -1,5 +1,5 @@
-import type { EditorHost } from '@blocksuite/block-std';
-import type { AffineAIPanelWidgetConfig } from '@blocksuite/blocks';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import type { AffineAIPanelWidgetConfig } from '@blocksuite/affine/blocks';
import { css, html, LitElement, nothing } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/peek-view/chat-block-input.ts b/packages/frontend/core/src/blocksuite/presets/ai/peek-view/chat-block-input.ts
index 9889d21f73..3aaa6fb9d9 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/peek-view/chat-block-input.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/peek-view/chat-block-input.ts
@@ -1,6 +1,6 @@
-import type { EditorHost } from '@blocksuite/block-std';
-import { type AIError, openFileOrFiles } from '@blocksuite/blocks';
-import { type ChatMessage } from '@blocksuite/presets';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import { type AIError, openFileOrFiles } from '@blocksuite/affine/blocks';
+import { type ChatMessage } from '@blocksuite/affine/presets';
import { css, html, LitElement, nothing } from 'lit';
import { property, query, state } from 'lit/decorators.js';
import { classMap } from 'lit/directives/class-map.js';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/peek-view/chat-block-peek-view.ts b/packages/frontend/core/src/blocksuite/presets/ai/peek-view/chat-block-peek-view.ts
index c3aaa953e9..3733ea5236 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/peek-view/chat-block-peek-view.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/peek-view/chat-block-peek-view.ts
@@ -3,7 +3,7 @@ import './date-time';
import '../_common/components/chat-action-list';
import '../_common/components/copy-more';
-import { type EditorHost } from '@blocksuite/block-std';
+import { type EditorHost } from '@blocksuite/affine/block-std';
import {
type AIError,
CanvasElementType,
@@ -11,13 +11,13 @@ import {
DocModeProvider,
type EdgelessRootService,
TelemetryProvider,
-} from '@blocksuite/blocks';
-import { NotificationProvider } from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
+import { NotificationProvider } from '@blocksuite/affine/blocks';
import {
type AIChatBlockModel,
type ChatMessage,
ChatMessagesSchema,
-} from '@blocksuite/presets';
+} from '@blocksuite/affine/presets';
import { html, LitElement, nothing } from 'lit';
import { property, query, state } from 'lit/decorators.js';
import { classMap } from 'lit/directives/class-map.js';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/peek-view/types.ts b/packages/frontend/core/src/blocksuite/presets/ai/peek-view/types.ts
index cd8b9d7fca..a16e3a11f7 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/peek-view/types.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/peek-view/types.ts
@@ -1,5 +1,5 @@
-import type { AIError } from '@blocksuite/blocks';
-import { type ChatMessage } from '@blocksuite/presets';
+import type { AIError } from '@blocksuite/affine/blocks';
+import { type ChatMessage } from '@blocksuite/affine/presets';
export type ChatStatus =
| 'success'
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/peek-view/utils.ts b/packages/frontend/core/src/blocksuite/presets/ai/peek-view/utils.ts
index 8f68cc7dd2..93a530b62f 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/peek-view/utils.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/peek-view/utils.ts
@@ -1,10 +1,10 @@
-import type { EdgelessRootService } from '@blocksuite/blocks';
-import { Bound } from '@blocksuite/global/utils';
+import type { EdgelessRootService } from '@blocksuite/affine/blocks';
+import { Bound } from '@blocksuite/affine/global/utils';
import {
type AIChatBlockModel,
CHAT_BLOCK_HEIGHT,
CHAT_BLOCK_WIDTH,
-} from '@blocksuite/presets';
+} from '@blocksuite/affine/presets';
/**
* Calculates the bounding box for a child block
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/provider.ts b/packages/frontend/core/src/blocksuite/presets/ai/provider.ts
index 6135dce200..9ddcbd5e12 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/provider.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/provider.ts
@@ -1,6 +1,9 @@
-import type { EditorHost } from '@blocksuite/block-std';
-import { PaymentRequiredError, UnauthorizedError } from '@blocksuite/blocks';
-import { Slot } from '@blocksuite/store';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import {
+ PaymentRequiredError,
+ UnauthorizedError,
+} from '@blocksuite/affine/blocks';
+import { Slot } from '@blocksuite/affine/store';
export interface AIUserInfo {
id: string;
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/slides/index.ts b/packages/frontend/core/src/blocksuite/presets/ai/slides/index.ts
index 05089b1d07..c713f7e6ef 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/slides/index.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/slides/index.ts
@@ -1,6 +1,6 @@
-import type { EditorHost } from '@blocksuite/block-std';
-import type { EdgelessRootService } from '@blocksuite/blocks';
-import type { BlockSnapshot } from '@blocksuite/store';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import type { EdgelessRootService } from '@blocksuite/affine/blocks';
+import type { BlockSnapshot } from '@blocksuite/affine/store';
import { markdownToSnapshot } from '../utils/markdown-utils';
import { getSurfaceElementFromEditor } from '../utils/selection-utils';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/slides/template.ts b/packages/frontend/core/src/blocksuite/presets/ai/slides/template.ts
index 816679a28c..9f369191df 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/slides/template.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/slides/template.ts
@@ -1,5 +1,5 @@
-import { Bound } from '@blocksuite/global/utils';
-import { nanoid } from '@blocksuite/store';
+import { Bound } from '@blocksuite/affine/global/utils';
+import { nanoid } from '@blocksuite/affine/store';
import { AIProvider } from '../provider';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/utils/connector.ts b/packages/frontend/core/src/blocksuite/presets/ai/utils/connector.ts
index d6ab52cf4e..6b5fc8c649 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/utils/connector.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/utils/connector.ts
@@ -2,8 +2,8 @@ import {
type ConnectorElementModel,
type EdgelessRootService,
SurfaceBlockComponent,
-} from '@blocksuite/blocks';
-import { assertExists } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import { assertExists } from '@blocksuite/affine/global/utils';
export const getConnectorFromId = (
id: string,
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/utils/custom-specs.ts b/packages/frontend/core/src/blocksuite/presets/ai/utils/custom-specs.ts
index 25760913c7..537041feea 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/utils/custom-specs.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/utils/custom-specs.ts
@@ -1,5 +1,8 @@
-import { BlockViewIdentifier, type ExtensionType } from '@blocksuite/block-std';
-import { PageEditorBlockSpecs } from '@blocksuite/blocks';
+import {
+ BlockViewIdentifier,
+ type ExtensionType,
+} from '@blocksuite/affine/block-std';
+import { PageEditorBlockSpecs } from '@blocksuite/affine/blocks';
import { literal } from 'lit/static-html.js';
export const CustomPageEditorBlockSpecs: ExtensionType[] = [
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/utils/edgeless.ts b/packages/frontend/core/src/blocksuite/presets/ai/utils/edgeless.ts
index 2e8dc329b2..f3d4e20da3 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/utils/edgeless.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/utils/edgeless.ts
@@ -1,4 +1,4 @@
-import type { BlockComponent, EditorHost } from '@blocksuite/block-std';
+import type { BlockComponent, EditorHost } from '@blocksuite/affine/block-std';
import {
AFFINE_EDGELESS_COPILOT_WIDGET,
type EdgelessCopilotWidget,
@@ -6,7 +6,7 @@ import {
matchFlavours,
MindmapElementModel,
type ShapeElementModel,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
export function mindMapToMarkdown(mindmap: MindmapElementModel) {
let markdownStr = '';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/utils/editor-actions.ts b/packages/frontend/core/src/blocksuite/presets/ai/utils/editor-actions.ts
index c28651577a..e19f3838b5 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/utils/editor-actions.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/utils/editor-actions.ts
@@ -2,10 +2,10 @@ import type {
BlockComponent,
EditorHost,
TextSelection,
-} from '@blocksuite/block-std';
-import type { AffineAIPanelWidget } from '@blocksuite/blocks';
-import { isInsideEdgelessEditor } from '@blocksuite/blocks';
-import { type BlockModel, Slice } from '@blocksuite/store';
+} from '@blocksuite/affine/block-std';
+import type { AffineAIPanelWidget } from '@blocksuite/affine/blocks';
+import { isInsideEdgelessEditor } from '@blocksuite/affine/blocks';
+import { type BlockModel, Slice } from '@blocksuite/affine/store';
import {
insertFromMarkdown,
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/utils/image.ts b/packages/frontend/core/src/blocksuite/presets/ai/utils/image.ts
index 870412de7b..d26be8469e 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/utils/image.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/utils/image.ts
@@ -1,5 +1,5 @@
-import { fetchImage } from '@blocksuite/blocks';
-import { assertExists } from '@blocksuite/global/utils';
+import { fetchImage } from '@blocksuite/affine/blocks';
+import { assertExists } from '@blocksuite/affine/global/utils';
export async function fetchImageToFile(
url: string,
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/utils/markdown-utils.ts b/packages/frontend/core/src/blocksuite/presets/ai/utils/markdown-utils.ts
index 5b64544ee6..1df1ce17b3 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/utils/markdown-utils.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/utils/markdown-utils.ts
@@ -2,7 +2,7 @@ import type {
EditorHost,
TextRangePoint,
TextSelection,
-} from '@blocksuite/block-std';
+} from '@blocksuite/affine/block-std';
import {
defaultImageProxyMiddleware,
embedSyncedDocMiddleware,
@@ -11,8 +11,8 @@ import {
pasteMiddleware,
PlainTextAdapter,
titleMiddleware,
-} from '@blocksuite/blocks';
-import { assertExists } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import { assertExists } from '@blocksuite/affine/global/utils';
import type {
BlockModel,
BlockSnapshot,
@@ -20,8 +20,8 @@ import type {
DraftModel,
Slice,
SliceSnapshot,
-} from '@blocksuite/store';
-import { DocCollection, Job } from '@blocksuite/store';
+} from '@blocksuite/affine/store';
+import { DocCollection, Job } from '@blocksuite/affine/store';
const updateSnapshotText = (
point: TextRangePoint,
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/utils/selection-utils.ts b/packages/frontend/core/src/blocksuite/presets/ai/utils/selection-utils.ts
index f3c22f7fb7..566c39efdd 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/utils/selection-utils.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/utils/selection-utils.ts
@@ -1,18 +1,18 @@
-import type { EditorHost } from '@blocksuite/block-std';
+import type { EditorHost } from '@blocksuite/affine/block-std';
import {
type CopilotSelectionController,
type FrameBlockModel,
ImageBlockModel,
type SurfaceBlockComponent,
-} from '@blocksuite/blocks';
-import { BlocksUtils, EdgelessRootService } from '@blocksuite/blocks';
-import { assertExists } from '@blocksuite/global/utils';
+} from '@blocksuite/affine/blocks';
+import { BlocksUtils, EdgelessRootService } from '@blocksuite/affine/blocks';
+import { assertExists } from '@blocksuite/affine/global/utils';
import {
type BlockModel,
type DraftModel,
Slice,
toDraftModel,
-} from '@blocksuite/store';
+} from '@blocksuite/affine/store';
import { getEdgelessCopilotWidget, getService } from './edgeless';
import { getContentFromSlice } from './markdown-utils';
diff --git a/packages/frontend/core/src/commands/affine-creation.tsx b/packages/frontend/core/src/commands/affine-creation.tsx
index d14111c74e..f9c87abe4b 100644
--- a/packages/frontend/core/src/commands/affine-creation.tsx
+++ b/packages/frontend/core/src/commands/affine-creation.tsx
@@ -1,6 +1,6 @@
import type { useI18n } from '@affine/i18n';
import { track } from '@affine/track';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import { ImportIcon, PlusIcon } from '@blocksuite/icons/rc';
import type { usePageHelper } from '../components/blocksuite/block-suite-page-list/utils';
diff --git a/packages/frontend/core/src/commands/affine-navigation.tsx b/packages/frontend/core/src/commands/affine-navigation.tsx
index 75874a2f35..a7715a9608 100644
--- a/packages/frontend/core/src/commands/affine-navigation.tsx
+++ b/packages/frontend/core/src/commands/affine-navigation.tsx
@@ -1,7 +1,7 @@
import type { useI18n } from '@affine/i18n';
import { track } from '@affine/track';
+import type { DocCollection } from '@blocksuite/affine/store';
import { ArrowRightBigIcon } from '@blocksuite/icons/rc';
-import type { DocCollection } from '@blocksuite/store';
import type { createStore } from 'jotai';
import {
diff --git a/packages/frontend/core/src/components/affine/page-history-modal/data.ts b/packages/frontend/core/src/components/affine/page-history-modal/data.ts
index f1a74f001e..237d989a80 100644
--- a/packages/frontend/core/src/components/affine/page-history-modal/data.ts
+++ b/packages/frontend/core/src/components/affine/page-history-modal/data.ts
@@ -4,8 +4,8 @@ import { DebugLogger } from '@affine/debug';
import type { ListHistoryQuery } from '@affine/graphql';
import { listHistoryQuery, recoverDocMutation } from '@affine/graphql';
import { i18nTime } from '@affine/i18n';
-import { assertEquals } from '@blocksuite/global/utils';
-import { DocCollection } from '@blocksuite/store';
+import { assertEquals } from '@blocksuite/affine/global/utils';
+import { DocCollection } from '@blocksuite/affine/store';
import { getAFFiNEWorkspaceSchema } from '@toeverything/infra';
import { useEffect, useMemo } from 'react';
import useSWRImmutable from 'swr/immutable';
diff --git a/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx b/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx
index b76a7aa7b3..1c07238578 100644
--- a/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx
+++ b/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx
@@ -9,9 +9,12 @@ import { WorkspacePermissionService } from '@affine/core/modules/permissions';
import { WorkspaceQuotaService } from '@affine/core/modules/quota';
import { i18nTime, Trans, useI18n } from '@affine/i18n';
import { track } from '@affine/track';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
+import type {
+ Doc as BlockSuiteDoc,
+ DocCollection,
+} from '@blocksuite/affine/store';
import { CloseIcon, ToggleCollapseIcon } from '@blocksuite/icons/rc';
-import type { Doc as BlockSuiteDoc, DocCollection } from '@blocksuite/store';
import * as Collapsible from '@radix-ui/react-collapsible';
import type { DialogContentProps } from '@radix-ui/react-dialog';
import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
diff --git a/packages/frontend/core/src/components/affine/page-properties/table.tsx b/packages/frontend/core/src/components/affine/page-properties/table.tsx
index 1d138a891c..3586a75391 100644
--- a/packages/frontend/core/src/components/affine/page-properties/table.tsx
+++ b/packages/frontend/core/src/components/affine/page-properties/table.tsx
@@ -10,7 +10,7 @@ import type {
} from '@affine/core/modules/properties/services/schema';
import { i18nTime, useI18n } from '@affine/i18n';
import { track } from '@affine/track';
-import { assertExists } from '@blocksuite/global/utils';
+import { assertExists } from '@blocksuite/affine/global/utils';
import {
ArrowDownSmallIcon,
DeleteIcon,
diff --git a/packages/frontend/core/src/components/affine/reference-link/index.tsx b/packages/frontend/core/src/components/affine/reference-link/index.tsx
index 3094c0ebab..fc6a42f6a7 100644
--- a/packages/frontend/core/src/components/affine/reference-link/index.tsx
+++ b/packages/frontend/core/src/components/affine/reference-link/index.tsx
@@ -7,8 +7,8 @@ import {
import { WorkbenchLink } from '@affine/core/modules/workbench';
import { useI18n } from '@affine/i18n';
import { track } from '@affine/track';
-import type { DocMode } from '@blocksuite/blocks';
-import type { DocCollection } from '@blocksuite/store';
+import type { DocMode } from '@blocksuite/affine/blocks';
+import type { DocCollection } from '@blocksuite/affine/store';
import { useLiveData, useService } from '@toeverything/infra';
import { nanoid } from 'nanoid';
import {
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/connector.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/connector.tsx
index 1813d45506..6e9bd157c5 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/connector.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/connector.tsx
@@ -19,8 +19,8 @@ import {
PointStyle,
StrokeStyle,
TextAlign,
-} from '@blocksuite/blocks';
-import type { Doc } from '@blocksuite/store';
+} from '@blocksuite/affine/blocks';
+import type { Doc } from '@blocksuite/affine/store';
import { useFramework, useLiveData } from '@toeverything/infra';
import { useCallback, useMemo } from 'react';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/docs/index.ts b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/docs/index.ts
index de7d95a7b2..ccad216546 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/docs/index.ts
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/docs/index.ts
@@ -1,6 +1,6 @@
-import { AffineSchemas } from '@blocksuite/blocks';
-import type { Doc, DocSnapshot } from '@blocksuite/store';
-import { DocCollection, Job, Schema } from '@blocksuite/store';
+import { AffineSchemas } from '@blocksuite/affine/blocks';
+import type { Doc, DocSnapshot } from '@blocksuite/affine/store';
+import { DocCollection, Job, Schema } from '@blocksuite/affine/store';
const getCollection = (() => {
let collection: DocCollection | null = null;
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/mind-map.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/mind-map.tsx
index 08afaabbf5..c44af2507a 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/mind-map.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/mind-map.tsx
@@ -7,8 +7,8 @@ import {
import { SettingRow } from '@affine/component/setting-components';
import { EditorSettingService } from '@affine/core/modules/editor-settting';
import { useI18n } from '@affine/i18n';
-import { LayoutType, MindmapStyle } from '@blocksuite/blocks';
-import type { Doc } from '@blocksuite/store';
+import { LayoutType, MindmapStyle } from '@blocksuite/affine/blocks';
+import type { Doc } from '@blocksuite/affine/store';
import { useFramework, useLiveData } from '@toeverything/infra';
import { useCallback, useMemo } from 'react';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/note.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/note.tsx
index 41f39f2bcf..ac566ee794 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/note.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/note.tsx
@@ -15,8 +15,8 @@ import {
NoteShadow,
NoteShadowMap,
StrokeStyle,
-} from '@blocksuite/blocks';
-import type { Doc } from '@blocksuite/store';
+} from '@blocksuite/affine/blocks';
+import type { Doc } from '@blocksuite/affine/store';
import { useFramework, useLiveData } from '@toeverything/infra';
import { useCallback, useMemo } from 'react';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/pen.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/pen.tsx
index 6257374b0b..af7db658eb 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/pen.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/pen.tsx
@@ -2,8 +2,8 @@ import { MenuItem, MenuTrigger, Slider } from '@affine/component';
import { SettingRow } from '@affine/component/setting-components';
import { EditorSettingService } from '@affine/core/modules/editor-settting';
import { useI18n } from '@affine/i18n';
-import { LineColor, LineColorMap } from '@blocksuite/blocks';
-import type { Doc } from '@blocksuite/store';
+import { LineColor, LineColorMap } from '@blocksuite/affine/blocks';
+import type { Doc } from '@blocksuite/affine/store';
import { useFramework, useLiveData } from '@toeverything/infra';
import { useCallback, useMemo } from 'react';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/shape.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/shape.tsx
index a09a6d963f..de6ce22b6c 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/shape.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/shape.tsx
@@ -8,12 +8,12 @@ import {
import { SettingRow } from '@affine/component/setting-components';
import { EditorSettingService } from '@affine/core/modules/editor-settting';
import { useI18n } from '@affine/i18n';
-import type { EditorHost } from '@blocksuite/block-std';
+import type { EditorHost } from '@blocksuite/affine/block-std';
import type {
EdgelessRootService,
ShapeElementModel,
ShapeName,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import {
createEnumMap,
FontFamily,
@@ -28,8 +28,8 @@ import {
ShapeType,
StrokeStyle,
TextAlign,
-} from '@blocksuite/blocks';
-import type { Doc } from '@blocksuite/store';
+} from '@blocksuite/affine/blocks';
+import type { Doc } from '@blocksuite/affine/store';
import { useFramework, useLiveData } from '@toeverything/infra';
import { useCallback, useMemo, useState } from 'react';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/snapshot.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/snapshot.tsx
index 96380a9f93..a3c45e64d2 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/snapshot.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/snapshot.tsx
@@ -1,13 +1,13 @@
import { Skeleton } from '@affine/component';
import type { EditorSettingSchema } from '@affine/core/modules/editor-settting';
import { EditorSettingService } from '@affine/core/modules/editor-settting';
-import type { EditorHost } from '@blocksuite/block-std';
-import { BlockStdScope } from '@blocksuite/block-std';
-import type { GfxPrimitiveElementModel } from '@blocksuite/block-std/gfx';
-import type { EdgelessRootService } from '@blocksuite/blocks';
-import { SpecProvider } from '@blocksuite/blocks';
-import { Bound } from '@blocksuite/global/utils';
-import type { Block, Doc } from '@blocksuite/store';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import { BlockStdScope } from '@blocksuite/affine/block-std';
+import type { GfxPrimitiveElementModel } from '@blocksuite/affine/block-std/gfx';
+import type { EdgelessRootService } from '@blocksuite/affine/blocks';
+import { SpecProvider } from '@blocksuite/affine/blocks';
+import { Bound } from '@blocksuite/affine/global/utils';
+import type { Block, Doc } from '@blocksuite/affine/store';
import { useFramework } from '@toeverything/infra';
import { isEqual } from 'lodash-es';
import { useCallback, useEffect, useRef } from 'react';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/text.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/text.tsx
index 723533505c..c7c2955430 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/text.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/text.tsx
@@ -15,8 +15,8 @@ import {
LineColor,
LineColorMap,
TextAlign,
-} from '@blocksuite/blocks';
-import type { Doc } from '@blocksuite/store';
+} from '@blocksuite/affine/blocks';
+import type { Doc } from '@blocksuite/affine/store';
import { useFramework, useLiveData } from '@toeverything/infra';
import { useCallback, useMemo } from 'react';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/utils.ts b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/utils.ts
index f3767465a9..31ecf42175 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/utils.ts
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/utils.ts
@@ -1,6 +1,6 @@
-import type { SurfaceBlockModel } from '@blocksuite/block-std/gfx';
-import type { FrameBlockModel } from '@blocksuite/blocks';
-import type { Doc } from '@blocksuite/store';
+import type { SurfaceBlockModel } from '@blocksuite/affine/block-std/gfx';
+import type { FrameBlockModel } from '@blocksuite/affine/blocks';
+import type { Doc } from '@blocksuite/affine/store';
export function getSurfaceBlock(doc: Doc) {
const blocks = doc.getBlocksByFlavour('affine:surface');
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/general.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/general.tsx
index 61c60fe799..fe3fdd6480 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/general.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/general.tsx
@@ -24,7 +24,7 @@ import {
SystemFontFamilyService,
} from '@affine/core/modules/system-font-family';
import { useI18n } from '@affine/i18n';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import { DoneIcon, SearchIcon } from '@blocksuite/icons/rc';
import {
FeatureFlagService,
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/utils.ts b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/utils.ts
index 66431d2814..4f970ba9cf 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/utils.ts
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/utils.ts
@@ -1,4 +1,4 @@
-import { FontWeight } from '@blocksuite/blocks';
+import { FontWeight } from '@blocksuite/affine/blocks';
import { useTheme } from 'next-themes';
function getColorFromMap(
diff --git a/packages/frontend/core/src/components/affine/share-page-modal/index.tsx b/packages/frontend/core/src/components/affine/share-page-modal/index.tsx
index 9ef355cc18..5e794ddb5a 100644
--- a/packages/frontend/core/src/components/affine/share-page-modal/index.tsx
+++ b/packages/frontend/core/src/components/affine/share-page-modal/index.tsx
@@ -1,6 +1,6 @@
import { useEnableCloud } from '@affine/core/components/hooks/affine/use-enable-cloud';
import { track } from '@affine/track';
-import type { Doc } from '@blocksuite/store';
+import type { Doc } from '@blocksuite/affine/store';
import { type Workspace } from '@toeverything/infra';
import { useCallback } from 'react';
diff --git a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-menu.tsx b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-menu.tsx
index 246db6153b..ceb219996a 100644
--- a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-menu.tsx
+++ b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-menu.tsx
@@ -4,8 +4,8 @@ import { Menu } from '@affine/component/ui/menu';
import { ShareInfoService } from '@affine/core/modules/share-doc';
import { WorkspaceFlavour } from '@affine/env/workspace';
import { useI18n } from '@affine/i18n';
+import type { Doc } from '@blocksuite/affine/store';
import { LockIcon, PublishIcon } from '@blocksuite/icons/rc';
-import type { Doc } from '@blocksuite/store';
import {
useLiveData,
useService,
diff --git a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx
index 811231cd7d..6240a43a22 100644
--- a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx
+++ b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx
@@ -15,7 +15,7 @@ import { WorkspaceFlavour } from '@affine/env/workspace';
import { PublicPageMode } from '@affine/graphql';
import { useI18n } from '@affine/i18n';
import { track } from '@affine/track';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import {
BlockIcon,
CollaborationIcon,
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/copilot-client.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/copilot-client.ts
index 1a30678b85..60d2a8e41c 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/copilot-client.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/copilot-client.ts
@@ -19,7 +19,7 @@ import {
GeneralNetworkError,
PaymentRequiredError,
UnauthorizedError,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import { getCurrentStore } from '@toeverything/infra';
type OptionsField<T extends GraphQLQuery> =
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/request.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/request.ts
index 74c1e0f0bf..3fea50acea 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/request.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/request.ts
@@ -1,6 +1,6 @@
import { AIProvider } from '@affine/core/blocksuite/presets/ai';
import type { ForkChatSessionInput } from '@affine/graphql';
-import { assertExists } from '@blocksuite/global/utils';
+import { assertExists } from '@blocksuite/affine/global/utils';
import { partition } from 'lodash-es';
import { CopilotClient } from './copilot-client';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/setup-provider.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/setup-provider.tsx
index e701af56d4..57d2e5c3b4 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/setup-provider.tsx
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/setup-provider.tsx
@@ -7,8 +7,8 @@ import {
type RequestOptions,
} from '@affine/graphql';
import { track } from '@affine/track';
-import { UnauthorizedError } from '@blocksuite/blocks';
-import { assertExists } from '@blocksuite/global/utils';
+import { UnauthorizedError } from '@blocksuite/affine/blocks';
+import { assertExists } from '@blocksuite/affine/global/utils';
import { getCurrentStore } from '@toeverything/infra';
import { z } from 'zod';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/tracker.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/tracker.ts
index 89ff529625..0265aac741 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/tracker.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/tracker.ts
@@ -1,7 +1,7 @@
import { AIProvider } from '@affine/core/blocksuite/presets/ai';
import { mixpanel, track } from '@affine/track';
-import type { EditorHost } from '@blocksuite/block-std';
-import type { BlockModel } from '@blocksuite/store';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import type { BlockModel } from '@blocksuite/affine/store';
import { lowerCase, omit } from 'lodash-es';
type ElementModel = BlockSuite.SurfaceElementModel;
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor-container.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor-container.tsx
index 8a7143f470..1b8d59426a 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor-container.tsx
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor-container.tsx
@@ -1,11 +1,11 @@
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import type {
AffineEditorContainer,
DocTitle,
EdgelessEditor,
PageEditor,
-} from '@blocksuite/presets';
-import { type Doc, Slot } from '@blocksuite/store';
+} from '@blocksuite/affine/presets';
+import { type Doc, Slot } from '@blocksuite/affine/store';
import clsx from 'clsx';
import type React from 'react';
import {
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor.tsx
index 45553c323c..e27ba8b8ea 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor.tsx
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor.tsx
@@ -8,10 +8,10 @@ import {
EmbedLoomBlockService,
EmbedYoutubeBlockService,
ImageBlockService,
-} from '@blocksuite/blocks';
-import { DisposableGroup } from '@blocksuite/global/utils';
-import type { AffineEditorContainer } from '@blocksuite/presets';
-import type { Doc } from '@blocksuite/store';
+} from '@blocksuite/affine/blocks';
+import { DisposableGroup } from '@blocksuite/affine/global/utils';
+import type { AffineEditorContainer } from '@blocksuite/affine/presets';
+import type { Doc } from '@blocksuite/affine/store';
import { use } from 'foxact/use';
import type { CSSProperties } from 'react';
import { Suspense, useEffect } from 'react';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/index.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/index.ts
index d3be9554de..2de10721c4 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/index.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/index.ts
@@ -1,13 +1,11 @@
import { registerAICustomComponents } from '@affine/core/blocksuite/presets/ai';
-import { effects as blocksEffects } from '@blocksuite/blocks/effects';
-import { effects as presetsEffects } from '@blocksuite/presets/effects';
+import { effects as bsEffects } from '@blocksuite/affine/effects';
import { setupAIProvider } from './ai/setup-provider';
import { effects as edgelessEffects } from './specs/edgeless';
import { effects as patchEffects } from './specs/preview';
-blocksEffects();
-presetsEffects();
+bsEffects();
patchEffects();
setupAIProvider();
edgelessEffects();
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/journal-doc-title.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-editor/journal-doc-title.tsx
index d42a8496c1..6cde60aac8 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/journal-doc-title.tsx
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/journal-doc-title.tsx
@@ -1,6 +1,6 @@
import { useJournalInfoHelper } from '@affine/core/components/hooks/use-journal';
import { useI18n } from '@affine/i18n';
-import type { Doc } from '@blocksuite/store';
+import type { Doc } from '@blocksuite/affine/store';
import * as styles from './styles.css';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/lit-adaper.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-editor/lit-adaper.tsx
index 9a4c0b470d..0590df8b8f 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/lit-adaper.tsx
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/lit-adaper.tsx
@@ -8,9 +8,13 @@ import { EditorService } from '@affine/core/modules/editor';
import { EditorSettingService } from '@affine/core/modules/editor-settting';
import { toURLSearchParams } from '@affine/core/modules/navigation';
import { PeekViewService } from '@affine/core/modules/peek-view';
-import type { DocMode } from '@blocksuite/blocks';
-import { DocTitle, EdgelessEditor, PageEditor } from '@blocksuite/presets';
-import type { Doc } from '@blocksuite/store';
+import type { DocMode } from '@blocksuite/affine/blocks';
+import {
+ DocTitle,
+ EdgelessEditor,
+ PageEditor,
+} from '@blocksuite/affine/presets';
+import type { Doc } from '@blocksuite/affine/store';
import {
DocService,
DocsService,
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/no-page-error.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/no-page-error.ts
index 326c421125..8c63dfc37d 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/no-page-error.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/no-page-error.ts
@@ -1,4 +1,4 @@
-import type { Doc } from '@blocksuite/store';
+import type { Doc } from '@blocksuite/affine/store';
import type { Map as YMap } from 'yjs';
/**
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/common.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/common.ts
index 6e093d810f..2cbf03ac9b 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/common.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/common.ts
@@ -3,7 +3,7 @@ import {
AIImageBlockSpec,
AIParagraphBlockSpec,
} from '@affine/core/blocksuite/presets/ai';
-import type { ExtensionType } from '@blocksuite/block-std';
+import type { ExtensionType } from '@blocksuite/affine/block-std';
import {
BookmarkBlockSpec,
CodeBlockSpec,
@@ -24,8 +24,8 @@ import {
ParagraphBlockSpec,
RefNodeSlotsExtension,
RichTextExtensions,
-} from '@blocksuite/blocks';
-import { AIChatBlockSpec } from '@blocksuite/presets';
+} from '@blocksuite/affine/blocks';
+import { AIChatBlockSpec } from '@blocksuite/affine/presets';
import { CustomAttachmentBlockSpec } from './custom/attachment-block';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/attachment-block.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/attachment-block.ts
index aa33403f02..17a938b228 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/attachment-block.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/attachment-block.ts
@@ -3,11 +3,11 @@ import {
BlockServiceIdentifier,
type ExtensionType,
StdIdentifier,
-} from '@blocksuite/block-std';
+} from '@blocksuite/affine/block-std';
import {
AttachmentBlockService,
AttachmentBlockSpec,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import bytes from 'bytes';
class CustomAttachmentBlockService extends AttachmentBlockService {
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/database-block.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/database-block.ts
index 95736bf209..cc08ea3ccb 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/database-block.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/database-block.ts
@@ -7,7 +7,10 @@ import { getAffineCloudBaseUrl } from '@affine/core/modules/cloud/services/fetch
import { EditorService } from '@affine/core/modules/editor';
import { I18n } from '@affine/i18n';
import { track } from '@affine/track';
-import type { DatabaseBlockModel, MenuOptions } from '@blocksuite/blocks';
+import type {
+ DatabaseBlockModel,
+ MenuOptions,
+} from '@blocksuite/affine/blocks';
import { LinkIcon } from '@blocksuite/icons/lit';
import type { FrameworkProvider } from '@toeverything/infra';
import type { TemplateResult } from 'lit';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/root-block.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/root-block.ts
index 3e4c1c6e03..e19cbb85bc 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/root-block.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/root-block.ts
@@ -4,14 +4,20 @@ import {
} from '@affine/core/blocksuite/presets/ai';
import { EditorSettingService } from '@affine/core/modules/editor-settting';
import { mixpanel } from '@affine/track';
-import { ConfigExtension, type ExtensionType } from '@blocksuite/block-std';
+import {
+ ConfigExtension,
+ type ExtensionType,
+} from '@blocksuite/affine/block-std';
import {
EdgelessRootBlockSpec,
EditorSettingExtension,
FontLoaderService,
PageRootBlockSpec,
-} from '@blocksuite/blocks';
-import { type TelemetryEventMap, TelemetryProvider } from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
+import {
+ type TelemetryEventMap,
+ TelemetryProvider,
+} from '@blocksuite/affine/blocks';
import { type FrameworkProvider } from '@toeverything/infra';
import { getFontConfigExtension } from '../font-extension';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/spec-patchers.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/spec-patchers.tsx
index 7d64fe24a4..63ae7ae70a 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/spec-patchers.tsx
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/spec-patchers.tsx
@@ -27,15 +27,15 @@ import {
BlockViewIdentifier,
type ExtensionType,
type WidgetComponent,
-} from '@blocksuite/block-std';
-import { BlockServiceWatcher } from '@blocksuite/block-std';
+} from '@blocksuite/affine/block-std';
+import { BlockServiceWatcher } from '@blocksuite/affine/block-std';
import type {
AffineReference,
DocMode,
DocModeProvider,
QuickSearchResult,
RootService,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import {
AffineSlashMenuWidget,
DocModeExtension,
@@ -46,9 +46,9 @@ import {
PeekViewExtension,
QuickSearchExtension,
ReferenceNodeConfigExtension,
-} from '@blocksuite/blocks';
-import { AIChatBlockSchema } from '@blocksuite/presets';
-import { type BlockSnapshot, Text } from '@blocksuite/store';
+} from '@blocksuite/affine/blocks';
+import { AIChatBlockSchema } from '@blocksuite/affine/presets';
+import { type BlockSnapshot, Text } from '@blocksuite/affine/store';
import {
type DocProps,
type DocService,
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/widgets/linked.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/widgets/linked.ts
index 22fa168415..3371ebf1f2 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/widgets/linked.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/widgets/linked.ts
@@ -2,10 +2,10 @@ import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta';
import { WorkspacePropertiesAdapter } from '@affine/core/modules/properties';
import { I18n } from '@affine/i18n';
import { track } from '@affine/track';
-import type { EditorHost } from '@blocksuite/block-std';
-import type { AffineInlineEditor } from '@blocksuite/blocks';
-import { LinkedWidgetUtils } from '@blocksuite/blocks';
-import type { DocMeta } from '@blocksuite/store';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import type { AffineInlineEditor } from '@blocksuite/affine/blocks';
+import { LinkedWidgetUtils } from '@blocksuite/affine/blocks';
+import type { DocMeta } from '@blocksuite/affine/store';
import { type FrameworkProvider, WorkspaceService } from '@toeverything/infra';
// TODO: fix the type
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/widgets/toolbar.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/widgets/toolbar.ts
index 13981f92a1..7380edf9b7 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/widgets/toolbar.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/widgets/toolbar.ts
@@ -7,12 +7,12 @@ import { getAffineCloudBaseUrl } from '@affine/core/modules/cloud/services/fetch
import { EditorService } from '@affine/core/modules/editor';
import { I18n } from '@affine/i18n';
import { track } from '@affine/track';
-import type { MenuItemGroup } from '@blocksuite/affine-components/toolbar';
import type {
GfxBlockElementModel,
GfxPrimitiveElementModel,
-} from '@blocksuite/block-std/gfx';
-import type { MenuContext } from '@blocksuite/blocks';
+} from '@blocksuite/affine/block-std/gfx';
+import type { MenuContext } from '@blocksuite/affine/blocks';
+import type { MenuItemGroup } from '@blocksuite/affine-components/toolbar';
import { LinkIcon } from '@blocksuite/icons/lit';
import type { FrameworkProvider } from '@toeverything/infra';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/edgeless.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/edgeless.ts
index 2f109893cc..50a6ffc87a 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/edgeless.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/edgeless.ts
@@ -1,7 +1,7 @@
import { builtInTemplates as builtInEdgelessTemplates } from '@affine/templates/edgeless';
import { builtInTemplates as builtInStickersTemplates } from '@affine/templates/stickers';
-import type { ExtensionType } from '@blocksuite/block-std';
-import type { TemplateManager } from '@blocksuite/blocks';
+import type { ExtensionType } from '@blocksuite/affine/block-std';
+import type { TemplateManager } from '@blocksuite/affine/blocks';
import {
EdgelessNoteBlockSpec,
EdgelessSurfaceBlockSpec,
@@ -9,7 +9,7 @@ import {
EdgelessTemplatePanel,
EdgelessTextBlockSpec,
FrameBlockSpec,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import type { FrameworkProvider } from '@toeverything/infra';
import { AIBlockSpecs, DefaultBlockSpecs } from './common';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/font-extension.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/font-extension.ts
index 8d2473ecaf..72456a5fc1 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/font-extension.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/font-extension.ts
@@ -1,4 +1,7 @@
-import { AffineCanvasTextFonts, FontConfigExtension } from '@blocksuite/blocks';
+import {
+ AffineCanvasTextFonts,
+ FontConfigExtension,
+} from '@blocksuite/affine/blocks';
export function getFontConfigExtension() {
return FontConfigExtension(
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/page.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/page.ts
index 13f1864cd7..b7ea0e5f4f 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/page.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/page.ts
@@ -1,9 +1,9 @@
-import type { ExtensionType } from '@blocksuite/block-std';
+import type { ExtensionType } from '@blocksuite/affine/block-std';
import {
NoteBlockSpec,
PageSurfaceBlockSpec,
PageSurfaceRefBlockSpec,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
import { type FrameworkProvider } from '@toeverything/infra';
import { AIBlockSpecs, DefaultBlockSpecs } from './common';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/preview.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/preview.ts
index d49719116f..410510f547 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/preview.ts
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/preview.ts
@@ -1,6 +1,6 @@
-import type { ExtensionType } from '@blocksuite/block-std';
-import { SpecProvider } from '@blocksuite/blocks';
-import { AIChatBlockSpec } from '@blocksuite/presets';
+import type { ExtensionType } from '@blocksuite/affine/block-std';
+import { SpecProvider } from '@blocksuite/affine/blocks';
+import { AIChatBlockSpec } from '@blocksuite/affine/presets';
import { getFontConfigExtension } from './font-extension';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-header/journal/date-picker.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-header/journal/date-picker.tsx
index ac76a12a19..13587d5c67 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-header/journal/date-picker.tsx
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-header/journal/date-picker.tsx
@@ -4,7 +4,7 @@ import {
useJournalInfoHelper,
useJournalRouteHelper,
} from '@affine/core/components/hooks/use-journal';
-import type { Doc, DocCollection } from '@blocksuite/store';
+import type { Doc, DocCollection } from '@blocksuite/affine/store';
import dayjs from 'dayjs';
import { useEffect, useRef, useState } from 'react';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-header/journal/today-button.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-header/journal/today-button.tsx
index dce5c4b9dc..d528b38a87 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-header/journal/today-button.tsx
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-header/journal/today-button.tsx
@@ -1,7 +1,7 @@
import { Button } from '@affine/component';
import { useJournalRouteHelper } from '@affine/core/components/hooks/use-journal';
import { useI18n } from '@affine/i18n';
-import type { DocCollection } from '@blocksuite/store';
+import type { DocCollection } from '@blocksuite/affine/store';
import { useCallback } from 'react';
export interface JournalTodayButtonProps {
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-header/menu/index.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-header/menu/index.tsx
index 0de35334c7..612ff304e0 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-header/menu/index.tsx
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-header/menu/index.tsx
@@ -26,6 +26,7 @@ import { ViewService } from '@affine/core/modules/workbench/services/view';
import { WorkspaceFlavour } from '@affine/env/workspace';
import { useI18n } from '@affine/i18n';
import { track } from '@affine/track';
+import type { Doc } from '@blocksuite/affine/store';
import {
DuplicateIcon,
EdgelessIcon,
@@ -41,7 +42,6 @@ import {
SplitViewIcon,
TocIcon,
} from '@blocksuite/icons/rc';
-import type { Doc } from '@blocksuite/store';
import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
import { useSetAtom } from 'jotai';
import { useCallback, useState } from 'react';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-mode-switch/index.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-mode-switch/index.tsx
index 5d6f054b92..d33e3072fd 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-mode-switch/index.tsx
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-mode-switch/index.tsx
@@ -3,7 +3,7 @@ import { registerAffineCommand } from '@affine/core/commands';
import { EditorService } from '@affine/core/modules/editor';
import { useI18n } from '@affine/i18n';
import { track } from '@affine/track';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import { EdgelessIcon, PageIcon } from '@blocksuite/icons/rc';
import { useLiveData, useService } from '@toeverything/infra';
import { useCallback, useEffect, useMemo } from 'react';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx
index c332810765..89846db071 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx
@@ -1,8 +1,8 @@
import { toast } from '@affine/component';
import { EditorSettingService } from '@affine/core/modules/editor-settting';
import { WorkbenchService } from '@affine/core/modules/workbench';
-import type { DocMode } from '@blocksuite/blocks';
-import type { DocCollection } from '@blocksuite/store';
+import type { DocMode } from '@blocksuite/affine/blocks';
+import type { DocCollection } from '@blocksuite/affine/store';
import { type DocProps, DocsService, useServices } from '@toeverything/infra';
import { useCallback, useMemo } from 'react';
@@ -43,7 +43,7 @@ export const usePageHelper = (docCollection: DocCollection) => {
const importFileAndOpen = useMemo(
() => async () => {
- const { showImportModal } = await import('@blocksuite/blocks');
+ const { showImportModal } = await import('@blocksuite/affine/blocks');
const { promise, resolve, reject } =
Promise.withResolvers<
Parameters<
diff --git a/packages/frontend/core/src/components/blocksuite/outline-viewer/index.tsx b/packages/frontend/core/src/components/blocksuite/outline-viewer/index.tsx
index dd8a55fa98..7b18cd8373 100644
--- a/packages/frontend/core/src/components/blocksuite/outline-viewer/index.tsx
+++ b/packages/frontend/core/src/components/blocksuite/outline-viewer/index.tsx
@@ -1,5 +1,5 @@
-import type { AffineEditorContainer } from '@blocksuite/presets';
-import { OutlineViewer } from '@blocksuite/presets';
+import type { AffineEditorContainer } from '@blocksuite/affine/presets';
+import { OutlineViewer } from '@blocksuite/affine/presets';
import { useCallback, useRef } from 'react';
import * as styles from './outline-viewer.css';
diff --git a/packages/frontend/core/src/components/cloud/share-header-right-item/index.tsx b/packages/frontend/core/src/components/cloud/share-header-right-item/index.tsx
index 42ea2f5ba5..ab5cb3642a 100644
--- a/packages/frontend/core/src/components/cloud/share-header-right-item/index.tsx
+++ b/packages/frontend/core/src/components/cloud/share-header-right-item/index.tsx
@@ -1,5 +1,5 @@
import { AuthService } from '@affine/core/modules/cloud';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import { useLiveData, useService } from '@toeverything/infra';
import { ImportTemplateButton } from './import-template';
diff --git a/packages/frontend/core/src/components/hooks/affine/use-all-page-list-config.tsx b/packages/frontend/core/src/components/hooks/affine/use-all-page-list-config.tsx
index 3bc7fca4a0..6941bfe614 100644
--- a/packages/frontend/core/src/components/hooks/affine/use-all-page-list-config.tsx
+++ b/packages/frontend/core/src/components/hooks/affine/use-all-page-list-config.tsx
@@ -6,7 +6,7 @@ import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/properties'
import { ShareDocsListService } from '@affine/core/modules/share-doc';
import { PublicPageMode } from '@affine/graphql';
import { useI18n } from '@affine/i18n';
-import type { DocMeta } from '@blocksuite/store';
+import type { DocMeta } from '@blocksuite/affine/store';
import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
import { useCallback, useEffect, useMemo } from 'react';
diff --git a/packages/frontend/core/src/components/hooks/affine/use-block-suite-meta-helper.ts b/packages/frontend/core/src/components/hooks/affine/use-block-suite-meta-helper.ts
index 4020199be4..6efe884a6f 100644
--- a/packages/frontend/core/src/components/hooks/affine/use-block-suite-meta-helper.ts
+++ b/packages/frontend/core/src/components/hooks/affine/use-block-suite-meta-helper.ts
@@ -1,7 +1,7 @@
import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
import { useDocMetaHelper } from '@affine/core/components/hooks/use-block-suite-page-meta';
import { useDocCollectionHelper } from '@affine/core/components/hooks/use-block-suite-workspace-helper';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import { DocsService, useService, WorkspaceService } from '@toeverything/infra';
import { useCallback } from 'react';
import { applyUpdate, encodeStateAsUpdate } from 'yjs';
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 c020f9de92..7056aa0602 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
@@ -11,9 +11,9 @@ import {
HtmlTransformer,
MarkdownTransformer,
printToPdf,
-} from '@blocksuite/blocks';
-import type { AffineEditorContainer } from '@blocksuite/presets';
-import type { Doc } from '@blocksuite/store';
+} from '@blocksuite/affine/blocks';
+import type { AffineEditorContainer } from '@blocksuite/affine/presets';
+import type { Doc } from '@blocksuite/affine/store';
import { useLiveData, useService } from '@toeverything/infra';
import { useSetAtom } from 'jotai';
import { nanoid } from 'nanoid';
diff --git a/packages/frontend/core/src/components/hooks/affine/use-reference-link-helper.ts b/packages/frontend/core/src/components/hooks/affine/use-reference-link-helper.ts
index 6f2a9150b6..7652229fc5 100644
--- a/packages/frontend/core/src/components/hooks/affine/use-reference-link-helper.ts
+++ b/packages/frontend/core/src/components/hooks/affine/use-reference-link-helper.ts
@@ -1,4 +1,4 @@
-import type { DocCollection } from '@blocksuite/store';
+import type { DocCollection } from '@blocksuite/affine/store';
import { useCallback } from 'react';
export function useReferenceLinkHelper(docCollection: DocCollection) {
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 3eac45ae7e..71e1d0e732 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
@@ -3,9 +3,9 @@ import { getAffineCloudBaseUrl } from '@affine/core/modules/cloud/services/fetch
import { toURLSearchParams } from '@affine/core/modules/navigation';
import { useI18n } from '@affine/i18n';
import { track } from '@affine/track';
-import { type EditorHost } from '@blocksuite/block-std';
-import { GfxBlockElementModel } from '@blocksuite/block-std/gfx';
-import type { DocMode, EdgelessRootService } from '@blocksuite/blocks';
+import { type EditorHost } from '@blocksuite/affine/block-std';
+import { GfxBlockElementModel } from '@blocksuite/affine/block-std/gfx';
+import type { DocMode, EdgelessRootService } from '@blocksuite/affine/blocks';
import { useCallback } from 'react';
export type UseSharingUrl = {
diff --git a/packages/frontend/core/src/components/hooks/use-all-block-suite-page-meta.ts b/packages/frontend/core/src/components/hooks/use-all-block-suite-page-meta.ts
index c6bc598efe..52ef8099a6 100644
--- a/packages/frontend/core/src/components/hooks/use-all-block-suite-page-meta.ts
+++ b/packages/frontend/core/src/components/hooks/use-all-block-suite-page-meta.ts
@@ -1,4 +1,4 @@
-import type { DocCollection, DocMeta } from '@blocksuite/store';
+import type { DocCollection, DocMeta } from '@blocksuite/affine/store';
import type { Atom } from 'jotai';
import { atom, useAtomValue } from 'jotai';
diff --git a/packages/frontend/core/src/components/hooks/use-app-config-storage.ts b/packages/frontend/core/src/components/hooks/use-app-config-storage.ts
index b5416c3abe..7b7f080cd8 100644
--- a/packages/frontend/core/src/components/hooks/use-app-config-storage.ts
+++ b/packages/frontend/core/src/components/hooks/use-app-config-storage.ts
@@ -1,5 +1,5 @@
import { apis } from '@affine/electron-api';
-import { assertExists } from '@blocksuite/global/utils';
+import { assertExists } from '@blocksuite/affine/global/utils';
import type { AppConfigSchema } from '@toeverything/infra';
import { AppConfigStorage, defaultAppConfig } from '@toeverything/infra';
import type { Dispatch } from 'react';
diff --git a/packages/frontend/core/src/components/hooks/use-block-suite-editor.ts b/packages/frontend/core/src/components/hooks/use-block-suite-editor.ts
index f8e3f9a570..608b6ee93a 100644
--- a/packages/frontend/core/src/components/hooks/use-block-suite-editor.ts
+++ b/packages/frontend/core/src/components/hooks/use-block-suite-editor.ts
@@ -1,4 +1,4 @@
-import type { AffineEditorContainer } from '@blocksuite/presets';
+import type { AffineEditorContainer } from '@blocksuite/affine/presets';
import type { SetStateAction } from 'jotai';
import { atom, useAtom } from 'jotai';
diff --git a/packages/frontend/core/src/components/hooks/use-block-suite-page-meta.ts b/packages/frontend/core/src/components/hooks/use-block-suite-page-meta.ts
index 98604a5d2f..467765cd86 100644
--- a/packages/frontend/core/src/components/hooks/use-block-suite-page-meta.ts
+++ b/packages/frontend/core/src/components/hooks/use-block-suite-page-meta.ts
@@ -1,4 +1,4 @@
-import type { DocCollection, DocMeta } from '@blocksuite/store';
+import type { DocCollection, DocMeta } from '@blocksuite/affine/store';
import { DocsService, useService, WorkspaceService } from '@toeverything/infra';
import { useCallback, useMemo } from 'react';
diff --git a/packages/frontend/core/src/components/hooks/use-block-suite-workspace-helper.ts b/packages/frontend/core/src/components/hooks/use-block-suite-workspace-helper.ts
index a27d08b54c..72d7521ac2 100644
--- a/packages/frontend/core/src/components/hooks/use-block-suite-workspace-helper.ts
+++ b/packages/frontend/core/src/components/hooks/use-block-suite-workspace-helper.ts
@@ -1,4 +1,4 @@
-import type { Doc, DocCollection } from '@blocksuite/store';
+import type { Doc, DocCollection } from '@blocksuite/affine/store';
import { useMemo } from 'react';
export function useDocCollectionHelper(docCollection: DocCollection) {
diff --git a/packages/frontend/core/src/components/hooks/use-block-suite-workspace-page-title.ts b/packages/frontend/core/src/components/hooks/use-block-suite-workspace-page-title.ts
index c533917495..cc484a0b2b 100644
--- a/packages/frontend/core/src/components/hooks/use-block-suite-workspace-page-title.ts
+++ b/packages/frontend/core/src/components/hooks/use-block-suite-workspace-page-title.ts
@@ -1,5 +1,5 @@
-import { assertExists } from '@blocksuite/global/utils';
-import type { DocCollection } from '@blocksuite/store';
+import { assertExists } from '@blocksuite/affine/global/utils';
+import type { DocCollection } from '@blocksuite/affine/store';
import type { Atom } from 'jotai';
import { atom, useAtomValue } from 'jotai';
import { useCallback } from 'react';
diff --git a/packages/frontend/core/src/components/hooks/use-block-suite-workspace-page.ts b/packages/frontend/core/src/components/hooks/use-block-suite-workspace-page.ts
index 1ec1070ac3..562266e2dc 100644
--- a/packages/frontend/core/src/components/hooks/use-block-suite-workspace-page.ts
+++ b/packages/frontend/core/src/components/hooks/use-block-suite-workspace-page.ts
@@ -1,6 +1,6 @@
import { DebugLogger } from '@affine/debug';
-import { DisposableGroup } from '@blocksuite/global/utils';
-import type { Doc, DocCollection } from '@blocksuite/store';
+import { DisposableGroup } from '@blocksuite/affine/global/utils';
+import type { Doc, DocCollection } from '@blocksuite/affine/store';
import { useEffect, useState } from 'react';
const logger = new DebugLogger('use-doc-collection-page');
diff --git a/packages/frontend/core/src/components/hooks/use-journal.ts b/packages/frontend/core/src/components/hooks/use-journal.ts
index 6a972ccdc6..b5e87f9656 100644
--- a/packages/frontend/core/src/components/hooks/use-journal.ts
+++ b/packages/frontend/core/src/components/hooks/use-journal.ts
@@ -1,7 +1,7 @@
import { EditorSettingService } from '@affine/core/modules/editor-settting';
import { i18nTime } from '@affine/i18n';
import { track } from '@affine/track';
-import { type DocCollection, Text } from '@blocksuite/store';
+import { type DocCollection, Text } from '@blocksuite/affine/store';
import {
type DocProps,
DocsService,
diff --git a/packages/frontend/core/src/components/hooks/use-navigate-helper.ts b/packages/frontend/core/src/components/hooks/use-navigate-helper.ts
index 24561cc2f8..68871f9374 100644
--- a/packages/frontend/core/src/components/hooks/use-navigate-helper.ts
+++ b/packages/frontend/core/src/components/hooks/use-navigate-helper.ts
@@ -1,5 +1,5 @@
import { toURLSearchParams } from '@affine/core/modules/navigation';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import { createContext, useCallback, useContext, useMemo } from 'react';
import type { NavigateFunction, NavigateOptions } from 'react-router-dom';
diff --git a/packages/frontend/core/src/components/hooks/use-register-workspace-commands.ts b/packages/frontend/core/src/components/hooks/use-register-workspace-commands.ts
index 120656666a..5014218e02 100644
--- a/packages/frontend/core/src/components/hooks/use-register-workspace-commands.ts
+++ b/packages/frontend/core/src/components/hooks/use-register-workspace-commands.ts
@@ -1,5 +1,5 @@
import { useI18n } from '@affine/i18n';
-import type { AffineEditorContainer } from '@blocksuite/presets';
+import type { AffineEditorContainer } from '@blocksuite/affine/presets';
import { useService, WorkspaceService } from '@toeverything/infra';
import { useStore } from 'jotai';
import { useTheme } from 'next-themes';
diff --git a/packages/frontend/core/src/components/layouts/workspace-layout.tsx b/packages/frontend/core/src/components/layouts/workspace-layout.tsx
index 751700810c..b71ad55cac 100644
--- a/packages/frontend/core/src/components/layouts/workspace-layout.tsx
+++ b/packages/frontend/core/src/components/layouts/workspace-layout.tsx
@@ -4,7 +4,7 @@ import {
resolveGlobalLoadingEventAtom,
} from '@affine/component/global-loading';
import { useI18n } from '@affine/i18n';
-import { type DocMode, ZipTransformer } from '@blocksuite/blocks';
+import { type DocMode, ZipTransformer } from '@blocksuite/affine/blocks';
import {
DocsService,
effect,
diff --git a/packages/frontend/core/src/components/page-detail-editor.tsx b/packages/frontend/core/src/components/page-detail-editor.tsx
index 66637bbd4e..7c55411eb3 100644
--- a/packages/frontend/core/src/components/page-detail-editor.tsx
+++ b/packages/frontend/core/src/components/page-detail-editor.tsx
@@ -1,6 +1,6 @@
import './page-detail-editor.css';
-import type { AffineEditorContainer } from '@blocksuite/presets';
+import type { AffineEditorContainer } from '@blocksuite/affine/presets';
import { useLiveData, useService } from '@toeverything/infra';
import { cssVar } from '@toeverything/theme';
import clsx from 'clsx';
diff --git a/packages/frontend/core/src/components/page-list/__tests__/filter.spec.tsx b/packages/frontend/core/src/components/page-list/__tests__/filter.spec.tsx
index 8604ff7218..7ee1666b63 100644
--- a/packages/frontend/core/src/components/page-list/__tests__/filter.spec.tsx
+++ b/packages/frontend/core/src/components/page-list/__tests__/filter.spec.tsx
@@ -11,7 +11,7 @@ import type {
VariableMap,
} from '@affine/env/filter';
import { createI18n, I18nextProvider } from '@affine/i18n';
-import { assertExists } from '@blocksuite/global/utils';
+import { assertExists } from '@blocksuite/affine/global/utils';
import { render } from '@testing-library/react';
import type { ReactElement } from 'react';
import { useState } from 'react';
diff --git a/packages/frontend/core/src/components/page-list/__tests__/use-block-suite-page-preview.spec.ts b/packages/frontend/core/src/components/page-list/__tests__/use-block-suite-page-preview.spec.ts
index 2ff2155d54..d8fba4c489 100644
--- a/packages/frontend/core/src/components/page-list/__tests__/use-block-suite-page-preview.spec.ts
+++ b/packages/frontend/core/src/components/page-list/__tests__/use-block-suite-page-preview.spec.ts
@@ -3,10 +3,10 @@
*/
import 'fake-indexeddb/auto';
-import { AffineSchemas } from '@blocksuite/blocks/schemas';
-import { assertExists } from '@blocksuite/global/utils';
-import type { Doc } from '@blocksuite/store';
-import { DocCollection, Schema } from '@blocksuite/store';
+import { AffineSchemas } from '@blocksuite/affine/blocks/schemas';
+import { assertExists } from '@blocksuite/affine/global/utils';
+import type { Doc } from '@blocksuite/affine/store';
+import { DocCollection, Schema } from '@blocksuite/affine/store';
import { renderHook } from '@testing-library/react';
import { useAtomValue } from 'jotai';
import { beforeEach, describe, expect, test, vi } from 'vitest';
diff --git a/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx b/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx
index 161509e542..5a336afd88 100644
--- a/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx
+++ b/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx
@@ -13,7 +13,7 @@ import { isNewTabTrigger } from '@affine/core/utils';
import type { Collection } from '@affine/env/filter';
import { useI18n } from '@affine/i18n';
import { track } from '@affine/track';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import {
ArrowDownSmallIcon,
SearchIcon,
diff --git a/packages/frontend/core/src/components/page-list/docs/virtualized-page-list.tsx b/packages/frontend/core/src/components/page-list/docs/virtualized-page-list.tsx
index a35b0aef35..ade146738a 100644
--- a/packages/frontend/core/src/components/page-list/docs/virtualized-page-list.tsx
+++ b/packages/frontend/core/src/components/page-list/docs/virtualized-page-list.tsx
@@ -5,7 +5,7 @@ import { CollectionService } from '@affine/core/modules/collection';
import type { Tag } from '@affine/core/modules/tag';
import type { Collection, Filter } from '@affine/env/filter';
import { Trans, useI18n } from '@affine/i18n';
-import type { DocMeta } from '@blocksuite/store';
+import type { DocMeta } from '@blocksuite/affine/store';
import { useService, WorkspaceService } from '@toeverything/infra';
import { useCallback, useMemo, useRef, useState } from 'react';
diff --git a/packages/frontend/core/src/components/page-list/group-definitions.tsx b/packages/frontend/core/src/components/page-list/group-definitions.tsx
index 6135972fa0..7a180d48b9 100644
--- a/packages/frontend/core/src/components/page-list/group-definitions.tsx
+++ b/packages/frontend/core/src/components/page-list/group-definitions.tsx
@@ -2,8 +2,8 @@ import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/properties'
import type { Tag } from '@affine/core/modules/tag';
import { TagService } from '@affine/core/modules/tag';
import { useI18n } from '@affine/i18n';
+import type { DocMeta } from '@blocksuite/affine/store';
import { FavoritedIcon, FavoriteIcon } from '@blocksuite/icons/rc';
-import type { DocMeta } from '@blocksuite/store';
import { LiveData, useLiveData, useService } from '@toeverything/infra';
import { type ReactNode, useMemo } from 'react';
diff --git a/packages/frontend/core/src/components/page-list/operation-cell.tsx b/packages/frontend/core/src/components/page-list/operation-cell.tsx
index c40a140ed5..9ca95c3d80 100644
--- a/packages/frontend/core/src/components/page-list/operation-cell.tsx
+++ b/packages/frontend/core/src/components/page-list/operation-cell.tsx
@@ -14,6 +14,7 @@ import { WorkbenchService } from '@affine/core/modules/workbench';
import type { Collection, DeleteCollectionInfo } from '@affine/env/filter';
import { useI18n } from '@affine/i18n';
import { track } from '@affine/track';
+import type { DocMeta } from '@blocksuite/affine/store';
import {
DeleteIcon,
DeletePermanentlyIcon,
@@ -28,7 +29,6 @@ import {
ResetIcon,
SplitViewIcon,
} from '@blocksuite/icons/rc';
-import type { DocMeta } from '@blocksuite/store';
import {
FeatureFlagService,
useLiveData,
diff --git a/packages/frontend/core/src/components/page-list/page-content-preview.tsx b/packages/frontend/core/src/components/page-list/page-content-preview.tsx
index a40ef97e97..644d807df8 100644
--- a/packages/frontend/core/src/components/page-list/page-content-preview.tsx
+++ b/packages/frontend/core/src/components/page-list/page-content-preview.tsx
@@ -1,4 +1,4 @@
-import type { DocCollection } from '@blocksuite/store';
+import type { DocCollection } from '@blocksuite/affine/store';
import { useAtomValue } from 'jotai';
import { type ReactNode, Suspense } from 'react';
diff --git a/packages/frontend/core/src/components/page-list/page-group.tsx b/packages/frontend/core/src/components/page-list/page-group.tsx
index 3532cdc3ff..399bce1b49 100644
--- a/packages/frontend/core/src/components/page-list/page-group.tsx
+++ b/packages/frontend/core/src/components/page-list/page-group.tsx
@@ -1,9 +1,9 @@
import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta';
import type { Tag } from '@affine/env/filter';
import { useI18n } from '@affine/i18n';
-import { assertExists } from '@blocksuite/global/utils';
+import { assertExists } from '@blocksuite/affine/global/utils';
+import type { DocCollection, DocMeta } from '@blocksuite/affine/store';
import { ToggleCollapseIcon, ViewLayersIcon } from '@blocksuite/icons/rc';
-import type { DocCollection, DocMeta } from '@blocksuite/store';
import * as Collapsible from '@radix-ui/react-collapsible';
import { useLiveData, useService } from '@toeverything/infra';
import clsx from 'clsx';
diff --git a/packages/frontend/core/src/components/page-list/types.ts b/packages/frontend/core/src/components/page-list/types.ts
index 9a3e451163..e8887ce205 100644
--- a/packages/frontend/core/src/components/page-list/types.ts
+++ b/packages/frontend/core/src/components/page-list/types.ts
@@ -1,5 +1,5 @@
import type { Collection, Tag } from '@affine/env/filter';
-import type { DocCollection, DocMeta } from '@blocksuite/store';
+import type { DocCollection, DocMeta } from '@blocksuite/affine/store';
import type { PropsWithChildren, ReactNode } from 'react';
import type { To } from 'react-router-dom';
diff --git a/packages/frontend/core/src/components/page-list/use-block-suite-page-preview.ts b/packages/frontend/core/src/components/page-list/use-block-suite-page-preview.ts
index 6cd2c491aa..f5efc2edc3 100644
--- a/packages/frontend/core/src/components/page-list/use-block-suite-page-preview.ts
+++ b/packages/frontend/core/src/components/page-list/use-block-suite-page-preview.ts
@@ -1,4 +1,4 @@
-import type { Doc } from '@blocksuite/store';
+import type { Doc } from '@blocksuite/affine/store';
import type { Atom } from 'jotai';
import { atom } from 'jotai';
diff --git a/packages/frontend/core/src/components/page-list/use-block-suite-workspace-page.ts b/packages/frontend/core/src/components/page-list/use-block-suite-workspace-page.ts
index a020eff1df..b7d2833af6 100644
--- a/packages/frontend/core/src/components/page-list/use-block-suite-workspace-page.ts
+++ b/packages/frontend/core/src/components/page-list/use-block-suite-workspace-page.ts
@@ -1,6 +1,6 @@
import { DebugLogger } from '@affine/debug';
-import { DisposableGroup } from '@blocksuite/global/utils';
-import type { Doc, DocCollection } from '@blocksuite/store';
+import { DisposableGroup } from '@blocksuite/affine/global/utils';
+import type { Doc, DocCollection } from '@blocksuite/affine/store';
import { useEffect, useState } from 'react';
const logger = new DebugLogger('useBlockSuiteWorkspacePage');
diff --git a/packages/frontend/core/src/components/page-list/use-collection-manager.ts b/packages/frontend/core/src/components/page-list/use-collection-manager.ts
index 3ef98e923b..8264c0fb5b 100644
--- a/packages/frontend/core/src/components/page-list/use-collection-manager.ts
+++ b/packages/frontend/core/src/components/page-list/use-collection-manager.ts
@@ -1,5 +1,5 @@
import type { Collection, Filter, VariableMap } from '@affine/env/filter';
-import type { DocMeta } from '@blocksuite/store';
+import type { DocMeta } from '@blocksuite/affine/store';
import { evalFilterList } from './filter';
diff --git a/packages/frontend/core/src/components/page-list/use-filtered-page-metas.tsx b/packages/frontend/core/src/components/page-list/use-filtered-page-metas.tsx
index 4799b13323..c5b7aa0df8 100644
--- a/packages/frontend/core/src/components/page-list/use-filtered-page-metas.tsx
+++ b/packages/frontend/core/src/components/page-list/use-filtered-page-metas.tsx
@@ -2,7 +2,7 @@ import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/properties'
import { ShareDocsListService } from '@affine/core/modules/share-doc';
import type { Collection, Filter } from '@affine/env/filter';
import { PublicPageMode } from '@affine/graphql';
-import type { DocMeta } from '@blocksuite/store';
+import type { DocMeta } from '@blocksuite/affine/store';
import { useLiveData, useService } from '@toeverything/infra';
import { useCallback, useEffect, useMemo } from 'react';
diff --git a/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.tsx b/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.tsx
index 8afc8c00ff..f74bb9b5da 100644
--- a/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.tsx
+++ b/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.tsx
@@ -2,7 +2,7 @@ import { Button, Modal, RadioGroup } from '@affine/component';
import { useAllPageListConfig } from '@affine/core/components/hooks/affine/use-all-page-list-config';
import type { Collection } from '@affine/env/filter';
import { useI18n } from '@affine/i18n';
-import type { DocCollection, DocMeta } from '@blocksuite/store';
+import type { DocCollection, DocMeta } from '@blocksuite/affine/store';
import type { DialogContentProps } from '@radix-ui/react-dialog';
import type { ReactNode } from 'react';
import { useCallback, useMemo, useState } from 'react';
diff --git a/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx b/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx
index 35f051794b..d64f05e717 100644
--- a/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx
+++ b/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx
@@ -2,13 +2,13 @@ import { Button, IconButton, Tooltip } from '@affine/component';
import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/properties';
import type { Collection } from '@affine/env/filter';
import { Trans, useI18n } from '@affine/i18n';
+import type { DocMeta } from '@blocksuite/affine/store';
import {
CloseIcon,
EdgelessIcon,
PageIcon,
ToggleCollapseIcon,
} from '@blocksuite/icons/rc';
-import type { DocMeta } from '@blocksuite/store';
import { DocsService, useLiveData, useService } from '@toeverything/infra';
import { cssVar } from '@toeverything/theme';
import clsx from 'clsx';
diff --git a/packages/frontend/core/src/components/page-list/view/edit-collection/select-page.tsx b/packages/frontend/core/src/components/page-list/view/edit-collection/select-page.tsx
index 881a8d39da..28a34848cb 100644
--- a/packages/frontend/core/src/components/page-list/view/edit-collection/select-page.tsx
+++ b/packages/frontend/core/src/components/page-list/view/edit-collection/select-page.tsx
@@ -4,8 +4,8 @@ import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/properties'
import { ShareDocsListService } from '@affine/core/modules/share-doc';
import { PublicPageMode } from '@affine/graphql';
import { Trans, useI18n } from '@affine/i18n';
+import type { DocMeta } from '@blocksuite/affine/store';
import { FilterIcon } from '@blocksuite/icons/rc';
-import type { DocMeta } from '@blocksuite/store';
import {
useLiveData,
useServices,
diff --git a/packages/frontend/core/src/components/page-list/view/edit-collection/use-search.tsx b/packages/frontend/core/src/components/page-list/view/edit-collection/use-search.tsx
index dd70c8fa77..74b83db6f1 100644
--- a/packages/frontend/core/src/components/page-list/view/edit-collection/use-search.tsx
+++ b/packages/frontend/core/src/components/page-list/view/edit-collection/use-search.tsx
@@ -1,4 +1,4 @@
-import type { DocMeta } from '@blocksuite/store';
+import type { DocMeta } from '@blocksuite/affine/store';
import { useState } from 'react';
export const useSearch = (list: DocMeta[]) => {
diff --git a/packages/frontend/core/src/components/page-list/virtualized-trash-list.tsx b/packages/frontend/core/src/components/page-list/virtualized-trash-list.tsx
index 802dbc7a0c..a70e60641a 100644
--- a/packages/frontend/core/src/components/page-list/virtualized-trash-list.tsx
+++ b/packages/frontend/core/src/components/page-list/virtualized-trash-list.tsx
@@ -2,7 +2,7 @@ import { toast, useConfirmModal } from '@affine/component';
import { useBlockSuiteMetaHelper } from '@affine/core/components/hooks/affine/use-block-suite-meta-helper';
import { useBlockSuiteDocMeta } from '@affine/core/components/hooks/use-block-suite-page-meta';
import { Trans, useI18n } from '@affine/i18n';
-import type { DocMeta } from '@blocksuite/store';
+import type { DocMeta } from '@blocksuite/affine/store';
import { useService, WorkspaceService } from '@toeverything/infra';
import { useCallback, useMemo, useRef, useState } from 'react';
diff --git a/packages/frontend/core/src/components/providers/swr-config-provider.tsx b/packages/frontend/core/src/components/providers/swr-config-provider.tsx
index 4abffaf6ac..fa20135f10 100644
--- a/packages/frontend/core/src/components/providers/swr-config-provider.tsx
+++ b/packages/frontend/core/src/components/providers/swr-config-provider.tsx
@@ -1,6 +1,6 @@
import { notify } from '@affine/component';
import { GraphQLError } from '@affine/graphql';
-import { assertExists } from '@blocksuite/global/utils';
+import { assertExists } from '@blocksuite/affine/global/utils';
import type { PropsWithChildren, ReactNode } from 'react';
import { useCallback } from 'react';
import type { SWRConfiguration } from 'swr';
diff --git a/packages/frontend/core/src/components/root-app-sidebar/import-page.tsx b/packages/frontend/core/src/components/root-app-sidebar/import-page.tsx
index a4d25afe83..1a52174678 100644
--- a/packages/frontend/core/src/components/root-app-sidebar/import-page.tsx
+++ b/packages/frontend/core/src/components/root-app-sidebar/import-page.tsx
@@ -1,8 +1,8 @@
import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
import { useI18n } from '@affine/i18n';
import { track } from '@affine/track';
+import type { DocCollection } from '@blocksuite/affine/store';
import { ImportIcon } from '@blocksuite/icons/rc';
-import type { DocCollection } from '@blocksuite/store';
import { MenuItem } from '../app-sidebar';
import { usePageHelper } from '../blocksuite/block-suite-page-list/utils';
diff --git a/packages/frontend/core/src/components/root-app-sidebar/index.tsx b/packages/frontend/core/src/components/root-app-sidebar/index.tsx
index 7736414d9f..39bf3583b4 100644
--- a/packages/frontend/core/src/components/root-app-sidebar/index.tsx
+++ b/packages/frontend/core/src/components/root-app-sidebar/index.tsx
@@ -12,13 +12,13 @@ import { isNewTabTrigger } from '@affine/core/utils';
import { apis, events } from '@affine/electron-api';
import { useI18n } from '@affine/i18n';
import { track } from '@affine/track';
+import type { Doc } from '@blocksuite/affine/store';
import {
AllDocsIcon,
GithubIcon,
JournalIcon,
SettingsIcon,
} from '@blocksuite/icons/rc';
-import type { Doc } from '@blocksuite/store';
import type { Workspace } from '@toeverything/infra';
import {
useLiveData,
diff --git a/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx b/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx
index cb80f23f25..4e456cf8fa 100644
--- a/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx
+++ b/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx
@@ -7,8 +7,8 @@ import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta';
import { WorkbenchService } from '@affine/core/modules/workbench';
import { isNewTabTrigger } from '@affine/core/utils';
import { useI18n } from '@affine/i18n';
+import type { DocCollection } from '@blocksuite/affine/store';
import { TodayIcon } from '@blocksuite/icons/rc';
-import type { DocCollection } from '@blocksuite/store';
import { useLiveData, useService } from '@toeverything/infra';
import { type MouseEvent } from 'react';
diff --git a/packages/frontend/core/src/desktop/pages/import-template.tsx b/packages/frontend/core/src/desktop/pages/import-template.tsx
index caf479c0f8..48b659c265 100644
--- a/packages/frontend/core/src/desktop/pages/import-template.tsx
+++ b/packages/frontend/core/src/desktop/pages/import-template.tsx
@@ -1,4 +1,4 @@
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import { useService } from '@toeverything/infra';
import { useEffect } from 'react';
import { useSearchParams } from 'react-router-dom';
diff --git a/packages/frontend/core/src/desktop/pages/onboarding.tsx b/packages/frontend/core/src/desktop/pages/onboarding.tsx
index 2ef01cafcb..f494f0f94d 100644
--- a/packages/frontend/core/src/desktop/pages/onboarding.tsx
+++ b/packages/frontend/core/src/desktop/pages/onboarding.tsx
@@ -1,5 +1,5 @@
import { apis } from '@affine/electron-api';
-import { assertExists } from '@blocksuite/global/utils';
+import { assertExists } from '@blocksuite/affine/global/utils';
import { useCallback } from 'react';
import { redirect } from 'react-router-dom';
diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page-header.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page-header.tsx
index 4d585a9efa..dbefe6a8c8 100644
--- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page-header.tsx
+++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page-header.tsx
@@ -17,7 +17,7 @@ import { useDocCollectionPageTitle } from '@affine/core/components/hooks/use-blo
import { useJournalInfoHelper } from '@affine/core/components/hooks/use-journal';
import { EditorService } from '@affine/core/modules/editor';
import { ViewIcon, ViewTitle } from '@affine/core/modules/workbench';
-import type { Doc } from '@blocksuite/store';
+import type { Doc } from '@blocksuite/affine/store';
import { useLiveData, useService, type Workspace } from '@toeverything/infra';
import { useAtom, useAtomValue } from 'jotai';
import { forwardRef, useCallback, useEffect, useRef, useState } from 'react';
diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx
index 3ac40b1ec1..3481d61f26 100644
--- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx
+++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx
@@ -10,10 +10,10 @@ import { EditorService } from '@affine/core/modules/editor';
import { RecentDocsService } from '@affine/core/modules/quicksearch';
import { ViewService } from '@affine/core/modules/workbench/services/view';
import { useI18n } from '@affine/i18n';
-import { RefNodeSlotsProvider } from '@blocksuite/blocks';
-import { DisposableGroup } from '@blocksuite/global/utils';
+import { RefNodeSlotsProvider } from '@blocksuite/affine/blocks';
+import { DisposableGroup } from '@blocksuite/affine/global/utils';
+import { type AffineEditorContainer } from '@blocksuite/affine/presets';
import { AiIcon, FrameIcon, TocIcon, TodayIcon } from '@blocksuite/icons/rc';
-import { type AffineEditorContainer } from '@blocksuite/presets';
import {
DocService,
FeatureFlagService,
diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/chat.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/chat.tsx
index e07df7dc1e..31dcf8a4b3 100644
--- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/chat.tsx
+++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/chat.tsx
@@ -1,7 +1,10 @@
import { ChatPanel } from '@affine/core/blocksuite/presets/ai';
-import { DocModeProvider, RefNodeSlotsProvider } from '@blocksuite/blocks';
-import { assertExists } from '@blocksuite/global/utils';
-import type { AffineEditorContainer } from '@blocksuite/presets';
+import {
+ DocModeProvider,
+ RefNodeSlotsProvider,
+} from '@blocksuite/affine/blocks';
+import { assertExists } from '@blocksuite/affine/global/utils';
+import type { AffineEditorContainer } from '@blocksuite/affine/presets';
import { forwardRef, useCallback, useEffect, useRef } from 'react';
import * as styles from './chat.css';
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 616b7dc035..6ca62948e7 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,6 +1,6 @@
-import { assertExists } from '@blocksuite/global/utils';
-import type { AffineEditorContainer } from '@blocksuite/presets';
-import { FramePanel } from '@blocksuite/presets';
+import { assertExists } from '@blocksuite/affine/global/utils';
+import type { AffineEditorContainer } from '@blocksuite/affine/presets';
+import { FramePanel } from '@blocksuite/affine/presets';
import { useCallback, 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 999d134ff4..f161959486 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 { AffineEditorContainer } from '@blocksuite/presets';
-import { OutlinePanel } from '@blocksuite/presets';
+import type { AffineEditorContainer } from '@blocksuite/affine/presets';
+import { OutlinePanel } from '@blocksuite/affine/presets';
import { useCallback, useRef } from 'react';
import * as styles from './outline.css';
diff --git a/packages/frontend/core/src/desktop/pages/workspace/index.tsx b/packages/frontend/core/src/desktop/pages/workspace/index.tsx
index 508d816230..7107c84b3a 100644
--- a/packages/frontend/core/src/desktop/pages/workspace/index.tsx
+++ b/packages/frontend/core/src/desktop/pages/workspace/index.tsx
@@ -1,7 +1,7 @@
import { AffineOtherPageLayout } from '@affine/component/affine-other-page-layout';
import { AppFallback } from '@affine/core/components/affine/app-container';
import { workbenchRoutes } from '@affine/core/desktop/workbench-router';
-import { ZipTransformer } from '@blocksuite/blocks';
+import { ZipTransformer } from '@blocksuite/affine/blocks';
import type { Workspace, WorkspaceMetadata } from '@toeverything/infra';
import {
FrameworkScope,
diff --git a/packages/frontend/core/src/desktop/pages/workspace/share/share-header.tsx b/packages/frontend/core/src/desktop/pages/workspace/share/share-header.tsx
index 532169364f..b8a98ee44b 100644
--- a/packages/frontend/core/src/desktop/pages/workspace/share/share-header.tsx
+++ b/packages/frontend/core/src/desktop/pages/workspace/share/share-header.tsx
@@ -2,7 +2,7 @@ import { AuthModal } from '@affine/core/components/affine/auth';
import { BlocksuiteHeaderTitle } from '@affine/core/components/blocksuite/block-suite-header/title';
import { EditorModeSwitch } from '@affine/core/components/blocksuite/block-suite-mode-switch';
import ShareHeaderRightItem from '@affine/core/components/cloud/share-header-right-item';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import * as styles from './share-header.css';
diff --git a/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx b/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx
index 818bdd2178..42ad5c7562 100644
--- a/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx
+++ b/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx
@@ -23,10 +23,10 @@ import {
type DocMode,
DocModes,
RefNodeSlotsProvider,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
+import type { AffineEditorContainer } from '@blocksuite/affine/presets';
import { DisposableGroup } from '@blocksuite/global/utils';
import { Logo1Icon } from '@blocksuite/icons/rc';
-import type { AffineEditorContainer } from '@blocksuite/presets';
import type { Doc, Workspace } from '@toeverything/infra';
import {
DocsService,
diff --git a/packages/frontend/core/src/desktop/pages/workspace/trash-page.tsx b/packages/frontend/core/src/desktop/pages/workspace/trash-page.tsx
index 52c0743cdd..ee39e6c0c6 100644
--- a/packages/frontend/core/src/desktop/pages/workspace/trash-page.tsx
+++ b/packages/frontend/core/src/desktop/pages/workspace/trash-page.tsx
@@ -5,7 +5,7 @@ import {
} from '@affine/core/components/page-list';
import { Header } from '@affine/core/components/pure/header';
import { useI18n } from '@affine/i18n';
-import { assertExists } from '@blocksuite/global/utils';
+import { assertExists } from '@blocksuite/affine/global/utils';
import { DeleteIcon } from '@blocksuite/icons/rc';
import {
GlobalContextService,
diff --git a/packages/frontend/core/src/mobile/components/doc-card/index.tsx b/packages/frontend/core/src/mobile/components/doc-card/index.tsx
index 2d6f2db933..6b0a75aec7 100644
--- a/packages/frontend/core/src/mobile/components/doc-card/index.tsx
+++ b/packages/frontend/core/src/mobile/components/doc-card/index.tsx
@@ -7,7 +7,7 @@ import {
WorkbenchLink,
type WorkbenchLinkProps,
} from '@affine/core/modules/workbench';
-import type { DocMeta } from '@blocksuite/store';
+import type { DocMeta } from '@blocksuite/affine/store';
import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
import clsx from 'clsx';
import { forwardRef, type ReactNode } from 'react';
diff --git a/packages/frontend/core/src/mobile/components/search-input/index.tsx b/packages/frontend/core/src/mobile/components/search-input/index.tsx
index 31612bfe07..5ad91b7d5e 100644
--- a/packages/frontend/core/src/mobile/components/search-input/index.tsx
+++ b/packages/frontend/core/src/mobile/components/search-input/index.tsx
@@ -1,5 +1,5 @@
import { useAutoFocus } from '@affine/component';
-import { getFigmaSquircleSvgPath } from '@blocksuite/global/utils';
+import { getFigmaSquircleSvgPath } from '@blocksuite/affine/global/utils';
import { SearchIcon } from '@blocksuite/icons/rc';
import clsx from 'clsx';
import { debounce } from 'lodash-es';
diff --git a/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx b/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx
index e58b4d0b8c..45a4f859d1 100644
--- a/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx
+++ b/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx
@@ -19,9 +19,9 @@ import {
EmbedYoutubeBlockService,
ImageBlockService,
RefNodeSlotsProvider,
-} from '@blocksuite/blocks';
-import { DisposableGroup } from '@blocksuite/global/utils';
-import { type AffineEditorContainer } from '@blocksuite/presets';
+} from '@blocksuite/affine/blocks';
+import { DisposableGroup } from '@blocksuite/affine/global/utils';
+import { type AffineEditorContainer } from '@blocksuite/affine/presets';
import {
DocService,
FrameworkScope,
diff --git a/packages/frontend/core/src/mobile/views/all-docs/doc/list.tsx b/packages/frontend/core/src/mobile/views/all-docs/doc/list.tsx
index 9fe199431f..2ff82558bc 100644
--- a/packages/frontend/core/src/mobile/views/all-docs/doc/list.tsx
+++ b/packages/frontend/core/src/mobile/views/all-docs/doc/list.tsx
@@ -10,8 +10,8 @@ import {
import { itemsToItemGroups } from '@affine/core/components/page-list/items-to-item-group';
import type { Tag } from '@affine/core/modules/tag';
import type { Collection, Filter } from '@affine/env/filter';
+import type { DocMeta } from '@blocksuite/affine/store';
import { ToggleExpandIcon } from '@blocksuite/icons/rc';
-import type { DocMeta } from '@blocksuite/store';
import * as Collapsible from '@radix-ui/react-collapsible';
import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
import { useMemo } from 'react';
diff --git a/packages/frontend/core/src/mobile/views/all-docs/doc/masonry.tsx b/packages/frontend/core/src/mobile/views/all-docs/doc/masonry.tsx
index 8cd9129110..254cfca0bb 100644
--- a/packages/frontend/core/src/mobile/views/all-docs/doc/masonry.tsx
+++ b/packages/frontend/core/src/mobile/views/all-docs/doc/masonry.tsx
@@ -1,4 +1,4 @@
-import type { DocMeta } from '@blocksuite/store';
+import type { DocMeta } from '@blocksuite/affine/store';
import { useMemo } from 'react';
import { DocCard } from '../../../components';
diff --git a/packages/frontend/core/src/modules/docs-search/worker/in-worker.ts b/packages/frontend/core/src/modules/docs-search/worker/in-worker.ts
index 7ba7151f3f..06b6462d70 100644
--- a/packages/frontend/core/src/modules/docs-search/worker/in-worker.ts
+++ b/packages/frontend/core/src/modules/docs-search/worker/in-worker.ts
@@ -1,4 +1,4 @@
-import type { AffineTextAttributes } from '@blocksuite/blocks';
+import type { AffineTextAttributes } from '@blocksuite/affine/blocks';
import type { DeltaInsert } from '@blocksuite/inline';
import { Document } from '@toeverything/infra';
import { toHexString } from 'lib0/buffer.js';
diff --git a/packages/frontend/core/src/modules/editor-settting/entities/editor-setting.ts b/packages/frontend/core/src/modules/editor-settting/entities/editor-setting.ts
index b8966a0148..dd2535784b 100644
--- a/packages/frontend/core/src/modules/editor-settting/entities/editor-setting.ts
+++ b/packages/frontend/core/src/modules/editor-settting/entities/editor-setting.ts
@@ -1,8 +1,8 @@
+import type { DeepPartial } from '@blocksuite/affine/global/utils';
import {
createSignalFromObservable,
type Signal,
} from '@blocksuite/affine-shared/utils';
-import type { DeepPartial } from '@blocksuite/global/utils';
import { Entity, LiveData } from '@toeverything/infra';
import { isObject, merge } from 'lodash-es';
import type { Observable } from 'rxjs';
diff --git a/packages/frontend/core/src/modules/editor/entities/editor.ts b/packages/frontend/core/src/modules/editor/entities/editor.ts
index 379eac5ab3..3bd8cae568 100644
--- a/packages/frontend/core/src/modules/editor/entities/editor.ts
+++ b/packages/frontend/core/src/modules/editor/entities/editor.ts
@@ -2,9 +2,12 @@ import type {
DocMode,
EdgelessRootService,
ReferenceParams,
-} from '@blocksuite/blocks';
+} from '@blocksuite/affine/blocks';
+import type {
+ AffineEditorContainer,
+ DocTitle,
+} from '@blocksuite/affine/presets';
import type { InlineEditor } from '@blocksuite/inline';
-import type { AffineEditorContainer, DocTitle } from '@blocksuite/presets';
import type { DocService, WorkspaceService } from '@toeverything/infra';
import { Entity, LiveData } from '@toeverything/infra';
import { isEqual } from 'lodash-es';
diff --git a/packages/frontend/core/src/modules/explorer/views/nodes/collection/index.tsx b/packages/frontend/core/src/modules/explorer/views/nodes/collection/index.tsx
index d324168d85..eceadff47a 100644
--- a/packages/frontend/core/src/modules/explorer/views/nodes/collection/index.tsx
+++ b/packages/frontend/core/src/modules/explorer/views/nodes/collection/index.tsx
@@ -17,8 +17,8 @@ import type { Collection } from '@affine/env/filter';
import { PublicPageMode } from '@affine/graphql';
import { useI18n } from '@affine/i18n';
import { track } from '@affine/track';
+import type { DocMeta } from '@blocksuite/affine/store';
import { FilterMinusIcon } from '@blocksuite/icons/rc';
-import type { DocMeta } from '@blocksuite/store';
import {
DocsService,
GlobalContextService,
diff --git a/packages/frontend/core/src/modules/import-template/entities/dialog.ts b/packages/frontend/core/src/modules/import-template/entities/dialog.ts
index 8eb1599171..caed7787c6 100644
--- a/packages/frontend/core/src/modules/import-template/entities/dialog.ts
+++ b/packages/frontend/core/src/modules/import-template/entities/dialog.ts
@@ -1,4 +1,4 @@
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import { Entity, LiveData } from '@toeverything/infra';
interface TemplateOptions {
diff --git a/packages/frontend/core/src/modules/import-template/services/import.ts b/packages/frontend/core/src/modules/import-template/services/import.ts
index 5d0bb92147..af8183d6ab 100644
--- a/packages/frontend/core/src/modules/import-template/services/import.ts
+++ b/packages/frontend/core/src/modules/import-template/services/import.ts
@@ -1,5 +1,5 @@
import type { WorkspaceFlavour } from '@affine/env/workspace';
-import { type DocMode, ZipTransformer } from '@blocksuite/blocks';
+import { type DocMode, ZipTransformer } from '@blocksuite/affine/blocks';
import type { WorkspaceMetadata, WorkspacesService } from '@toeverything/infra';
import { DocsService, Service } from '@toeverything/infra';
diff --git a/packages/frontend/core/src/modules/import-template/views/dialog.tsx b/packages/frontend/core/src/modules/import-template/views/dialog.tsx
index 12f863d79b..86f25f46d4 100644
--- a/packages/frontend/core/src/modules/import-template/views/dialog.tsx
+++ b/packages/frontend/core/src/modules/import-template/views/dialog.tsx
@@ -5,7 +5,7 @@ import { useWorkspaceName } from '@affine/core/components/hooks/use-workspace-in
import { WorkspaceSelector } from '@affine/core/components/workspace-selector';
import { WorkspaceFlavour } from '@affine/env/workspace';
import { useI18n } from '@affine/i18n';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import { AllDocsIcon } from '@blocksuite/icons/rc';
import {
useLiveData,
diff --git a/packages/frontend/core/src/modules/navigation/utils.ts b/packages/frontend/core/src/modules/navigation/utils.ts
index 0b12b46153..0700868ec8 100644
--- a/packages/frontend/core/src/modules/navigation/utils.ts
+++ b/packages/frontend/core/src/modules/navigation/utils.ts
@@ -1,4 +1,4 @@
-import type { ReferenceParams } from '@blocksuite/blocks';
+import type { ReferenceParams } from '@blocksuite/affine/blocks';
import { isNil, pick, pickBy } from 'lodash-es';
import type { ParsedQuery, ParseOptions } from 'query-string';
import queryString from 'query-string';
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 71d714fa8f..d018e9b3a6 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,4 @@
-import type { BlockComponent, EditorHost } from '@blocksuite/block-std';
+import type { BlockComponent, EditorHost } from '@blocksuite/affine/block-std';
import type {
DocMode,
EmbedLinkedDocModel,
@@ -6,10 +6,10 @@ import type {
ImageBlockModel,
SurfaceRefBlockComponent,
SurfaceRefBlockModel,
-} from '@blocksuite/blocks';
-import { AffineReference } from '@blocksuite/blocks';
-import type { AIChatBlockModel } from '@blocksuite/presets';
-import type { BlockModel } from '@blocksuite/store';
+} from '@blocksuite/affine/blocks';
+import { AffineReference } from '@blocksuite/affine/blocks';
+import type { AIChatBlockModel } from '@blocksuite/affine/presets';
+import type { BlockModel } from '@blocksuite/affine/store';
import { Entity, LiveData } from '@toeverything/infra';
import type { TemplateResult } from 'lit';
import { firstValueFrom, map, race } from 'rxjs';
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 896d9b10dd..961f275816 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
@@ -11,9 +11,9 @@ import {
type DocMode,
type EdgelessRootService,
RefNodeSlotsProvider,
-} from '@blocksuite/blocks';
-import { Bound, DisposableGroup } from '@blocksuite/global/utils';
-import type { AffineEditorContainer } from '@blocksuite/presets';
+} from '@blocksuite/affine/blocks';
+import { Bound, DisposableGroup } from '@blocksuite/affine/global/utils';
+import type { AffineEditorContainer } from '@blocksuite/affine/presets';
import {
FrameworkScope,
useLiveData,
diff --git a/packages/frontend/core/src/modules/peek-view/view/image-preview/index.tsx b/packages/frontend/core/src/modules/peek-view/view/image-preview/index.tsx
index f7db5592a7..55b74a2dec 100644
--- a/packages/frontend/core/src/modules/peek-view/view/image-preview/index.tsx
+++ b/packages/frontend/core/src/modules/peek-view/view/image-preview/index.tsx
@@ -1,8 +1,9 @@
import { toast } from '@affine/component';
import { Button, IconButton } from '@affine/component/ui/button';
import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
-import type { ImageBlockModel } from '@blocksuite/blocks';
-import { assertExists } from '@blocksuite/global/utils';
+import type { ImageBlockModel } from '@blocksuite/affine/blocks';
+import { assertExists } from '@blocksuite/affine/global/utils';
+import type { BlockModel } from '@blocksuite/affine/store';
import {
ArrowLeftSmallIcon,
ArrowRightSmallIcon,
@@ -14,7 +15,6 @@ import {
PlusIcon,
ViewBarIcon,
} from '@blocksuite/icons/rc';
-import type { BlockModel } from '@blocksuite/store';
import { useService } from '@toeverything/infra';
import clsx from 'clsx';
import { fileTypeFromBuffer } from 'file-type';
diff --git a/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.tsx b/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.tsx
index 9647f5dce4..306586d108 100644
--- a/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.tsx
+++ b/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.tsx
@@ -1,6 +1,6 @@
import { IconButton } from '@affine/component';
import { useI18n } from '@affine/i18n';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import {
CloseIcon,
ExpandFullIcon,
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 4c899710d1..fd47d82a7c 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,6 +1,6 @@
import { toReactNode } from '@affine/component';
import { AIChatBlockPeekViewTemplate } from '@affine/core/blocksuite/presets/ai';
-import { BlockComponent } from '@blocksuite/block-std';
+import { BlockComponent } from '@blocksuite/affine/block-std';
import { useLiveData, useService } from '@toeverything/infra';
import { useEffect, useMemo } from 'react';
diff --git a/packages/frontend/core/src/modules/peek-view/view/utils.ts b/packages/frontend/core/src/modules/peek-view/view/utils.ts
index dfb7f042cc..765ac2ff26 100644
--- a/packages/frontend/core/src/modules/peek-view/view/utils.ts
+++ b/packages/frontend/core/src/modules/peek-view/view/utils.ts
@@ -1,4 +1,4 @@
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import type { Doc } from '@toeverything/infra';
import {
DocsService,
diff --git a/packages/frontend/core/src/modules/properties/services/adapter.ts b/packages/frontend/core/src/modules/properties/services/adapter.ts
index 3554162051..d40ee7ecef 100644
--- a/packages/frontend/core/src/modules/properties/services/adapter.ts
+++ b/packages/frontend/core/src/modules/properties/services/adapter.ts
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-non-null-assertion */
// the adapter is to bridge the workspace rootdoc & native js bindings
-import { createYProxy, type Y } from '@blocksuite/store';
+import { createYProxy, type Y } from '@blocksuite/affine/store';
import type { WorkspaceService } from '@toeverything/infra';
import { LiveData, Service } from '@toeverything/infra';
import { defaultsDeep } from 'lodash-es';
diff --git a/packages/frontend/core/src/modules/properties/services/legacy-properties.ts b/packages/frontend/core/src/modules/properties/services/legacy-properties.ts
index a65e8a25b7..ec98809e2b 100644
--- a/packages/frontend/core/src/modules/properties/services/legacy-properties.ts
+++ b/packages/frontend/core/src/modules/properties/services/legacy-properties.ts
@@ -1,5 +1,5 @@
import type { Tag } from '@affine/env/filter';
-import type { DocsPropertiesMeta } from '@blocksuite/store';
+import type { DocsPropertiesMeta } from '@blocksuite/affine/store';
import type { WorkspaceService } from '@toeverything/infra';
import { LiveData, Service } from '@toeverything/infra';
import { Observable } from 'rxjs';
diff --git a/packages/frontend/core/src/modules/quicksearch/impls/commands.ts b/packages/frontend/core/src/modules/quicksearch/impls/commands.ts
index d0f540d88d..4d215e662c 100644
--- a/packages/frontend/core/src/modules/quicksearch/impls/commands.ts
+++ b/packages/frontend/core/src/modules/quicksearch/impls/commands.ts
@@ -4,7 +4,7 @@ import {
type CommandCategory,
PreconditionStrategy,
} from '@affine/core/commands';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import type { GlobalContextService } from '@toeverything/infra';
import { Entity, LiveData } from '@toeverything/infra';
import Fuse from 'fuse.js';
diff --git a/packages/frontend/core/src/modules/quicksearch/impls/creation.ts b/packages/frontend/core/src/modules/quicksearch/impls/creation.ts
index 8f6dca5e6d..47ebc09358 100644
--- a/packages/frontend/core/src/modules/quicksearch/impls/creation.ts
+++ b/packages/frontend/core/src/modules/quicksearch/impls/creation.ts
@@ -1,4 +1,4 @@
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import { EdgelessIcon, PageIcon } from '@blocksuite/icons/rc';
import { Entity, LiveData } from '@toeverything/infra';
diff --git a/packages/frontend/core/src/modules/quicksearch/impls/links.ts b/packages/frontend/core/src/modules/quicksearch/impls/links.ts
index 5201107c4e..50bfa12c74 100644
--- a/packages/frontend/core/src/modules/quicksearch/impls/links.ts
+++ b/packages/frontend/core/src/modules/quicksearch/impls/links.ts
@@ -1,4 +1,4 @@
-import type { ReferenceParams } from '@blocksuite/blocks';
+import type { ReferenceParams } from '@blocksuite/affine/blocks';
import { BlockLinkIcon, EdgelessIcon, PageIcon } from '@blocksuite/icons/rc';
import type { DocsService, WorkspaceService } from '@toeverything/infra';
import { Entity, LiveData } from '@toeverything/infra';
diff --git a/packages/frontend/core/src/modules/quicksearch/services/cmdk.ts b/packages/frontend/core/src/modules/quicksearch/services/cmdk.ts
index 94c33d6a32..f2384fb794 100644
--- a/packages/frontend/core/src/modules/quicksearch/services/cmdk.ts
+++ b/packages/frontend/core/src/modules/quicksearch/services/cmdk.ts
@@ -1,5 +1,5 @@
import { track } from '@affine/track';
-import { Text } from '@blocksuite/store';
+import { Text } from '@blocksuite/affine/store';
import type { DocProps, DocsService } from '@toeverything/infra';
import { Service } from '@toeverything/infra';
diff --git a/packages/frontend/core/src/modules/share-doc/entities/share-reader.ts b/packages/frontend/core/src/modules/share-doc/entities/share-reader.ts
index 5b16b07f77..82c94db320 100644
--- a/packages/frontend/core/src/modules/share-doc/entities/share-reader.ts
+++ b/packages/frontend/core/src/modules/share-doc/entities/share-reader.ts
@@ -1,5 +1,5 @@
import { UserFriendlyError } from '@affine/graphql';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import {
effect,
Entity,
diff --git a/packages/frontend/core/src/modules/share-doc/stores/share-reader.ts b/packages/frontend/core/src/modules/share-doc/stores/share-reader.ts
index 60132e7978..fd9e66bea6 100644
--- a/packages/frontend/core/src/modules/share-doc/stores/share-reader.ts
+++ b/packages/frontend/core/src/modules/share-doc/stores/share-reader.ts
@@ -1,5 +1,5 @@
import { ErrorNames, UserFriendlyError } from '@affine/graphql';
-import type { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/affine/blocks';
import { Store } from '@toeverything/infra';
import { type FetchService, isBackendError } from '../../cloud';
diff --git a/packages/frontend/core/src/modules/workbench/entities/workbench.ts b/packages/frontend/core/src/modules/workbench/entities/workbench.ts
index 898a6b9b14..fcfc779a2b 100644
--- a/packages/frontend/core/src/modules/workbench/entities/workbench.ts
+++ b/packages/frontend/core/src/modules/workbench/entities/workbench.ts
@@ -1,6 +1,6 @@
import { toURLSearchParams } from '@affine/core/modules/navigation/utils';
import { Unreachable } from '@affine/env/constant';
-import type { ReferenceParams } from '@blocksuite/blocks';
+import type { ReferenceParams } from '@blocksuite/affine/blocks';
import { Entity, LiveData } from '@toeverything/infra';
import { type To } from 'history';
import { omit } from 'lodash-es';
diff --git a/packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts b/packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts
index 30610c30f8..3be51a66c3 100644
--- a/packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts
+++ b/packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts
@@ -6,7 +6,7 @@ import {
getIsOwnerQuery,
getWorkspacesQuery,
} from '@affine/graphql';
-import { DocCollection } from '@blocksuite/store';
+import { DocCollection } from '@blocksuite/affine/store';
import {
ApplicationStarted,
type BlobStorage,
diff --git a/packages/frontend/core/src/modules/workspace-engine/impls/engine/blob-sqlite.ts b/packages/frontend/core/src/modules/workspace-engine/impls/engine/blob-sqlite.ts
index b7f39999b2..cc7c5e219f 100644
--- a/packages/frontend/core/src/modules/workspace-engine/impls/engine/blob-sqlite.ts
+++ b/packages/frontend/core/src/modules/workspace-engine/impls/engine/blob-sqlite.ts
@@ -1,5 +1,5 @@
import { apis } from '@affine/electron-api';
-import { assertExists } from '@blocksuite/global/utils';
+import { assertExists } from '@blocksuite/affine/global/utils';
import type { BlobStorage } from '@toeverything/infra';
import { bufferToBlob } from '../../utils/buffer-to-blob';
diff --git a/packages/frontend/core/src/modules/workspace-engine/impls/local.ts b/packages/frontend/core/src/modules/workspace-engine/impls/local.ts
index 647c1602a0..4cd22f35a1 100644
--- a/packages/frontend/core/src/modules/workspace-engine/impls/local.ts
+++ b/packages/frontend/core/src/modules/workspace-engine/impls/local.ts
@@ -1,6 +1,6 @@
import { apis } from '@affine/electron-api';
import { WorkspaceFlavour } from '@affine/env/workspace';
-import { DocCollection } from '@blocksuite/store';
+import { DocCollection } from '@blocksuite/affine/store';
import type {
BlobStorage,
DocStorage,
diff --git a/packages/frontend/core/src/utils/first-app-data.ts b/packages/frontend/core/src/utils/first-app-data.ts
index 0d201b961f..57d89fd5b5 100644
--- a/packages/frontend/core/src/utils/first-app-data.ts
+++ b/packages/frontend/core/src/utils/first-app-data.ts
@@ -2,7 +2,7 @@ import { DebugLogger } from '@affine/debug';
import { DEFAULT_WORKSPACE_NAME } from '@affine/env/constant';
import { WorkspaceFlavour } from '@affine/env/workspace';
import onboardingUrl from '@affine/templates/onboarding.zip';
-import { ZipTransformer } from '@blocksuite/blocks';
+import { ZipTransformer } from '@blocksuite/affine/blocks';
import type { WorkspacesService } from '@toeverything/infra';
import { DocsService } from '@toeverything/infra';
diff --git a/packages/frontend/core/src/utils/toast.ts b/packages/frontend/core/src/utils/toast.ts
index b65e99d96f..d07e485ac3 100644
--- a/packages/frontend/core/src/utils/toast.ts
+++ b/packages/frontend/core/src/utils/toast.ts
@@ -1,6 +1,6 @@
import type { ToastOptions } from '@affine/component';
import { toast as basicToast } from '@affine/component';
-import { assertEquals } from '@blocksuite/global/utils';
+import { assertEquals } from '@blocksuite/affine/global/utils';
export const toast = (message: string, options?: ToastOptions) => {
const modal = document.querySelector(
diff --git a/packages/frontend/core/src/utils/user-setting.ts b/packages/frontend/core/src/utils/user-setting.ts
index cb1438bc46..40996fe5aa 100644
--- a/packages/frontend/core/src/utils/user-setting.ts
+++ b/packages/frontend/core/src/utils/user-setting.ts
@@ -1,5 +1,5 @@
import type { Collection } from '@affine/env/filter';
-import type { DocCollection } from '@blocksuite/store';
+import type { DocCollection } from '@blocksuite/affine/store';
import { nanoid } from 'nanoid';
import type { Map as YMap } from 'yjs';
import { Doc as YDoc } from 'yjs';
diff --git a/scripts/setup/vi-mock.ts b/scripts/setup/vi-mock.ts
index 70b4028dd5..b7d48d73d5 100644
--- a/scripts/setup/vi-mock.ts
+++ b/scripts/setup/vi-mock.ts
@@ -4,7 +4,7 @@ vi.mock('lottie-web', () => ({
default: {},
}));
-vi.mock('@blocksuite/presets', () => ({
+vi.mock('@blocksuite/affine/presets', () => ({
AffineEditorContainer: vi.fn(),
BiDirectionalLinkPanel: vi.fn(),
DocMetaTags: vi.fn(),
diff --git a/tools/@types/env/__all.d.ts b/tools/@types/env/__all.d.ts
index 3bf37f80a0..a191d80038 100644
--- a/tools/@types/env/__all.d.ts
+++ b/tools/@types/env/__all.d.ts
@@ -20,7 +20,7 @@ declare global {
var SENTRY_RELEASE: { id: string } | undefined;
}
-declare module '@blocksuite/store' {
+declare module '@blocksuite/affine/store' {
interface DocMeta {
/**
* @deprecated
diff --git a/tools/bump-blocksuite/index.js b/tools/bump-blocksuite/index.js
index 521b8e36d4..a2916afbf8 100644
--- a/tools/bump-blocksuite/index.js
+++ b/tools/bump-blocksuite/index.js
@@ -17,13 +17,11 @@ import corePackage from '../../packages/frontend/core/package.json' assert { typ
const clipboard = new Clipboard();
-const oldHash = corePackage.dependencies['@blocksuite/block-std']
- .split('-')
- .pop();
+const oldHash = corePackage.dependencies['@blocksuite/affine'].split('-').pop();
-const info = await fetch(
- 'https://registry.npmjs.org/@blocksuite/block-std'
-).then(res => res.json());
+const info = await fetch('https://registry.npmjs.org/@blocksuite/affine').then(
+ res => res.json()
+);
const latestVersion = info['dist-tags'].latest;
const latestHash = latestVersion.split('-').pop();
diff --git a/tools/cli/package.json b/tools/cli/package.json
index b761b255c0..518960a800 100644
--- a/tools/cli/package.json
+++ b/tools/cli/package.json
@@ -6,7 +6,7 @@
"@affine/env": "workspace:*",
"@affine/templates": "workspace:*",
"@aws-sdk/client-s3": "^3.620.0",
- "@blocksuite/presets": "0.17.14",
+ "@blocksuite/affine": "0.17.14",
"@clack/core": "^0.3.4",
"@clack/prompts": "^0.7.0",
"@magic-works/i18n-codegen": "^0.6.0",
diff --git a/tools/cli/src/webpack/config.ts b/tools/cli/src/webpack/config.ts
index 77b913e38a..375dae1cce 100644
--- a/tools/cli/src/webpack/config.ts
+++ b/tools/cli/src/webpack/config.ts
@@ -155,7 +155,7 @@ export const createConfiguration: (
alias: {
yjs: join(workspaceRoot, 'node_modules', 'yjs'),
lit: join(workspaceRoot, 'node_modules', 'lit'),
- '@blocksuite/block-std': blocksuiteBaseDir
+ '@blocksuite/affine/block-std': blocksuiteBaseDir
? join(blocksuiteBaseDir, 'packages', 'framework', 'block-std', 'src')
: join(
workspaceRoot,
@@ -164,7 +164,7 @@ export const createConfiguration: (
'block-std',
'dist'
),
- '@blocksuite/blocks': blocksuiteBaseDir
+ '@blocksuite/affine/blocks': blocksuiteBaseDir
? join(blocksuiteBaseDir, 'packages', 'blocks', 'src')
: join(
workspaceRoot,
@@ -173,7 +173,7 @@ export const createConfiguration: (
'blocks',
'dist'
),
- '@blocksuite/presets': blocksuiteBaseDir
+ '@blocksuite/affine/presets': blocksuiteBaseDir
? join(blocksuiteBaseDir, 'packages', 'presets', 'src')
: join(
workspaceRoot,
@@ -182,7 +182,7 @@ export const createConfiguration: (
'presets',
'dist'
),
- '@blocksuite/global': blocksuiteBaseDir
+ '@blocksuite/affine/global': blocksuiteBaseDir
? join(blocksuiteBaseDir, 'packages', 'framework', 'global', 'src')
: join(
workspaceRoot,
@@ -191,24 +191,25 @@ export const createConfiguration: (
'global',
'dist'
),
- '@blocksuite/store/providers/broadcast-channel': blocksuiteBaseDir
- ? join(
- blocksuiteBaseDir,
- 'packages',
- 'framework',
- 'store',
- 'src/providers/broadcast-channel'
- )
- : join(
- workspaceRoot,
- 'node_modules',
- '@blocksuite',
- 'store',
- 'dist',
- 'providers',
- 'broadcast-channel.js'
- ),
- '@blocksuite/store': blocksuiteBaseDir
+ '@blocksuite/affine/store/providers/broadcast-channel':
+ blocksuiteBaseDir
+ ? join(
+ blocksuiteBaseDir,
+ 'packages',
+ 'framework',
+ 'store',
+ 'src/providers/broadcast-channel'
+ )
+ : join(
+ workspaceRoot,
+ 'node_modules',
+ '@blocksuite',
+ 'store',
+ 'dist',
+ 'providers',
+ 'broadcast-channel.js'
+ ),
+ '@blocksuite/affine/store': blocksuiteBaseDir
? join(blocksuiteBaseDir, 'packages', 'framework', 'store', 'src')
: join(workspaceRoot, 'node_modules', '@blocksuite', 'store', 'dist'),
'@blocksuite/inline': blocksuiteBaseDir
diff --git a/tools/cli/src/webpack/runtime-config.ts b/tools/cli/src/webpack/runtime-config.ts
index 9d68075f2d..380581ea1d 100644
--- a/tools/cli/src/webpack/runtime-config.ts
+++ b/tools/cli/src/webpack/runtime-config.ts
@@ -23,7 +23,7 @@ export function getBuildConfig(buildFlags: BuildFlags): BUILD_CONFIG_TYPE {
appBuildType: 'stable' as const,
serverUrlPrefix: 'https://app.affine.pro',
appVersion: packageJson.version,
- editorVersion: packageJson.devDependencies['@blocksuite/presets'],
+ editorVersion: packageJson.devDependencies['@blocksuite/affine'],
githubUrl: 'https://github.com/toeverything/AFFiNE',
changelogUrl: 'https://affine.pro/what-is-new',
downloadUrl: 'https://affine.pro/download',
diff --git a/vitest.config.ts b/vitest.config.ts
index ae537e167c..66f131358a 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -73,7 +73,7 @@ export default defineConfig({
},
server: {
deps: {
- inline: ['@blocksuite/blocks'],
+ inline: ['@blocksuite/affine/blocks'],
},
},
},
diff --git a/yarn.lock b/yarn.lock
index 0444f78741..058208fb09 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -237,7 +237,7 @@ __metadata:
"@affine/env": "workspace:*"
"@affine/templates": "workspace:*"
"@aws-sdk/client-s3": "npm:^3.620.0"
- "@blocksuite/presets": "npm:0.17.14"
+ "@blocksuite/affine": "npm:0.17.14"
"@clack/core": "npm:^0.3.4"
"@clack/prompts": "npm:^0.7.0"
"@magic-works/i18n-codegen": "npm:^0.6.0"
@@ -294,7 +294,7 @@ __metadata:
"@affine/i18n": "workspace:*"
"@atlaskit/pragmatic-drag-and-drop": "npm:^1.2.1"
"@atlaskit/pragmatic-drag-and-drop-hitbox": "npm:^1.0.3"
- "@blocksuite/global": "npm:0.17.14"
+ "@blocksuite/affine": "npm:0.17.14"
"@blocksuite/icons": "npm:2.1.67"
"@chromatic-com/storybook": "npm:^2.0.0"
"@emotion/react": "npm:^11.11.4"
@@ -347,11 +347,8 @@ __metadata:
vitest: "npm:2.1.1"
zod: "npm:^3.22.4"
peerDependencies:
- "@blocksuite/blocks": "*"
- "@blocksuite/global": "*"
+ "@blocksuite/affine": "*"
"@blocksuite/icons": 2.1.67
- "@blocksuite/presets": "*"
- "@blocksuite/store": "*"
languageName: unknown
linkType: soft
@@ -367,13 +364,8 @@ __metadata:
"@affine/i18n": "workspace:*"
"@affine/templates": "workspace:*"
"@affine/track": "workspace:*"
- "@blocksuite/block-std": "npm:0.17.14"
- "@blocksuite/blocks": "npm:0.17.14"
- "@blocksuite/global": "npm:0.17.14"
+ "@blocksuite/affine": "npm:0.17.14"
"@blocksuite/icons": "npm:2.1.67"
- "@blocksuite/inline": "npm:0.17.14"
- "@blocksuite/presets": "npm:0.17.14"
- "@blocksuite/store": "npm:0.17.14"
"@dnd-kit/core": "npm:^6.1.0"
"@dnd-kit/modifiers": "npm:^7.0.0"
"@dnd-kit/sortable": "npm:^8.0.0"
@@ -478,7 +470,7 @@ __metadata:
"@affine/core": "workspace:*"
"@affine/i18n": "workspace:*"
"@affine/native": "workspace:*"
- "@blocksuite/global": "npm:0.17.14"
+ "@blocksuite/affine": "npm:0.17.14"
"@electron-forge/cli": "npm:^7.3.0"
"@electron-forge/core": "npm:^7.3.0"
"@electron-forge/core-utils": "npm:^7.3.0"
@@ -530,13 +522,11 @@ __metadata:
version: 0.0.0-use.local
resolution: "@affine/env@workspace:packages/common/env"
dependencies:
- "@blocksuite/global": "npm:0.17.14"
- "@blocksuite/store": "npm:0.17.14"
+ "@blocksuite/affine": "npm:0.17.14"
vitest: "npm:2.1.1"
zod: "npm:^3.22.4"
peerDependencies:
"@affine/templates": "workspace:*"
- "@blocksuite/global": 0.11.0-nightly-202401020419-752a5b8
languageName: unknown
linkType: soft
@@ -580,7 +570,7 @@ __metadata:
"@affine/component": "workspace:*"
"@affine/core": "workspace:*"
"@affine/i18n": "workspace:*"
- "@blocksuite/blocks": "npm:0.17.14"
+ "@blocksuite/affine": "npm:0.17.14"
"@blocksuite/icons": "npm:^2.1.67"
"@sentry/react": "npm:^8.0.0"
"@types/react": "npm:^18.2.75"
@@ -2609,6 +2599,20 @@ __metadata:
languageName: node
linkType: hard
+"@blocksuite/affine@npm:0.17.14":
+ version: 0.17.14
+ resolution: "@blocksuite/affine@npm:0.17.14"
+ dependencies:
+ "@blocksuite/block-std": "npm:0.17.14"
+ "@blocksuite/blocks": "npm:0.17.14"
+ "@blocksuite/global": "npm:0.17.14"
+ "@blocksuite/inline": "npm:0.17.14"
+ "@blocksuite/presets": "npm:0.17.14"
+ "@blocksuite/store": "npm:0.17.14"
+ checksum: 10/cf787cd5be95ce9cbda5a8c1c14bcda194bdde691f301b0f23dae7032eb5e505aac26dff03fb9dbd5f2b5836b9b58004923d38865f46f954aa0f8dac7f7ccb5d
+ languageName: node
+ linkType: hard
+
"@blocksuite/block-std@npm:0.17.14":
version: 0.17.14
resolution: "@blocksuite/block-std@npm:0.17.14"
@@ -12630,10 +12634,7 @@ __metadata:
"@affine/debug": "workspace:*"
"@affine/env": "workspace:*"
"@affine/templates": "workspace:*"
- "@blocksuite/blocks": "npm:0.17.14"
- "@blocksuite/global": "npm:0.17.14"
- "@blocksuite/presets": "npm:0.17.14"
- "@blocksuite/store": "npm:0.17.14"
+ "@blocksuite/affine": "npm:0.17.14"
"@datastructures-js/binary-search-tree": "npm:^5.3.2"
"@testing-library/react": "npm:^16.0.0"
fake-indexeddb: "npm:^6.0.0"
@@ -12652,15 +12653,12 @@ __metadata:
zod: "npm:^3.22.4"
peerDependencies:
"@affine/templates": "*"
- "@blocksuite/presets": "*"
electron: "*"
react: "*"
yjs: ^13
peerDependenciesMeta:
"@affine/templates":
optional: true
- "@blocksuite/presets":
- optional: true
electron:
optional: true
react: