fix: move workspace to top level (#2717)

(cherry picked from commit 4958d096b0)
This commit is contained in:
Himself65
2023-06-07 23:20:35 +08:00
committed by Alex Yang
parent 28e05dc92c
commit d273ee955b
88 changed files with 353 additions and 329 deletions
+1 -1
View File
@@ -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';
@@ -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';
@@ -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';
@@ -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';
@@ -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';
@@ -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';
+1 -1
View File
@@ -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';
@@ -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';
@@ -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';
+1 -1
View File
@@ -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';
@@ -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';
+2 -2
View File
@@ -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';