chore: Unified registration and path specification

This commit is contained in:
tzhangchi
2022-12-28 11:06:56 +08:00
committed by DarkSky
parent 8a8559e1fe
commit bf81203353
21 changed files with 33 additions and 37 deletions
+8 -8
View File
@@ -1,16 +1,16 @@
{ {
"name": "pathfinder", "name": "AFFiNE",
"version": "0.0.0", "version": "0.3.0",
"private": true, "private": true,
"author": "toeverything", "author": "toeverything",
"license": "MPL-2.0", "license": "MPL-2.0",
"scripts": { "scripts": {
"dev": "pnpm --filter=!@pathfinder/app build && pnpm --filter @pathfinder/app dev", "dev": "pnpm --filter=!@affine/app build && pnpm --filter @affine/app dev",
"dev:ac": "pnpm --filter=!@pathfinder/app build && pnpm --filter @pathfinder/app dev:ac", "dev:ac": "pnpm --filter=!@affine/app build && pnpm --filter @affine/app dev:ac",
"build": " pnpm --filter=!@pathfinder/app build && pnpm --filter!=@pathfinder/data-services -r build", "build": " pnpm --filter=!@affine/app build && pnpm --filter!=@affine/data-services -r build",
"export": "pnpm --filter @pathfinder/app export", "export": "pnpm --filter @affine/app export",
"start": "pnpm --filter @pathfinder/app start", "start": "pnpm --filter @affine/app start",
"lint": "pnpm --filter @pathfinder/app lint", "lint": "pnpm --filter @affine/app lint",
"test": "playwright test", "test": "playwright test",
"test:e2e": "playwright test", "test:e2e": "playwright test",
"test:e2e:codegen": "npx playwright codegen http://localhost:8080", "test:e2e:codegen": "npx playwright codegen http://localhost:8080",
+3 -3
View File
@@ -1,5 +1,5 @@
{ {
"name": "@pathfinder/app", "name": "@affine/app",
"version": "0.1.0", "version": "0.1.0",
"scripts": { "scripts": {
"dev": "next dev -p 8080", "dev": "next dev -p 8080",
@@ -23,8 +23,8 @@
"@mui/base": "^5.0.0-alpha.87", "@mui/base": "^5.0.0-alpha.87",
"@mui/icons-material": "^5.10.9", "@mui/icons-material": "^5.10.9",
"@mui/material": "^5.8.6", "@mui/material": "^5.8.6",
"@pathfinder/data-services": "workspace:@pathfinder/data-services@*", "@affine/data-services": "workspace:@affine/data-services@*",
"@toeverything/pathfinder-logger": "workspace:@pathfinder/logger@*", "@toeverything/pathfinder-logger": "workspace:@affine/logger@*",
"cmdk": "^0.1.20", "cmdk": "^0.1.20",
"css-spring": "^4.1.0", "css-spring": "^4.1.0",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
@@ -4,7 +4,7 @@ import { Modal, ModalWrapper, ModalCloseButton } from '@/ui/modal';
import { Button } from '@/ui/button'; import { Button } from '@/ui/button';
import Input from '@/ui/input'; import Input from '@/ui/input';
import { useState } from 'react'; import { useState } from 'react';
import { inviteMember, getUserByEmail } from '@pathfinder/data-services'; import { inviteMember, getUserByEmail } from '@affine/data-services';
import { Avatar } from '@mui/material'; import { Avatar } from '@mui/material';
interface LoginModalProps { interface LoginModalProps {
open: boolean; open: boolean;
@@ -1,4 +1,4 @@
import { signInWithGoogle } from '@pathfinder/data-services'; import { signInWithGoogle } from '@affine/data-services';
import { styled } from '@/styles'; import { styled } from '@/styles';
import { Button } from '@/ui/button'; import { Button } from '@/ui/button';
import { useModal } from '@/providers/global-modal-provider'; import { useModal } from '@/providers/global-modal-provider';
@@ -11,7 +11,7 @@ import {
import { useState } from 'react'; import { useState } from 'react';
import { ModalCloseButton } from '@/ui/modal'; import { ModalCloseButton } from '@/ui/modal';
import { Button } from '@/ui/button'; import { Button } from '@/ui/button';
import { deleteWorkspace } from '@pathfinder/data-services'; import { deleteWorkspace } from '@affine/data-services';
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
import { useAppState } from '@/providers/app-state-provider'; import { useAppState } from '@/providers/app-state-provider';
@@ -9,11 +9,7 @@ import { StyledSettingH2 } from '../style';
import { useState } from 'react'; import { useState } from 'react';
import { Button } from '@/ui/button'; import { Button } from '@/ui/button';
import Input from '@/ui/input'; import Input from '@/ui/input';
import { import { uploadBlob, Workspace, WorkspaceType } from '@affine/data-services';
uploadBlob,
Workspace,
WorkspaceType,
} from '@pathfinder/data-services';
import { useAppState } from '@/providers/app-state-provider'; import { useAppState } from '@/providers/app-state-provider';
import { WorkspaceDetails } from '@/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent'; import { WorkspaceDetails } from '@/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent';
import { WorkspaceDelete } from './delete'; import { WorkspaceDelete } from './delete';
@@ -7,7 +7,7 @@ import {
} from './style'; } from './style';
import { ModalCloseButton } from '@/ui/modal'; import { ModalCloseButton } from '@/ui/modal';
import { Button } from '@/ui/button'; import { Button } from '@/ui/button';
import { leaveWorkspace } from '@pathfinder/data-services'; import { leaveWorkspace } from '@affine/data-services';
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
import { useAppState } from '@/providers/app-state-provider'; import { useAppState } from '@/providers/app-state-provider';
@@ -42,7 +42,7 @@ import {
Member, Member,
removeMember, removeMember,
updateWorkspace, updateWorkspace,
} from '@pathfinder/data-services'; } from '@affine/data-services';
import { Avatar } from '@mui/material'; import { Avatar } from '@mui/material';
import { Menu, MenuItem } from '@/ui/menu'; import { Menu, MenuItem } from '@/ui/menu';
import { toast } from '@/ui/toast'; import { toast } from '@/ui/toast';
@@ -12,7 +12,7 @@ import {
} from './WorkspaceItem'; } from './WorkspaceItem';
import { WorkspaceSetting } from '@/components/workspace-setting'; import { WorkspaceSetting } from '@/components/workspace-setting';
import { useCallback, useEffect, useState } from 'react'; 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'; import { useModal } from '@/providers/global-modal-provider';
export type WorkspaceDetails = Record< export type WorkspaceDetails = Record<
@@ -1,4 +1,4 @@
import { createWorkspace, uploadBlob } from '@pathfinder/data-services'; import { createWorkspace, uploadBlob } from '@affine/data-services';
import Modal from '@/ui/modal'; import Modal from '@/ui/modal';
import Input from '@/ui/input'; import Input from '@/ui/input';
import { import {
@@ -7,7 +7,7 @@ import {
} from '../styles'; } from '../styles';
import { FooterSetting } from './FooterSetting'; import { FooterSetting } from './FooterSetting';
import { FooterUsers } from './FooterUsers'; import { FooterUsers } from './FooterUsers';
import { WorkspaceType } from '@pathfinder/data-services'; import { WorkspaceType } from '@affine/data-services';
import { useAppState } from '@/providers/app-state-provider'; import { useAppState } from '@/providers/app-state-provider';
interface WorkspaceItemProps { interface WorkspaceItemProps {
@@ -3,7 +3,7 @@ import { Avatar, WorkspaceName, SelectorWrapper } from './styles';
import { SelectorPopperContent } from './SelectorPopperContent'; import { SelectorPopperContent } from './SelectorPopperContent';
import { useState } from 'react'; import { useState } from 'react';
import { useAppState } from '@/providers/app-state-provider'; import { useAppState } from '@/providers/app-state-provider';
import { WorkspaceType } from '@pathfinder/data-services'; import { WorkspaceType } from '@affine/data-services';
import { AffineIcon } from '../icons/icons'; import { AffineIcon } from '../icons/icons';
export const WorkspaceSelector = () => { export const WorkspaceSelector = () => {
@@ -1,7 +1,7 @@
import { styled } from '@/styles'; import { styled } from '@/styles';
import { Empty } from '@/ui/empty'; import { Empty } from '@/ui/empty';
import { Avatar } from '@mui/material'; import { Avatar } from '@mui/material';
import { acceptInviting } from '@pathfinder/data-services'; import { acceptInviting } from '@affine/data-services';
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
@@ -1,6 +1,6 @@
import { createContext, MutableRefObject, useContext } from 'react'; import { createContext, MutableRefObject, useContext } from 'react';
import type { Workspace } from '@pathfinder/data-services'; import type { Workspace } from '@affine/data-services';
import { AccessTokenMessage } from '@pathfinder/data-services'; import { AccessTokenMessage } from '@affine/data-services';
import type { import type {
Page as StorePage, Page as StorePage,
Workspace as StoreWorkspace, Workspace as StoreWorkspace,
@@ -13,7 +13,7 @@ import {
downloadWorkspace, downloadWorkspace,
token, token,
WebsocketProvider, WebsocketProvider,
} from '@pathfinder/data-services'; } from '@affine/data-services';
interface Props { interface Props {
setLoadWorkspaceHandler: (handler: LoadWorkspaceHandler) => void; setLoadWorkspaceHandler: (handler: LoadWorkspaceHandler) => void;
@@ -3,7 +3,7 @@ import {
AccessTokenMessage, AccessTokenMessage,
getWorkspaces, getWorkspaces,
token, token,
} from '@pathfinder/data-services'; } from '@affine/data-services';
import { LoadWorkspaceHandler } from '../context'; import { LoadWorkspaceHandler } from '../context';
export const useSyncData = ({ export const useSyncData = ({
@@ -5,7 +5,7 @@ import {
token, token,
AccessTokenMessage, AccessTokenMessage,
getWorkspaces, getWorkspaces,
} from '@pathfinder/data-services'; } from '@affine/data-services';
import { AppState, AppStateContext } from './context'; import { AppState, AppStateContext } from './context';
import type { import type {
AppStateValue, AppStateValue,
+1 -1
View File
@@ -1,5 +1,5 @@
{ {
"name": "@pathfinder/data-services", "name": "@affine/data-services",
"version": "1.0.0", "version": "1.0.0",
"description": "", "description": "",
"type": "module", "type": "module",
+1 -1
View File
@@ -1,5 +1,5 @@
{ {
"name": "@pathfinder/logger", "name": "@affine/logger",
"version": "0.0.1", "version": "0.0.1",
"description": "", "description": "",
"main": "dist/src/index.js", "main": "dist/src/index.js",
+1 -1
View File
@@ -2,7 +2,7 @@ import { useEffect } from 'react';
export const Logger = () => { export const Logger = () => {
useEffect(() => { useEffect(() => {
console.log('@pathfinder/logger: Render Track'); console.log('@affine/logger: Render Track');
}, []); }, []);
return null; return null;
+3 -3
View File
@@ -42,6 +42,7 @@ importers:
packages/app: packages/app:
specifiers: specifiers:
'@affine/data-services': workspace:@affine/data-services@*
'@blocksuite/blocks': 0.3.0-20221225075400-9710eea '@blocksuite/blocks': 0.3.0-20221225075400-9710eea
'@blocksuite/editor': 0.3.0-20221225075400-9710eea '@blocksuite/editor': 0.3.0-20221225075400-9710eea
'@blocksuite/icons': ^2.0.2 '@blocksuite/icons': ^2.0.2
@@ -55,8 +56,7 @@ importers:
'@mui/base': ^5.0.0-alpha.87 '@mui/base': ^5.0.0-alpha.87
'@mui/icons-material': ^5.10.9 '@mui/icons-material': ^5.10.9
'@mui/material': ^5.8.6 '@mui/material': ^5.8.6
'@pathfinder/data-services': workspace:@pathfinder/data-services@* '@toeverything/pathfinder-logger': workspace:@affine/logger@*
'@toeverything/pathfinder-logger': workspace:@pathfinder/logger@*
'@types/node': 18.7.18 '@types/node': 18.7.18
'@types/react': 18.0.20 '@types/react': 18.0.20
'@types/react-dom': 18.0.6 '@types/react-dom': 18.0.6
@@ -81,6 +81,7 @@ importers:
typescript: 4.8.3 typescript: 4.8.3
yjs: ^13.5.43 yjs: ^13.5.43
dependencies: dependencies:
'@affine/data-services': link:../data-services
'@blocksuite/blocks': 0.3.0-20221225075400-9710eea_yjs@13.5.43 '@blocksuite/blocks': 0.3.0-20221225075400-9710eea_yjs@13.5.43
'@blocksuite/editor': 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 '@blocksuite/icons': 2.0.2_w5j4k42lgipnm43s3brx6h3c34
@@ -94,7 +95,6 @@ importers:
'@mui/base': 5.0.0-alpha.101_7ey2zzynotv32rpkwno45fsx4e '@mui/base': 5.0.0-alpha.101_7ey2zzynotv32rpkwno45fsx4e
'@mui/icons-material': 5.10.9_5fncb4nagb4cvvcnwamw2rozfa '@mui/icons-material': 5.10.9_5fncb4nagb4cvvcnwamw2rozfa
'@mui/material': 5.10.9_af5ln35zuaotaffazii6n6bke4 '@mui/material': 5.10.9_af5ln35zuaotaffazii6n6bke4
'@pathfinder/data-services': link:../data-services
'@toeverything/pathfinder-logger': link:../logger '@toeverything/pathfinder-logger': link:../logger
cmdk: 0.1.20_7ey2zzynotv32rpkwno45fsx4e cmdk: 0.1.20_7ey2zzynotv32rpkwno45fsx4e
css-spring: 4.1.0 css-spring: 4.1.0