fix: move workspace to top level (#2717)

apps/web/src/adapters/affine/fetcher.ts

@@ -1,9 +1,9 @@
 import { Unreachable } from '@affine/env/constant';
+import type { AffineLegacyCloudWorkspace } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { affineApis } from '@affine/workspace/affine/shared';
 import { rootStore } from '@affine/workspace/atom';
 import { createAffineProviders } from '@affine/workspace/providers';
-import type { AffineLegacyCloudWorkspace } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { assertExists } from '@blocksuite/store';
 

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

@@ -5,6 +5,12 @@
 import { AFFINE_STORAGE_KEY, config } from '@affine/env';
 import { initEmptyPage } from '@affine/env/blocksuite';
 import { PageNotFoundError } from '@affine/env/constant';
+import type { AffineLegacyCloudWorkspace } from '@affine/env/workspace';
+import {
+  LoadPriority,
+  ReleaseType,
+  WorkspaceFlavour,
+} from '@affine/env/workspace';
 import { currentAffineUserAtom } from '@affine/workspace/affine/atom';
 import {
   clearLoginStorage,
@@ -21,12 +27,6 @@ import {
   createIndexedDBBackgroundProvider,
 } from '@affine/workspace/providers';
 import { createAffineDownloadProvider } from '@affine/workspace/providers';
-import type { AffineLegacyCloudWorkspace } from '@affine/workspace/type';
-import {
-  LoadPriority,
-  ReleaseType,
-  WorkspaceFlavour,
-} from '@affine/workspace/type';
 import {
   cleanupWorkspace,
   createEmptyBlockSuiteWorkspace,

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

@@ -6,16 +6,16 @@ import {
 } from '@affine/env';
 import { initEmptyPage, initPageWithPreloading } from '@affine/env/blocksuite';
 import { PageNotFoundError } from '@affine/env/constant';
+import {
+  LoadPriority,
+  ReleaseType,
+  WorkspaceFlavour,
+} from '@affine/env/workspace';
 import {
   CRUD,
   saveWorkspaceToLocalStorage,
 } from '@affine/workspace/local/crud';
 import { createIndexedDBBackgroundProvider } from '@affine/workspace/providers';
-import {
-  LoadPriority,
-  ReleaseType,
-  WorkspaceFlavour,
-} from '@affine/workspace/type';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { nanoid } from '@blocksuite/store';
 

apps/web/src/adapters/type.tsx

@@ -2,12 +2,12 @@ import type {
   AppEvents,
   WorkspaceCRUD,
   WorkspaceUISchema,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
 import type {
   LoadPriority,
   ReleaseType,
   WorkspaceFlavour,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
 
 export interface WorkspaceAdapter<Flavour extends WorkspaceFlavour> {
   releaseType: ReleaseType;

apps/web/src/adapters/workspace.ts

@@ -1,10 +1,10 @@
 import { Unreachable } from '@affine/env';
-import type { AppEvents, WorkspaceUISchema } from '@affine/workspace/type';
+import type { AppEvents, WorkspaceUISchema } from '@affine/env/workspace';
 import {
   LoadPriority,
   ReleaseType,
   WorkspaceFlavour,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
 
 import { AffineAdapter } from './affine';
 import { LocalAdapter } from './local';

apps/web/src/atoms/__tests__/atom.spec.ts

@@ -4,12 +4,12 @@
 import 'fake-indexeddb/auto';
 
 import { initEmptyPage } from '@affine/env/blocksuite';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import {
   rootCurrentWorkspaceIdAtom,
   rootWorkspacesMetadataAtom,
 } from '@affine/workspace/atom';
 import { createIndexedDBDownloadProvider } from '@affine/workspace/providers';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import {
   _cleanupBlockSuiteWorkspaceCache,
   createEmptyBlockSuiteWorkspace,

apps/web/src/atoms/index.ts

@@ -1,7 +1,7 @@
 import { DebugLogger } from '@affine/debug';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import type { RootWorkspaceMetadata } from '@affine/workspace/atom';
 import { rootWorkspacesMetadataAtom } from '@affine/workspace/atom';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import type { Page } from '@blocksuite/store';
 import { atom } from 'jotai';
 import { atomWithStorage } from 'jotai/utils';

apps/web/src/atoms/public-workspace/index.ts

@@ -1,8 +1,8 @@
 import type { BlockSuiteFeatureFlags } from '@affine/env';
 import { config } from '@affine/env';
+import type { AffinePublicWorkspace } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { affineApis } from '@affine/workspace/affine/shared';
-import type { AffinePublicWorkspace } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { atom } from 'jotai';
 

apps/web/src/atoms/root.ts

@@ -1,15 +1,15 @@
 //#region async atoms that to load the real workspace data
 import { DebugLogger } from '@affine/debug';
 import { config } from '@affine/env';
+import type {
+  NecessaryProvider,
+  WorkspaceRegistry,
+} from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import {
   rootCurrentWorkspaceIdAtom,
   rootWorkspacesMetadataAtom,
 } from '@affine/workspace/atom';
-import type {
-  NecessaryProvider,
-  WorkspaceRegistry,
-} from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { assertExists } from '@blocksuite/store';
 import { atom } from 'jotai';
 

apps/web/src/components/__debug__/client/editor.tsx

@@ -1,5 +1,5 @@
 import { initEmptyPage } from '@affine/env/blocksuite';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import type { EditorContainer } from '@blocksuite/editor';
 import type { Page } from '@blocksuite/store';

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

@@ -1,6 +1,6 @@
+import type { SettingPanel, WorkspaceRegistry } from '@affine/env/workspace';
+import { settingPanel, WorkspaceFlavour } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import type { SettingPanel, WorkspaceRegistry } from '@affine/workspace/type';
-import { settingPanel, WorkspaceFlavour } from '@affine/workspace/type';
 import type { MouseEvent } from 'react';
 import type React from 'react';
 import { Suspense, useCallback, useEffect, useMemo, useRef } from 'react';

apps/web/src/components/affine/workspace-setting-detail/panel/collaboration/index.tsx

@@ -1,13 +1,13 @@
 import { Button, IconButton, Menu, MenuItem, Wrapper } from '@affine/component';
 import { config } from '@affine/env';
 import { Unreachable } from '@affine/env/constant';
-import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { PermissionType } from '@affine/workspace/affine/api';
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+} from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
+import { PermissionType } from '@affine/env/workspace/legacy-cloud';
+import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import {
   DeleteTemporarilyIcon,
   EmailIcon,

apps/web/src/components/affine/workspace-setting-detail/panel/general/delete/index.tsx

@@ -1,7 +1,7 @@
 import { Button, Input, Modal, ModalCloseButton } from '@affine/component';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { Trans } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { useBlockSuiteWorkspaceName } from '@toeverything/hooks/use-block-suite-workspace-name';
 import { useCallback, useState } from 'react';
 

apps/web/src/components/affine/workspace-setting-detail/panel/publish/index.tsx

@@ -7,12 +7,12 @@ import {
 } from '@affine/component';
 import { config } from '@affine/env';
 import { Unreachable } from '@affine/env/constant';
-import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+} from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
+import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import { Box } from '@mui/material';
 import type React from 'react';
 import { useCallback, useEffect, useState } from 'react';

apps/web/src/components/affine/workspace-setting-detail/panel/sync/index.tsx

@@ -1,7 +1,7 @@
 import { Content, FlexWrapper, styled } from '@affine/component';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { Trans } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { useBlockSuiteWorkspaceAvatarUrl } from '@toeverything/hooks/use-block-suite-workspace-avatar-url';
 import { useBlockSuiteWorkspaceName } from '@toeverything/hooks/use-block-suite-workspace-name';
 import type React from 'react';

apps/web/src/components/blocksuite/block-suite-page-list/index.tsx

@@ -5,7 +5,7 @@ import {
   PageList,
   PageListTrashView,
 } from '@affine/component/page-list';
-import type { View } from '@affine/component/page-list/filter/shared-types';
+import type { View } from '@affine/env/filter';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import { EdgelessIcon, PageIcon } from '@blocksuite/icons';
 import type { PageMeta } from '@blocksuite/store';

apps/web/src/components/blocksuite/workspace-header/header-right-items/share-menu.tsx

@@ -4,8 +4,8 @@ import { Unreachable } from '@affine/env/constant';
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
-import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/workspace/type';
+} from '@affine/env/workspace';
+import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace';
 import type { Page } from '@blocksuite/store';
 import { assertEquals } from '@blocksuite/store';
 import { useRouter } from 'next/router';

apps/web/src/components/blocksuite/workspace-header/header-right-items/sync-user.tsx

@@ -1,5 +1,7 @@
 import { displayFlex, IconButton, styled, Tooltip } from '@affine/component';
 import { config } from '@affine/env';
+import type { LocalWorkspace } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import {
   getLoginStorage,
@@ -7,8 +9,6 @@ import {
   SignMethod,
 } from '@affine/workspace/affine/login';
 import { affineAuth } from '@affine/workspace/affine/shared';
-import type { LocalWorkspace } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import {
   CloudWorkspaceIcon,
   LocalWorkspaceIcon,

apps/web/src/components/blocksuite/workspace-header/header.tsx

@@ -4,7 +4,7 @@ import {
   appSidebarOpenAtom,
 } from '@affine/component/app-sidebar';
 import { SidebarSwitch } from '@affine/component/app-sidebar/sidebar-header';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { CloseIcon, MinusIcon, RoundedRectangleIcon } from '@blocksuite/icons';
 import type { Page } from '@blocksuite/store';
 import { affinePluginsAtom } from '@toeverything/plugin-infra/manager';

apps/web/src/components/pure/workspace-list-modal/index.tsx

@@ -7,13 +7,13 @@ import {
   Tooltip,
 } from '@affine/component';
 import { WorkspaceList } from '@affine/component/workspace-list';
-import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import type { AccessTokenMessage } from '@affine/workspace/affine/login';
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+} from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
+import { useAFFiNEI18N } from '@affine/i18n/hooks';
+import type { AccessTokenMessage } from '@affine/workspace/affine/login';
 import { HelpIcon, ImportIcon, PlusIcon } from '@blocksuite/icons';
 import type { DragEndEvent } from '@dnd-kit/core';
 import { useCallback, useRef } from 'react';

apps/web/src/components/root-app-sidebar/index.tsx

@@ -10,8 +10,8 @@ import {
   SidebarScrollableContainer,
 } from '@affine/component/app-sidebar';
 import { config } from '@affine/env';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import {
   DeleteTemporarilyIcon,
   FolderIcon,

apps/web/src/components/workspace-header.tsx

@@ -6,9 +6,9 @@ import {
   ViewList,
 } from '@affine/component/page-list';
 import { config } from '@affine/env';
+import type { WorkspaceHeaderProps } from '@affine/env/workspace';
+import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import type { WorkspaceHeaderProps } from '@affine/workspace/type';
-import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/workspace/type';
 import { SettingsIcon } from '@blocksuite/icons';
 import { RESET } from 'jotai/utils';
 import type { ReactElement } from 'react';

apps/web/src/hooks/__tests__/index.spec.tsx

@@ -5,8 +5,8 @@ import 'fake-indexeddb/auto';
 
 import assert from 'node:assert';
 
+import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace';
 import { rootCurrentWorkspaceIdAtom } from '@affine/workspace/atom';
-import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/workspace/type';
 import type { PageBlockModel } from '@blocksuite/blocks';
 import { __unstableSchemas, AffineSchemas } from '@blocksuite/blocks/models';
 import type { Page } from '@blocksuite/store';

apps/web/src/hooks/__tests__/use-recent-views.spec.tsx

@@ -1,12 +1,12 @@
 /**
  * @vitest-environment happy-dom
  */
+import type { LocalWorkspace } from '@affine/env/workspace';
+import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace';
 import {
   rootCurrentWorkspaceIdAtom,
   rootWorkspacesMetadataAtom,
 } from '@affine/workspace/atom';
-import type { LocalWorkspace } from '@affine/workspace/type';
-import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/workspace/type';
 import { __unstableSchemas, AffineSchemas } from '@blocksuite/blocks/models';
 import type { Page } from '@blocksuite/store';
 import { assertExists } from '@blocksuite/store';

apps/web/src/hooks/__tests__/use-router-helper.spec.ts

@@ -1,7 +1,7 @@
 /**
  * @vitest-environment happy-dom
  */
-import { WorkspaceSubPath } from '@affine/workspace/type';
+import { WorkspaceSubPath } from '@affine/env/workspace';
 import { renderHook } from '@testing-library/react';
 import { useRouter } from 'next/router';
 import routerMock from 'next-router-mock';

apps/web/src/hooks/affine/use-affine-log-in.ts

@@ -1,4 +1,4 @@
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { useRouter } from 'next/router';
 import { useCallback } from 'react';
 

apps/web/src/hooks/affine/use-affine-log-out.ts

@@ -1,4 +1,4 @@
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { useRouter } from 'next/router';
 import { useCallback } from 'react';
 

apps/web/src/hooks/affine/use-is-workspace-owner.ts

@@ -1,5 +1,5 @@
-import { PermissionType } from '@affine/workspace/affine/api';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
+import { PermissionType } from '@affine/env/workspace/legacy-cloud';
 
 import type { AffineOfficialWorkspace } from '../../shared';
 

apps/web/src/hooks/affine/use-members.ts

@@ -1,4 +1,4 @@
-import type { Member } from '@affine/workspace/affine/api';
+import type { Member } from '@affine/env/workspace/legacy-cloud';
 import { affineApis } from '@affine/workspace/affine/shared';
 import { useCallback } from 'react';
 import useSWR from 'swr';

apps/web/src/hooks/affine/use-toggle-workspace-publish.ts

@@ -1,6 +1,6 @@
+import type { AffineLegacyCloudWorkspace } from '@affine/env/workspace';
 import { affineApis } from '@affine/workspace/affine/shared';
 import { rootStore, rootWorkspacesMetadataAtom } from '@affine/workspace/atom';
-import type { AffineLegacyCloudWorkspace } from '@affine/workspace/type';
 import { useCallback } from 'react';
 import useSWR from 'swr';
 

apps/web/src/hooks/root/use-on-transform-workspace.ts

@@ -1,3 +1,5 @@
+import type { WorkspaceRegistry } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { currentAffineUserAtom } from '@affine/workspace/affine/atom';
 import {
   getLoginStorage,
@@ -8,8 +10,6 @@ import {
 } from '@affine/workspace/affine/login';
 import { affineAuth } from '@affine/workspace/affine/shared';
 import { rootCurrentWorkspaceIdAtom } from '@affine/workspace/atom';
-import type { WorkspaceRegistry } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { useSetAtom } from 'jotai';
 import { useCallback } from 'react';
 

apps/web/src/hooks/use-router-helper.ts

@@ -1,4 +1,4 @@
-import type { WorkspaceSubPath } from '@affine/workspace/type';
+import type { WorkspaceSubPath } from '@affine/env/workspace';
 import type { NextRouter } from 'next/router';
 import { useCallback } from 'react';
 

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

@@ -1,6 +1,6 @@
+import type { WorkspaceFlavour } from '@affine/env/workspace';
+import type { WorkspaceRegistry } from '@affine/env/workspace';
 import { rootWorkspacesMetadataAtom } from '@affine/workspace/atom';
-import type { WorkspaceFlavour } from '@affine/workspace/type';
-import type { WorkspaceRegistry } from '@affine/workspace/type';
 import { useSetAtom } from 'jotai';
 import { useCallback } from 'react';
 

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

@@ -1,8 +1,8 @@
 import { DebugLogger } from '@affine/debug';
+import type { LocalWorkspace } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { rootWorkspacesMetadataAtom } from '@affine/workspace/atom';
 import { saveWorkspaceToLocalStorage } from '@affine/workspace/local/crud';
-import type { LocalWorkspace } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { nanoid } from '@blocksuite/store';
 import { useAtomValue, useSetAtom } from 'jotai';

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

@@ -1,5 +1,5 @@
 import { AppContainer, MainContainer } from '@affine/component/workspace';
-import type { AffinePublicWorkspace } from '@affine/workspace/type';
+import type { AffinePublicWorkspace } from '@affine/env/workspace';
 import { useAtom } from 'jotai';
 import Head from 'next/head';
 import { useRouter } from 'next/router';

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

@@ -12,6 +12,8 @@ import {
 import { DebugLogger } from '@affine/debug';
 import { config, DEFAULT_HELLO_WORLD_PAGE_ID } from '@affine/env';
 import { initEmptyPage, initPageWithPreloading } from '@affine/env/blocksuite';
+import type { BackgroundProvider } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { setUpLanguage, useI18N } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import { createAffineGlobalChannel } from '@affine/workspace/affine/sync';
@@ -21,8 +23,6 @@ import {
   rootStore,
   rootWorkspacesMetadataAtom,
 } from '@affine/workspace/atom';
-import type { BackgroundProvider } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { assertEquals, assertExists, nanoid } from '@blocksuite/store';
 import type { DragEndEvent } from '@dnd-kit/core';
 import {

apps/web/src/pages/_debug/broadcast.dev.tsx

@@ -1,9 +1,9 @@
 import { Button } from '@affine/component';
 import { AppContainer, MainContainer } from '@affine/component/workspace';
 import { DebugLogger } from '@affine/debug';
+import type { BroadCastChannelProvider } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { createBroadCastChannelProvider } from '@affine/workspace/providers';
-import type { BroadCastChannelProvider } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { nanoid } from '@blocksuite/store';
 import { Typography } from '@mui/material';

apps/web/src/pages/index.tsx

@@ -1,6 +1,6 @@
 import { WorkspaceFallback } from '@affine/component/workspace';
 import { DebugLogger } from '@affine/debug';
-import { WorkspaceSubPath } from '@affine/workspace/type';
+import { WorkspaceSubPath } from '@affine/env/workspace';
 import type { NextPage } from 'next';
 import { useRouter } from 'next/router';
 import { Suspense, useEffect } from 'react';

apps/web/src/pages/invite/[invite-code].tsx

@@ -1,7 +1,7 @@
 import { displayFlex, styled } from '@affine/component';
 import { Button } from '@affine/component';
-import type { Permission } from '@affine/workspace/affine/api';
-import { WorkspaceSubPath } from '@affine/workspace/type';
+import { WorkspaceSubPath } from '@affine/env/workspace';
+import type { Permission } from '@affine/env/workspace/legacy-cloud';
 import {
   SucessfulDuotoneIcon,
   UnsucessfulDuotoneIcon,

apps/web/src/pages/workspace/[workspaceId]/all.tsx

@@ -1,7 +1,7 @@
 import { useAllPageSetting } from '@affine/component/page-list';
 import { QueryParamError } from '@affine/env/constant';
+import { WorkspaceSubPath } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { WorkspaceSubPath } from '@affine/workspace/type';
 import { assertExists } from '@blocksuite/store';
 import Head from 'next/head';
 import { useRouter } from 'next/router';

apps/web/src/pages/workspace/[workspaceId]/setting.tsx

@@ -1,10 +1,10 @@
-import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import type { SettingPanel } from '@affine/workspace/type';
+import type { SettingPanel } from '@affine/env/workspace';
 import {
   settingPanel,
   settingPanelValues,
   WorkspaceSubPath,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
+import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import { assertExists } from '@blocksuite/store';
 import { useAtom } from 'jotai';
 import { atomWithStorage } from 'jotai/utils';

apps/web/src/pages/workspace/[workspaceId]/shared.tsx

@@ -1,5 +1,5 @@
+import { WorkspaceSubPath } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { WorkspaceSubPath } from '@affine/workspace/type';
 import { assertExists } from '@blocksuite/store';
 import Head from 'next/head';
 import { useRouter } from 'next/router';

apps/web/src/pages/workspace/[workspaceId]/trash.tsx

@@ -1,5 +1,5 @@
+import { WorkspaceSubPath } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { WorkspaceSubPath } from '@affine/workspace/type';
 import { assertExists } from '@blocksuite/store';
 import Head from 'next/head';
 import { useRouter } from 'next/router';

apps/web/src/providers/modal-provider.tsx

@@ -1,9 +1,9 @@
 import { env } from '@affine/env';
+import { WorkspaceSubPath } from '@affine/env/workspace';
 import {
   rootCurrentWorkspaceIdAtom,
   rootWorkspacesMetadataAtom,
 } from '@affine/workspace/atom';
-import { WorkspaceSubPath } from '@affine/workspace/type';
 import { arrayMove } from '@dnd-kit/sortable';
 import { useAtom, useSetAtom } from 'jotai';
 import { useRouter } from 'next/router';

apps/web/src/shared/index.ts

@@ -1,9 +1,9 @@
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
-import type { AffinePublicWorkspace } from '@affine/workspace/type';
-import type { WorkspaceRegistry } from '@affine/workspace/type';
+} from '@affine/env/workspace';
+import type { AffinePublicWorkspace } from '@affine/env/workspace';
+import type { WorkspaceRegistry } from '@affine/env/workspace';
 import { Workspace as BlockSuiteWorkspace } from '@blocksuite/store';
 import type { NextPage } from 'next';
 import type { ReactElement, ReactNode } from 'react';