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.

refactor(editor): remove unused block dependencies (#11959)

Saul-Mironed6e7039b7bb7
diff --git a/blocksuite/affine/blocks/root/package.json b/blocksuite/affine/blocks/root/package.json
index c244caec33..93dc8595ab 100644
--- a/blocksuite/affine/blocks/root/package.json
+++ b/blocksuite/affine/blocks/root/package.json
@@ -12,19 +12,14 @@
"dependencies": {
"@blocksuite/affine-block-attachment": "workspace:*",
"@blocksuite/affine-block-bookmark": "workspace:*",
- "@blocksuite/affine-block-data-view": "workspace:*",
"@blocksuite/affine-block-database": "workspace:*",
"@blocksuite/affine-block-edgeless-text": "workspace:*",
"@blocksuite/affine-block-embed": "workspace:*",
"@blocksuite/affine-block-frame": "workspace:*",
"@blocksuite/affine-block-image": "workspace:*",
- "@blocksuite/affine-block-latex": "workspace:*",
- "@blocksuite/affine-block-list": "workspace:*",
"@blocksuite/affine-block-note": "workspace:*",
"@blocksuite/affine-block-paragraph": "workspace:*",
"@blocksuite/affine-block-surface": "workspace:*",
- "@blocksuite/affine-block-surface-ref": "workspace:*",
- "@blocksuite/affine-block-table": "workspace:*",
"@blocksuite/affine-components": "workspace:*",
"@blocksuite/affine-fragment-doc-title": "workspace:*",
"@blocksuite/affine-gfx-brush": "workspace:*",
@@ -33,12 +28,8 @@
"@blocksuite/affine-gfx-mindmap": "workspace:*",
"@blocksuite/affine-gfx-note": "workspace:*",
"@blocksuite/affine-gfx-shape": "workspace:*",
- "@blocksuite/affine-gfx-template": "workspace:*",
"@blocksuite/affine-gfx-text": "workspace:*",
- "@blocksuite/affine-inline-latex": "workspace:*",
- "@blocksuite/affine-inline-link": "workspace:*",
"@blocksuite/affine-inline-preset": "workspace:*",
- "@blocksuite/affine-inline-reference": "workspace:*",
"@blocksuite/affine-model": "workspace:*",
"@blocksuite/affine-rich-text": "workspace:*",
"@blocksuite/affine-shared": "workspace:*",
diff --git a/blocksuite/affine/blocks/root/src/edgeless/edgeless-builtin-spec.ts b/blocksuite/affine/blocks/root/src/edgeless/edgeless-builtin-spec.ts
index 5effc87876..ee39e89a1f 100644
--- a/blocksuite/affine/blocks/root/src/edgeless/edgeless-builtin-spec.ts
+++ b/blocksuite/affine/blocks/root/src/edgeless/edgeless-builtin-spec.ts
@@ -1,7 +1,6 @@
import type * as BrushEffect from '@blocksuite/affine-gfx-brush';
import type * as NoteEffect from '@blocksuite/affine-gfx-note';
import type * as ShapeEffect from '@blocksuite/affine-gfx-shape';
-import { TextTool } from '@blocksuite/affine-gfx-text';
import { InteractivityManager } from '@blocksuite/std/gfx';
import type { ExtensionType } from '@blocksuite/store';
@@ -11,7 +10,6 @@ import { DefaultTool } from './gfx-tool/default-tool.js';
import { EmptyTool } from './gfx-tool/empty-tool.js';
import { PanTool } from './gfx-tool/pan-tool.js';
import { AltCloneExtension } from './interact-extensions/clone-ext.js';
-import { DblClickAddEdgelessText } from './interact-extensions/dblclick-add-edgeless-text.js';
import { SnapExtension } from './interact-extensions/snap-manager.js';
import { EditPropsMiddlewareBuilder } from './middlewares/base.js';
import { SnapOverlay } from './utils/snap-manager.js';
@@ -24,14 +22,12 @@ declare type _GLOBAL_ =
export const EdgelessToolExtension: ExtensionType[] = [
DefaultTool,
PanTool,
- TextTool,
EmptyTool,
];
export const EdgelessEditExtensions: ExtensionType[] = [
InteractivityManager,
SnapExtension,
- DblClickAddEdgelessText,
];
export const EdgelessBuiltInManager: ExtensionType[] = [
diff --git a/blocksuite/affine/blocks/root/tsconfig.json b/blocksuite/affine/blocks/root/tsconfig.json
index bbe641110a..b02a7b6e62 100644
--- a/blocksuite/affine/blocks/root/tsconfig.json
+++ b/blocksuite/affine/blocks/root/tsconfig.json
@@ -9,19 +9,14 @@
"references": [
{ "path": "../attachment" },
{ "path": "../bookmark" },
- { "path": "../data-view" },
{ "path": "../database" },
{ "path": "../edgeless-text" },
{ "path": "../embed" },
{ "path": "../frame" },
{ "path": "../image" },
- { "path": "../latex" },
- { "path": "../list" },
{ "path": "../note" },
{ "path": "../paragraph" },
{ "path": "../surface" },
- { "path": "../surface-ref" },
- { "path": "../table" },
{ "path": "../../components" },
{ "path": "../../fragments/doc-title" },
{ "path": "../../gfx/brush" },
@@ -30,12 +25,8 @@
{ "path": "../../gfx/mindmap" },
{ "path": "../../gfx/note" },
{ "path": "../../gfx/shape" },
- { "path": "../../gfx/template" },
{ "path": "../../gfx/text" },
- { "path": "../../inlines/latex" },
- { "path": "../../inlines/link" },
{ "path": "../../inlines/preset" },
- { "path": "../../inlines/reference" },
{ "path": "../../model" },
{ "path": "../../rich-text" },
{ "path": "../../shared" },
diff --git a/blocksuite/affine/blocks/root/src/edgeless/interact-extensions/dblclick-add-edgeless-text.ts b/blocksuite/affine/gfx/text/src/dblclick-add-edgeless-text.ts
similarity index 92%
rename from blocksuite/affine/blocks/root/src/edgeless/interact-extensions/dblclick-add-edgeless-text.ts
rename to blocksuite/affine/gfx/text/src/dblclick-add-edgeless-text.ts
index a8e57f4d98..d10e24567e 100644
--- a/blocksuite/affine/blocks/root/src/edgeless/interact-extensions/dblclick-add-edgeless-text.ts
+++ b/blocksuite/affine/gfx/text/src/dblclick-add-edgeless-text.ts
@@ -1,7 +1,3 @@
-import {
- addText,
- insertEdgelessTextCommand,
-} from '@blocksuite/affine-gfx-text';
import {
FeatureFlagService,
TelemetryProvider,
@@ -11,6 +7,9 @@ import {
InteractivityExtension,
} from '@blocksuite/std/gfx';
+import { insertEdgelessTextCommand } from './commands';
+import { addText } from './edgeless-text-editor';
+
export class DblClickAddEdgelessText extends InteractivityExtension {
static override key = 'dbl-click-add-edgeless-text';
diff --git a/blocksuite/affine/gfx/text/src/view.ts b/blocksuite/affine/gfx/text/src/view.ts
index a9a16e6763..ef5c202a5e 100644
--- a/blocksuite/affine/gfx/text/src/view.ts
+++ b/blocksuite/affine/gfx/text/src/view.ts
@@ -3,9 +3,11 @@ import {
ViewExtensionProvider,
} from '@blocksuite/affine-ext-loader';
+import { DblClickAddEdgelessText } from './dblclick-add-edgeless-text';
import { effects } from './effects';
import { TextElementRendererExtension } from './element-renderer';
import { TextElementView } from './element-view';
+import { TextTool } from './tool';
import { textToolbarExtension } from './toolbar';
export class TextViewExtension extends ViewExtensionProvider {
@@ -21,7 +23,9 @@ export class TextViewExtension extends ViewExtensionProvider {
context.register(TextElementView);
context.register(TextElementRendererExtension);
if (this.isEdgeless(context.scope)) {
+ context.register(TextTool);
context.register(textToolbarExtension);
+ context.register(DblClickAddEdgelessText);
}
}
}
diff --git a/tools/utils/src/workspace.gen.ts b/tools/utils/src/workspace.gen.ts
index b42fb972aa..707678848d 100644
--- a/tools/utils/src/workspace.gen.ts
+++ b/tools/utils/src/workspace.gen.ts
@@ -322,19 +322,14 @@ export const PackageList = [
workspaceDependencies: [
'blocksuite/affine/blocks/attachment',
'blocksuite/affine/blocks/bookmark',
- 'blocksuite/affine/blocks/data-view',
'blocksuite/affine/blocks/database',
'blocksuite/affine/blocks/edgeless-text',
'blocksuite/affine/blocks/embed',
'blocksuite/affine/blocks/frame',
'blocksuite/affine/blocks/image',
- 'blocksuite/affine/blocks/latex',
- 'blocksuite/affine/blocks/list',
'blocksuite/affine/blocks/note',
'blocksuite/affine/blocks/paragraph',
'blocksuite/affine/blocks/surface',
- 'blocksuite/affine/blocks/surface-ref',
- 'blocksuite/affine/blocks/table',
'blocksuite/affine/components',
'blocksuite/affine/fragments/doc-title',
'blocksuite/affine/gfx/brush',
@@ -343,12 +338,8 @@ export const PackageList = [
'blocksuite/affine/gfx/mindmap',
'blocksuite/affine/gfx/note',
'blocksuite/affine/gfx/shape',
- 'blocksuite/affine/gfx/template',
'blocksuite/affine/gfx/text',
- 'blocksuite/affine/inlines/latex',
- 'blocksuite/affine/inlines/link',
'blocksuite/affine/inlines/preset',
- 'blocksuite/affine/inlines/reference',
'blocksuite/affine/model',
'blocksuite/affine/rich-text',
'blocksuite/affine/shared',
diff --git a/yarn.lock b/yarn.lock
index 8e8e015327..d1571417cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2823,19 +2823,14 @@ __metadata:
dependencies:
"@blocksuite/affine-block-attachment": "workspace:*"
"@blocksuite/affine-block-bookmark": "workspace:*"
- "@blocksuite/affine-block-data-view": "workspace:*"
"@blocksuite/affine-block-database": "workspace:*"
"@blocksuite/affine-block-edgeless-text": "workspace:*"
"@blocksuite/affine-block-embed": "workspace:*"
"@blocksuite/affine-block-frame": "workspace:*"
"@blocksuite/affine-block-image": "workspace:*"
- "@blocksuite/affine-block-latex": "workspace:*"
- "@blocksuite/affine-block-list": "workspace:*"
"@blocksuite/affine-block-note": "workspace:*"
"@blocksuite/affine-block-paragraph": "workspace:*"
"@blocksuite/affine-block-surface": "workspace:*"
- "@blocksuite/affine-block-surface-ref": "workspace:*"
- "@blocksuite/affine-block-table": "workspace:*"
"@blocksuite/affine-components": "workspace:*"
"@blocksuite/affine-fragment-doc-title": "workspace:*"
"@blocksuite/affine-gfx-brush": "workspace:*"
@@ -2844,12 +2839,8 @@ __metadata:
"@blocksuite/affine-gfx-mindmap": "workspace:*"
"@blocksuite/affine-gfx-note": "workspace:*"
"@blocksuite/affine-gfx-shape": "workspace:*"
- "@blocksuite/affine-gfx-template": "workspace:*"
"@blocksuite/affine-gfx-text": "workspace:*"
- "@blocksuite/affine-inline-latex": "workspace:*"
- "@blocksuite/affine-inline-link": "workspace:*"
"@blocksuite/affine-inline-preset": "workspace:*"
- "@blocksuite/affine-inline-reference": "workspace:*"
"@blocksuite/affine-model": "workspace:*"
"@blocksuite/affine-rich-text": "workspace:*"
"@blocksuite/affine-shared": "workspace:*"