From 0d79f183c579e6ed41df92ad10f3224e993fd824 Mon Sep 17 00:00:00 2001 From: DarkSky Date: Thu, 29 Dec 2022 14:55:41 +0800 Subject: [PATCH] chore: rename data services --- .vscode/settings.json | 2 +- package.json | 4 ++-- packages/app/package.json | 2 +- .../src/components/invite-members/index.tsx | 2 +- .../login-modal/LoginOptionButton.tsx | 2 +- .../general/delete/delete.tsx | 2 +- .../workspace-setting/general/general.tsx | 2 +- .../workspace-setting/general/leave/leave.tsx | 2 +- .../workspace-setting/workspace-setting.tsx | 2 +- .../SelectorPopperContent.tsx | 2 +- .../workspace-create/workspace-create.tsx | 2 +- .../WorkspaceItem/WorkspaceItem.tsx | 2 +- .../WorkspaceSelector/WorkspaceSelector.tsx | 2 +- .../app/src/pages/invite/[invite_code].tsx | 2 +- .../providers/app-state-provider/context.ts | 4 ++-- .../app-state-provider/hooks/use-sync-data.ts | 6 +----- .../providers/app-state-provider/provider.tsx | 2 +- .../{data-services => data-center}/.gitignore | 0 .../package.json | 2 +- .../playwright.config.ts | 0 .../src/auth.ts | 0 .../data-center/src/datacenter/datacenter.ts | 9 +++++++++ packages/data-center/src/datacenter/index.ts | 15 +++++++++++++++ .../src/index.ts | 2 +- .../src/request/events.ts | 0 .../src/request/index.ts | 0 .../src/request/token.ts | 0 .../src/sdks/index.ts | 0 .../src/sdks/types/common.ts | 0 .../src/sdks/types/index.ts | 0 .../src/sdks/user.hook.ts | 0 .../src/sdks/user.ts | 0 .../src/sdks/workspace.hook.ts | 0 .../src/sdks/workspace.ts | 0 .../src/websocket/index.ts | 0 .../src/websocket/y-websocket.js | 0 .../tests/datacenter.spec.ts | 0 .../tests/utils.ts | 2 +- .../tsconfig.json | 0 packages/data-services/src/data-center.ts | 19 ------------------- pnpm-lock.yaml | 6 +++--- 41 files changed, 49 insertions(+), 48 deletions(-) rename packages/{data-services => data-center}/.gitignore (100%) rename packages/{data-services => data-center}/package.json (95%) rename packages/{data-services => data-center}/playwright.config.ts (100%) rename packages/{data-services => data-center}/src/auth.ts (100%) create mode 100644 packages/data-center/src/datacenter/datacenter.ts create mode 100644 packages/data-center/src/datacenter/index.ts rename packages/{data-services => data-center}/src/index.ts (75%) rename packages/{data-services => data-center}/src/request/events.ts (100%) rename packages/{data-services => data-center}/src/request/index.ts (100%) rename packages/{data-services => data-center}/src/request/token.ts (100%) rename packages/{data-services => data-center}/src/sdks/index.ts (100%) rename packages/{data-services => data-center}/src/sdks/types/common.ts (100%) rename packages/{data-services => data-center}/src/sdks/types/index.ts (100%) rename packages/{data-services => data-center}/src/sdks/user.hook.ts (100%) rename packages/{data-services => data-center}/src/sdks/user.ts (100%) rename packages/{data-services => data-center}/src/sdks/workspace.hook.ts (100%) rename packages/{data-services => data-center}/src/sdks/workspace.ts (100%) rename packages/{data-services => data-center}/src/websocket/index.ts (100%) rename packages/{data-services => data-center}/src/websocket/y-websocket.js (100%) rename packages/{data-services => data-center}/tests/datacenter.spec.ts (100%) rename packages/{data-services => data-center}/tests/utils.ts (52%) rename packages/{data-services => data-center}/tsconfig.json (100%) delete mode 100644 packages/data-services/src/data-center.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index 3b157a8bda..a366193c02 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,5 +3,5 @@ "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true, "editor.formatOnSaveMode": "file", - "cSpell.words": ["blocksuite", "livedemo", "pnpm", "testid"] + "cSpell.words": ["blocksuite", "datacenter", "livedemo", "pnpm", "testid"] } diff --git a/package.json b/package.json index 2bb9544346..07d7344df1 100644 --- a/package.json +++ b/package.json @@ -7,12 +7,12 @@ "scripts": { "dev": "pnpm --filter=!@affine/app build && pnpm --filter @affine/app dev", "dev:ac": "pnpm --filter=!@affine/app build && pnpm --filter @affine/app dev:ac", - "build": " pnpm --filter=!@affine/app build && pnpm --filter!=@affine/data-services -r build", + "build": " pnpm --filter=!@affine/app build && pnpm --filter!=@affine/datacenter -r build", "export": "pnpm --filter @affine/app export", "start": "pnpm --filter @affine/app start", "lint": "pnpm --filter @affine/app lint", "test": "playwright test", - "test:dc": "pnpm --filter @affine/data-services test", + "test:dc": "pnpm --filter @affine/datacenter test", "test:e2e:codegen": "npx playwright codegen http://localhost:8080", "test:unit": "jest", "postinstall": "husky install", diff --git a/packages/app/package.json b/packages/app/package.json index fe87845bd1..00b96a7fd1 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -10,7 +10,7 @@ "lint": "next lint" }, "dependencies": { - "@affine/data-services": "workspace:*", + "@affine/datacenter": "workspace:*", "@blocksuite/blocks": "0.3.1", "@blocksuite/editor": "0.3.1", "@blocksuite/icons": "^2.0.2", diff --git a/packages/app/src/components/invite-members/index.tsx b/packages/app/src/components/invite-members/index.tsx index 1cf5951237..d4c9af03f4 100644 --- a/packages/app/src/components/invite-members/index.tsx +++ b/packages/app/src/components/invite-members/index.tsx @@ -4,7 +4,7 @@ import { Modal, ModalWrapper, ModalCloseButton } from '@/ui/modal'; import { Button } from '@/ui/button'; import Input from '@/ui/input'; import { useState } from 'react'; -import { inviteMember, getUserByEmail } from '@affine/data-services'; +import { inviteMember, getUserByEmail } from '@affine/datacenter'; import { Avatar } from '@mui/material'; interface LoginModalProps { open: boolean; diff --git a/packages/app/src/components/login-modal/LoginOptionButton.tsx b/packages/app/src/components/login-modal/LoginOptionButton.tsx index 298fbd86ba..94728c6e0a 100644 --- a/packages/app/src/components/login-modal/LoginOptionButton.tsx +++ b/packages/app/src/components/login-modal/LoginOptionButton.tsx @@ -1,4 +1,4 @@ -import { signInWithGoogle } from '@affine/data-services'; +import { signInWithGoogle } from '@affine/datacenter'; import { styled } from '@/styles'; import { Button } from '@/ui/button'; import { useModal } from '@/providers/global-modal-provider'; diff --git a/packages/app/src/components/workspace-setting/general/delete/delete.tsx b/packages/app/src/components/workspace-setting/general/delete/delete.tsx index 2d0663d734..596435014f 100644 --- a/packages/app/src/components/workspace-setting/general/delete/delete.tsx +++ b/packages/app/src/components/workspace-setting/general/delete/delete.tsx @@ -11,7 +11,7 @@ import { import { useState } from 'react'; import { ModalCloseButton } from '@/ui/modal'; import { Button } from '@/ui/button'; -import { deleteWorkspace } from '@affine/data-services'; +import { deleteWorkspace } from '@affine/datacenter'; import { useRouter } from 'next/router'; import { useAppState } from '@/providers/app-state-provider'; diff --git a/packages/app/src/components/workspace-setting/general/general.tsx b/packages/app/src/components/workspace-setting/general/general.tsx index 74f355fd12..acff4876f8 100644 --- a/packages/app/src/components/workspace-setting/general/general.tsx +++ b/packages/app/src/components/workspace-setting/general/general.tsx @@ -9,7 +9,7 @@ import { StyledSettingH2 } from '../style'; import { useState } from 'react'; import { Button } from '@/ui/button'; import Input from '@/ui/input'; -import { uploadBlob, Workspace, WorkspaceType } from '@affine/data-services'; +import { uploadBlob, Workspace, WorkspaceType } from '@affine/datacenter'; import { useAppState } from '@/providers/app-state-provider'; import { WorkspaceDetails } from '@/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent'; import { WorkspaceDelete } from './delete'; diff --git a/packages/app/src/components/workspace-setting/general/leave/leave.tsx b/packages/app/src/components/workspace-setting/general/leave/leave.tsx index 41fae82d07..4caef41fbe 100644 --- a/packages/app/src/components/workspace-setting/general/leave/leave.tsx +++ b/packages/app/src/components/workspace-setting/general/leave/leave.tsx @@ -7,7 +7,7 @@ import { } from './style'; import { ModalCloseButton } from '@/ui/modal'; import { Button } from '@/ui/button'; -import { leaveWorkspace } from '@affine/data-services'; +import { leaveWorkspace } from '@affine/datacenter'; import { useRouter } from 'next/router'; import { useAppState } from '@/providers/app-state-provider'; diff --git a/packages/app/src/components/workspace-setting/workspace-setting.tsx b/packages/app/src/components/workspace-setting/workspace-setting.tsx index ee67205ed9..4f3ea36ba7 100644 --- a/packages/app/src/components/workspace-setting/workspace-setting.tsx +++ b/packages/app/src/components/workspace-setting/workspace-setting.tsx @@ -42,7 +42,7 @@ import { Member, removeMember, updateWorkspace, -} from '@affine/data-services'; +} from '@affine/datacenter'; import { Avatar } from '@mui/material'; import { Menu, MenuItem } from '@/ui/menu'; import { toast } from '@/ui/toast'; diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx index 161f6dc19b..1748e3e5be 100644 --- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx +++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx @@ -12,7 +12,7 @@ import { } from './WorkspaceItem'; import { WorkspaceSetting } from '@/components/workspace-setting'; import { useCallback, useEffect, useState } from 'react'; -import { getWorkspaceDetail, WorkspaceType } from '@affine/data-services'; +import { getWorkspaceDetail, WorkspaceType } from '@affine/datacenter'; import { useModal } from '@/providers/global-modal-provider'; export type WorkspaceDetails = Record< diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/CreateWorkspaceItem/workspace-create/workspace-create.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/CreateWorkspaceItem/workspace-create/workspace-create.tsx index d2cf9f58ef..a5a2545271 100644 --- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/CreateWorkspaceItem/workspace-create/workspace-create.tsx +++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/CreateWorkspaceItem/workspace-create/workspace-create.tsx @@ -1,4 +1,4 @@ -import { createWorkspace, uploadBlob } from '@affine/data-services'; +import { createWorkspace, uploadBlob } from '@affine/datacenter'; import Modal from '@/ui/modal'; import Input from '@/ui/input'; import { diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/WorkspaceItem/WorkspaceItem.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/WorkspaceItem/WorkspaceItem.tsx index 12f0ba59ca..31c2a22250 100644 --- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/WorkspaceItem/WorkspaceItem.tsx +++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/WorkspaceItem/WorkspaceItem.tsx @@ -7,7 +7,7 @@ import { } from '../styles'; import { FooterSetting } from './FooterSetting'; import { FooterUsers } from './FooterUsers'; -import { WorkspaceType } from '@affine/data-services'; +import { WorkspaceType } from '@affine/datacenter'; import { useAppState } from '@/providers/app-state-provider'; interface WorkspaceItemProps { diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx index 0e574cebbd..4e0299888f 100644 --- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx +++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx @@ -3,7 +3,7 @@ import { Avatar, WorkspaceName, SelectorWrapper } from './styles'; import { SelectorPopperContent } from './SelectorPopperContent'; import { useState } from 'react'; import { useAppState } from '@/providers/app-state-provider'; -import { WorkspaceType } from '@affine/data-services'; +import { WorkspaceType } from '@affine/datacenter'; import { AffineIcon } from '../icons/icons'; export const WorkspaceSelector = () => { diff --git a/packages/app/src/pages/invite/[invite_code].tsx b/packages/app/src/pages/invite/[invite_code].tsx index b0f8fece67..69ada5c7e7 100644 --- a/packages/app/src/pages/invite/[invite_code].tsx +++ b/packages/app/src/pages/invite/[invite_code].tsx @@ -1,7 +1,7 @@ import { styled } from '@/styles'; import { Empty } from '@/ui/empty'; import { Avatar } from '@mui/material'; -import { acceptInviting } from '@affine/data-services'; +import { acceptInviting } from '@affine/datacenter'; import { useRouter } from 'next/router'; import { useEffect, useState } from 'react'; diff --git a/packages/app/src/providers/app-state-provider/context.ts b/packages/app/src/providers/app-state-provider/context.ts index 5dda7ddbd6..01a0f78b17 100644 --- a/packages/app/src/providers/app-state-provider/context.ts +++ b/packages/app/src/providers/app-state-provider/context.ts @@ -1,6 +1,6 @@ import { createContext, MutableRefObject, useContext } from 'react'; -import type { Workspace } from '@affine/data-services'; -import { AccessTokenMessage } from '@affine/data-services'; +import type { Workspace } from '@affine/datacenter'; +import { AccessTokenMessage } from '@affine/datacenter'; import type { Page as StorePage, Workspace as StoreWorkspace, diff --git a/packages/app/src/providers/app-state-provider/hooks/use-sync-data.ts b/packages/app/src/providers/app-state-provider/hooks/use-sync-data.ts index ae1d37fe7e..a65c6b96a7 100644 --- a/packages/app/src/providers/app-state-provider/hooks/use-sync-data.ts +++ b/packages/app/src/providers/app-state-provider/hooks/use-sync-data.ts @@ -1,9 +1,5 @@ import { useEffect } from 'react'; -import { - AccessTokenMessage, - getWorkspaces, - token, -} from '@affine/data-services'; +import { AccessTokenMessage, getWorkspaces, token } from '@affine/datacenter'; import { LoadWorkspaceHandler } from '../context'; export const useSyncData = ({ diff --git a/packages/app/src/providers/app-state-provider/provider.tsx b/packages/app/src/providers/app-state-provider/provider.tsx index 44971a002a..c9258480dc 100644 --- a/packages/app/src/providers/app-state-provider/provider.tsx +++ b/packages/app/src/providers/app-state-provider/provider.tsx @@ -1,7 +1,7 @@ import { useMemo, useState, useEffect, useCallback, useRef } from 'react'; import type { ReactNode } from 'react'; import dynamic from 'next/dynamic'; -import { getWorkspaces } from '@affine/data-services'; +import { getWorkspaces } from '@affine/datacenter'; import { AppState, AppStateContext } from './context'; import type { AppStateValue, diff --git a/packages/data-services/.gitignore b/packages/data-center/.gitignore similarity index 100% rename from packages/data-services/.gitignore rename to packages/data-center/.gitignore diff --git a/packages/data-services/package.json b/packages/data-center/package.json similarity index 95% rename from packages/data-services/package.json rename to packages/data-center/package.json index 65bdc17129..9d38ffde50 100644 --- a/packages/data-services/package.json +++ b/packages/data-center/package.json @@ -1,5 +1,5 @@ { - "name": "@affine/data-services", + "name": "@affine/datacenter", "version": "0.3.0", "description": "", "type": "module", diff --git a/packages/data-services/playwright.config.ts b/packages/data-center/playwright.config.ts similarity index 100% rename from packages/data-services/playwright.config.ts rename to packages/data-center/playwright.config.ts diff --git a/packages/data-services/src/auth.ts b/packages/data-center/src/auth.ts similarity index 100% rename from packages/data-services/src/auth.ts rename to packages/data-center/src/auth.ts diff --git a/packages/data-center/src/datacenter/datacenter.ts b/packages/data-center/src/datacenter/datacenter.ts new file mode 100644 index 0000000000..190278561f --- /dev/null +++ b/packages/data-center/src/datacenter/datacenter.ts @@ -0,0 +1,9 @@ +export class DataCenter { + static async init() { + return new DataCenter(); + } + + private constructor() { + // TODO + } +} diff --git a/packages/data-center/src/datacenter/index.ts b/packages/data-center/src/datacenter/index.ts new file mode 100644 index 0000000000..b6feba0795 --- /dev/null +++ b/packages/data-center/src/datacenter/index.ts @@ -0,0 +1,15 @@ +import { DataCenter } from './datacenter.js'; + +const _initializeDataCenter = () => { + let _dataCenterInstance: Promise; + + return () => { + if (!_dataCenterInstance) { + _dataCenterInstance = DataCenter.init(); + } + + return _dataCenterInstance; + }; +}; + +export const getDataCenter = _initializeDataCenter(); diff --git a/packages/data-services/src/index.ts b/packages/data-center/src/index.ts similarity index 75% rename from packages/data-services/src/index.ts rename to packages/data-center/src/index.ts index 89de33b6b8..8fafbdf11b 100644 --- a/packages/data-services/src/index.ts +++ b/packages/data-center/src/index.ts @@ -3,4 +3,4 @@ export * from './request'; export * from './sdks'; export * from './websocket'; -export { getDataCenter } from './data-center'; +export { getDataCenter } from './datacenter'; diff --git a/packages/data-services/src/request/events.ts b/packages/data-center/src/request/events.ts similarity index 100% rename from packages/data-services/src/request/events.ts rename to packages/data-center/src/request/events.ts diff --git a/packages/data-services/src/request/index.ts b/packages/data-center/src/request/index.ts similarity index 100% rename from packages/data-services/src/request/index.ts rename to packages/data-center/src/request/index.ts diff --git a/packages/data-services/src/request/token.ts b/packages/data-center/src/request/token.ts similarity index 100% rename from packages/data-services/src/request/token.ts rename to packages/data-center/src/request/token.ts diff --git a/packages/data-services/src/sdks/index.ts b/packages/data-center/src/sdks/index.ts similarity index 100% rename from packages/data-services/src/sdks/index.ts rename to packages/data-center/src/sdks/index.ts diff --git a/packages/data-services/src/sdks/types/common.ts b/packages/data-center/src/sdks/types/common.ts similarity index 100% rename from packages/data-services/src/sdks/types/common.ts rename to packages/data-center/src/sdks/types/common.ts diff --git a/packages/data-services/src/sdks/types/index.ts b/packages/data-center/src/sdks/types/index.ts similarity index 100% rename from packages/data-services/src/sdks/types/index.ts rename to packages/data-center/src/sdks/types/index.ts diff --git a/packages/data-services/src/sdks/user.hook.ts b/packages/data-center/src/sdks/user.hook.ts similarity index 100% rename from packages/data-services/src/sdks/user.hook.ts rename to packages/data-center/src/sdks/user.hook.ts diff --git a/packages/data-services/src/sdks/user.ts b/packages/data-center/src/sdks/user.ts similarity index 100% rename from packages/data-services/src/sdks/user.ts rename to packages/data-center/src/sdks/user.ts diff --git a/packages/data-services/src/sdks/workspace.hook.ts b/packages/data-center/src/sdks/workspace.hook.ts similarity index 100% rename from packages/data-services/src/sdks/workspace.hook.ts rename to packages/data-center/src/sdks/workspace.hook.ts diff --git a/packages/data-services/src/sdks/workspace.ts b/packages/data-center/src/sdks/workspace.ts similarity index 100% rename from packages/data-services/src/sdks/workspace.ts rename to packages/data-center/src/sdks/workspace.ts diff --git a/packages/data-services/src/websocket/index.ts b/packages/data-center/src/websocket/index.ts similarity index 100% rename from packages/data-services/src/websocket/index.ts rename to packages/data-center/src/websocket/index.ts diff --git a/packages/data-services/src/websocket/y-websocket.js b/packages/data-center/src/websocket/y-websocket.js similarity index 100% rename from packages/data-services/src/websocket/y-websocket.js rename to packages/data-center/src/websocket/y-websocket.js diff --git a/packages/data-services/tests/datacenter.spec.ts b/packages/data-center/tests/datacenter.spec.ts similarity index 100% rename from packages/data-services/tests/datacenter.spec.ts rename to packages/data-center/tests/datacenter.spec.ts diff --git a/packages/data-services/tests/utils.ts b/packages/data-center/tests/utils.ts similarity index 52% rename from packages/data-services/tests/utils.ts rename to packages/data-center/tests/utils.ts index c06d906058..7b06d4c6d6 100644 --- a/packages/data-services/tests/utils.ts +++ b/packages/data-center/tests/utils.ts @@ -1,4 +1,4 @@ export const getDataCenter = () => - import('../src/data-center.js').then(async dataCenter => + import('../src/datacenter/index.js').then(async dataCenter => dataCenter.getDataCenter() ); diff --git a/packages/data-services/tsconfig.json b/packages/data-center/tsconfig.json similarity index 100% rename from packages/data-services/tsconfig.json rename to packages/data-center/tsconfig.json diff --git a/packages/data-services/src/data-center.ts b/packages/data-services/src/data-center.ts deleted file mode 100644 index 4c4f1e9916..0000000000 --- a/packages/data-services/src/data-center.ts +++ /dev/null @@ -1,19 +0,0 @@ -class DataCenter { - static async init() { - return new DataCenter(); - } - - private constructor() { - // TODO - } -} - -let _dataCenterInstance: Promise; - -export const getDataCenter = () => { - if (!_dataCenterInstance) { - _dataCenterInstance = DataCenter.init(); - } - - return _dataCenterInstance; -}; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c628062826..5dd19be231 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -44,7 +44,7 @@ importers: packages/app: specifiers: - '@affine/data-services': workspace:* + '@affine/datacenter': workspace:* '@blocksuite/blocks': 0.3.1 '@blocksuite/editor': 0.3.1 '@blocksuite/icons': ^2.0.2 @@ -86,7 +86,7 @@ importers: typescript: 4.8.3 yjs: ^13.5.44 dependencies: - '@affine/data-services': link:../data-services + '@affine/datacenter': link:../data-center '@blocksuite/blocks': 0.3.1_yjs@13.5.44 '@blocksuite/editor': 0.3.1_yjs@13.5.44 '@blocksuite/icons': 2.0.4_w5j4k42lgipnm43s3brx6h3c34 @@ -129,7 +129,7 @@ importers: raw-loader: 4.0.2 typescript: 4.8.3 - packages/data-services: + packages/data-center: specifiers: '@playwright/test': ^1.29.1 encoding: ^0.1.13