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

feat: bump blocksuite (#5845)

Browse Source
This commit is contained in:
Ayush Agrawal
2024-02-20 18:19:41 +05:30
committed by GitHub
parent a554c8aabe
commit 6fad241350
36 changed files with 187 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/frontend/core/.webpack/runtime-config.ts
View File

@@ -5,7 +5,14 @@ import { createRequire } from 'node:module';
const require = createRequire(import.meta.url);
const packageJson = require('../package.json');
const editorFlags: BlockSuiteFeatureFlags = {
const editorFlagsStable: BlockSuiteFeatureFlags = {
enable_synced_doc_block: false,
enable_expand_database_block: false,
enable_bultin_ledits: false,
};
const editorFlagsCanary: BlockSuiteFeatureFlags = {
enable_synced_doc_block: true,
enable_expand_database_block: false,
enable_bultin_ledits: false,
};
@@ -32,7 +39,7 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
enablePayment: true,
enablePageHistory: true,
serverUrlPrefix: 'https://app.affine.pro',
editorFlags,
editorFlags: editorFlagsStable,
appVersion: packageJson.version,
editorVersion: packageJson.dependencies['@blocksuite/presets'],
appBuildType: 'stable',
@@ -73,7 +80,7 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
enablePayment: true,
enablePageHistory: true,
serverUrlPrefix: 'https://affine.fail',
editorFlags,
editorFlags: editorFlagsCanary,
appVersion: packageJson.version,
editorVersion: packageJson.dependencies['@blocksuite/presets'],
appBuildType: 'canary',

14
packages/frontend/core/package.json
View File

@@ -25,14 +25,14 @@
"@affine/i18n": "workspace:*",
"@affine/templates": "workspace:*",
"@affine/workspace-impl": "workspace:*",
"@blocksuite/block-std": "0.12.0-canary-202402091051-49c1eff",
"@blocksuite/blocks": "0.12.0-canary-202402091051-49c1eff",
"@blocksuite/global": "0.12.0-canary-202402091051-49c1eff",
"@blocksuite/block-std": "0.12.0-canary-202402200831-bc2769f",
"@blocksuite/blocks": "0.12.0-canary-202402200831-bc2769f",
"@blocksuite/global": "0.12.0-canary-202402200831-bc2769f",
"@blocksuite/icons": "2.1.44",
"@blocksuite/inline": "0.12.0-canary-202402091051-49c1eff",
"@blocksuite/lit": "0.12.0-canary-202402091051-49c1eff",
"@blocksuite/presets": "0.12.0-canary-202402091051-49c1eff",
"@blocksuite/store": "0.12.0-canary-202402091051-49c1eff",
"@blocksuite/inline": "0.12.0-canary-202402200831-bc2769f",
"@blocksuite/lit": "0.12.0-canary-202402200831-bc2769f",
"@blocksuite/presets": "0.12.0-canary-202402200831-bc2769f",
"@blocksuite/store": "0.12.0-canary-202402200831-bc2769f",
"@dnd-kit/core": "^6.0.8",
"@dnd-kit/sortable": "^8.0.0",
"@emotion/cache": "^11.11.0",

2
packages/frontend/core/src/bootstrap/first-app-data.ts
View File

@@ -33,7 +33,7 @@ export async function createFirstAppData(workspaceManager: WorkspaceManager) {
workspace.setPageMeta(page.id, {
jumpOnce: true,
});
await initEmptyPage(page);
initEmptyPage(page);
}
logger.debug('create first workspace');
}

2
packages/frontend/core/src/components/affine/create-workspace-modal/index.tsx
View File

@@ -164,7 +164,7 @@ export const CreateWorkspaceModal = ({
workspace.setPageMeta(page.id, {
jumpOnce: true,
});
await initEmptyPage(page);
initEmptyPage(page);
}
logger.debug('create first workspace');
}

10
packages/frontend/core/src/components/affine/page-history-modal/data.ts
View File

@@ -161,12 +161,10 @@ export const useSnapshotPage = (
});
page.awarenessStore.setReadonly(page, true);
const spaceDoc = page.spaceDoc;
page
.load(() => {
applyUpdate(spaceDoc, new Uint8Array(snapshot));
historyShellWorkspace.schema.upgradePage(0, {}, spaceDoc);
})
.catch(console.error); // must load before applyUpdate
page.load(() => {
applyUpdate(spaceDoc, new Uint8Array(snapshot));
historyShellWorkspace.schema.upgradePage(0, {}, spaceDoc);
}); // must load before applyUpdate
}
return page ?? undefined;
}, [pageDocId, snapshot, ts, workspace]);

2
packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor.tsx
View File

@@ -39,7 +39,7 @@ export type EditorProps = {
function usePageRoot(page: Page) {
if (!page.ready) {
use(page.load());
page.load();
}
if (!page.root) {

8
packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx
View File

@@ -27,9 +27,7 @@ export const usePageHelper = (blockSuiteWorkspace: BlockSuiteWorkspace) => {
const createPageAndOpen = useCallback(
(mode?: 'page' | 'edgeless') => {
const page = createPage();
initEmptyPage(page).catch(error => {
toast(`Failed to initialize Page: ${error.message}`);
});
initEmptyPage(page);
setPageMode(page.id, mode || 'page');
openPage(blockSuiteWorkspace.id, page.id);
return page;
@@ -66,10 +64,10 @@ export const usePageHelper = (blockSuiteWorkspace: BlockSuiteWorkspace) => {
const createLinkedPageAndOpen = useAsyncCallback(
async (pageId: string) => {
const page = createPageAndOpen();
await page.load();
page.load();
const parentPage = blockSuiteWorkspace.getPage(pageId);
if (parentPage) {
await parentPage.load();
parentPage.load();
const text = parentPage.Text.fromDelta([
{
insert: ' ',

2
packages/frontend/core/src/components/page-list/__tests__/use-block-suite-page-preview.spec.ts
View File

@@ -22,7 +22,7 @@ beforeEach(async () => {
vi.useFakeTimers({ toFake: ['requestIdleCallback'] });
blockSuiteWorkspace = new BlockSuiteWorkspace({ id: 'test', schema });
const initPage = async (page: Page) => {
await page.waitForLoaded();
page.waitForLoaded();
expect(page).not.toBeNull();
assertExists(page);
const pageBlockId = page.addBlock('affine:page', {

7
packages/frontend/core/src/components/page-list/use-block-suite-workspace-page.ts
View File

@@ -1,10 +1,7 @@
import { DebugLogger } from '@affine/debug';
import { DisposableGroup } from '@blocksuite/global/utils';
import type { Page, Workspace } from '@blocksuite/store';
import { useEffect, useState } from 'react';
const logger = new DebugLogger('use-block-suite-workspace-page');
export function useBlockSuiteWorkspacePage(
blockSuiteWorkspace: Workspace,
pageId: string | null
@@ -36,9 +33,7 @@ export function useBlockSuiteWorkspacePage(
useEffect(() => {
if (page && !page.loaded) {
page.load().catch(err => {
logger.error('Failed to load page', err);
});
page.load();
}
}, [page]);

4
packages/frontend/core/src/components/pure/cmdk/data-hooks.tsx
View File

@@ -247,7 +247,7 @@ export const usePageCommands = () => {
category: 'affine:creation',
run: async () => {
const page = pageHelper.createPage();
await page.load();
page.load();
pageMetaHelper.setPageTitle(page.id, query);
},
icon: <PageIcon />,
@@ -262,7 +262,7 @@ export const usePageCommands = () => {
category: 'affine:creation',
run: async () => {
const page = pageHelper.createEdgeless();
await page.load();
page.load();
pageMetaHelper.setPageTitle(page.id, query);
},
icon: <EdgelessIcon />,

2
packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/add-favourite-button.tsx
View File

@@ -25,7 +25,7 @@ export const AddFavouriteButton = ({
createLinkedPage(pageId);
} else {
const page = createPage();
await page.load();
page.load();
setPageMeta(page.id, { favorite: true });
}
},

2
packages/frontend/core/src/components/root-app-sidebar/index.tsx
View File

@@ -115,7 +115,7 @@ export const RootAppSidebar = ({
const onClickNewPage = useAsyncCallback(async () => {
const page = createPage();
await page.waitForLoaded();
page.waitForLoaded();
openPage(page.id);
}, [createPage, openPage]);

6
packages/frontend/core/src/hooks/__tests__/use-block-suite-workspace-helper.spec.ts
View File

@@ -22,9 +22,9 @@ beforeEach(async () => {
id: 'test',
schema,
});
await initEmptyPage(blockSuiteWorkspace.createPage({ id: 'page0' }));
await initEmptyPage(blockSuiteWorkspace.createPage({ id: 'page1' }));
await initEmptyPage(blockSuiteWorkspace.createPage({ id: 'page2' }));
initEmptyPage(blockSuiteWorkspace.createPage({ id: 'page0' }));
initEmptyPage(blockSuiteWorkspace.createPage({ id: 'page1' }));
initEmptyPage(blockSuiteWorkspace.createPage({ id: 'page2' }));
});
describe('useBlockSuiteWorkspaceHelper', () => {

2
packages/frontend/core/src/hooks/affine/use-block-suite-meta-helper.ts
View File

@@ -154,7 +154,7 @@ export function useBlockSuiteMetaHelper(
const newPage = createPage();
const currentPage = blockSuiteWorkspace.getPage(pageId);
await newPage.waitForLoaded();
newPage.waitForLoaded();
if (!currentPageMeta || !currentPage) {
return;
}

7
packages/frontend/core/src/hooks/use-block-suite-workspace-page.ts
View File

@@ -1,10 +1,7 @@
import { DebugLogger } from '@affine/debug';
import { DisposableGroup } from '@blocksuite/global/utils';
import type { Page, Workspace } from '@blocksuite/store';
import { useEffect, useState } from 'react';
const logger = new DebugLogger('use-block-suite-workspace-page');
export function useBlockSuiteWorkspacePage(
blockSuiteWorkspace: Workspace,
pageId: string | null
@@ -36,9 +33,7 @@ export function useBlockSuiteWorkspacePage(
useEffect(() => {
if (page && !page.loaded) {
page.load().catch(err => {
logger.error('Failed to load page', err);
});
page.load();
}
}, [page]);

4
packages/frontend/core/src/hooks/use-journal.ts
View File

@@ -37,9 +37,7 @@ export const useJournalHelper = (workspace: BlockSuiteWorkspace) => {
page.workspace.setPageMeta(page.id, {
createDate: dayjs(maybeDate).toDate().getTime(),
});
initEmptyPage(page, title).catch(err =>
console.error('Failed to load journal page', err)
);
initEmptyPage(page, title);
adapter.setJournalPageDateString(page.id, title);
return page;
},

2
packages/frontend/core/src/testing.ts
View File

@@ -24,7 +24,7 @@ export async function configureTestingEnvironment() {
const { workspace } = workspaceManager.open(
await workspaceManager.createWorkspace(WorkspaceFlavour.LOCAL, async ws => {
const initPage = async (page: BlockSuitePage) => {
await page.load();
page.load();
const pageBlockId = page.addBlock('affine:page', {
title: new page.Text(''),
});