diff --git a/package.json b/package.json index 12c09107dd..8fbcc8190a 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,16 @@ { - "name": "pathfinder", - "version": "0.0.0", + "name": "AFFiNE", + "version": "0.3.0", "private": true, "author": "toeverything", "license": "MPL-2.0", "scripts": { - "dev": "pnpm --filter=!@pathfinder/app build && pnpm --filter @pathfinder/app dev", - "dev:ac": "pnpm --filter=!@pathfinder/app build && pnpm --filter @pathfinder/app dev:ac", - "build": " pnpm --filter=!@pathfinder/app build && pnpm --filter!=@pathfinder/data-services -r build", - "export": "pnpm --filter @pathfinder/app export", - "start": "pnpm --filter @pathfinder/app start", - "lint": "pnpm --filter @pathfinder/app lint", + "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", + "export": "pnpm --filter @affine/app export", + "start": "pnpm --filter @affine/app start", + "lint": "pnpm --filter @affine/app lint", "test": "playwright test", "test:e2e": "playwright test", "test:e2e:codegen": "npx playwright codegen http://localhost:8080", diff --git a/packages/app/package.json b/packages/app/package.json index 430db2e181..5f49e43f57 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,5 +1,5 @@ { - "name": "@pathfinder/app", + "name": "@affine/app", "version": "0.1.0", "scripts": { "dev": "next dev -p 8080", @@ -23,8 +23,8 @@ "@mui/base": "^5.0.0-alpha.87", "@mui/icons-material": "^5.10.9", "@mui/material": "^5.8.6", - "@pathfinder/data-services": "workspace:@pathfinder/data-services@*", - "@toeverything/pathfinder-logger": "workspace:@pathfinder/logger@*", + "@affine/data-services": "workspace:@affine/data-services@*", + "@toeverything/pathfinder-logger": "workspace:@affine/logger@*", "cmdk": "^0.1.20", "css-spring": "^4.1.0", "dayjs": "^1.11.7", diff --git a/packages/app/src/components/invite-members/index.tsx b/packages/app/src/components/invite-members/index.tsx index ec8a1aabf8..dba1ce3bea 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 '@pathfinder/data-services'; +import { inviteMember, getUserByEmail } from '@affine/data-services'; 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 759277109e..298fbd86ba 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 '@pathfinder/data-services'; +import { signInWithGoogle } from '@affine/data-services'; 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 7608faea36..2d0663d734 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 '@pathfinder/data-services'; +import { deleteWorkspace } from '@affine/data-services'; 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 db191ce247..74f355fd12 100644 --- a/packages/app/src/components/workspace-setting/general/general.tsx +++ b/packages/app/src/components/workspace-setting/general/general.tsx @@ -9,11 +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 '@pathfinder/data-services'; +import { uploadBlob, Workspace, WorkspaceType } from '@affine/data-services'; 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 416f02ded1..41fae82d07 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 '@pathfinder/data-services'; +import { leaveWorkspace } from '@affine/data-services'; 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 1791c07f78..9aa3ed3eb7 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 '@pathfinder/data-services'; +} from '@affine/data-services'; 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 61d5b65158..161f6dc19b 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 '@pathfinder/data-services'; +import { getWorkspaceDetail, WorkspaceType } from '@affine/data-services'; 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 d5ecb67b89..d2cf9f58ef 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 '@pathfinder/data-services'; +import { createWorkspace, uploadBlob } from '@affine/data-services'; 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 b832ec40d4..12f0ba59ca 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 '@pathfinder/data-services'; +import { WorkspaceType } from '@affine/data-services'; 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 24599f6700..0e574cebbd 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 '@pathfinder/data-services'; +import { WorkspaceType } from '@affine/data-services'; 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 e068dfc271..b0f8fece67 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 '@pathfinder/data-services'; +import { acceptInviting } from '@affine/data-services'; 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 aa2d92f64c..054472d1a1 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 '@pathfinder/data-services'; -import { AccessTokenMessage } from '@pathfinder/data-services'; +import type { Workspace } from '@affine/data-services'; +import { AccessTokenMessage } from '@affine/data-services'; import type { Page as StorePage, Workspace as StoreWorkspace, diff --git a/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx b/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx index 6cf3c199f9..1686b0eedf 100644 --- a/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx +++ b/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx @@ -13,7 +13,7 @@ import { downloadWorkspace, token, WebsocketProvider, -} from '@pathfinder/data-services'; +} from '@affine/data-services'; interface Props { setLoadWorkspaceHandler: (handler: LoadWorkspaceHandler) => void; 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 3e3c86817a..ae1d37fe7e 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 @@ -3,7 +3,7 @@ import { AccessTokenMessage, getWorkspaces, token, -} from '@pathfinder/data-services'; +} from '@affine/data-services'; 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 56acbcd393..386f7becb7 100644 --- a/packages/app/src/providers/app-state-provider/provider.tsx +++ b/packages/app/src/providers/app-state-provider/provider.tsx @@ -5,7 +5,7 @@ import { token, AccessTokenMessage, getWorkspaces, -} from '@pathfinder/data-services'; +} from '@affine/data-services'; import { AppState, AppStateContext } from './context'; import type { AppStateValue, diff --git a/packages/data-services/package.json b/packages/data-services/package.json index 2709f71c93..2e05587c69 100644 --- a/packages/data-services/package.json +++ b/packages/data-services/package.json @@ -1,5 +1,5 @@ { - "name": "@pathfinder/data-services", + "name": "@affine/data-services", "version": "1.0.0", "description": "", "type": "module", diff --git a/packages/logger/package.json b/packages/logger/package.json index 61050b3ced..d3b264b06e 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -1,5 +1,5 @@ { - "name": "@pathfinder/logger", + "name": "@affine/logger", "version": "0.0.1", "description": "", "main": "dist/src/index.js", diff --git a/packages/logger/src/Logger.tsx b/packages/logger/src/Logger.tsx index 21db5d263c..1c2941b38a 100644 --- a/packages/logger/src/Logger.tsx +++ b/packages/logger/src/Logger.tsx @@ -2,7 +2,7 @@ import { useEffect } from 'react'; export const Logger = () => { useEffect(() => { - console.log('@pathfinder/logger: Render Track'); + console.log('@affine/logger: Render Track'); }, []); return null; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 06eda8f2d0..ad65f27cf6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -42,6 +42,7 @@ importers: packages/app: specifiers: + '@affine/data-services': workspace:@affine/data-services@* '@blocksuite/blocks': 0.3.0-20221225075400-9710eea '@blocksuite/editor': 0.3.0-20221225075400-9710eea '@blocksuite/icons': ^2.0.2 @@ -55,8 +56,7 @@ importers: '@mui/base': ^5.0.0-alpha.87 '@mui/icons-material': ^5.10.9 '@mui/material': ^5.8.6 - '@pathfinder/data-services': workspace:@pathfinder/data-services@* - '@toeverything/pathfinder-logger': workspace:@pathfinder/logger@* + '@toeverything/pathfinder-logger': workspace:@affine/logger@* '@types/node': 18.7.18 '@types/react': 18.0.20 '@types/react-dom': 18.0.6 @@ -81,6 +81,7 @@ importers: typescript: 4.8.3 yjs: ^13.5.43 dependencies: + '@affine/data-services': link:../data-services '@blocksuite/blocks': 0.3.0-20221225075400-9710eea_yjs@13.5.43 '@blocksuite/editor': 0.3.0-20221225075400-9710eea_yjs@13.5.43 '@blocksuite/icons': 2.0.2_w5j4k42lgipnm43s3brx6h3c34 @@ -94,7 +95,6 @@ importers: '@mui/base': 5.0.0-alpha.101_7ey2zzynotv32rpkwno45fsx4e '@mui/icons-material': 5.10.9_5fncb4nagb4cvvcnwamw2rozfa '@mui/material': 5.10.9_af5ln35zuaotaffazii6n6bke4 - '@pathfinder/data-services': link:../data-services '@toeverything/pathfinder-logger': link:../logger cmdk: 0.1.20_7ey2zzynotv32rpkwno45fsx4e css-spring: 4.1.0