From 2b3da1f0e997c84466f93f84c58799eb000fca35 Mon Sep 17 00:00:00 2001
From: Saul-Mirone <Saul-Mirone@outlook.com>
Date: Mon, 20 Jan 2025 06:14:46 +0000
Subject: [PATCH] fix: remove global, store and std in affine packages (#9785)

---
 blocksuite/affine/all/package.json                          | 1 +
 blocksuite/affine/all/src/store/test.ts                     | 6 ++++++
 packages/frontend/core/package.json                         | 3 ---
 .../src/blocksuite/presets/ai/actions/edgeless-handler.ts   | 2 +-
 .../src/blocksuite/presets/ai/chat-panel/chat-config.ts     | 2 +-
 .../ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.ts  | 4 ++--
 .../core/src/blocksuite/presets/ai/utils/extract.ts         | 2 +-
 .../core/src/blocksuite/presets/ai/utils/selection-utils.ts | 2 +-
 .../presets/blocks/ai-chat-block/ai-chat-edgeless-block.ts  | 2 +-
 .../blocks/ai-chat-block/components/ai-chat-messages.ts     | 4 ++--
 .../block-suite-editor/specs/custom/root-block.ts           | 2 +-
 .../specs/custom/widgets/edgeless-note-header.tsx           | 2 +-
 .../__tests__/use-block-suite-page-preview.spec.ts          | 5 ++---
 .../setting/general-setting/editor/edgeless/snapshot.tsx    | 2 +-
 .../core/src/desktop/pages/workspace/share/share-page.tsx   | 2 +-
 .../core/src/modules/at-menu-config/services/index.ts       | 2 +-
 .../core/src/modules/docs-search/services/docs-search.ts    | 2 +-
 packages/frontend/templates/README.md                       | 2 +-
 yarn.lock                                                   | 3 ---
 19 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 blocksuite/affine/all/src/store/test.ts

diff --git a/blocksuite/affine/all/package.json b/blocksuite/affine/all/package.json
index d0cfb95a57..4fb907fac1 100644
--- a/blocksuite/affine/all/package.json
+++ b/blocksuite/affine/all/package.json
@@ -33,6 +33,7 @@
     "./global/di": "./src/global/di.ts",
     "./global/types": "./src/global/types.ts",
     "./store": "./src/store/index.ts",
+    "./store/test": "./src/store/test.ts",
     "./inline": "./src/inline/index.ts",
     "./inline/consts": "./src/inline/consts.ts",
     "./inline/types": "./src/inline/types.ts",
diff --git a/blocksuite/affine/all/src/store/test.ts b/blocksuite/affine/all/src/store/test.ts
new file mode 100644
index 0000000000..e74a4b8464
--- /dev/null
+++ b/blocksuite/affine/all/src/store/test.ts
@@ -0,0 +1,6 @@
+export {
+  createAutoIncrementIdGenerator,
+  TestDoc,
+  TestMeta,
+  TestWorkspace,
+} from '@blocksuite/store/test';
diff --git a/packages/frontend/core/package.json b/packages/frontend/core/package.json
index 23683e7d61..f272d2eae9 100644
--- a/packages/frontend/core/package.json
+++ b/packages/frontend/core/package.json
@@ -20,10 +20,7 @@
     "@blocksuite/affine": "workspace:*",
     "@blocksuite/affine-components": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
-    "@blocksuite/block-std": "workspace:*",
-    "@blocksuite/global": "workspace:*",
     "@blocksuite/icons": "2.2.2",
-    "@blocksuite/store": "workspace:*",
     "@capacitor/app": "^6.0.2",
     "@capacitor/browser": "^6.0.4",
     "@dotlottie/player-component": "^2.7.12",
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 b473e292b6..29d3155c11 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,4 +1,5 @@
 import type { EditorHost } from '@blocksuite/affine/block-std';
+import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx';
 import type {
   AffineAIPanelWidget,
   AIError,
@@ -15,7 +16,6 @@ import {
 } from '@blocksuite/affine/blocks';
 import { assertExists } from '@blocksuite/affine/global/utils';
 import { Slice } from '@blocksuite/affine/store';
-import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
 import type { TemplateResult } from 'lit';
 
 import { AIChatBlockModel } from '../../../blocks';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-config.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-config.ts
index 4882e5ce0d..4a2b916cf9 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-config.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/chat-config.ts
@@ -1,4 +1,4 @@
-import type { Store } from '@blocksuite/store';
+import type { Store } from '@blocksuite/affine/store';
 import type { Signal } from '@preact/signals-core';
 
 export interface AINetworkSearchConfig {
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.ts b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.ts
index 0a70aec0cc..9d69b24a11 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.ts
@@ -4,8 +4,8 @@ import {
   MarkdownInlineToDeltaAdapterExtensions,
 } from '@blocksuite/affine/blocks';
 import { Container } from '@blocksuite/affine/global/di';
-import { Schema } from '@blocksuite/store';
-import { TestWorkspace } from '@blocksuite/store/test';
+import { Schema } from '@blocksuite/affine/store';
+import { TestWorkspace } from '@blocksuite/affine/store/test';
 import { describe, expect, test } from 'vitest';
 
 import { markdownToMindmap } from '../mindmap-preview.js';
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/utils/extract.ts b/packages/frontend/core/src/blocksuite/presets/ai/utils/extract.ts
index 0f6b6d34e7..ad4224ffb6 100644
--- a/packages/frontend/core/src/blocksuite/presets/ai/utils/extract.ts
+++ b/packages/frontend/core/src/blocksuite/presets/ai/utils/extract.ts
@@ -10,9 +10,9 @@ import {
   NoteDisplayMode,
   titleMiddleware,
 } from '@blocksuite/affine/blocks';
+import type { ServiceProvider } from '@blocksuite/affine/global/di';
 import type { BlockModel, Store } from '@blocksuite/affine/store';
 import { Slice, toDraftModel, Transformer } from '@blocksuite/affine/store';
-import type { ServiceProvider } from '@blocksuite/global/di';
 
 import type { ChatContextValue, DocContext } from '../chat-panel/chat-context';
 import {
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 8a6c156b95..14c2a1bc01 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,4 +1,5 @@
 import { type EditorHost, TextSelection } from '@blocksuite/affine/block-std';
+import type { GfxModel } from '@blocksuite/affine/block-std/gfx';
 import {
   BlocksUtils,
   type CopilotTool,
@@ -14,7 +15,6 @@ import {
   Slice,
   toDraftModel,
 } from '@blocksuite/affine/store';
-import type { GfxModel } from '@blocksuite/block-std/gfx';
 
 import { getContentFromSlice } from '../../_common';
 import { getEdgelessCopilotWidget, getService } from './edgeless';
diff --git a/packages/frontend/core/src/blocksuite/presets/blocks/ai-chat-block/ai-chat-edgeless-block.ts b/packages/frontend/core/src/blocksuite/presets/blocks/ai-chat-block/ai-chat-edgeless-block.ts
index 6f93a3cd2c..de4aab7f07 100644
--- a/packages/frontend/core/src/blocksuite/presets/blocks/ai-chat-block/ai-chat-edgeless-block.ts
+++ b/packages/frontend/core/src/blocksuite/presets/blocks/ai-chat-block/ai-chat-edgeless-block.ts
@@ -1,5 +1,5 @@
 import { toGfxBlockComponent } from '@blocksuite/affine/block-std';
-import { Bound } from '@blocksuite/global/utils';
+import { Bound } from '@blocksuite/affine/global/utils';
 import { html } from 'lit';
 import { styleMap } from 'lit/directives/style-map.js';
 
diff --git a/packages/frontend/core/src/blocksuite/presets/blocks/ai-chat-block/components/ai-chat-messages.ts b/packages/frontend/core/src/blocksuite/presets/blocks/ai-chat-block/components/ai-chat-messages.ts
index 059059696f..3d43a2147c 100644
--- a/packages/frontend/core/src/blocksuite/presets/blocks/ai-chat-block/components/ai-chat-messages.ts
+++ b/packages/frontend/core/src/blocksuite/presets/blocks/ai-chat-block/components/ai-chat-messages.ts
@@ -1,5 +1,5 @@
-import type { EditorHost } from '@blocksuite/block-std';
-import type { AffineAIPanelState } from '@blocksuite/blocks';
+import type { EditorHost } from '@blocksuite/affine/block-std';
+import type { AffineAIPanelState } from '@blocksuite/affine/blocks';
 import { css, html, LitElement } from 'lit';
 import { property } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
diff --git a/packages/frontend/core/src/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 29b9c4c924..2b0babc2f3 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
@@ -32,6 +32,7 @@ import {
   TelemetryProvider,
   ThemeExtensionIdentifier,
 } from '@blocksuite/affine/blocks';
+import type { Container } from '@blocksuite/affine/global/di';
 import type { ExtensionType } from '@blocksuite/affine/store';
 import {
   createSignalFromObservable,
@@ -39,7 +40,6 @@ import {
   type Signal,
   SpecProvider,
 } from '@blocksuite/affine-shared/utils';
-import type { Container } from '@blocksuite/global/di';
 import { LinkedPageIcon, PageIcon } from '@blocksuite/icons/lit';
 import { type FrameworkProvider } from '@toeverything/infra';
 import type { TemplateResult } from 'lit';
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/widgets/edgeless-note-header.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/widgets/edgeless-note-header.tsx
index ac64476ea8..b601d32d0a 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/widgets/edgeless-note-header.tsx
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/widgets/edgeless-note-header.tsx
@@ -7,9 +7,9 @@ import { useInsidePeekView } from '@affine/core/modules/peek-view/view/modal-con
 import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
+import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx';
 import { matchFlavours, type NoteBlockModel } from '@blocksuite/affine/blocks';
 import { Bound } from '@blocksuite/affine/global/utils';
-import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
 import {
   ExpandFullIcon,
   InformationIcon,
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 137844d50a..15cf13b260 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
@@ -5,9 +5,8 @@ import 'fake-indexeddb/auto';
 
 import { AffineSchemas } from '@blocksuite/affine/blocks/schemas';
 import { assertExists } from '@blocksuite/affine/global/utils';
-import { type Store, Text } from '@blocksuite/affine/store';
-import { Schema } from '@blocksuite/store';
-import { TestWorkspace } from '@blocksuite/store/test';
+import { Schema, type Store, Text } from '@blocksuite/affine/store';
+import { TestWorkspace } from '@blocksuite/affine/store/test';
 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/desktop/dialogs/setting/general-setting/editor/edgeless/snapshot.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/snapshot.tsx
index 7c8d489743..01d4f094e3 100644
--- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/snapshot.tsx
+++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/snapshot.tsx
@@ -18,10 +18,10 @@ import {
   SpecProvider,
   ThemeExtensionIdentifier,
 } from '@blocksuite/affine/blocks';
+import type { Container } from '@blocksuite/affine/global/di';
 import { Bound } from '@blocksuite/affine/global/utils';
 import type { Block, Store } from '@blocksuite/affine/store';
 import { createSignalFromObservable } from '@blocksuite/affine-shared/utils';
-import type { Container } from '@blocksuite/global/di';
 import type { Signal } from '@preact/signals-core';
 import type { FrameworkProvider } from '@toeverything/infra';
 import { useFramework } from '@toeverything/infra';
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 26ade694b9..9355842b21 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
@@ -25,8 +25,8 @@ import {
   DocModes,
   RefNodeSlotsProvider,
 } from '@blocksuite/affine/blocks';
+import { DisposableGroup } from '@blocksuite/affine/global/utils';
 import type { AffineEditorContainer } from '@blocksuite/affine/presets';
-import { DisposableGroup } from '@blocksuite/global/utils';
 import { Logo1Icon } from '@blocksuite/icons/rc';
 import { FrameworkScope, useLiveData, useService } from '@toeverything/infra';
 import clsx from 'clsx';
diff --git a/packages/frontend/core/src/modules/at-menu-config/services/index.ts b/packages/frontend/core/src/modules/at-menu-config/services/index.ts
index e4c9147056..2295a92743 100644
--- a/packages/frontend/core/src/modules/at-menu-config/services/index.ts
+++ b/packages/frontend/core/src/modules/at-menu-config/services/index.ts
@@ -1,6 +1,7 @@
 import { fuzzyMatch } from '@affine/core/utils/fuzzy-match';
 import { I18n, i18nTime } from '@affine/i18n';
 import track from '@affine/track';
+import type { EditorHost } from '@blocksuite/affine/block-std';
 import {
   type AffineInlineEditor,
   type DocMode,
@@ -12,7 +13,6 @@ import {
 import type { DocMeta } from '@blocksuite/affine/store';
 import { Text } from '@blocksuite/affine/store';
 import { createSignalFromObservable } from '@blocksuite/affine-shared/utils';
-import type { EditorHost } from '@blocksuite/block-std';
 import {
   DateTimeIcon,
   NewXxxEdgelessIcon,
diff --git a/packages/frontend/core/src/modules/docs-search/services/docs-search.ts b/packages/frontend/core/src/modules/docs-search/services/docs-search.ts
index 792e54d410..1db80dd904 100644
--- a/packages/frontend/core/src/modules/docs-search/services/docs-search.ts
+++ b/packages/frontend/core/src/modules/docs-search/services/docs-search.ts
@@ -1,5 +1,5 @@
 import { toURLSearchParams } from '@affine/core/modules/navigation';
-import type { ReferenceParams } from '@blocksuite/blocks';
+import type { ReferenceParams } from '@blocksuite/affine/blocks';
 import { fromPromise, OnEvent, Service } from '@toeverything/infra';
 import { isEmpty, omit } from 'lodash-es';
 import { map, type Observable, switchMap } from 'rxjs';
diff --git a/packages/frontend/templates/README.md b/packages/frontend/templates/README.md
index c4630213f8..f7f39be177 100644
--- a/packages/frontend/templates/README.md
+++ b/packages/frontend/templates/README.md
@@ -7,7 +7,7 @@ Manages template files for use in AFFiNE. For now we only support onboarding tem
 Before we offer a better solution, to update the onboarding templates:
 
 1. run AFFiNE core locally (dev mode)
-2. expose `ZipTransformer` to window. e.g., `import {ZipTransformer} from '@blocksuite/blocks'; window.ZipTransformer = ZipTransformer;`
+2. expose `ZipTransformer` to window. e.g., `import {ZipTransformer} from '@blocksuite/affine/blocks'; window.ZipTransformer = ZipTransformer;`
 3. run the following script
    ```js
    (async () => {
diff --git a/yarn.lock b/yarn.lock
index b21caf4d80..61444ea416 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -362,10 +362,7 @@ __metadata:
     "@blocksuite/affine": "workspace:*"
     "@blocksuite/affine-components": "workspace:*"
     "@blocksuite/affine-shared": "workspace:*"
-    "@blocksuite/block-std": "workspace:*"
-    "@blocksuite/global": "workspace:*"
     "@blocksuite/icons": "npm:2.2.2"
-    "@blocksuite/store": "workspace:*"
     "@capacitor/app": "npm:^6.0.2"
     "@capacitor/browser": "npm:^6.0.4"
     "@dotlottie/player-component": "npm:^2.7.12"