Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-08-03 02:20:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(editor): remove blocks package (#10708)

Browse Source
This commit is contained in:
Saul-Mirone
2025-03-09 05:44:26 +00:00
parent 0766a2d9ae
commit 12bc142809
277 changed files with 904 additions and 1060 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocksuite/integration-test/package.json
+1 -5
View File
@@ -13,12 +13,8 @@
"author": "toeverything",
"license": "MIT",
"dependencies": {
"@blocksuite/block-std": "workspace:*",
"@blocksuite/blocks": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/affine": "workspace:*",
"@blocksuite/icons": "^2.2.2",
"@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.3",
"@lottiefiles/dotlottie-wc": "^0.4.0",
blocksuite/integration-test/src/__tests__/edgeless/color-picker.spec.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import '@toeverything/theme/style.css';
import {
ColorScheme,
type EdgelessRootBlockComponent,
ThemeProvider,
} from '@blocksuite/blocks';
} from '@blocksuite/affine/blocks';
import { ThemeProvider } from '@blocksuite/affine/shared/services';
import { beforeEach, describe, expect, test } from 'vitest';
import { getDocRootBlock } from '../utils/edgeless.js';
blocksuite/integration-test/src/__tests__/edgeless/frame.spec.ts
+1 -1
View File
@@ -3,7 +3,7 @@ import type {
EdgelessRootBlockComponent,
FrameBlockComponent,
FrameBlockModel,
} from '@blocksuite/blocks';
} from '@blocksuite/affine/blocks';
import { assertType } from '@blocksuite/global/utils';
import { Text } from '@blocksuite/store';
import { beforeEach, describe, expect, test } from 'vitest';
blocksuite/integration-test/src/__tests__/edgeless/group.spec.ts
+2 -2
View File
@@ -1,10 +1,10 @@
import type { MindmapElementModel } from '@blocksuite/affine-model';
import {
type EdgelessRootBlockComponent,
type GroupElementModel,
LayoutType,
NoteDisplayMode,
} from '@blocksuite/blocks';
} from '@blocksuite/affine/blocks';
import type { MindmapElementModel } from '@blocksuite/affine-model';
import { beforeEach, describe, expect, test } from 'vitest';
import * as Y from 'yjs';
blocksuite/integration-test/src/__tests__/edgeless/last-props.spec.ts
+3 -3
View File
@@ -1,4 +1,3 @@
import type { BlockStdScope } from '@blocksuite/block-std';
import {
type BrushElementModel,
type ConnectorElementModel,
@@ -6,7 +5,6 @@ import {
DefaultTheme,
type EdgelessRootBlockComponent,
type EdgelessTextBlockModel,
EditPropsStore,
FontFamily,
type FrameBlockModel,
getSurfaceBlock,
@@ -18,7 +16,9 @@ import {
type ShapeElementModel,
ShapeType,
type TextElementModel,
} from '@blocksuite/blocks';
} from '@blocksuite/affine/blocks';
import { EditPropsStore } from '@blocksuite/affine/shared/services';
import type { BlockStdScope } from '@blocksuite/block-std';
import { beforeEach, describe, expect, test } from 'vitest';
import { getDocRootBlock } from '../utils/edgeless.js';
blocksuite/integration-test/src/__tests__/edgeless/layer.spec.ts
+3 -3
View File
@@ -1,11 +1,11 @@
import type { BlockComponent } from '@blocksuite/block-std';
import { generateKeyBetween } from '@blocksuite/block-std/gfx';
import type {
EdgelessRootBlockComponent,
GroupElementModel,
NoteBlockModel,
SurfaceElementModel,
} from '@blocksuite/blocks';
} from '@blocksuite/affine/blocks';
import type { BlockComponent } from '@blocksuite/block-std';
import { generateKeyBetween } from '@blocksuite/block-std/gfx';
import type { BlockModel, Store } from '@blocksuite/store';
import { beforeEach, describe, expect, test } from 'vitest';
import * as Y from 'yjs';
blocksuite/integration-test/src/__tests__/edgeless/mindmap.spec.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import { LayoutType, type MindMapView } from '@blocksuite/affine/blocks';
import type { MindmapElementModel } from '@blocksuite/affine-model';
import type { GfxController } from '@blocksuite/block-std/gfx';
import { LayoutType, type MindMapView } from '@blocksuite/blocks';
import { Bound } from '@blocksuite/global/gfx';
import { beforeEach, describe, expect, test } from 'vitest';
blocksuite/integration-test/src/__tests__/edgeless/surface-model.spec.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import type {
GroupElementModel,
ShapeElementModel,
SurfaceBlockModel,
} from '@blocksuite/blocks';
import { DefaultTheme } from '@blocksuite/blocks';
} from '@blocksuite/affine/blocks';
import { DefaultTheme } from '@blocksuite/affine/blocks';
import { beforeEach, describe, expect, test, vi } from 'vitest';
import { wait } from '../utils/common.js';
blocksuite/integration-test/src/__tests__/edgeless/surface-ref.spec.ts
+1 -1
View File
@@ -3,7 +3,7 @@ import {
EdgelessRootService,
type FrameBlockComponent,
type SurfaceRefBlockComponent,
} from '@blocksuite/blocks';
} from '@blocksuite/affine/blocks';
import type { DocSnapshot } from '@blocksuite/store';
import { beforeEach, describe, expect, test } from 'vitest';
blocksuite/integration-test/src/__tests__/edgeless/template.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import {
EdgelessTemplatePanel,
type Template,
type TemplateManager,
} from '@blocksuite/blocks';
} from '@blocksuite/affine/blocks';
import { beforeEach, expect, test } from 'vitest';
import { setupEditor } from '../utils/setup.js';
blocksuite/integration-test/src/__tests__/edgeless/tools.spec.ts
+1 -1
View File
@@ -1,7 +1,7 @@
import type {
EdgelessRootBlockComponent,
SurfaceBlockComponent,
} from '@blocksuite/blocks';
} from '@blocksuite/affine/blocks';
import { beforeEach, describe, expect, test } from 'vitest';
import { click, drag, wait } from '../utils/common.js';
blocksuite/integration-test/src/__tests__/main/snapshot.spec.ts
+2 -2
View File
@@ -1,8 +1,8 @@
import {
AffineSchemas,
type SurfaceBlockModel,
ZipTransformer,
} from '@blocksuite/blocks';
} from '@blocksuite/affine/blocks';
import { AffineSchemas } from '@blocksuite/affine/schemas';
import type { PointLocation } from '@blocksuite/global/gfx';
import { Schema } from '@blocksuite/store';
import { beforeEach, expect, test } from 'vitest';
blocksuite/integration-test/src/__tests__/utils/edgeless.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import type {
EdgelessRootBlockComponent,
PageRootBlockComponent,
SurfaceBlockComponent,
} from '@blocksuite/blocks';
} from '@blocksuite/affine/blocks';
import type { Store } from '@blocksuite/store';
import type { TestAffineEditorContainer } from '../../index.js';
blocksuite/integration-test/src/__tests__/utils/misc.ts
+2 -1
View File
@@ -1,4 +1,5 @@
import { AffineSchemas, replaceIdMiddleware } from '@blocksuite/blocks';
import { replaceIdMiddleware } from '@blocksuite/affine/blocks';
import { AffineSchemas } from '@blocksuite/affine/schemas';
import {
type DocSnapshot,
Schema,
blocksuite/integration-test/src/__tests__/utils/setup.ts
+8 -6
View File
@@ -1,7 +1,7 @@
import '@toeverything/theme/style.css';
import '@toeverything/theme/fonts.css';
import { effects as blocksEffects } from '@blocksuite/blocks/effects';
import { effects as blocksEffects } from '@blocksuite/affine/effects';
import type { ExtensionType, Store, Transformer } from '@blocksuite/store';
import { effects } from '../../effects.js';
@@ -9,16 +9,18 @@ import { effects } from '../../effects.js';
blocksEffects();
effects();
import type { ViewportTurboRendererExtension } from '@blocksuite/affine-shared/viewport-renderer';
import {
CommunityCanvasTextFonts,
type DocMode,
EdgelessEditorBlockSpecs,
FontConfigExtension,
PageEditorBlockSpecs,
StoreExtensions,
} from '@blocksuite/blocks';
import { AffineSchemas } from '@blocksuite/blocks/schemas';
} from '@blocksuite/affine/blocks';
import { AffineSchemas } from '@blocksuite/affine/schemas';
import {
CommunityCanvasTextFonts,
FontConfigExtension,
} from '@blocksuite/affine/shared/services';
import type { ViewportTurboRendererExtension } from '@blocksuite/affine-shared/viewport-renderer';
import { Schema, Text } from '@blocksuite/store';
import {
createAutoIncrementIdGenerator,
blocksuite/integration-test/src/editors/editor-container.ts
+5 -4
View File
@@ -1,11 +1,12 @@
import { BlockStdScope, ShadowlessElement } from '@blocksuite/block-std';
import { type DocMode, ThemeProvider } from '@blocksuite/blocks';
import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { BlockStdScope, ShadowlessElement } from '@blocksuite/affine/block-std';
import type { DocMode } from '@blocksuite/affine/blocks';
import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import { ThemeProvider } from '@blocksuite/affine/shared/services';
import {
type BlockModel,
type ExtensionType,
type Store,
} from '@blocksuite/store';
} from '@blocksuite/affine/store';
import { computed, signal } from '@preact/signals-core';
import { css, html } from 'lit';
import { property } from 'lit/decorators.js';
blocksuite/integration-test/src/effects.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import '@blocksuite/blocks/effects';
import '@blocksuite/affine/effects';
import { TestAffineEditorContainer } from './editors/index.js';
blocksuite/integration-test/tsconfig.json
+1 -7
View File
@@ -6,11 +6,5 @@
"tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo"
},
"include": ["./src", "./src/**/*.json"],
"references": [
{ "path": "../framework/block-std" },
{ "path": "../blocks" },
{ "path": "../framework/global" },
{ "path": "../framework/inline" },
{ "path": "../framework/store" }
]
"references": [{ "path": "../affine/all" }]
}
blocksuite/integration-test/vitest.config.ts
-23
View File
@@ -1,6 +1,3 @@
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin';
import { defineConfig } from 'vitest/config';
@@ -41,26 +38,6 @@ export default defineConfig(_configEnv =>
testTransformMode: {
web: ['src/__tests__/**/*.spec.ts'],
},
alias: {
'@blocksuite/blocks': path.resolve(
fileURLToPath(new URL('../blocks/src', import.meta.url))
),
'@blocksuite/blocks/*': path.resolve(
fileURLToPath(new URL('../blocks/src/*', import.meta.url))
),
'@blocksuite/global/*': path.resolve(
fileURLToPath(new URL('../framework/global/src/*', import.meta.url))
),
'@blocksuite/store': path.resolve(
fileURLToPath(new URL('../framework/store/src', import.meta.url))
),
'@blocksuite/inline': path.resolve(
fileURLToPath(new URL('../framework/inline/src', import.meta.url))
),
'@blocksuite/inline/*': path.resolve(
fileURLToPath(new URL('../framework/inline/src/*', import.meta.url))
),
},
},
})
);