chore: try bs-affine

toeverything · Sep 19, 2024 · 6be857f · 6be857f
1 parent fc9e5fb
commit 6be857f
Show file tree

Hide file tree

Showing 222 changed files with 656 additions and 628 deletions.
diff --git 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.13",
-    "@blocksuite/store": "0.17.13",
+    "@blocksuite/affine": "0.0.0-canary-20240919125746",
     "vitest": "2.1.1"
   },
   "exports": {

diff --git 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
@@ -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/env/src/global.ts b/packages/common/env/src/global.ts
@@ -1,5 +1,3 @@
-/// <reference types="@blocksuite/global" />
-
 import { UaHelper } from './ua-helper.js';
 
 export type BUILD_CONFIG_TYPE = {

diff --git 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.13",
-    "@blocksuite/global": "0.17.13",
-    "@blocksuite/presets": "0.17.13",
-    "@blocksuite/store": "0.17.13",
+    "@blocksuite/affine": "0.0.0-canary-20240919125746",
     "@datastructures-js/binary-search-tree": "^5.3.2",
     "foxact": "^0.2.33",
     "fuse.js": "^7.0.0",
@@ -34,7 +31,7 @@
   "devDependencies": {
     "@affine-test/fixtures": "workspace:*",
     "@affine/templates": "workspace:*",
-    "@blocksuite/presets": "0.17.13",
+    "@blocksuite/presets": "0.0.0-canary-20240919125746",
     "@testing-library/react": "^16.0.0",
     "fake-indexeddb": "^6.0.0",
     "react": "^18.2.0",

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,4 @@
+import type { BlockSuiteFlags } from '@blocksuite/affine/global/types';
 type FeedbackType = 'discord' | 'email' | 'github';
 
 export type FlagInfo = {

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -28,7 +28,7 @@
     "@affine/core": "workspace:*",
     "@affine/i18n": "workspace:*",
     "@affine/native": "workspace:*",
-    "@blocksuite/global": "0.17.13",
+    "@blocksuite/affine": "0.0.0-canary-20240919125746",
     "@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
@@ -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
@@ -13,7 +13,7 @@
     "@affine/component": "workspace:*",
     "@affine/core": "workspace:*",
     "@affine/i18n": "workspace:*",
-    "@blocksuite/blocks": "0.17.13",
+    "@blocksuite/affine": "0.0.0-canary-20240919125746",
     "@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
@@ -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.13",
+    "@blocksuite/affine": "0.0.0-canary-20240919125746",
     "@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
@@ -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
@@ -16,13 +16,8 @@
     "@affine/i18n": "workspace:*",
     "@affine/templates": "workspace:*",
     "@affine/track": "workspace:*",
-    "@blocksuite/block-std": "0.17.13",
-    "@blocksuite/blocks": "0.17.13",
-    "@blocksuite/global": "0.17.13",
+    "@blocksuite/affine": "0.0.0-canary-20240919125746",
     "@blocksuite/icons": "2.1.67",
-    "@blocksuite/inline": "0.17.13",
-    "@blocksuite/presets": "0.17.13",
-    "@blocksuite/store": "0.17.13",
     "@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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,12 +1,16 @@
-import type { Chain, EditorHost, InitCommandCtx } from '@blocksuite/block-std';
+import type {
+  Chain,
+  EditorHost,
+  InitCommandCtx,
+} from '@blocksuite/affine/block-std';
 import {
   type AIItemGroupConfig,
   type AISubItemConfig,
   type CopilotSelectionController,
   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
@@ -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 {