From 2e6386e4cf10f5fa6fb23f02c9ee8aad73592b17 Mon Sep 17 00:00:00 2001 From: Ayush Agrawal <54364088+AyushAgrawal-A2@users.noreply.github.com> Date: Tue, 20 Feb 2024 18:19:41 +0530 Subject: [PATCH] feat: bump blocksuite (#5845) --- packages/common/env/package.json | 4 +- packages/common/env/src/global.ts | 1 + packages/common/infra/package.json | 10 +- .../src/blocksuite/initialization/index.ts | 4 +- packages/common/workspace/src/manager.ts | 3 + packages/common/y-indexeddb/package.json | 6 +- .../y-indexeddb/src/__tests__/index.spec.ts | 18 +- packages/common/y-provider/package.json | 2 +- packages/frontend/component/package.json | 10 +- .../frontend/core/.webpack/runtime-config.ts | 13 +- packages/frontend/core/package.json | 14 +- .../core/src/bootstrap/first-app-data.ts | 2 +- .../affine/create-workspace-modal/index.tsx | 2 +- .../affine/page-history-modal/data.ts | 10 +- .../block-suite-editor/blocksuite-editor.tsx | 2 +- .../block-suite-page-list/utils.tsx | 8 +- .../use-block-suite-page-preview.spec.ts | 2 +- .../use-block-suite-workspace-page.ts | 7 +- .../core/src/components/pure/cmdk/data.tsx | 6 +- .../favorite/add-favourite-button.tsx | 2 +- .../src/components/root-app-sidebar/index.tsx | 2 +- .../use-block-suite-workspace-helper.spec.ts | 6 +- ...-block-suite-workspace-page-title.spec.tsx | 2 +- .../affine/use-block-suite-meta-helper.ts | 2 +- .../hooks/use-block-suite-workspace-page.ts | 7 +- .../frontend/core/src/hooks/use-journal.ts | 4 +- packages/frontend/electron/package.json | 8 +- .../src/local/__tests__/engine.spec.ts | 2 +- .../src/local/__tests__/peer.spec.ts | 4 +- tests/storybook/package.json | 14 +- .../src/stories/blocksuite-editor.stories.tsx | 2 +- .../src/stories/page-list.stories.tsx | 2 +- yarn.lock | 200 ++++++++++-------- 33 files changed, 200 insertions(+), 181 deletions(-) diff --git a/packages/common/env/package.json b/packages/common/env/package.json index 8612b475e7..3dd5a3937e 100644 --- a/packages/common/env/package.json +++ b/packages/common/env/package.json @@ -3,8 +3,8 @@ "private": true, "type": "module", "devDependencies": { - "@blocksuite/global": "0.12.0-canary-202402091051-49c1eff", - "@blocksuite/store": "0.12.0-canary-202402091051-49c1eff", + "@blocksuite/global": "0.12.0-canary-202402200831-bc2769f", + "@blocksuite/store": "0.12.0-canary-202402200831-bc2769f", "react": "18.2.0", "react-dom": "18.2.0", "vitest": "1.1.3" diff --git a/packages/common/env/src/global.ts b/packages/common/env/src/global.ts index db3f9c3af6..3807a941c1 100644 --- a/packages/common/env/src/global.ts +++ b/packages/common/env/src/global.ts @@ -7,6 +7,7 @@ import { isDesktop, isServer } from './constant.js'; import { UaHelper } from './ua-helper.js'; export const blockSuiteFeatureFlags = z.object({ + enable_synced_doc_block: z.boolean(), enable_expand_database_block: z.boolean(), enable_bultin_ledits: z.boolean(), }); diff --git a/packages/common/infra/package.json b/packages/common/infra/package.json index acab055812..341bc5c9d1 100644 --- a/packages/common/infra/package.json +++ b/packages/common/infra/package.json @@ -13,9 +13,9 @@ "@affine/debug": "workspace:*", "@affine/env": "workspace:*", "@affine/templates": "workspace:*", - "@blocksuite/blocks": "0.12.0-canary-202402091051-49c1eff", - "@blocksuite/global": "0.12.0-canary-202402091051-49c1eff", - "@blocksuite/store": "0.12.0-canary-202402091051-49c1eff", + "@blocksuite/blocks": "0.12.0-canary-202402200831-bc2769f", + "@blocksuite/global": "0.12.0-canary-202402200831-bc2769f", + "@blocksuite/store": "0.12.0-canary-202402200831-bc2769f", "jotai": "^2.5.1", "jotai-effect": "^0.2.3", "nanoid": "^5.0.3", @@ -26,8 +26,8 @@ "devDependencies": { "@affine-test/fixtures": "workspace:*", "@affine/templates": "workspace:*", - "@blocksuite/lit": "0.12.0-canary-202402091051-49c1eff", - "@blocksuite/presets": "0.12.0-canary-202402091051-49c1eff", + "@blocksuite/lit": "0.12.0-canary-202402200831-bc2769f", + "@blocksuite/presets": "0.12.0-canary-202402200831-bc2769f", "async-call-rpc": "^6.3.1", "react": "^18.2.0", "rxjs": "^7.8.1", diff --git a/packages/common/infra/src/blocksuite/initialization/index.ts b/packages/common/infra/src/blocksuite/initialization/index.ts index 04423b2389..e5b1ffa7b6 100644 --- a/packages/common/infra/src/blocksuite/initialization/index.ts +++ b/packages/common/infra/src/blocksuite/initialization/index.ts @@ -13,8 +13,8 @@ import { Map as YMap } from 'yjs'; import { getLatestVersions } from '../migration/blocksuite'; import { replaceIdMiddleware } from './middleware'; -export async function initEmptyPage(page: Page, title?: string) { - await page.load(() => { +export function initEmptyPage(page: Page, title?: string) { + page.load(() => { const pageBlockId = page.addBlock('affine:page', { title: new page.Text(title ?? ''), }); diff --git a/packages/common/workspace/src/manager.ts b/packages/common/workspace/src/manager.ts index 2aa9f3759e..9e775d63be 100644 --- a/packages/common/workspace/src/manager.ts +++ b/packages/common/workspace/src/manager.ts @@ -1,4 +1,5 @@ import { DebugLogger } from '@affine/debug'; +import { setupEditorFlags } from '@affine/env/global'; import { WorkspaceFlavour } from '@affine/env/workspace'; import { assertEquals } from '@blocksuite/global/utils'; import type { Workspace as BlockSuiteWorkspace } from '@blocksuite/store'; @@ -164,6 +165,8 @@ export class WorkspaceManager { // apply compatibility fix fixWorkspaceVersion(workspace.blockSuiteWorkspace.doc); + setupEditorFlags(workspace.blockSuiteWorkspace); + return workspace; } } diff --git a/packages/common/y-indexeddb/package.json b/packages/common/y-indexeddb/package.json index cfda1bc993..0e984b9d2b 100644 --- a/packages/common/y-indexeddb/package.json +++ b/packages/common/y-indexeddb/package.json @@ -32,14 +32,14 @@ } }, "dependencies": { - "@blocksuite/global": "0.12.0-canary-202402091051-49c1eff", + "@blocksuite/global": "0.12.0-canary-202402200831-bc2769f", "idb": "^8.0.0", "nanoid": "^5.0.3", "y-provider": "workspace:*" }, "devDependencies": { - "@blocksuite/blocks": "0.12.0-canary-202402091051-49c1eff", - "@blocksuite/store": "0.12.0-canary-202402091051-49c1eff", + "@blocksuite/blocks": "0.12.0-canary-202402200831-bc2769f", + "@blocksuite/store": "0.12.0-canary-202402200831-bc2769f", "fake-indexeddb": "^5.0.0", "vite": "^5.0.6", "vite-plugin-dts": "3.7.0", diff --git a/packages/common/y-indexeddb/src/__tests__/index.spec.ts b/packages/common/y-indexeddb/src/__tests__/index.spec.ts index 2d597dd0cd..4ca121bd9f 100644 --- a/packages/common/y-indexeddb/src/__tests__/index.spec.ts +++ b/packages/common/y-indexeddb/src/__tests__/index.spec.ts @@ -100,7 +100,7 @@ describe('indexeddb provider', () => { ], }); const page = workspace.createPage({ id: 'page0' }); - await page.waitForLoaded(); + page.waitForLoaded(); const pageBlockId = page.addBlock('affine:page', { title: '' }); const frameId = page.addBlock('affine:note', {}, pageBlockId); page.addBlock('affine:paragraph', {}, frameId); @@ -129,7 +129,7 @@ describe('indexeddb provider', () => { | WorkspacePersist | undefined; assertExists(data); - await testWorkspace.getPage('page0')?.waitForLoaded(); + testWorkspace.getPage('page0')?.waitForLoaded(); data.updates.forEach(({ update }) => { Workspace.Y.applyUpdate(subPage, update); }); @@ -148,7 +148,7 @@ describe('indexeddb provider', () => { expect(provider.connected).toBe(false); { const page = workspace.createPage({ id: 'page0' }); - await page.waitForLoaded(); + page.waitForLoaded(); const pageBlockId = page.addBlock('affine:page', { title: '' }); const frameId = page.addBlock('affine:note', {}, pageBlockId); page.addBlock('affine:paragraph', {}, frameId); @@ -203,7 +203,7 @@ describe('indexeddb provider', () => { provider.connect(); { const page = workspace.createPage({ id: 'page0' }); - await page.waitForLoaded(); + page.waitForLoaded(); const pageBlockId = page.addBlock('affine:page', { title: '' }); const frameId = page.addBlock('affine:note', {}, pageBlockId); for (let i = 0; i < 99; i++) { @@ -369,14 +369,14 @@ describe('subDoc', () => { const page0 = workspace.createPage({ id: 'page0', }); - await page0.waitForLoaded(); + page0.waitForLoaded(); const { paragraphBlockId: paragraphBlockIdPage1 } = initEmptyPage(page0); const provider = createIndexedDBProvider(workspace.doc, rootDBName); provider.connect(); const page1 = workspace.createPage({ id: 'page1', }); - await page1.waitForLoaded(); + page1.waitForLoaded(); const { paragraphBlockId: paragraphBlockIdPage2 } = initEmptyPage(page1); await setTimeout(200); provider.disconnect(); @@ -390,14 +390,14 @@ describe('subDoc', () => { provider.connect(); await setTimeout(200); const page0 = newWorkspace.getPage('page0') as Page; - await page0.waitForLoaded(); + page0.waitForLoaded(); await setTimeout(200); { const block = page0.getBlockById(paragraphBlockIdPage1); assertExists(block); } const page1 = newWorkspace.getPage('page1') as Page; - await page1.waitForLoaded(); + page1.waitForLoaded(); await setTimeout(200); { const block = page1.getBlockById(paragraphBlockIdPage2); @@ -410,7 +410,7 @@ describe('subDoc', () => { describe('utils', () => { test('download binary', async () => { const page = workspace.createPage({ id: 'page0' }); - await page.waitForLoaded(); + page.waitForLoaded(); initEmptyPage(page); const provider = createIndexedDBProvider(workspace.doc, rootDBName); provider.connect(); diff --git a/packages/common/y-provider/package.json b/packages/common/y-provider/package.json index 1efe8ceaaa..47d051de12 100644 --- a/packages/common/y-provider/package.json +++ b/packages/common/y-provider/package.json @@ -24,7 +24,7 @@ "build": "vite build" }, "devDependencies": { - "@blocksuite/store": "0.12.0-canary-202402091051-49c1eff", + "@blocksuite/store": "0.12.0-canary-202402200831-bc2769f", "vite": "^5.0.6", "vite-plugin-dts": "3.7.0", "vitest": "1.1.3", diff --git a/packages/frontend/component/package.json b/packages/frontend/component/package.json index 12ed5e8be8..66fe839898 100644 --- a/packages/frontend/component/package.json +++ b/packages/frontend/component/package.json @@ -73,12 +73,12 @@ "uuid": "^9.0.1" }, "devDependencies": { - "@blocksuite/blocks": "0.12.0-canary-202402091051-49c1eff", - "@blocksuite/global": "0.12.0-canary-202402091051-49c1eff", + "@blocksuite/blocks": "0.12.0-canary-202402200831-bc2769f", + "@blocksuite/global": "0.12.0-canary-202402200831-bc2769f", "@blocksuite/icons": "2.1.44", - "@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/lit": "0.12.0-canary-202402200831-bc2769f", + "@blocksuite/presets": "0.12.0-canary-202402200831-bc2769f", + "@blocksuite/store": "0.12.0-canary-202402200831-bc2769f", "@storybook/addon-actions": "^7.5.3", "@storybook/addon-essentials": "^7.5.3", "@storybook/addon-interactions": "^7.5.3", diff --git a/packages/frontend/core/.webpack/runtime-config.ts b/packages/frontend/core/.webpack/runtime-config.ts index 0b81bb4c85..17358c0051 100644 --- a/packages/frontend/core/.webpack/runtime-config.ts +++ b/packages/frontend/core/.webpack/runtime-config.ts @@ -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, }; @@ -33,7 +40,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', @@ -75,7 +82,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', diff --git a/packages/frontend/core/package.json b/packages/frontend/core/package.json index 9cf5ead799..5a63b0b8d7 100644 --- a/packages/frontend/core/package.json +++ b/packages/frontend/core/package.json @@ -26,14 +26,14 @@ "@affine/templates": "workspace:*", "@affine/workspace": "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", diff --git a/packages/frontend/core/src/bootstrap/first-app-data.ts b/packages/frontend/core/src/bootstrap/first-app-data.ts index d040b73b40..6fb9b40864 100644 --- a/packages/frontend/core/src/bootstrap/first-app-data.ts +++ b/packages/frontend/core/src/bootstrap/first-app-data.ts @@ -33,7 +33,7 @@ export async function createFirstAppData() { workspace.setPageMeta(page.id, { jumpOnce: true, }); - await initEmptyPage(page); + initEmptyPage(page); } logger.debug('create first workspace'); } diff --git a/packages/frontend/core/src/components/affine/create-workspace-modal/index.tsx b/packages/frontend/core/src/components/affine/create-workspace-modal/index.tsx index df58adbfaa..b86f76f0b1 100644 --- a/packages/frontend/core/src/components/affine/create-workspace-modal/index.tsx +++ b/packages/frontend/core/src/components/affine/create-workspace-modal/index.tsx @@ -164,7 +164,7 @@ export const CreateWorkspaceModal = ({ workspace.setPageMeta(page.id, { jumpOnce: true, }); - await initEmptyPage(page); + initEmptyPage(page); } logger.debug('create first workspace'); } diff --git a/packages/frontend/core/src/components/affine/page-history-modal/data.ts b/packages/frontend/core/src/components/affine/page-history-modal/data.ts index 225b902400..48700508c5 100644 --- a/packages/frontend/core/src/components/affine/page-history-modal/data.ts +++ b/packages/frontend/core/src/components/affine/page-history-modal/data.ts @@ -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]); diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor.tsx index 532073dc09..9f5d3efd6e 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor.tsx +++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor.tsx @@ -39,7 +39,7 @@ export type EditorProps = { function usePageRoot(page: Page) { if (!page.ready) { - use(page.load()); + page.load(); } if (!page.root) { diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx index 02ff39ab84..a288ba9a70 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx +++ b/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx @@ -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: ' ', 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 92b9ed5102..e36be557e9 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 @@ -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', { diff --git a/packages/frontend/core/src/components/page-list/use-block-suite-workspace-page.ts b/packages/frontend/core/src/components/page-list/use-block-suite-workspace-page.ts index 0039201bfc..d375a566c5 100644 --- a/packages/frontend/core/src/components/page-list/use-block-suite-workspace-page.ts +++ b/packages/frontend/core/src/components/page-list/use-block-suite-workspace-page.ts @@ -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]); diff --git a/packages/frontend/core/src/components/pure/cmdk/data.tsx b/packages/frontend/core/src/components/pure/cmdk/data.tsx index 469a463526..b192b2896a 100644 --- a/packages/frontend/core/src/components/pure/cmdk/data.tsx +++ b/packages/frontend/core/src/components/pure/cmdk/data.tsx @@ -67,7 +67,7 @@ const safeCurrentPageAtom = atom>(async get => { } if (!page.loaded) { - await page.waitForLoaded(); + page.load(); } return page; }); @@ -310,7 +310,7 @@ export const usePageCommands = () => { category: 'affine:creation', run: async () => { const page = pageHelper.createPage(); - await page.waitForLoaded(); + page.load(); pageMetaHelper.setPageTitle(page.id, query); }, icon: , @@ -325,7 +325,7 @@ export const usePageCommands = () => { category: 'affine:creation', run: async () => { const page = pageHelper.createEdgeless(); - await page.waitForLoaded(); + page.load(); pageMetaHelper.setPageTitle(page.id, query); }, icon: , diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/add-favourite-button.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/add-favourite-button.tsx index 2bebff6464..feb1311775 100644 --- a/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/add-favourite-button.tsx +++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/add-favourite-button.tsx @@ -25,7 +25,7 @@ export const AddFavouriteButton = ({ createLinkedPage(pageId); } else { const page = createPage(); - await page.load(); + page.load(); setPageMeta(page.id, { favorite: true }); } }, diff --git a/packages/frontend/core/src/components/root-app-sidebar/index.tsx b/packages/frontend/core/src/components/root-app-sidebar/index.tsx index ffc86afb3c..219689a3c7 100644 --- a/packages/frontend/core/src/components/root-app-sidebar/index.tsx +++ b/packages/frontend/core/src/components/root-app-sidebar/index.tsx @@ -115,7 +115,7 @@ export const RootAppSidebar = ({ const onClickNewPage = useAsyncCallback(async () => { const page = createPage(); - await page.waitForLoaded(); + page.waitForLoaded(); openPage(page.id); }, [createPage, openPage]); diff --git a/packages/frontend/core/src/hooks/__tests__/use-block-suite-workspace-helper.spec.ts b/packages/frontend/core/src/hooks/__tests__/use-block-suite-workspace-helper.spec.ts index 52e96aeefc..e12e1e6089 100644 --- a/packages/frontend/core/src/hooks/__tests__/use-block-suite-workspace-helper.spec.ts +++ b/packages/frontend/core/src/hooks/__tests__/use-block-suite-workspace-helper.spec.ts @@ -30,9 +30,9 @@ beforeEach(async () => { blockSuiteWorkspace.doc.emit('sync', []); - 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', () => { diff --git a/packages/frontend/core/src/hooks/__tests__/use-block-suite-workspace-page-title.spec.tsx b/packages/frontend/core/src/hooks/__tests__/use-block-suite-workspace-page-title.spec.tsx index 8f5eaeb860..d0cd8771bb 100644 --- a/packages/frontend/core/src/hooks/__tests__/use-block-suite-workspace-page-title.spec.tsx +++ b/packages/frontend/core/src/hooks/__tests__/use-block-suite-workspace-page-title.spec.tsx @@ -54,7 +54,7 @@ beforeEach(async () => { blockSuiteWorkspace.doc.emit('sync', []); const initPage = async (page: Page) => { - await page.waitForLoaded(); + page.load(); expect(page).not.toBeNull(); assertExists(page); const pageBlockId = page.addBlock('affine:page', { diff --git a/packages/frontend/core/src/hooks/affine/use-block-suite-meta-helper.ts b/packages/frontend/core/src/hooks/affine/use-block-suite-meta-helper.ts index 2267a69133..ffa9b9d6da 100644 --- a/packages/frontend/core/src/hooks/affine/use-block-suite-meta-helper.ts +++ b/packages/frontend/core/src/hooks/affine/use-block-suite-meta-helper.ts @@ -152,7 +152,7 @@ export function useBlockSuiteMetaHelper( const newPage = createPage(); const currentPage = blockSuiteWorkspace.getPage(pageId); - await newPage.waitForLoaded(); + newPage.waitForLoaded(); if (!currentPageMeta || !currentPage) { return; } diff --git a/packages/frontend/core/src/hooks/use-block-suite-workspace-page.ts b/packages/frontend/core/src/hooks/use-block-suite-workspace-page.ts index 1e6c069788..3d889ef762 100644 --- a/packages/frontend/core/src/hooks/use-block-suite-workspace-page.ts +++ b/packages/frontend/core/src/hooks/use-block-suite-workspace-page.ts @@ -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]); diff --git a/packages/frontend/core/src/hooks/use-journal.ts b/packages/frontend/core/src/hooks/use-journal.ts index 642b05ecfa..67b7af85e4 100644 --- a/packages/frontend/core/src/hooks/use-journal.ts +++ b/packages/frontend/core/src/hooks/use-journal.ts @@ -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; }, diff --git a/packages/frontend/electron/package.json b/packages/frontend/electron/package.json index 7b9f88a974..aa5f0f9e6f 100644 --- a/packages/frontend/electron/package.json +++ b/packages/frontend/electron/package.json @@ -25,10 +25,10 @@ "@affine-test/kit": "workspace:*", "@affine/env": "workspace:*", "@affine/native": "workspace:*", - "@blocksuite/blocks": "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/blocks": "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", "@electron-forge/cli": "^7.2.0", "@electron-forge/core": "^7.2.0", "@electron-forge/core-utils": "^7.2.0", diff --git a/packages/frontend/workspace-impl/src/local/__tests__/engine.spec.ts b/packages/frontend/workspace-impl/src/local/__tests__/engine.spec.ts index 30faa2f0ed..8c0c47ca7f 100644 --- a/packages/frontend/workspace-impl/src/local/__tests__/engine.spec.ts +++ b/packages/frontend/workspace-impl/src/local/__tests__/engine.spec.ts @@ -40,7 +40,7 @@ describe('SyncEngine', () => { const page = workspace.createPage({ id: 'page0', }); - await page.load(); + page.load(); const pageBlockId = page.addBlock('affine:page', { title: new page.Text(''), }); diff --git a/packages/frontend/workspace-impl/src/local/__tests__/peer.spec.ts b/packages/frontend/workspace-impl/src/local/__tests__/peer.spec.ts index 11e28dc232..ce02ca2670 100644 --- a/packages/frontend/workspace-impl/src/local/__tests__/peer.spec.ts +++ b/packages/frontend/workspace-impl/src/local/__tests__/peer.spec.ts @@ -34,7 +34,7 @@ describe('SyncPeer', () => { const page = workspace.createPage({ id: 'page0', }); - await page.load(); + page.load(); const pageBlockId = page.addBlock('affine:page', { title: new page.Text(''), }); @@ -83,7 +83,7 @@ describe('SyncPeer', () => { id: 'page0', }); expect(syncPeer.status.step).toBe(SyncPeerStep.LoadingSubDoc); - await page.load(); + page.load(); await syncPeer.waitForSynced(); page.addBlock('affine:page', { title: new page.Text(''), diff --git a/tests/storybook/package.json b/tests/storybook/package.json index 31e81d18e1..d042a50e48 100644 --- a/tests/storybook/package.json +++ b/tests/storybook/package.json @@ -22,14 +22,14 @@ "storybook-addon-react-router-v6": "^2.0.10" }, "devDependencies": { - "@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", "@storybook/addon-actions": "^7.5.3", "@storybook/addon-essentials": "^7.5.3", "@storybook/addon-interactions": "^7.5.3", diff --git a/tests/storybook/src/stories/blocksuite-editor.stories.tsx b/tests/storybook/src/stories/blocksuite-editor.stories.tsx index 219a14e44d..1b67384a18 100644 --- a/tests/storybook/src/stories/blocksuite-editor.stories.tsx +++ b/tests/storybook/src/stories/blocksuite-editor.stories.tsx @@ -14,7 +14,7 @@ async function createAndInitPage( preview: string ) { const page = workspace.createPage(); - await initEmptyPage(page, title); + initEmptyPage(page, title); page.getBlockByFlavour('affine:paragraph').at(0)?.text?.insert(preview, 0); return page; } diff --git a/tests/storybook/src/stories/page-list.stories.tsx b/tests/storybook/src/stories/page-list.stories.tsx index f232bcad0b..f7da05cdd5 100644 --- a/tests/storybook/src/stories/page-list.stories.tsx +++ b/tests/storybook/src/stories/page-list.stories.tsx @@ -231,7 +231,7 @@ async function createAndInitPage( preview: string ) { const page = workspace.createPage(); - await initEmptyPage(page, title); + initEmptyPage(page, title); page.getBlockByFlavour('affine:paragraph').at(0)?.text?.insert(preview, 0); return page; } diff --git a/yarn.lock b/yarn.lock index cf201cde5d..9df7ff4f91 100644 --- a/yarn.lock +++ b/yarn.lock @@ -202,12 +202,12 @@ __metadata: "@affine/graphql": "workspace:*" "@affine/i18n": "workspace:*" "@affine/workspace": "workspace:*" - "@blocksuite/blocks": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/global": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/blocks": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/global": "npm:0.12.0-canary-202402200831-bc2769f" "@blocksuite/icons": "npm:2.1.44" - "@blocksuite/lit": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/presets": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/store": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/lit": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/presets": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/store": "npm:0.12.0-canary-202402200831-bc2769f" "@dnd-kit/core": "npm:^6.0.8" "@dnd-kit/modifiers": "npm:^7.0.0" "@dnd-kit/sortable": "npm:^8.0.0" @@ -305,14 +305,14 @@ __metadata: "@affine/workspace": "workspace:*" "@affine/workspace-impl": "workspace:*" "@aws-sdk/client-s3": "npm:3.499.0" - "@blocksuite/block-std": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/blocks": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/global": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/block-std": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/blocks": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/global": "npm:0.12.0-canary-202402200831-bc2769f" "@blocksuite/icons": "npm:2.1.44" - "@blocksuite/inline": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/lit": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/presets": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/store": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/inline": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/lit": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/presets": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/store": "npm:0.12.0-canary-202402200831-bc2769f" "@dnd-kit/core": "npm:^6.0.8" "@dnd-kit/sortable": "npm:^8.0.0" "@emotion/cache": "npm:^11.11.0" @@ -439,10 +439,10 @@ __metadata: "@affine-test/kit": "workspace:*" "@affine/env": "workspace:*" "@affine/native": "workspace:*" - "@blocksuite/blocks": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/lit": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/presets": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/store": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/blocks": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/lit": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/presets": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/store": "npm:0.12.0-canary-202402200831-bc2769f" "@electron-forge/cli": "npm:^7.2.0" "@electron-forge/core": "npm:^7.2.0" "@electron-forge/core-utils": "npm:^7.2.0" @@ -491,8 +491,8 @@ __metadata: version: 0.0.0-use.local resolution: "@affine/env@workspace:packages/common/env" dependencies: - "@blocksuite/global": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/store": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/global": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/store": "npm:0.12.0-canary-202402200831-bc2769f" lit: "npm:^3.0.2" react: "npm:18.2.0" react-dom: "npm:18.2.0" @@ -739,14 +739,14 @@ __metadata: "@affine/component": "workspace:*" "@affine/i18n": "workspace:*" "@affine/workspace-impl": "workspace:*" - "@blocksuite/block-std": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/blocks": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/global": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/block-std": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/blocks": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/global": "npm:0.12.0-canary-202402200831-bc2769f" "@blocksuite/icons": "npm:2.1.44" - "@blocksuite/inline": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/lit": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/presets": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/store": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/inline": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/lit": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/presets": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/store": "npm:0.12.0-canary-202402200831-bc2769f" "@dnd-kit/sortable": "npm:^8.0.0" "@storybook/addon-actions": "npm:^7.5.3" "@storybook/addon-essentials": "npm:^7.5.3" @@ -3965,29 +3965,29 @@ __metadata: languageName: node linkType: hard -"@blocksuite/block-std@npm:0.12.0-canary-202402091051-49c1eff": - version: 0.12.0-canary-202402091051-49c1eff - resolution: "@blocksuite/block-std@npm:0.12.0-canary-202402091051-49c1eff" +"@blocksuite/block-std@npm:0.12.0-canary-202402200831-bc2769f": + version: 0.12.0-canary-202402200831-bc2769f + resolution: "@blocksuite/block-std@npm:0.12.0-canary-202402200831-bc2769f" dependencies: - "@blocksuite/global": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/global": "npm:0.12.0-canary-202402200831-bc2769f" lz-string: "npm:^1.5.0" w3c-keyname: "npm:^2.2.8" zod: "npm:^3.22.4" peerDependencies: - "@blocksuite/store": 0.12.0-canary-202402091051-49c1eff - checksum: d0918252b2721a69ee68fe8141904944d5d1370589379f5548de6380b346151c494e5656b243f2bee14fa04fdebffb9ed6b6cd9f5041a22397a3cd8320ebfe70 + "@blocksuite/store": 0.12.0-canary-202402200831-bc2769f + checksum: 2d86dd8cfcfc4c0d661efa1211406333ba83a0bd636ab8e4f36cd68a720736409559baecf1c3c1c5d23362a4705fbd65baa629c805c34682b47cfe309df8e085 languageName: node linkType: hard -"@blocksuite/blocks@npm:0.12.0-canary-202402091051-49c1eff": - version: 0.12.0-canary-202402091051-49c1eff - resolution: "@blocksuite/blocks@npm:0.12.0-canary-202402091051-49c1eff" +"@blocksuite/blocks@npm:0.12.0-canary-202402200831-bc2769f": + version: 0.12.0-canary-202402200831-bc2769f + resolution: "@blocksuite/blocks@npm:0.12.0-canary-202402200831-bc2769f" dependencies: - "@blocksuite/block-std": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/global": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/inline": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/lit": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/store": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/block-std": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/global": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/inline": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/lit": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/store": "npm:0.12.0-canary-202402200831-bc2769f" "@floating-ui/dom": "npm:^1.5.4" "@toeverything/theme": "npm:^0.7.27" "@types/hast": "npm:^3.0.3" @@ -4021,16 +4021,16 @@ __metadata: unified: "npm:^11.0.4" webfontloader: "npm:^1.6.28" zod: "npm:^3.22.4" - checksum: 31f00bb34cad484775676229fa611f2746c79cfb7a2a70d3e64fc8f75ea22d0066f31525e44cdf7f6e17ecfb2c02353e79b05084e231812f9fa8a51a7800a5ad + checksum: 002c829a4c8735bfa72cc3574711ba4cf7945eda9abbde96273ed07e48ebb7edec118a9855ce86f99c80822f0d52c87b151539824915df98574b62a7bc6c2f1f languageName: node linkType: hard -"@blocksuite/global@npm:0.12.0-canary-202402091051-49c1eff": - version: 0.12.0-canary-202402091051-49c1eff - resolution: "@blocksuite/global@npm:0.12.0-canary-202402091051-49c1eff" +"@blocksuite/global@npm:0.12.0-canary-202402200831-bc2769f": + version: 0.12.0-canary-202402200831-bc2769f + resolution: "@blocksuite/global@npm:0.12.0-canary-202402200831-bc2769f" dependencies: zod: "npm:^3.22.4" - checksum: 82b3b2dac28290b4a2e58f81a3af2881d8b3ce821c6ed09c2106500ea579871cec9823a58c7a5c8470942e0c2f630c21e99e6ed7edd932e0495376f83946787b + checksum: 25feca841b607987f499427a2ff2b05fda278b2c61c4004a23744f8cd387f854a2c7e8971a44b05990e3dcd22ba86e55fd17cbed77c958f382b9d760f4cde622 languageName: node linkType: hard @@ -4044,58 +4044,59 @@ __metadata: languageName: node linkType: hard -"@blocksuite/inline@npm:0.12.0-canary-202402091051-49c1eff": - version: 0.12.0-canary-202402091051-49c1eff - resolution: "@blocksuite/inline@npm:0.12.0-canary-202402091051-49c1eff" +"@blocksuite/inline@npm:0.12.0-canary-202402200831-bc2769f": + version: 0.12.0-canary-202402200831-bc2769f + resolution: "@blocksuite/inline@npm:0.12.0-canary-202402200831-bc2769f" dependencies: - "@blocksuite/global": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/global": "npm:0.12.0-canary-202402200831-bc2769f" zod: "npm:^3.22.4" peerDependencies: lit: ^3.1.1 yjs: ^13 - checksum: 834eda448b5005b859a0125cc6ae164ed1db809916ac9d43b80faf080b093c350294891b23bd58279a717228d0a2325500393340fef7386bc6db379b1ebec459 + checksum: b388c01aba167a3fb2659d2152ad13e70f7abdef2e96008fd3b138a2929866de1fa3c9174c8874e6bff4f94a3b74cf5307bf900314428776bf4dd61dca7a971b languageName: node linkType: hard -"@blocksuite/lit@npm:0.12.0-canary-202402091051-49c1eff": - version: 0.12.0-canary-202402091051-49c1eff - resolution: "@blocksuite/lit@npm:0.12.0-canary-202402091051-49c1eff" +"@blocksuite/lit@npm:0.12.0-canary-202402200831-bc2769f": + version: 0.12.0-canary-202402200831-bc2769f + resolution: "@blocksuite/lit@npm:0.12.0-canary-202402200831-bc2769f" dependencies: - "@blocksuite/global": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/inline": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/global": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/inline": "npm:0.12.0-canary-202402200831-bc2769f" lit: "npm:^3.1.1" peerDependencies: - "@blocksuite/block-std": 0.12.0-canary-202402091051-49c1eff - "@blocksuite/store": 0.12.0-canary-202402091051-49c1eff - checksum: 7fea79dc1690cdfe8fe2a8c4070684acbda9da3424e3aae2245464ddaad3a0a8598206116bea988e8aad558652d426154a461a6668296c7b377182b4d967196c + "@blocksuite/block-std": 0.12.0-canary-202402200831-bc2769f + "@blocksuite/store": 0.12.0-canary-202402200831-bc2769f + checksum: 462d67065196868a2da1583632b57d095f8cc9497cf6ab15dcabe8f750978dbdd54085a9052f703352786fd28e141dcab77656a0dd5335faafd793c9a57edbcc languageName: node linkType: hard -"@blocksuite/presets@npm:0.12.0-canary-202402091051-49c1eff": - version: 0.12.0-canary-202402091051-49c1eff - resolution: "@blocksuite/presets@npm:0.12.0-canary-202402091051-49c1eff" +"@blocksuite/presets@npm:0.12.0-canary-202402200831-bc2769f": + version: 0.12.0-canary-202402200831-bc2769f + resolution: "@blocksuite/presets@npm:0.12.0-canary-202402200831-bc2769f" dependencies: - "@blocksuite/block-std": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/blocks": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/global": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/inline": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/lit": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/store": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/block-std": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/blocks": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/global": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/inline": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/lit": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/store": "npm:0.12.0-canary-202402200831-bc2769f" "@fal-ai/serverless-client": "npm:^0.8.2" "@floating-ui/dom": "npm:^1.5.4" "@toeverything/theme": "npm:^0.7.27" lit: "npm:^3.1.1" openai: "npm:^4.25.0" - checksum: 4cc670bfbe5ed73b4f2c6c77e1cfa93bbe1170a6ae7cc885d893eb7ade50e2fc4e652cc5a1b2f4f6e12ddc36812b96fbdda38e102be6b352da74b7f95ef45696 + checksum: 9cae2b16072b3737417adb3f207581307f26bdc01fe2f03b853267cefd43c51abb114eccf4a3278672143e9926f87daffd19ebc114830a0e6b2adedab224e191 languageName: node linkType: hard -"@blocksuite/store@npm:0.12.0-canary-202402091051-49c1eff": - version: 0.12.0-canary-202402091051-49c1eff - resolution: "@blocksuite/store@npm:0.12.0-canary-202402091051-49c1eff" +"@blocksuite/store@npm:0.12.0-canary-202402200831-bc2769f": + version: 0.12.0-canary-202402200831-bc2769f + resolution: "@blocksuite/store@npm:0.12.0-canary-202402200831-bc2769f" dependencies: - "@blocksuite/global": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/inline": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/global": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/inline": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/sync": "npm:0.12.0-canary-202402200831-bc2769f" "@types/flexsearch": "npm:^0.7.6" flexsearch: "npm:0.7.43" idb-keyval: "npm:^6.2.1" @@ -4106,9 +4107,21 @@ __metadata: y-protocols: "npm:^1.0.6" zod: "npm:^3.22.4" peerDependencies: - async-call-rpc: ^6 yjs: ^13 - checksum: c358a21dd5d6b9a89649894dd04fe667c1ef08102b5e00b999688491a20ed9e9f648dd8b349d1f617772a18c4219b5d75b5674a7825def0236248336f0dbf8eb + checksum: 54dcba2b22e8bb0b13f13468132368e88aa14267393328953f58fdfd7e89efed22bdaf09efdf4d612bb8ae5fa48c4b8343312d1bacc1e0290d69d46f21833582 + languageName: node + linkType: hard + +"@blocksuite/sync@npm:0.12.0-canary-202402200831-bc2769f": + version: 0.12.0-canary-202402200831-bc2769f + resolution: "@blocksuite/sync@npm:0.12.0-canary-202402200831-bc2769f" + dependencies: + "@blocksuite/global": "npm:0.12.0-canary-202402200831-bc2769f" + idb: "npm:^8.0.0" + y-protocols: "npm:^1.0.6" + peerDependencies: + yjs: ^13 + checksum: 6e3cfa8ec1da2d86aeceefa720dc53ff8ae40c3593d60f011818ff9ab1150173c2c54c0d615a83a3d31aee1f2f7c9cae8d08365d55003a038f84e0c032d8c001 languageName: node linkType: hard @@ -13545,11 +13558,11 @@ __metadata: "@affine/debug": "workspace:*" "@affine/env": "workspace:*" "@affine/templates": "workspace:*" - "@blocksuite/blocks": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/global": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/lit": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/presets": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/store": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/blocks": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/global": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/lit": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/presets": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/store": "npm:0.12.0-canary-202402200831-bc2769f" async-call-rpc: "npm:^6.3.1" jotai: "npm:^2.5.1" jotai-effect: "npm:^0.2.3" @@ -13596,9 +13609,9 @@ __metadata: version: 0.0.0-use.local resolution: "@toeverything/y-indexeddb@workspace:packages/common/y-indexeddb" dependencies: - "@blocksuite/blocks": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/global": "npm:0.12.0-canary-202402091051-49c1eff" - "@blocksuite/store": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/blocks": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/global": "npm:0.12.0-canary-202402200831-bc2769f" + "@blocksuite/store": "npm:0.12.0-canary-202402200831-bc2769f" fake-indexeddb: "npm:^5.0.0" idb: "npm:^8.0.0" nanoid: "npm:^5.0.3" @@ -16423,7 +16436,7 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.5.1, axios@npm:^1.6.1": +"axios@npm:^1.5.1": version: 1.6.2 resolution: "axios@npm:1.6.2" dependencies: @@ -16434,6 +16447,17 @@ __metadata: languageName: node linkType: hard +"axios@npm:^1.6.1": + version: 1.6.7 + resolution: "axios@npm:1.6.7" + dependencies: + follow-redirects: "npm:^1.15.4" + form-data: "npm:^4.0.0" + proxy-from-env: "npm:^1.1.0" + checksum: a1932b089ece759cd261f175d9ebf4d41c8994cf0c0767cda86055c7a19bcfdade8ae3464bf4cec4c8b142f4a657dc664fb77a41855e8376cf38b86d7a86518f + languageName: node + linkType: hard + "babel-core@npm:^7.0.0-bridge.0": version: 7.0.0-bridge.0 resolution: "babel-core@npm:7.0.0-bridge.0" @@ -21626,13 +21650,13 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.0": - version: 1.15.4 - resolution: "follow-redirects@npm:1.15.4" +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.0, follow-redirects@npm:^1.15.4": + version: 1.15.5 + resolution: "follow-redirects@npm:1.15.5" peerDependenciesMeta: debug: optional: true - checksum: 2e8f5f259a6b02dfa8dc199e08431848a7c3beed32eb4c19945966164a52c89f07b86c3afcc32ebe4279cf0a960520e45a63013d6350309c5ec90133c5d9351a + checksum: d467f13c1c6aa734599b8b369cd7a625b20081af358f6204ff515f6f4116eb440de9c4e0c49f10798eeb0df26c95dd05d5e0d9ddc5786ab1a8a8abefe92929b4 languageName: node linkType: hard @@ -36203,7 +36227,7 @@ __metadata: version: 0.0.0-use.local resolution: "y-provider@workspace:packages/common/y-provider" dependencies: - "@blocksuite/store": "npm:0.12.0-canary-202402091051-49c1eff" + "@blocksuite/store": "npm:0.12.0-canary-202402200831-bc2769f" vite: "npm:^5.0.6" vite-plugin-dts: "npm:3.7.0" vitest: "npm:1.1.3"