refactor(core): move infra modules to core (#9207)

toeverything · Dec 23, 2024 · 129f94e · 129f94e
1 parent 2ea79d2
commit 129f94e
Show file tree

Hide file tree

Showing 337 changed files with 908 additions and 1,367 deletions.
diff --git a/packages/common/infra/src/index.ts b/packages/common/infra/src/index.ts
@@ -4,44 +4,7 @@ export * from './blocksuite';
 export * from './framework';
 export * from './initialization';
 export * from './livedata';
-export * from './modules/db';
-export * from './modules/doc';
-export * from './modules/feature-flag';
-export * from './modules/global-context';
-export * from './modules/lifecycle';
-export * from './modules/storage';
-export * from './modules/workspace';
 export * from './orm';
 export * from './storage';
 export * from './sync';
 export * from './utils';
-
-import type { Framework } from './framework';
-import { configureWorkspaceDBModule } from './modules/db';
-import { configureDocModule } from './modules/doc';
-import { configureFeatureFlagModule } from './modules/feature-flag';
-import { configureGlobalContextModule } from './modules/global-context';
-import { configureLifecycleModule } from './modules/lifecycle';
-import {
-  configureGlobalStorageModule,
-  configureTestingGlobalStorage,
-} from './modules/storage';
-import {
-  configureTestingWorkspaceProvider,
-  configureWorkspaceModule,
-} from './modules/workspace';
-
-export function configureInfraModules(framework: Framework) {
-  configureWorkspaceModule(framework);
-  configureDocModule(framework);
-  configureWorkspaceDBModule(framework);
-  configureGlobalStorageModule(framework);
-  configureGlobalContextModule(framework);
-  configureLifecycleModule(framework);
-  configureFeatureFlagModule(framework);
-}
-
-export function configureTestingInfraModules(framework: Framework) {
-  configureTestingGlobalStorage(framework);
-  configureTestingWorkspaceProvider(framework);
-}
diff --git a/packages/common/infra/src/modules/db/entities/table.ts b/packages/common/infra/src/modules/db/entities/table.ts
diff --git a/packages/common/infra/src/modules/storage/index.ts b/packages/common/infra/src/modules/storage/index.ts
diff --git a/packages/common/infra/src/modules/workspace/__tests__/workspace.spec.ts b/packages/common/infra/src/modules/workspace/__tests__/workspace.spec.ts
diff --git a/packages/common/infra/src/modules/workspace/testing/testing-provider.ts b/packages/common/infra/src/modules/workspace/testing/testing-provider.ts
diff --git a/packages/frontend/apps/android/src/app.tsx b/packages/frontend/apps/android/src/app.tsx
@@ -4,19 +4,15 @@ import { configureMobileModules } from '@affine/core/mobile/modules';
 import { router } from '@affine/core/mobile/router';
 import { configureCommonModules } from '@affine/core/modules';
 import { I18nProvider } from '@affine/core/modules/i18n';
+import { LifecycleService } from '@affine/core/modules/lifecycle';
 import { configureLocalStorageStateStorageImpls } from '@affine/core/modules/storage';
 import { configureIndexedDBUserspaceStorageProvider } from '@affine/core/modules/userspace';
 import { configureBrowserWorkbenchModule } from '@affine/core/modules/workbench';
 import {
   configureBrowserWorkspaceFlavours,
   configureIndexedDBWorkspaceEngineStorageProvider,
 } from '@affine/core/modules/workspace-engine';
-import {
-  Framework,
-  FrameworkRoot,
-  getCurrentStore,
-  LifecycleService,
-} from '@toeverything/infra';
+import { Framework, FrameworkRoot, getCurrentStore } from '@toeverything/infra';
 import { Suspense } from 'react';
 import { RouterProvider } from 'react-router-dom';
 

diff --git a/packages/frontend/apps/electron/renderer/app.tsx b/packages/frontend/apps/electron/renderer/app.tsx
@@ -10,12 +10,15 @@ import {
   DesktopApiService,
 } from '@affine/core/modules/desktop-api';
 import { GlobalDialogService } from '@affine/core/modules/dialogs';
+import { DocsService } from '@affine/core/modules/doc';
 import {
   configureSpellCheckSettingModule,
   EditorSettingService,
 } from '@affine/core/modules/editor-setting';
 import { configureFindInPageModule } from '@affine/core/modules/find-in-page';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import { I18nProvider } from '@affine/core/modules/i18n';
+import { LifecycleService } from '@affine/core/modules/lifecycle';
 import { configureElectronStateStorageImpls } from '@affine/core/modules/storage';
 import {
   ClientSchemeProvider,
@@ -26,22 +29,15 @@ import {
   configureDesktopWorkbenchModule,
   WorkbenchService,
 } from '@affine/core/modules/workbench';
+import { WorkspacesService } from '@affine/core/modules/workspace';
 import {
   configureBrowserWorkspaceFlavours,
   configureSqliteWorkspaceEngineStorageProvider,
 } from '@affine/core/modules/workspace-engine';
 import createEmotionCache from '@affine/core/utils/create-emotion-cache';
 import { apis, events } from '@affine/electron-api';
 import { CacheProvider } from '@emotion/react';
-import {
-  DocsService,
-  Framework,
-  FrameworkRoot,
-  getCurrentStore,
-  GlobalContextService,
-  LifecycleService,
-  WorkspacesService,
-} from '@toeverything/infra';
+import { Framework, FrameworkRoot, getCurrentStore } from '@toeverything/infra';
 import { Suspense } from 'react';
 import { RouterProvider } from 'react-router-dom';
 

diff --git a/packages/frontend/apps/electron/renderer/shell/app.tsx b/packages/frontend/apps/electron/renderer/shell/app.tsx
@@ -9,13 +9,12 @@ import {
 } from '@affine/core/modules/app-tabs-header';
 import { configureDesktopApiModule } from '@affine/core/modules/desktop-api';
 import { configureI18nModule, I18nProvider } from '@affine/core/modules/i18n';
-import { configureElectronStateStorageImpls } from '@affine/core/modules/storage';
-import { configureAppThemeModule } from '@affine/core/modules/theme';
 import {
+  configureElectronStateStorageImpls,
   configureGlobalStorageModule,
-  Framework,
-  FrameworkRoot,
-} from '@toeverything/infra';
+} from '@affine/core/modules/storage';
+import { configureAppThemeModule } from '@affine/core/modules/theme';
+import { Framework, FrameworkRoot } from '@toeverything/infra';
 
 import * as styles from './app.css';