Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-12 04:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: migrate to blocksuite/affine (#8332)

Browse Source 
Use `@blocksuite/affine` package for all blocksuite features in affine.

```ts
@blocksuite/store -> @blocksuite/affine/store
@blocksuite/global -> @blocksuite/affine/global
@blocksuite/block-std -> @blocksuite/affine/block-std
@blocksuite/blocks -> @blocksuite/affine/blocks
@blocksuite/presets -> @blocksuite/affine/presets
```
This commit is contained in:
Saul-Mirone
2024-09-20 10:55:47 +00:00
parent 39f60145fe
commit 35e232c61c
221 changed files with 504 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/common/infra/package.json
View File

@@ -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
},

2
packages/common/infra/src/blocksuite/migration/blocksuite.ts
View File

@@ -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,

2
packages/common/infra/src/blocksuite/migration/workspace.ts
View File

@@ -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';
/**

6
packages/common/infra/src/initialization/index.ts
View File

@@ -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>;

2
packages/common/infra/src/modules/doc/entities/doc.ts
View File

@@ -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';

2
packages/common/infra/src/modules/doc/entities/record-list.ts
View File

@@ -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';

4
packages/common/infra/src/modules/doc/entities/record.ts
View File

@@ -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';

2
packages/common/infra/src/modules/doc/scopes/doc.ts
View File

@@ -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';

2
packages/common/infra/src/modules/doc/services/docs.ts
View File

@@ -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';

4
packages/common/infra/src/modules/doc/stores/docs.ts
View File

@@ -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';

2
packages/common/infra/src/modules/feature-flag/types.ts
View File

@@ -1,4 +1,4 @@
import type { BlockSuiteFlags } from '@blocksuite/global/types';
import type { BlockSuiteFlags } from '@blocksuite/affine/global/types';
type FeedbackType = 'discord' | 'email' | 'github';

2
packages/common/infra/src/modules/global-context/entities/global-context.ts
View File

@@ -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';

2
packages/common/infra/src/modules/workspace/entities/workspace.ts
View File

@@ -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';

6
packages/common/infra/src/modules/workspace/global-schema.ts
View File

@@ -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() {

2
packages/common/infra/src/modules/workspace/providers/flavour.ts
View File

@@ -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';

2
packages/common/infra/src/modules/workspace/scopes/workspace.ts
View File

@@ -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;

2
packages/common/infra/src/modules/workspace/services/factory.ts
View File

@@ -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';

2
packages/common/infra/src/modules/workspace/services/transform.ts
View File

@@ -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';

2
packages/common/infra/src/modules/workspace/testing/testing-provider.ts
View File

@@ -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';

2
packages/common/infra/src/sync/blob/blob.ts
View File

@@ -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';