feat: bump blocksuite (#5812)

packages/common/env/package.json

@@ -3,8 +3,8 @@
   "private": true,
   "type": "module",
   "devDependencies": {
-    "@blocksuite/global": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/store": "0.12.0-canary-202402010557-e8d6e1d",
+    "@blocksuite/global": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/store": "0.12.0-canary-202402062232-9a8554c",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "vitest": "1.2.2"

packages/common/infra/package.json

@@ -17,9 +17,9 @@
     "@affine/debug": "workspace:*",
     "@affine/env": "workspace:*",
     "@affine/templates": "workspace:*",
-    "@blocksuite/blocks": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/global": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/store": "0.12.0-canary-202402010557-e8d6e1d",
+    "@blocksuite/blocks": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/global": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/store": "0.12.0-canary-202402062232-9a8554c",
     "foxact": "^0.2.20",
     "jotai": "^2.5.1",
     "jotai-effect": "^0.5.0",
@@ -33,8 +33,8 @@
   "devDependencies": {
     "@affine-test/fixtures": "workspace:*",
     "@affine/templates": "workspace:*",
-    "@blocksuite/lit": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/presets": "0.12.0-canary-202402010557-e8d6e1d",
+    "@blocksuite/lit": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/presets": "0.12.0-canary-202402062232-9a8554c",
     "@testing-library/react": "^14.0.0",
     "async-call-rpc": "^6.3.1",
     "react": "^18.2.0",

packages/common/y-indexeddb/package.json

@@ -32,14 +32,14 @@
     }
   },
   "dependencies": {
-    "@blocksuite/global": "0.12.0-canary-202402010557-e8d6e1d",
+    "@blocksuite/global": "0.12.0-canary-202402062232-9a8554c",
     "idb": "^8.0.0",
     "nanoid": "^5.0.3",
     "y-provider": "workspace:*"
   },
   "devDependencies": {
-    "@blocksuite/blocks": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/store": "0.12.0-canary-202402010557-e8d6e1d",
+    "@blocksuite/blocks": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/store": "0.12.0-canary-202402062232-9a8554c",
     "fake-indexeddb": "^5.0.0",
     "vite": "^5.0.6",
     "vite-plugin-dts": "3.7.2",

packages/common/y-provider/package.json

@@ -24,7 +24,7 @@
     "build": "vite build"
   },
   "devDependencies": {
-    "@blocksuite/store": "0.12.0-canary-202402010557-e8d6e1d",
+    "@blocksuite/store": "0.12.0-canary-202402062232-9a8554c",
     "vite": "^5.0.6",
     "vite-plugin-dts": "3.7.2",
     "vitest": "1.2.2",

packages/frontend/component/package.json

@@ -72,12 +72,12 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@blocksuite/blocks": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/global": "0.12.0-canary-202402010557-e8d6e1d",
+    "@blocksuite/blocks": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/global": "0.12.0-canary-202402062232-9a8554c",
     "@blocksuite/icons": "2.1.44",
-    "@blocksuite/lit": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/presets": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/store": "0.12.0-canary-202402010557-e8d6e1d",
+    "@blocksuite/lit": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/presets": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/store": "0.12.0-canary-202402062232-9a8554c",
     "@storybook/addon-actions": "^7.5.3",
     "@storybook/addon-essentials": "^7.5.3",
     "@storybook/addon-interactions": "^7.5.3",

packages/frontend/core/package.json

@@ -25,14 +25,14 @@
     "@affine/i18n": "workspace:*",
     "@affine/templates": "workspace:*",
     "@affine/workspace-impl": "workspace:*",
-    "@blocksuite/block-std": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/blocks": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/global": "0.12.0-canary-202402010557-e8d6e1d",
+    "@blocksuite/block-std": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/blocks": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/global": "0.12.0-canary-202402062232-9a8554c",
     "@blocksuite/icons": "2.1.44",
-    "@blocksuite/inline": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/lit": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/presets": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/store": "0.12.0-canary-202402010557-e8d6e1d",
+    "@blocksuite/inline": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/lit": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/presets": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/store": "0.12.0-canary-202402062232-9a8554c",
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/sortable": "^8.0.0",
     "@emotion/cache": "^11.11.0",

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

@@ -111,7 +111,6 @@ const getOrCreateShellWorkspace = (workspaceId: string) => {
     const blobStorage = new AffineCloudBlobStorage(workspaceId);
     workspace = new Workspace({
       id: workspaceId,
-      providerCreators: [],
       blobStorages: [
         () => ({
           crud: blobStorage,

packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor-container.tsx

@@ -48,7 +48,7 @@ interface BlocksuiteEditorContainerProps {
 // mimic the interface of the webcomponent and expose slots & host
 type BlocksuiteEditorContainerRef = Pick<
   (typeof AffineEditorContainer)['prototype'],
-  'mode' | 'page' | 'model' | 'slots' | 'host'
+  'mode' | 'page' | 'slots' | 'host'
 > &
   HTMLDivElement;
 

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

@@ -37,35 +37,23 @@ export type EditorProps = {
   className?: string;
 };
 
-/**
- * TODO: Defined async cache to support suspense, instead of reflect symbol to provider persistent error cache.
- */
-const PAGE_LOAD_KEY = Symbol('PAGE_LOAD');
-const PAGE_ROOT_KEY = Symbol('PAGE_ROOT');
-
 function usePageRoot(page: Page) {
-  let load$ = Reflect.get(page, PAGE_LOAD_KEY);
-  if (!load$) {
-    load$ = page.load();
-    Reflect.set(page, PAGE_LOAD_KEY, load$);
+  if (!page.ready) {
+    use(page.load());
   }
-  use(load$);
 
   if (!page.root) {
-    let root$: Promise<void> | undefined = Reflect.get(page, PAGE_ROOT_KEY);
-    if (!root$) {
-      root$ = new Promise((resolve, reject) => {
+    use(
+      new Promise<void>((resolve, reject) => {
         const disposable = page.slots.rootAdded.once(() => {
           resolve();
         });
         window.setTimeout(() => {
           disposable.dispose();
           reject(new NoPageRootError(page));
         }, 20 * 1000);
-      });
-      Reflect.set(page, PAGE_ROOT_KEY, root$);
-    }
-    use(root$);
+      })
+    );
   }
 
   return page.root;

packages/frontend/core/src/components/blocksuite/block-suite-editor/specs.ts

@@ -1,10 +1,12 @@
-import type { BlockServiceOptions, BlockSpec } from '@blocksuite/block-std';
-import type { ParagraphService } from '@blocksuite/blocks';
+import type { BlockSpec } from '@blocksuite/block-std';
+import type { PageService, ParagraphService } from '@blocksuite/blocks';
 import {
   AttachmentService,
+  CanvasTextFonts,
   DocEditorBlockSpecs,
+  DocPageService,
   EdgelessEditorBlockSpecs,
-  PageService,
+  EdgelessPageService,
 } from '@blocksuite/blocks';
 import bytes from 'bytes';
 import { html, unsafeStatic } from 'lit/static-html.js';
@@ -18,23 +20,28 @@ class CustomAttachmentService extends AttachmentService {
   }
 }
 
-class CustomPageService extends PageService {
-  constructor(opt: BlockServiceOptions) {
-    super(opt);
-    const officialDomains = new Set(['affine.pro', 'affine.fail']);
-    const load = this.fontLoader.load.bind(this.fontLoader);
-    this.fontLoader.load = function (fonts) {
-      if (!officialDomains.has(window.location.host)) {
-        return load(
-          fonts.map(f => ({
-            ...f,
-            // self-hosted fonts are served from /assets
-            url: '/assets' + new URL(f.url).pathname.split('/').pop(),
-          }))
-        );
-      }
-      return load(fonts);
-    };
+function customLoadFonts(service: PageService): void {
+  const officialDomains = new Set(['affine.pro', 'affine.fail']);
+  if (!officialDomains.has(window.location.host)) {
+    const fonts = CanvasTextFonts.map(font => ({
+      ...font,
+      // self-hosted fonts are served from /assets
+      url: '/assets' + new URL(font.url).pathname.split('/').pop(),
+    }));
+    service.fontLoader.load(fonts);
+  } else {
+    service.fontLoader.load(CanvasTextFonts);
+  }
+}
+
+class CustomDocPageService extends DocPageService {
+  override loadFonts(): void {
+    customLoadFonts(this);
+  }
+}
+class CustomEdgelessPageService extends EdgelessPageService {
+  override loadFonts(): void {
+    customLoadFonts(this);
   }
 }
 
@@ -100,7 +107,7 @@ export const docModeSpecs = DocEditorBlockSpecs.map(spec => {
   if (spec.schema.model.flavour === 'affine:page') {
     return {
       ...spec,
-      service: CustomPageService,
+      service: CustomDocPageService,
     };
   }
   return spec;
@@ -112,5 +119,11 @@ export const edgelessModeSpecs = EdgelessEditorBlockSpecs.map(spec => {
       service: CustomAttachmentService,
     };
   }
+  if (spec.schema.model.flavour === 'affine:page') {
+    return {
+      ...spec,
+      service: CustomEdgelessPageService,
+    };
+  }
   return spec;
 });

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-202402010557-e8d6e1d",
-    "@blocksuite/lit": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/presets": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/store": "0.12.0-canary-202402010557-e8d6e1d",
+    "@blocksuite/blocks": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/lit": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/presets": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/store": "0.12.0-canary-202402062232-9a8554c",
     "@electron-forge/cli": "^7.2.0",
     "@electron-forge/core": "^7.2.0",
     "@electron-forge/core-utils": "^7.2.0",

tests/affine-local/e2e/quick-search.spec.ts

@@ -315,6 +315,7 @@ test('assert the recent browse pages are on the recent list', async ({
   {
     const title = getBlockSuiteEditorTitle(page);
     await title.click();
+    await page.waitForTimeout(200);
     await title.pressSequentially('affine is the best', { delay: 100 });
     await expect(title).toHaveText('affine is the best', { timeout: 500 });
   }
@@ -419,7 +420,9 @@ test('can use cmdk to search page content and scroll to it, then the block will
     page.locator('[data-affine-editor-container]').getByText('123456')
   );
   expect(isVisitable).toBe(true);
-  const selectionElement = page.locator('affine-block-selection');
+  const selectionElement = page.locator(
+    'affine-block-selection[style*="display: block;"]'
+  );
   await expect(selectionElement).toBeVisible();
 });
 

tests/storybook/package.json

@@ -22,14 +22,14 @@
     "storybook-addon-react-router-v6": "^2.0.10"
   },
   "devDependencies": {
-    "@blocksuite/block-std": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/blocks": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/global": "0.12.0-canary-202402010557-e8d6e1d",
+    "@blocksuite/block-std": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/blocks": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/global": "0.12.0-canary-202402062232-9a8554c",
     "@blocksuite/icons": "2.1.44",
-    "@blocksuite/inline": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/lit": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/presets": "0.12.0-canary-202402010557-e8d6e1d",
-    "@blocksuite/store": "0.12.0-canary-202402010557-e8d6e1d",
+    "@blocksuite/inline": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/lit": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/presets": "0.12.0-canary-202402062232-9a8554c",
+    "@blocksuite/store": "0.12.0-canary-202402062232-9a8554c",
     "@storybook/addon-actions": "^7.5.3",
     "@storybook/addon-essentials": "^7.5.3",
     "@storybook/addon-interactions": "^7.5.3",