From c31a0d28cff9b0a8ed4f75cf786acf81309cdd34 Mon Sep 17 00:00:00 2001
From: fourdim <59462000+fourdim@users.noreply.github.com>
Date: Wed, 15 Jan 2025 05:38:05 +0000
Subject: [PATCH] fix(core): dependency cycle (#9704)

---
 .../blocksuite/block-suite-editor/starter-bar.tsx           | 6 ++----
 .../components/root-app-sidebar/template-doc-entrance.tsx   | 2 +-
 .../new-workspace-setting-detail/template.tsx               | 6 ++----
 .../src/modules/app-sidebar/views/add-page-button/index.tsx | 6 ++----
 packages/frontend/core/src/modules/db/services/db.ts        | 3 ++-
 packages/frontend/core/src/modules/template-doc/index.ts    | 1 -
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/starter-bar.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-editor/starter-bar.tsx
index 5be045b1d3..a8f5e931a7 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/starter-bar.tsx
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/starter-bar.tsx
@@ -1,9 +1,7 @@
 import { DocsService } from '@affine/core/modules/doc';
 import { FeatureFlagService } from '@affine/core/modules/feature-flag';
-import {
-  TemplateDocService,
-  TemplateListMenu,
-} from '@affine/core/modules/template-doc';
+import { TemplateDocService } from '@affine/core/modules/template-doc';
+import { TemplateListMenu } from '@affine/core/modules/template-doc/view/template-list-menu';
 import { useI18n } from '@affine/i18n';
 import type { Store } from '@blocksuite/affine/store';
 import {
diff --git a/packages/frontend/core/src/components/root-app-sidebar/template-doc-entrance.tsx b/packages/frontend/core/src/components/root-app-sidebar/template-doc-entrance.tsx
index c2204a853e..fe4f68dbc9 100644
--- a/packages/frontend/core/src/components/root-app-sidebar/template-doc-entrance.tsx
+++ b/packages/frontend/core/src/components/root-app-sidebar/template-doc-entrance.tsx
@@ -2,7 +2,7 @@ import { Menu, MenuItem, MenuSeparator } from '@affine/component';
 import { MenuItem as SidebarMenuItem } from '@affine/core/modules/app-sidebar/views';
 import { DocsService } from '@affine/core/modules/doc';
 import { FeatureFlagService } from '@affine/core/modules/feature-flag';
-import { TemplateListMenuContentScrollable } from '@affine/core/modules/template-doc';
+import { TemplateListMenuContentScrollable } from '@affine/core/modules/template-doc/view/template-list-menu';
 import { WorkbenchService } from '@affine/core/modules/workbench';
 import { inferOpenMode } from '@affine/core/utils';
 import { useI18n } from '@affine/i18n';
diff --git a/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/new-workspace-setting-detail/template.tsx b/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/new-workspace-setting-detail/template.tsx
index a721154583..36883f6fd2 100644
--- a/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/new-workspace-setting-detail/template.tsx
+++ b/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/new-workspace-setting-detail/template.tsx
@@ -11,10 +11,8 @@ import {
 import { DocsService } from '@affine/core/modules/doc';
 import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta';
 import { FeatureFlagService } from '@affine/core/modules/feature-flag';
-import {
-  TemplateDocService,
-  TemplateListMenu,
-} from '@affine/core/modules/template-doc';
+import { TemplateDocService } from '@affine/core/modules/template-doc';
+import { TemplateListMenu } from '@affine/core/modules/template-doc/view/template-list-menu';
 import { useI18n } from '@affine/i18n';
 import { DeleteIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService, useServices } from '@toeverything/infra';
diff --git a/packages/frontend/core/src/modules/app-sidebar/views/add-page-button/index.tsx b/packages/frontend/core/src/modules/app-sidebar/views/add-page-button/index.tsx
index 0edb82a875..5701a1df3e 100644
--- a/packages/frontend/core/src/modules/app-sidebar/views/add-page-button/index.tsx
+++ b/packages/frontend/core/src/modules/app-sidebar/views/add-page-button/index.tsx
@@ -4,10 +4,8 @@ import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hoo
 import { DocsService } from '@affine/core/modules/doc';
 import { EditorSettingService } from '@affine/core/modules/editor-setting';
 import { FeatureFlagService } from '@affine/core/modules/feature-flag';
-import {
-  TemplateDocService,
-  TemplateListMenuContentScrollable,
-} from '@affine/core/modules/template-doc';
+import { TemplateDocService } from '@affine/core/modules/template-doc';
+import { TemplateListMenuContentScrollable } from '@affine/core/modules/template-doc/view/template-list-menu';
 import { WorkbenchService } from '@affine/core/modules/workbench';
 import { WorkspaceService } from '@affine/core/modules/workspace';
 import { inferOpenMode } from '@affine/core/utils';
diff --git a/packages/frontend/core/src/modules/db/services/db.ts b/packages/frontend/core/src/modules/db/services/db.ts
index ed9d8dd8d4..ccad594d47 100644
--- a/packages/frontend/core/src/modules/db/services/db.ts
+++ b/packages/frontend/core/src/modules/db/services/db.ts
@@ -7,7 +7,8 @@ import {
 } from '@toeverything/infra';
 import { Doc as YDoc } from 'yjs';
 
-import { AuthService, type WorkspaceServerService } from '../../cloud';
+import type { WorkspaceServerService } from '../../cloud';
+import { AuthService } from '../../cloud/services/auth';
 import type { WorkspaceService } from '../../workspace';
 import { WorkspaceDB, type WorkspaceDBWithTables } from '../entities/db';
 import {
diff --git a/packages/frontend/core/src/modules/template-doc/index.ts b/packages/frontend/core/src/modules/template-doc/index.ts
index 4d4a42192c..d83fcb1762 100644
--- a/packages/frontend/core/src/modules/template-doc/index.ts
+++ b/packages/frontend/core/src/modules/template-doc/index.ts
@@ -10,7 +10,6 @@ import { TemplateDocListStore } from './store/list';
 import { TemplateDocSettingStore } from './store/setting';
 
 export { TemplateDocService };
-export * from './view/template-list-menu';
 
 export const configureTemplateDocModule = (framework: Framework) => {
   framework