fix(plugin-infra): react as peer dependency (#3260)

apps/web/src/adapters/local/index.tsx

@@ -19,7 +19,7 @@ import {
 import { createIndexedDBDownloadProvider } from '@affine/workspace/providers';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { nanoid } from '@blocksuite/store';
-import { useStaticBlockSuiteWorkspace } from '@toeverything/plugin-infra/__internal__/workspace';
+import { useStaticBlockSuiteWorkspace } from '@toeverything/plugin-infra/__internal__/react';
 
 import {
   BlockSuitePageList,

apps/web/src/components/affine/setting-modal/setting-sidebar/index.tsx

@@ -7,7 +7,7 @@ import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import type { RootWorkspaceMetadata } from '@affine/workspace/atom';
 import { rootWorkspacesMetadataAtom } from '@affine/workspace/atom';
 import { useBlockSuiteWorkspaceName } from '@toeverything/hooks/use-block-suite-workspace-name';
-import { useStaticBlockSuiteWorkspace } from '@toeverything/plugin-infra/__internal__/workspace';
+import { useStaticBlockSuiteWorkspace } from '@toeverything/plugin-infra/__internal__/react';
 import clsx from 'clsx';
 import { useAtomValue } from 'jotai';
 import type { FC } from 'react';

apps/web/src/components/affine/setting-modal/workspace-setting/index.tsx

@@ -1,5 +1,5 @@
 import { WorkspaceDetailSkeleton } from '@affine/component/setting-components';
-import { usePassiveWorkspaceEffect } from '@toeverything/plugin-infra/__internal__/workspace';
+import { usePassiveWorkspaceEffect } from '@toeverything/plugin-infra/__internal__/react';
 import { useSetAtom } from 'jotai';
 import { useRouter } from 'next/router';
 import { Suspense, useCallback } from 'react';

apps/web/src/hooks/use-workspace.ts

@@ -1,7 +1,7 @@
 import { rootWorkspacesMetadataAtom } from '@affine/workspace/atom';
 import { assertExists } from '@blocksuite/global/utils';
 import type { Workspace } from '@blocksuite/store';
-import { useStaticBlockSuiteWorkspace } from '@toeverything/plugin-infra/__internal__/workspace';
+import { useStaticBlockSuiteWorkspace } from '@toeverything/plugin-infra/__internal__/react';
 import type { Atom } from 'jotai';
 import { atom, useAtomValue } from 'jotai';
 

apps/web/src/layouts/workspace-layout.tsx

@@ -32,7 +32,7 @@ import {
   useSensors,
 } from '@dnd-kit/core';
 import { useBlockSuiteWorkspaceHelper } from '@toeverything/hooks/use-block-suite-workspace-helper';
-import { usePassiveWorkspaceEffect } from '@toeverything/plugin-infra/__internal__/workspace';
+import { usePassiveWorkspaceEffect } from '@toeverything/plugin-infra/__internal__/react';
 import {
   currentPageIdAtom,
   currentWorkspaceIdAtom,

packages/component/src/components/card/workspace-card/index.tsx

@@ -9,7 +9,7 @@ import {
   LocalWorkspaceIcon as DefaultLocalWorkspaceIcon,
 } from '@blocksuite/icons';
 import { useBlockSuiteWorkspaceName } from '@toeverything/hooks/use-block-suite-workspace-name';
-import { useStaticBlockSuiteWorkspace } from '@toeverything/plugin-infra/__internal__/workspace';
+import { useStaticBlockSuiteWorkspace } from '@toeverything/plugin-infra/__internal__/react';
 import type { FC } from 'react';
 import { useCallback } from 'react';
 

packages/plugin-infra/package.json

@@ -23,6 +23,11 @@
       "type": "./dist/__internal__/workspace.d.ts",
       "import": "./dist/__internal__/workspace.js",
       "require": "./dist/__internal__/workspace.cjs"
+    },
+    "./__internal__/react": {
+      "type": "./dist/__internal__/react.d.ts",
+      "import": "./dist/__internal__/react.js",
+      "require": "./dist/__internal__/react.cjs"
     }
   },
   "dependencies": {

packages/plugin-infra/src/__internal__/react.ts

@@ -0,0 +1,35 @@
+import type { Workspace } from '@blocksuite/store';
+import { type PassiveDocProvider } from '@blocksuite/store';
+import { useAtomValue } from 'jotai/react';
+import { useEffect } from 'react';
+
+import {
+  getActiveBlockSuiteWorkspaceAtom,
+  workspacePassiveEffectWeakMap,
+} from './workspace';
+
+export function useStaticBlockSuiteWorkspace(id: string): Workspace {
+  return useAtomValue(getActiveBlockSuiteWorkspaceAtom(id));
+}
+
+export function usePassiveWorkspaceEffect(workspace: Workspace) {
+  useEffect(() => {
+    if (workspacePassiveEffectWeakMap.get(workspace) === true) {
+      return;
+    }
+    const providers = workspace.providers.filter(
+      (provider): provider is PassiveDocProvider =>
+        'passive' in provider && provider.passive === true
+    );
+    providers.forEach(provider => {
+      provider.connect();
+    });
+    workspacePassiveEffectWeakMap.set(workspace, true);
+    return () => {
+      providers.forEach(provider => {
+        provider.disconnect();
+      });
+      workspacePassiveEffectWeakMap.delete(workspace);
+    };
+  }, [workspace]);
+}

packages/plugin-infra/src/__internal__/workspace.ts

@@ -1,9 +1,6 @@
 import type { ActiveDocProvider, Workspace } from '@blocksuite/store';
-import type { PassiveDocProvider } from '@blocksuite/store';
-import { useAtomValue } from 'jotai/react';
 import type { Atom } from 'jotai/vanilla';
 import { atom } from 'jotai/vanilla';
-import { useEffect } from 'react';
 
 /**
  * DO NOT ACCESS THIS MAP IN PRODUCTION, OR YOU WILL BE FIRED
@@ -60,29 +57,3 @@ export function getActiveBlockSuiteWorkspaceAtom(
   }
   return workspacePassiveAtomWeakMap.get(workspace) as Atom<Promise<Workspace>>;
 }
-
-export function useStaticBlockSuiteWorkspace(id: string): Workspace {
-  return useAtomValue(getActiveBlockSuiteWorkspaceAtom(id));
-}
-
-export function usePassiveWorkspaceEffect(workspace: Workspace) {
-  useEffect(() => {
-    if (workspacePassiveEffectWeakMap.get(workspace) === true) {
-      return;
-    }
-    const providers = workspace.providers.filter(
-      (provider): provider is PassiveDocProvider =>
-        'passive' in provider && provider.passive === true
-    );
-    providers.forEach(provider => {
-      provider.connect();
-    });
-    workspacePassiveEffectWeakMap.set(workspace, true);
-    return () => {
-      providers.forEach(provider => {
-        provider.disconnect();
-      });
-      workspacePassiveEffectWeakMap.delete(workspace);
-    };
-  }, [workspace]);
-}

packages/plugin-infra/src/__tests__/use-block-suite-workspace.spec.ts

@@ -7,10 +7,12 @@ import { getDefaultStore } from 'jotai/vanilla';
 import { expect, test, vi } from 'vitest';
 
 import {
-  getActiveBlockSuiteWorkspaceAtom,
-  INTERNAL_BLOCKSUITE_HASH_MAP,
   usePassiveWorkspaceEffect,
   useStaticBlockSuiteWorkspace,
+} from '../__internal__/react';
+import {
+  getActiveBlockSuiteWorkspaceAtom,
+  INTERNAL_BLOCKSUITE_HASH_MAP,
 } from '../__internal__/workspace';
 
 test('useStaticBlockSuiteWorkspace', async () => {

packages/plugin-infra/vite.config.ts

@@ -17,6 +17,7 @@ export default defineConfig({
           root,
           'src/__internal__/workspace.ts'
         ),
+        '__internal__/react': resolve(root, 'src/__internal__/react.ts'),
       },
     },
     rollupOptions: {