From ebca34c9e5bef7061ac81d311e4a1b485a634314 Mon Sep 17 00:00:00 2001
From: DiamondThree <857159145@qq.com>
Date: Mon, 6 Feb 2023 16:33:07 +0800
Subject: [PATCH 01/13] fix: workspace owner will delete himself
---
.../workspace-setting/member/MembersPage.tsx | 73 ++++++++++---------
1 file changed, 38 insertions(+), 35 deletions(-)
diff --git a/packages/app/src/components/workspace-setting/member/MembersPage.tsx b/packages/app/src/components/workspace-setting/member/MembersPage.tsx
index caa6047773..f7dec5cd31 100644
--- a/packages/app/src/components/workspace-setting/member/MembersPage.tsx
+++ b/packages/app/src/components/workspace-setting/member/MembersPage.tsx
@@ -32,7 +32,6 @@ import { EnableWorkspaceButton } from '@/components/enable-workspace';
export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
const [isInviteModalShow, setIsInviteModalShow] = useState(false);
const { members, removeMember, loaded } = useMembers();
-
const { t } = useTranslation();
const { confirm } = useConfirm();
@@ -94,41 +93,45 @@ export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
: t('Pending')}
-
+ )}
);
From be3158d52905f64f083a29070b78ac7e309edda8 Mon Sep 17 00:00:00 2001
From: DarkSky
Date: Mon, 6 Feb 2023 17:07:48 +0800
Subject: [PATCH 02/13] chore: bump ts & blocksuite
---
package.json | 2 +-
packages/app/package.json | 8 +-
packages/data-center/package.json | 6 +-
packages/i18n/package.json | 2 +-
packages/logger/package.json | 2 +-
pnpm-lock.yaml | 233 ++++++++++++------------------
6 files changed, 105 insertions(+), 148 deletions(-)
diff --git a/package.json b/package.json
index e8733185eb..3a1297e073 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
"lint-staged": "^13.1.0",
"nyc": "^15.1.0",
"prettier": "^2.7.1",
- "typescript": "^4.9.3"
+ "typescript": "^4.9.5"
},
"eslintConfig": {
"root": true,
diff --git a/packages/app/package.json b/packages/app/package.json
index 09c0d8640e..8277f07a48 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -11,10 +11,10 @@
"dependencies": {
"@affine/datacenter": "workspace:*",
"@affine/i18n": "workspace:*",
- "@blocksuite/blocks": "0.4.0-20230203030233-b22bea7",
- "@blocksuite/editor": "0.4.0-20230203030233-b22bea7",
+ "@blocksuite/blocks": "0.4.0-20230205175611-17a62e3",
+ "@blocksuite/editor": "0.4.0-20230205175611-17a62e3",
"@blocksuite/icons": "^2.0.2",
- "@blocksuite/store": "0.4.0-20230203030233-b22bea7",
+ "@blocksuite/store": "0.4.0-20230205175611-17a62e3",
"@emotion/css": "^11.10.0",
"@emotion/react": "^11.10.4",
"@emotion/server": "^11.10.0",
@@ -50,7 +50,7 @@
"eslint-plugin-prettier": "^4.2.1",
"next-pwa": "^5.6.0",
"raw-loader": "^4.0.2",
- "typescript": "4.8.3"
+ "typescript": "^4.9.5"
},
"eslintConfig": {
"extends": [
diff --git a/packages/data-center/package.json b/packages/data-center/package.json
index a7297fbe1c..087fb0b33d 100644
--- a/packages/data-center/package.json
+++ b/packages/data-center/package.json
@@ -23,12 +23,12 @@
"@playwright/test": "^1.29.1",
"@types/debug": "^4.1.7",
"fake-indexeddb": "4.0.1",
- "typescript": "^4.8.4",
+ "typescript": "^4.9.5",
"yjs": "^13.5.44"
},
"dependencies": {
- "@blocksuite/blocks": "0.4.0-20230203030233-b22bea7",
- "@blocksuite/store": "0.4.0-20230203030233-b22bea7",
+ "@blocksuite/blocks": "0.4.0-20230205175611-17a62e3",
+ "@blocksuite/store": "0.4.0-20230205175611-17a62e3",
"debug": "^4.3.4",
"encoding": "^0.1.13",
"firebase": "^9.15.0",
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index eb6c30a1a1..29358083a3 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -28,6 +28,6 @@
"devDependencies": {
"@types/prettier": "^2.7.2",
"ts-node": "^10.9.1",
- "typescript": "^4.8.4"
+ "typescript": "^4.9.5"
}
}
diff --git a/packages/logger/package.json b/packages/logger/package.json
index 43f2a05545..b1c858f613 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -24,6 +24,6 @@
},
"devDependencies": {
"@types/react": "^18.0.21",
- "typescript": "^4.8.4"
+ "typescript": "^4.9.5"
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 797a252a9b..f00882f360 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,18 +22,18 @@ importers:
lint-staged: ^13.1.0
nyc: ^15.1.0
prettier: ^2.7.1
- typescript: ^4.9.3
+ typescript: ^4.9.5
devDependencies:
'@changesets/cli': 2.26.0
'@playwright/test': 1.29.1
'@types/eslint': 8.4.10
'@types/node': 18.11.18
- '@typescript-eslint/eslint-plugin': 5.48.0_wxmz6cyorqfuzhhglktlvr5lve
- '@typescript-eslint/parser': 5.48.0_p4cjf2r47dnfiqufepc5hp43sq
+ '@typescript-eslint/eslint-plugin': 5.48.0_vqm4js66qtp4h6afqe3btrngbi
+ '@typescript-eslint/parser': 5.48.0_ifw3q4r6iq3gw7cspzs2siycvu
babel-plugin-istanbul: 6.1.1
cross-env: 7.0.3
eslint: 8.31.0
- eslint-config-next: 12.3.1_p4cjf2r47dnfiqufepc5hp43sq
+ eslint-config-next: 12.3.1_ifw3q4r6iq3gw7cspzs2siycvu
eslint-config-prettier: 8.5.0_eslint@8.31.0
eslint-plugin-prettier: 4.2.1_vkmhlldugy3fnk7p2bqhsfnaiq
fake-indexeddb: 4.0.1
@@ -42,16 +42,16 @@ importers:
lint-staged: 13.1.0
nyc: 15.1.0
prettier: 2.7.1
- typescript: 4.9.3
+ typescript: 4.9.5
packages/app:
specifiers:
'@affine/datacenter': workspace:*
'@affine/i18n': workspace:*
- '@blocksuite/blocks': 0.4.0-20230203030233-b22bea7
- '@blocksuite/editor': 0.4.0-20230203030233-b22bea7
+ '@blocksuite/blocks': 0.4.0-20230205175611-17a62e3
+ '@blocksuite/editor': 0.4.0-20230205175611-17a62e3
'@blocksuite/icons': ^2.0.2
- '@blocksuite/store': 0.4.0-20230203030233-b22bea7
+ '@blocksuite/store': 0.4.0-20230205175611-17a62e3
'@emotion/css': ^11.10.0
'@emotion/react': ^11.10.4
'@emotion/server': ^11.10.0
@@ -84,15 +84,15 @@ importers:
raw-loader: ^4.0.2
react: 18.2.0
react-dom: 18.2.0
- typescript: 4.8.3
+ typescript: ^4.9.5
yjs: ^13.5.44
dependencies:
'@affine/datacenter': link:../data-center
'@affine/i18n': link:../i18n
- '@blocksuite/blocks': 0.4.0-20230203030233-b22bea7_yjs@13.5.44
- '@blocksuite/editor': 0.4.0-20230203030233-b22bea7_yjs@13.5.44
+ '@blocksuite/blocks': 0.4.0-20230205175611-17a62e3_yjs@13.5.44
+ '@blocksuite/editor': 0.4.0-20230205175611-17a62e3_yjs@13.5.44
'@blocksuite/icons': 2.0.4_w5j4k42lgipnm43s3brx6h3c34
- '@blocksuite/store': 0.4.0-20230203030233-b22bea7_lit@2.4.0+yjs@13.5.44
+ '@blocksuite/store': 0.4.0-20230205175611-17a62e3_lit@2.4.0+yjs@13.5.44
'@emotion/css': 11.10.0
'@emotion/react': 11.10.4_w5j4k42lgipnm43s3brx6h3c34
'@emotion/server': 11.10.0_@emotion+css@11.10.0
@@ -122,17 +122,17 @@ importers:
'@types/wicg-file-system-access': 2020.9.5
chalk: 4.1.2
eslint: 8.22.0
- eslint-config-next: 12.3.1_76twfck5d7crjqrmw4yltga7zm
+ eslint-config-next: 12.3.1_hp3n5f6hao4yyg55iy34n6oive
eslint-config-prettier: 8.5.0_eslint@8.22.0
eslint-plugin-prettier: 4.2.1_i2cojdczqdiurzgttlwdgf764e
next-pwa: 5.6.0_next@13.1.0
raw-loader: 4.0.2
- typescript: 4.8.3
+ typescript: 4.9.5
packages/data-center:
specifiers:
- '@blocksuite/blocks': 0.4.0-20230203030233-b22bea7
- '@blocksuite/store': 0.4.0-20230203030233-b22bea7
+ '@blocksuite/blocks': 0.4.0-20230205175611-17a62e3
+ '@blocksuite/store': 0.4.0-20230205175611-17a62e3
'@playwright/test': ^1.29.1
'@types/debug': ^4.1.7
debug: ^4.3.4
@@ -144,12 +144,12 @@ importers:
ky-universal: ^0.11.0
lib0: ^0.2.58
swr: ^2.0.0
- typescript: ^4.8.4
+ typescript: ^4.9.5
y-protocols: ^1.0.5
yjs: ^13.5.44
dependencies:
- '@blocksuite/blocks': 0.4.0-20230203030233-b22bea7_yjs@13.5.44
- '@blocksuite/store': 0.4.0-20230203030233-b22bea7_yjs@13.5.44
+ '@blocksuite/blocks': 0.4.0-20230205175611-17a62e3_yjs@13.5.44
+ '@blocksuite/store': 0.4.0-20230205175611-17a62e3_yjs@13.5.44
debug: 4.3.4
encoding: 0.1.13
firebase: 9.15.0_encoding@0.1.13
@@ -163,7 +163,7 @@ importers:
'@playwright/test': 1.29.1
'@types/debug': 4.1.7
fake-indexeddb: 4.0.1
- typescript: 4.9.3
+ typescript: 4.9.5
yjs: 13.5.44
packages/i18n:
@@ -173,15 +173,15 @@ importers:
prettier: ^2.7.1
react-i18next: ^11.18.4
ts-node: ^10.9.1
- typescript: ^4.8.4
+ typescript: ^4.9.5
dependencies:
i18next: 21.10.0
prettier: 2.7.1
react-i18next: 11.18.6_i18next@21.10.0
devDependencies:
'@types/prettier': 2.7.2
- ts-node: 10.9.1_typescript@4.9.3
- typescript: 4.9.3
+ ts-node: 10.9.1_typescript@4.9.5
+ typescript: 4.9.5
packages/logger:
specifiers:
@@ -189,14 +189,14 @@ importers:
next: ^12.3.1
react: ^18.2.0
react-dom: ^18.2.0
- typescript: ^4.8.4
+ typescript: ^4.9.5
dependencies:
next: 12.3.1_biqbaboplfbrettd7655fr4n2y
react: 18.2.0
react-dom: 18.2.0_react@18.2.0
devDependencies:
'@types/react': 18.0.21
- typescript: 4.8.4
+ typescript: 4.9.5
packages:
@@ -1463,13 +1463,13 @@ packages:
to-fast-properties: 2.0.0
dev: true
- /@blocksuite/blocks/0.4.0-20230203030233-b22bea7_yjs@13.5.44:
- resolution: {integrity: sha512-mHRk7bT50Tct/Oltm2YrwjOOnlp6XOGsy4UCg7rVkKsW9n02HY+9RaDqXzRF934YR1ujl/ofr00k6ghFAH8XDw==}
+ /@blocksuite/blocks/0.4.0-20230205175611-17a62e3_yjs@13.5.44:
+ resolution: {integrity: sha512-LZHvoLXEViDoWLoxNwbV1yeFCyC07LOmBft5ql79PDep3uTo7nse21Sk7ChjHBbx1rOyXKsp8El8wpcEcrG+3g==}
dependencies:
- '@blocksuite/global': 0.4.0-20230203030233-b22bea7_lit@2.6.1
- '@blocksuite/phasor': 0.4.0-20230203030233-b22bea7_lit@2.6.1+yjs@13.5.44
- '@blocksuite/store': 0.4.0-20230203030233-b22bea7_lit@2.6.1+yjs@13.5.44
- '@blocksuite/virgo': 0.4.0-20230203030233-b22bea7_lit@2.6.1+yjs@13.5.44
+ '@blocksuite/global': 0.4.0-20230205175611-17a62e3_lit@2.6.1
+ '@blocksuite/phasor': 0.4.0-20230205175611-17a62e3_lit@2.6.1+yjs@13.5.44
+ '@blocksuite/store': 0.4.0-20230205175611-17a62e3_lit@2.6.1+yjs@13.5.44
+ '@blocksuite/virgo': 0.4.0-20230205175611-17a62e3_lit@2.6.1+yjs@13.5.44
'@popperjs/core': 2.11.6
autosize: 5.0.2
highlight.js: 11.7.0
@@ -1485,12 +1485,12 @@ packages:
- yjs
dev: false
- /@blocksuite/editor/0.4.0-20230203030233-b22bea7_yjs@13.5.44:
- resolution: {integrity: sha512-PYP6uW432lIJFhYr1OEfNFQBl0xNqCGa/CYanj4Dw18/tYj3BD25sBAAEGwW0ixY08gfolbglQTJj59qOccCxg==}
+ /@blocksuite/editor/0.4.0-20230205175611-17a62e3_yjs@13.5.44:
+ resolution: {integrity: sha512-PcdUGxfc9wKu/rMi3/oN/Z9PmnHPEnP2lFNiVAKHVo54+rZOsLy9vzn33AaAmRRrn9EbDCDBuUDGVjziVdWR8w==}
dependencies:
- '@blocksuite/blocks': 0.4.0-20230203030233-b22bea7_yjs@13.5.44
- '@blocksuite/global': 0.4.0-20230203030233-b22bea7_lit@2.6.1
- '@blocksuite/store': 0.4.0-20230203030233-b22bea7_lit@2.6.1+yjs@13.5.44
+ '@blocksuite/blocks': 0.4.0-20230205175611-17a62e3_yjs@13.5.44
+ '@blocksuite/global': 0.4.0-20230205175611-17a62e3_lit@2.6.1
+ '@blocksuite/store': 0.4.0-20230205175611-17a62e3_lit@2.6.1+yjs@13.5.44
lit: 2.6.1
marked: 4.2.12
turndown: 7.1.1
@@ -1501,8 +1501,8 @@ packages:
- yjs
dev: false
- /@blocksuite/global/0.4.0-20230203030233-b22bea7:
- resolution: {integrity: sha512-y1FJoRvocYQRi6zju5dPC9T/acN9Zxqe7Qy0/0wo3nHE9p/3wSGhoisJlTHKSuejW6oYp3fgOS+bOWpfHdhA6g==}
+ /@blocksuite/global/0.4.0-20230205175611-17a62e3:
+ resolution: {integrity: sha512-Oai1+yzyrGafdvUY6TU5cRON268awp0jNwIQpH4Bg23V4FYhamgxSb7JT//ZaBEeIA64xv+3PVXmtXOFBsNGlQ==}
peerDependencies:
lit: ^2.6
peerDependenciesMeta:
@@ -1513,8 +1513,8 @@ packages:
zod: 3.20.2
dev: false
- /@blocksuite/global/0.4.0-20230203030233-b22bea7_lit@2.4.0:
- resolution: {integrity: sha512-y1FJoRvocYQRi6zju5dPC9T/acN9Zxqe7Qy0/0wo3nHE9p/3wSGhoisJlTHKSuejW6oYp3fgOS+bOWpfHdhA6g==}
+ /@blocksuite/global/0.4.0-20230205175611-17a62e3_lit@2.4.0:
+ resolution: {integrity: sha512-Oai1+yzyrGafdvUY6TU5cRON268awp0jNwIQpH4Bg23V4FYhamgxSb7JT//ZaBEeIA64xv+3PVXmtXOFBsNGlQ==}
peerDependencies:
lit: ^2.6
peerDependenciesMeta:
@@ -1526,8 +1526,8 @@ packages:
zod: 3.20.2
dev: false
- /@blocksuite/global/0.4.0-20230203030233-b22bea7_lit@2.6.1:
- resolution: {integrity: sha512-y1FJoRvocYQRi6zju5dPC9T/acN9Zxqe7Qy0/0wo3nHE9p/3wSGhoisJlTHKSuejW6oYp3fgOS+bOWpfHdhA6g==}
+ /@blocksuite/global/0.4.0-20230205175611-17a62e3_lit@2.6.1:
+ resolution: {integrity: sha512-Oai1+yzyrGafdvUY6TU5cRON268awp0jNwIQpH4Bg23V4FYhamgxSb7JT//ZaBEeIA64xv+3PVXmtXOFBsNGlQ==}
peerDependencies:
lit: ^2.6
peerDependenciesMeta:
@@ -1549,12 +1549,12 @@ packages:
react: 18.2.0
dev: false
- /@blocksuite/phasor/0.4.0-20230203030233-b22bea7_lit@2.6.1+yjs@13.5.44:
- resolution: {integrity: sha512-C4eH4vJIImhisSCgi6WnNItU/Ed89FghYn1naqZvShp5QMBAWN0Ze9CgM7esXALcmxDpxN+Z45uY32yVqPYXRA==}
+ /@blocksuite/phasor/0.4.0-20230205175611-17a62e3_lit@2.6.1+yjs@13.5.44:
+ resolution: {integrity: sha512-JQcwQa5a5MG1U1Zxzbp+/GkQN/8tHLJ11nST1GlYTbKkWm1LMO+AfCytgt5622m/OHszw3+R6Uu4663Tg/94og==}
peerDependencies:
yjs: ^13
dependencies:
- '@blocksuite/global': 0.4.0-20230203030233-b22bea7_lit@2.6.1
+ '@blocksuite/global': 0.4.0-20230205175611-17a62e3_lit@2.6.1
fractional-indexing: 3.1.0
nanoid: 4.0.0
perfect-freehand: 1.2.0
@@ -1563,12 +1563,12 @@ packages:
- lit
dev: false
- /@blocksuite/store/0.4.0-20230203030233-b22bea7_lit@2.4.0+yjs@13.5.44:
- resolution: {integrity: sha512-RvgEM4o+QyXUKV1NVZC8HJO0vH4pE7ygr5U0b9Zu03RvErAdqdzy4HL/VkcI+gTzTHB72tQp9bPj8QxQ37dzow==}
+ /@blocksuite/store/0.4.0-20230205175611-17a62e3_lit@2.4.0+yjs@13.5.44:
+ resolution: {integrity: sha512-VT2dFJgJ0ebzgI0RF5+ru/V4vLQN9TpJ6lpWUb2EdpG6wPc+KgU6LNYRxCTT+q2PLY8R2PcBafJdUaTG0cf8Lw==}
peerDependencies:
yjs: ^13
dependencies:
- '@blocksuite/global': 0.4.0-20230203030233-b22bea7_lit@2.4.0
+ '@blocksuite/global': 0.4.0-20230205175611-17a62e3_lit@2.4.0
'@types/flexsearch': 0.7.3
buffer: 6.0.3
flexsearch: 0.7.21
@@ -1588,12 +1588,12 @@ packages:
- utf-8-validate
dev: false
- /@blocksuite/store/0.4.0-20230203030233-b22bea7_lit@2.6.1+yjs@13.5.44:
- resolution: {integrity: sha512-RvgEM4o+QyXUKV1NVZC8HJO0vH4pE7ygr5U0b9Zu03RvErAdqdzy4HL/VkcI+gTzTHB72tQp9bPj8QxQ37dzow==}
+ /@blocksuite/store/0.4.0-20230205175611-17a62e3_lit@2.6.1+yjs@13.5.44:
+ resolution: {integrity: sha512-VT2dFJgJ0ebzgI0RF5+ru/V4vLQN9TpJ6lpWUb2EdpG6wPc+KgU6LNYRxCTT+q2PLY8R2PcBafJdUaTG0cf8Lw==}
peerDependencies:
yjs: ^13
dependencies:
- '@blocksuite/global': 0.4.0-20230203030233-b22bea7_lit@2.6.1
+ '@blocksuite/global': 0.4.0-20230205175611-17a62e3_lit@2.6.1
'@types/flexsearch': 0.7.3
buffer: 6.0.3
flexsearch: 0.7.21
@@ -1613,12 +1613,12 @@ packages:
- utf-8-validate
dev: false
- /@blocksuite/store/0.4.0-20230203030233-b22bea7_yjs@13.5.44:
- resolution: {integrity: sha512-RvgEM4o+QyXUKV1NVZC8HJO0vH4pE7ygr5U0b9Zu03RvErAdqdzy4HL/VkcI+gTzTHB72tQp9bPj8QxQ37dzow==}
+ /@blocksuite/store/0.4.0-20230205175611-17a62e3_yjs@13.5.44:
+ resolution: {integrity: sha512-VT2dFJgJ0ebzgI0RF5+ru/V4vLQN9TpJ6lpWUb2EdpG6wPc+KgU6LNYRxCTT+q2PLY8R2PcBafJdUaTG0cf8Lw==}
peerDependencies:
yjs: ^13
dependencies:
- '@blocksuite/global': 0.4.0-20230203030233-b22bea7
+ '@blocksuite/global': 0.4.0-20230205175611-17a62e3
'@types/flexsearch': 0.7.3
buffer: 6.0.3
flexsearch: 0.7.21
@@ -1638,13 +1638,13 @@ packages:
- utf-8-validate
dev: false
- /@blocksuite/virgo/0.4.0-20230203030233-b22bea7_lit@2.6.1+yjs@13.5.44:
- resolution: {integrity: sha512-Jc7RpCkmBCj88xmtE9R9WFcbNBcl0X+NW+v42iYQ/1b3HuzWr2CaxxdHSMW/bXMQdXx/GrF8Ak0aYUYp6hQWDQ==}
+ /@blocksuite/virgo/0.4.0-20230205175611-17a62e3_lit@2.6.1+yjs@13.5.44:
+ resolution: {integrity: sha512-qWWmV/QnMP2kDNzN2e8RcNffTpLK0Cw6KrCBHhSg2TJqjTohVwBG+x4oSmS5vhh76WVvDCEwnEPQ1skVguHoSQ==}
peerDependencies:
lit: ^2
yjs: ^13
dependencies:
- '@blocksuite/global': 0.4.0-20230203030233-b22bea7_lit@2.6.1
+ '@blocksuite/global': 0.4.0-20230205175611-17a62e3_lit@2.6.1
lit: 2.6.1
yjs: 13.5.44
dev: false
@@ -3614,7 +3614,7 @@ packages:
resolution: {integrity: sha512-UYK244awtmcUYQfs7FR8710MJcefL2WvkyHMjA8yJzxd1mo0Gfn88sRZ1Bls7hiUhA2w7ne1gpJ9T5g3G0wOyA==}
dev: true
- /@typescript-eslint/eslint-plugin/5.48.0_wxmz6cyorqfuzhhglktlvr5lve:
+ /@typescript-eslint/eslint-plugin/5.48.0_vqm4js66qtp4h6afqe3btrngbi:
resolution: {integrity: sha512-SVLafp0NXpoJY7ut6VFVUU9I+YeFsDzeQwtK0WZ+xbRN3mtxJ08je+6Oi2N89qDn087COdO0u3blKZNv9VetRQ==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -3625,23 +3625,23 @@ packages:
typescript:
optional: true
dependencies:
- '@typescript-eslint/parser': 5.48.0_p4cjf2r47dnfiqufepc5hp43sq
+ '@typescript-eslint/parser': 5.48.0_ifw3q4r6iq3gw7cspzs2siycvu
'@typescript-eslint/scope-manager': 5.48.0
- '@typescript-eslint/type-utils': 5.48.0_p4cjf2r47dnfiqufepc5hp43sq
- '@typescript-eslint/utils': 5.48.0_p4cjf2r47dnfiqufepc5hp43sq
+ '@typescript-eslint/type-utils': 5.48.0_ifw3q4r6iq3gw7cspzs2siycvu
+ '@typescript-eslint/utils': 5.48.0_ifw3q4r6iq3gw7cspzs2siycvu
debug: 4.3.4
eslint: 8.31.0
ignore: 5.2.0
natural-compare-lite: 1.4.0
regexpp: 3.2.0
semver: 7.3.7
- tsutils: 3.21.0_typescript@4.9.3
- typescript: 4.9.3
+ tsutils: 3.21.0_typescript@4.9.5
+ typescript: 4.9.5
transitivePeerDependencies:
- supports-color
dev: true
- /@typescript-eslint/parser/5.48.0_76twfck5d7crjqrmw4yltga7zm:
+ /@typescript-eslint/parser/5.48.0_hp3n5f6hao4yyg55iy34n6oive:
resolution: {integrity: sha512-1mxNA8qfgxX8kBvRDIHEzrRGrKHQfQlbW6iHyfHYS0Q4X1af+S6mkLNtgCOsGVl8+/LUPrqdHMssAemkrQ01qg==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -3653,15 +3653,15 @@ packages:
dependencies:
'@typescript-eslint/scope-manager': 5.48.0
'@typescript-eslint/types': 5.48.0
- '@typescript-eslint/typescript-estree': 5.48.0_typescript@4.8.3
+ '@typescript-eslint/typescript-estree': 5.48.0_typescript@4.9.5
debug: 4.3.4
eslint: 8.22.0
- typescript: 4.8.3
+ typescript: 4.9.5
transitivePeerDependencies:
- supports-color
dev: true
- /@typescript-eslint/parser/5.48.0_p4cjf2r47dnfiqufepc5hp43sq:
+ /@typescript-eslint/parser/5.48.0_ifw3q4r6iq3gw7cspzs2siycvu:
resolution: {integrity: sha512-1mxNA8qfgxX8kBvRDIHEzrRGrKHQfQlbW6iHyfHYS0Q4X1af+S6mkLNtgCOsGVl8+/LUPrqdHMssAemkrQ01qg==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -3673,10 +3673,10 @@ packages:
dependencies:
'@typescript-eslint/scope-manager': 5.48.0
'@typescript-eslint/types': 5.48.0
- '@typescript-eslint/typescript-estree': 5.48.0_typescript@4.9.3
+ '@typescript-eslint/typescript-estree': 5.48.0_typescript@4.9.5
debug: 4.3.4
eslint: 8.31.0
- typescript: 4.9.3
+ typescript: 4.9.5
transitivePeerDependencies:
- supports-color
dev: true
@@ -3689,7 +3689,7 @@ packages:
'@typescript-eslint/visitor-keys': 5.48.0
dev: true
- /@typescript-eslint/type-utils/5.48.0_p4cjf2r47dnfiqufepc5hp43sq:
+ /@typescript-eslint/type-utils/5.48.0_ifw3q4r6iq3gw7cspzs2siycvu:
resolution: {integrity: sha512-vbtPO5sJyFjtHkGlGK4Sthmta0Bbls4Onv0bEqOGm7hP9h8UpRsHJwsrCiWtCUndTRNQO/qe6Ijz9rnT/DB+7g==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -3699,12 +3699,12 @@ packages:
typescript:
optional: true
dependencies:
- '@typescript-eslint/typescript-estree': 5.48.0_typescript@4.9.3
- '@typescript-eslint/utils': 5.48.0_p4cjf2r47dnfiqufepc5hp43sq
+ '@typescript-eslint/typescript-estree': 5.48.0_typescript@4.9.5
+ '@typescript-eslint/utils': 5.48.0_ifw3q4r6iq3gw7cspzs2siycvu
debug: 4.3.4
eslint: 8.31.0
- tsutils: 3.21.0_typescript@4.9.3
- typescript: 4.9.3
+ tsutils: 3.21.0_typescript@4.9.5
+ typescript: 4.9.5
transitivePeerDependencies:
- supports-color
dev: true
@@ -3714,7 +3714,7 @@ packages:
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
dev: true
- /@typescript-eslint/typescript-estree/5.48.0_typescript@4.8.3:
+ /@typescript-eslint/typescript-estree/5.48.0_typescript@4.9.5:
resolution: {integrity: sha512-7pjd94vvIjI1zTz6aq/5wwE/YrfIyEPLtGJmRfyNR9NYIW+rOvzzUv3Cmq2hRKpvt6e9vpvPUQ7puzX7VSmsEw==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -3729,34 +3729,13 @@ packages:
globby: 11.1.0
is-glob: 4.0.3
semver: 7.3.7
- tsutils: 3.21.0_typescript@4.8.3
- typescript: 4.8.3
+ tsutils: 3.21.0_typescript@4.9.5
+ typescript: 4.9.5
transitivePeerDependencies:
- supports-color
dev: true
- /@typescript-eslint/typescript-estree/5.48.0_typescript@4.9.3:
- resolution: {integrity: sha512-7pjd94vvIjI1zTz6aq/5wwE/YrfIyEPLtGJmRfyNR9NYIW+rOvzzUv3Cmq2hRKpvt6e9vpvPUQ7puzX7VSmsEw==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- peerDependencies:
- typescript: '*'
- peerDependenciesMeta:
- typescript:
- optional: true
- dependencies:
- '@typescript-eslint/types': 5.48.0
- '@typescript-eslint/visitor-keys': 5.48.0
- debug: 4.3.4
- globby: 11.1.0
- is-glob: 4.0.3
- semver: 7.3.7
- tsutils: 3.21.0_typescript@4.9.3
- typescript: 4.9.3
- transitivePeerDependencies:
- - supports-color
- dev: true
-
- /@typescript-eslint/utils/5.48.0_p4cjf2r47dnfiqufepc5hp43sq:
+ /@typescript-eslint/utils/5.48.0_ifw3q4r6iq3gw7cspzs2siycvu:
resolution: {integrity: sha512-x2jrMcPaMfsHRRIkL+x96++xdzvrdBCnYRd5QiW5Wgo1OB4kDYPbC1XjWP/TNqlfK93K/lUL92erq5zPLgFScQ==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -3766,7 +3745,7 @@ packages:
'@types/semver': 7.3.13
'@typescript-eslint/scope-manager': 5.48.0
'@typescript-eslint/types': 5.48.0
- '@typescript-eslint/typescript-estree': 5.48.0_typescript@4.9.3
+ '@typescript-eslint/typescript-estree': 5.48.0_typescript@4.9.5
eslint: 8.31.0
eslint-scope: 5.1.1
eslint-utils: 3.0.0_eslint@8.31.0
@@ -4835,7 +4814,7 @@ packages:
resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
engines: {node: '>=10'}
- /eslint-config-next/12.3.1_76twfck5d7crjqrmw4yltga7zm:
+ /eslint-config-next/12.3.1_hp3n5f6hao4yyg55iy34n6oive:
resolution: {integrity: sha512-EN/xwKPU6jz1G0Qi6Bd/BqMnHLyRAL0VsaQaWA7F3KkjAgZHi4f1uL1JKGWNxdQpHTW/sdGONBd0bzxUka/DJg==}
peerDependencies:
eslint: ^7.23.0 || ^8.0.0
@@ -4846,7 +4825,7 @@ packages:
dependencies:
'@next/eslint-plugin-next': 12.3.1
'@rushstack/eslint-patch': 1.2.0
- '@typescript-eslint/parser': 5.48.0_76twfck5d7crjqrmw4yltga7zm
+ '@typescript-eslint/parser': 5.48.0_hp3n5f6hao4yyg55iy34n6oive
eslint: 8.22.0
eslint-import-resolver-node: 0.3.6
eslint-import-resolver-typescript: 2.7.1_2iahngt3u2tkbdlu6s4gkur3pu
@@ -4854,13 +4833,13 @@ packages:
eslint-plugin-jsx-a11y: 6.6.1_eslint@8.22.0
eslint-plugin-react: 7.31.8_eslint@8.22.0
eslint-plugin-react-hooks: 4.6.0_eslint@8.22.0
- typescript: 4.8.3
+ typescript: 4.9.5
transitivePeerDependencies:
- eslint-import-resolver-webpack
- supports-color
dev: true
- /eslint-config-next/12.3.1_p4cjf2r47dnfiqufepc5hp43sq:
+ /eslint-config-next/12.3.1_ifw3q4r6iq3gw7cspzs2siycvu:
resolution: {integrity: sha512-EN/xwKPU6jz1G0Qi6Bd/BqMnHLyRAL0VsaQaWA7F3KkjAgZHi4f1uL1JKGWNxdQpHTW/sdGONBd0bzxUka/DJg==}
peerDependencies:
eslint: ^7.23.0 || ^8.0.0
@@ -4871,7 +4850,7 @@ packages:
dependencies:
'@next/eslint-plugin-next': 12.3.1
'@rushstack/eslint-patch': 1.2.0
- '@typescript-eslint/parser': 5.48.0_p4cjf2r47dnfiqufepc5hp43sq
+ '@typescript-eslint/parser': 5.48.0_ifw3q4r6iq3gw7cspzs2siycvu
eslint: 8.31.0
eslint-import-resolver-node: 0.3.6
eslint-import-resolver-typescript: 2.7.1_ol7jqilc3wemtdbq3nzhywgxq4
@@ -4879,7 +4858,7 @@ packages:
eslint-plugin-jsx-a11y: 6.6.1_eslint@8.31.0
eslint-plugin-react: 7.31.8_eslint@8.31.0
eslint-plugin-react-hooks: 4.6.0_eslint@8.31.0
- typescript: 4.9.3
+ typescript: 4.9.5
transitivePeerDependencies:
- eslint-import-resolver-webpack
- supports-color
@@ -4969,7 +4948,7 @@ packages:
eslint-import-resolver-webpack:
optional: true
dependencies:
- '@typescript-eslint/parser': 5.48.0_p4cjf2r47dnfiqufepc5hp43sq
+ '@typescript-eslint/parser': 5.48.0_ifw3q4r6iq3gw7cspzs2siycvu
debug: 3.2.7
eslint: 8.31.0
eslint-import-resolver-node: 0.3.6
@@ -4999,7 +4978,7 @@ packages:
eslint-import-resolver-webpack:
optional: true
dependencies:
- '@typescript-eslint/parser': 5.48.0_76twfck5d7crjqrmw4yltga7zm
+ '@typescript-eslint/parser': 5.48.0_hp3n5f6hao4yyg55iy34n6oive
debug: 3.2.7
eslint: 8.22.0
eslint-import-resolver-node: 0.3.6
@@ -5018,7 +4997,7 @@ packages:
'@typescript-eslint/parser':
optional: true
dependencies:
- '@typescript-eslint/parser': 5.48.0_p4cjf2r47dnfiqufepc5hp43sq
+ '@typescript-eslint/parser': 5.48.0_ifw3q4r6iq3gw7cspzs2siycvu
array-includes: 3.1.5
array.prototype.flat: 1.3.0
debug: 2.6.9
@@ -5049,7 +5028,7 @@ packages:
'@typescript-eslint/parser':
optional: true
dependencies:
- '@typescript-eslint/parser': 5.48.0_76twfck5d7crjqrmw4yltga7zm
+ '@typescript-eslint/parser': 5.48.0_hp3n5f6hao4yyg55iy34n6oive
array-includes: 3.1.5
array.prototype.flat: 1.3.0
debug: 2.6.9
@@ -8578,7 +8557,7 @@ packages:
engines: {node: '>=8'}
dev: true
- /ts-node/10.9.1_typescript@4.9.3:
+ /ts-node/10.9.1_typescript@4.9.5:
resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
hasBin: true
peerDependencies:
@@ -8603,7 +8582,7 @@ packages:
create-require: 1.1.1
diff: 4.0.2
make-error: 1.3.6
- typescript: 4.9.3
+ typescript: 4.9.5
v8-compile-cache-lib: 3.0.1
yn: 3.1.1
dev: true
@@ -8624,24 +8603,14 @@ packages:
/tslib/2.4.0:
resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
- /tsutils/3.21.0_typescript@4.8.3:
+ /tsutils/3.21.0_typescript@4.9.5:
resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
engines: {node: '>= 6'}
peerDependencies:
typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
dependencies:
tslib: 1.14.1
- typescript: 4.8.3
- dev: true
-
- /tsutils/3.21.0_typescript@4.9.3:
- resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
- engines: {node: '>= 6'}
- peerDependencies:
- typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
- dependencies:
- tslib: 1.14.1
- typescript: 4.9.3
+ typescript: 4.9.5
dev: true
/tty-table/4.1.6:
@@ -8715,20 +8684,8 @@ packages:
is-typedarray: 1.0.0
dev: true
- /typescript/4.8.3:
- resolution: {integrity: sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==}
- engines: {node: '>=4.2.0'}
- hasBin: true
- dev: true
-
- /typescript/4.8.4:
- resolution: {integrity: sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==}
- engines: {node: '>=4.2.0'}
- hasBin: true
- dev: true
-
- /typescript/4.9.3:
- resolution: {integrity: sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==}
+ /typescript/4.9.5:
+ resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==}
engines: {node: '>=4.2.0'}
hasBin: true
dev: true
From a5e0fbae9e5978b8c27f70bdd5226684f0ec0387 Mon Sep 17 00:00:00 2001
From: DarkSky
Date: Mon, 6 Feb 2023 17:13:39 +0800
Subject: [PATCH 03/13] chore: move docs to folder
---
CODE_OF_CONDUCT.md | 45 -----------------------------------------
CONTRIBUTING.md | 3 ---
docs/CODE_OF_CONDUCT.md | 20 +++++++++---------
3 files changed, 10 insertions(+), 58 deletions(-)
delete mode 100644 CODE_OF_CONDUCT.md
delete mode 100644 CONTRIBUTING.md
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 2e9c0db51e..0000000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to make participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-- Using welcoming and inclusive language
-- Being respectful of differing viewpoints and experiences
-- Gracefully accepting constructive criticism
-- Focusing on what is best for the community
-- Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-- The use of sexualized language or imagery and unwelcome sexual attention or advances
-- Trolling, insulting/derogatory comments, and personal or political attacks
-- Public or private harassment
-- Publishing others' private information, such as a physical or electronic address, without explicit permission
-- Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies within all project spaces, and it also applies when an individual is representing the project or its community in public spaces. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project maintainer. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4, available at
-
-For answers to common questions about this code of conduct, see
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 3876d1b89b..0000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Contributing to AFFiNE
-
-For information related to contributing to AFFiNE, please check out the [Contributing to AFFiNE](https://docs.affine.pro/affine/developer-docs/contributions) section of the documentation at the AFFiNE site.
diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md
index de5d75c159..2e9c0db51e 100644
--- a/docs/CODE_OF_CONDUCT.md
+++ b/docs/CODE_OF_CONDUCT.md
@@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
Examples of behavior that contributes to creating a positive environment include:
-- Using welcoming and inclusive language
-- Being respectful of differing viewpoints and experiences
-- Gracefully accepting constructive criticism
-- Focusing on what is best for the community
-- Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
Examples of unacceptable behavior by participants include:
-- The use of sexualized language or imagery and unwelcome sexual attention or advances
-- Trolling, insulting/derogatory comments, and personal or political attacks
-- Public or private harassment
-- Publishing others' private information, such as a physical or electronic address, without explicit permission
-- Other conduct which could reasonably be considered inappropriate in a professional setting
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
## Our Responsibilities
From 759ec6707ac598a38562a9be2778ca83d54868ba Mon Sep 17 00:00:00 2001
From: lawvs <18554747+lawvs@users.noreply.github.com>
Date: Mon, 6 Feb 2023 17:37:26 +0800
Subject: [PATCH 04/13] feat: add @emotion/babel-plugin
---
packages/app/.babelrc.js | 15 ++++++++++++++
packages/app/package.json | 1 +
pnpm-lock.yaml | 42 +++++++++++++++++++--------------------
3 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/packages/app/.babelrc.js b/packages/app/.babelrc.js
index a801fd94ff..e98989a64f 100644
--- a/packages/app/.babelrc.js
+++ b/packages/app/.babelrc.js
@@ -7,6 +7,21 @@ if (process.env.NODE_ENV === 'development' || process.env.COVERAGE === 'true') {
plugins.push('istanbul');
}
+plugins.push([
+ '@emotion',
+ {
+ // See https://emotion.sh/docs/@emotion/babel-plugin
+ importMap: {
+ '@/styles': {
+ styled: {
+ canonicalImport: ['@emotion/styled', 'default'],
+ styledBaseImport: ['@/styles', 'styled'],
+ },
+ },
+ },
+ },
+]);
+
module.exports = {
presets: ['next/babel'],
plugins,
diff --git a/packages/app/package.json b/packages/app/package.json
index 8277f07a48..fdd8586437 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -39,6 +39,7 @@
"yjs": "^13.5.44"
},
"devDependencies": {
+ "@emotion/babel-plugin": "^11.10.5",
"@types/node": "18.7.18",
"@types/react": "18.0.20",
"@types/react-dom": "18.0.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f00882f360..d58b2a44ff 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -52,6 +52,7 @@ importers:
'@blocksuite/editor': 0.4.0-20230205175611-17a62e3
'@blocksuite/icons': ^2.0.2
'@blocksuite/store': 0.4.0-20230205175611-17a62e3
+ '@emotion/babel-plugin': ^11.10.5
'@emotion/css': ^11.10.0
'@emotion/react': ^11.10.4
'@emotion/server': ^11.10.0
@@ -116,6 +117,7 @@ importers:
react-dom: 18.2.0_react@18.2.0
yjs: 13.5.44
devDependencies:
+ '@emotion/babel-plugin': 11.10.5
'@types/node': 18.7.18
'@types/react': 18.0.20
'@types/react-dom': 18.0.6
@@ -441,11 +443,11 @@ packages:
/@babel/helper-plugin-utils/7.19.0:
resolution: {integrity: sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==}
engines: {node: '>=6.9.0'}
+ dev: true
/@babel/helper-plugin-utils/7.20.2:
resolution: {integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==}
engines: {node: '>=6.9.0'}
- dev: true
/@babel/helper-remap-async-to-generator/7.18.9_@babel+core@7.20.5:
resolution: {integrity: sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==}
@@ -834,8 +836,7 @@ packages:
peerDependencies:
'@babel/core': ^7.0.0-0
dependencies:
- '@babel/helper-plugin-utils': 7.19.0
- dev: false
+ '@babel/helper-plugin-utils': 7.20.2
/@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.20.5:
resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
@@ -1840,8 +1841,8 @@ packages:
'@jridgewell/trace-mapping': 0.3.9
dev: true
- /@emotion/babel-plugin/11.10.2:
- resolution: {integrity: sha512-xNQ57njWTFVfPAc3cjfuaPdsgLp5QOSuRsj9MA6ndEhH/AzuZM86qIQzt6rq+aGBwj3n5/TkLmU5lhAfdRmogA==}
+ /@emotion/babel-plugin/11.10.5:
+ resolution: {integrity: sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA==}
peerDependencies:
'@babel/core': ^7.0.0
dependencies:
@@ -1850,14 +1851,13 @@ packages:
'@babel/runtime': 7.20.7
'@emotion/hash': 0.9.0
'@emotion/memoize': 0.8.0
- '@emotion/serialize': 1.1.0
+ '@emotion/serialize': 1.1.1
babel-plugin-macros: 3.1.0
convert-source-map: 1.9.0
escape-string-regexp: 4.0.0
find-root: 1.1.0
source-map: 0.5.7
- stylis: 4.0.13
- dev: false
+ stylis: 4.1.3
/@emotion/cache/11.10.3:
resolution: {integrity: sha512-Psmp/7ovAa8appWh3g51goxu/z3iVms7JXOreq136D8Bbn6dYraPnmL6mdM8GThEx9vwSn92Fz+mGSjBzN8UPQ==}
@@ -1887,7 +1887,7 @@ packages:
'@babel/core':
optional: true
dependencies:
- '@emotion/babel-plugin': 11.10.2
+ '@emotion/babel-plugin': 11.10.5
'@emotion/cache': 11.10.3
'@emotion/serialize': 1.1.0
'@emotion/sheet': 1.2.0
@@ -1896,7 +1896,6 @@ packages:
/@emotion/hash/0.9.0:
resolution: {integrity: sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==}
- dev: false
/@emotion/is-prop-valid/1.2.0:
resolution: {integrity: sha512-3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg==}
@@ -1906,7 +1905,6 @@ packages:
/@emotion/memoize/0.8.0:
resolution: {integrity: sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==}
- dev: false
/@emotion/react/11.10.4_w5j4k42lgipnm43s3brx6h3c34:
resolution: {integrity: sha512-j0AkMpr6BL8gldJZ6XQsQ8DnS9TxEQu1R+OGmDZiWjBAJtCcbt0tS3I/YffoqHXxH6MjgI7KdMbYKw3MEiU9eA==}
@@ -1921,7 +1919,7 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.19.0
- '@emotion/babel-plugin': 11.10.2
+ '@emotion/babel-plugin': 11.10.5
'@emotion/cache': 11.10.3
'@emotion/serialize': 1.1.0
'@emotion/use-insertion-effect-with-fallbacks': 1.0.0_react@18.2.0
@@ -1942,6 +1940,15 @@ packages:
csstype: 3.1.1
dev: false
+ /@emotion/serialize/1.1.1:
+ resolution: {integrity: sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==}
+ dependencies:
+ '@emotion/hash': 0.9.0
+ '@emotion/memoize': 0.8.0
+ '@emotion/unitless': 0.8.0
+ '@emotion/utils': 1.2.0
+ csstype: 3.1.1
+
/@emotion/server/11.10.0_@emotion+css@11.10.0:
resolution: {integrity: sha512-MTvJ21JPo9aS02GdjFW4nhdwOi2tNNpMmAM/YED0pkxzjDNi5WbiTwXqaCnvLc2Lr8NFtjhT0az1vTJyLIHYcw==}
peerDependencies:
@@ -1979,7 +1986,7 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.19.0
- '@emotion/babel-plugin': 11.10.2
+ '@emotion/babel-plugin': 11.10.5
'@emotion/is-prop-valid': 1.2.0
'@emotion/react': 11.10.4_w5j4k42lgipnm43s3brx6h3c34
'@emotion/serialize': 1.1.0
@@ -1991,7 +1998,6 @@ packages:
/@emotion/unitless/0.8.0:
resolution: {integrity: sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==}
- dev: false
/@emotion/use-insertion-effect-with-fallbacks/1.0.0_react@18.2.0:
resolution: {integrity: sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==}
@@ -2003,7 +2009,6 @@ packages:
/@emotion/utils/1.2.0:
resolution: {integrity: sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw==}
- dev: false
/@emotion/weak-memoize/0.3.0:
resolution: {integrity: sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==}
@@ -3541,7 +3546,6 @@ packages:
/@types/parse-json/4.0.0:
resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
- dev: false
/@types/prettier/2.7.2:
resolution: {integrity: sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==}
@@ -4040,7 +4044,6 @@ packages:
'@babel/runtime': 7.20.7
cosmiconfig: 7.0.1
resolve: 1.22.1
- dev: false
/babel-plugin-polyfill-corejs2/0.3.3_@babel+core@7.20.5:
resolution: {integrity: sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==}
@@ -4407,7 +4410,6 @@ packages:
parse-json: 5.2.0
path-type: 4.0.0
yaml: 1.10.2
- dev: false
/create-require/1.1.1:
resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
@@ -5510,7 +5512,6 @@ packages:
/find-root/1.1.0:
resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==}
- dev: false
/find-up/4.1.0:
resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
@@ -8147,7 +8148,6 @@ packages:
/source-map/0.5.7:
resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
engines: {node: '>=0.10.0'}
- dev: false
/source-map/0.6.1:
resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
@@ -8405,7 +8405,6 @@ packages:
/stylis/4.1.3:
resolution: {integrity: sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA==}
- dev: false
/supports-color/5.5.0:
resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
@@ -9231,7 +9230,6 @@ packages:
/yaml/1.10.2:
resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
engines: {node: '>= 6'}
- dev: false
/yaml/2.2.1:
resolution: {integrity: sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==}
From 1379094f4df6be3a37f7aaa81bf6ab844e221cb8 Mon Sep 17 00:00:00 2001
From: DiamondThree <857159145@qq.com>
Date: Mon, 6 Feb 2023 20:13:39 +0800
Subject: [PATCH 05/13] delete useless tips
---
packages/app/src/components/page-list/Empty.tsx | 1 -
1 file changed, 1 deletion(-)
diff --git a/packages/app/src/components/page-list/Empty.tsx b/packages/app/src/components/page-list/Empty.tsx
index 4430b8f1a9..f8dfc6745d 100644
--- a/packages/app/src/components/page-list/Empty.tsx
+++ b/packages/app/src/components/page-list/Empty.tsx
@@ -14,7 +14,6 @@ export const PageListEmpty = (props: { listType?: string }) => {
{listType === 'all' && {t('emptyAllPages')}
}
{listType === 'favorite' && {t('emptyFavourite')}
}
{listType === 'trash' && {t('emptyTrash')}
}
- {t('still designed')}
);
};
From 274505590c8f5b018ce6a701ef53abf802460646 Mon Sep 17 00:00:00 2001
From: tzhangchi
Date: Mon, 6 Feb 2023 21:58:41 +0800
Subject: [PATCH 06/13] feat: update the default workspace nameto `AFFiNE Test`
and add e2e test for it
---
.../WorkspaceSelector/WorkspaceSelector.tsx | 4 ++--
.../app/src/providers/app-state-provider/utils.ts | 2 +-
tests/local-first-workspace.spec.ts | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
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 36484ca46c..c254145851 100644
--- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx
+++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx
@@ -32,13 +32,13 @@ export const WorkspaceSelector = () => {
>
- {currentWorkspace?.name ?? 'AFFiNE'}
+ {currentWorkspace?.name ?? 'AFFiNE Test'}
{
return dataCenter.createWorkspace({
diff --git a/tests/local-first-workspace.spec.ts b/tests/local-first-workspace.spec.ts
index fb584d8991..7a2e26b3d1 100644
--- a/tests/local-first-workspace.spec.ts
+++ b/tests/local-first-workspace.spec.ts
@@ -5,15 +5,15 @@ import { loadPage } from './libs/load-page.js';
loadPage();
test.describe('Local first default workspace', () => {
- test.skip('Default workspace name', async ({ page }) => {
+ test('preset workspace name', async ({ page }) => {
const workspaceName = page.getByTestId('workspace-name');
- expect(await workspaceName.textContent()).toBe('AFFiNE');
+ expect(await workspaceName.textContent()).toBe('AFFiNE Test');
});
- test.skip('Default workspace avatar', async ({ page }) => {
+ test('default workspace avatar', async ({ page }) => {
const workspaceAvatar = page.getByTestId('workspace-avatar');
- expect(await workspaceAvatar.innerHTML()).toBe(
- ''
- );
+ expect(
+ await workspaceAvatar.locator('img').getAttribute('src')
+ ).not.toBeNull();
});
});
From 9548cc1ed100ce415a7f050c4843c1d90d65e231 Mon Sep 17 00:00:00 2001
From: tzhangchi
Date: Mon, 6 Feb 2023 22:26:01 +0800
Subject: [PATCH 07/13] feat: add e2e test for creating multi workspaces
---
.../workspace-modal/WorkspaceCard.tsx | 1 +
playwright.config.ts | 1 +
tests/libs/workspace-logic.ts | 24 +++++++++++
tests/local-first-workspace-list.spec.ts | 40 +++++++++++++++++++
4 files changed, 66 insertions(+)
create mode 100644 tests/libs/workspace-logic.ts
create mode 100644 tests/local-first-workspace-list.spec.ts
diff --git a/packages/app/src/components/workspace-modal/WorkspaceCard.tsx b/packages/app/src/components/workspace-modal/WorkspaceCard.tsx
index fe1173e580..fd6a12f7f8 100644
--- a/packages/app/src/components/workspace-modal/WorkspaceCard.tsx
+++ b/packages/app/src/components/workspace-modal/WorkspaceCard.tsx
@@ -23,6 +23,7 @@ export const WorkspaceCard = ({
const { t } = useTranslation();
return (
{
onClick(workspaceData);
}}
diff --git a/playwright.config.ts b/playwright.config.ts
index a8aa070449..f5fd850114 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -17,6 +17,7 @@ const config: PlaywrightTestConfig = {
browserName: 'chromium',
viewport: { width: 1440, height: 800 },
actionTimeout: 5 * 1000,
+ locale: 'en-US',
// Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer
// You can open traces locally(`npx playwright show-trace trace.zip`)
// or in your browser on [Playwright Trace Viewer](https://trace.playwright.dev/).
diff --git a/tests/libs/workspace-logic.ts b/tests/libs/workspace-logic.ts
new file mode 100644
index 0000000000..5c7f256dc6
--- /dev/null
+++ b/tests/libs/workspace-logic.ts
@@ -0,0 +1,24 @@
+import type { Page } from '@playwright/test';
+interface CreateWorkspaceParams {
+ name: string;
+}
+export async function createWorkspace(
+ params: CreateWorkspaceParams,
+ page: Page
+) {
+ // open workspace list modal
+ const workspaceName = page.getByTestId('workspace-name');
+ await workspaceName.click();
+
+ // open create workspace modal
+ await page.locator('.add-icon').click();
+
+ // input workspace name
+ await page.getByPlaceholder('Set a Workspace name').click();
+ await page.getByPlaceholder('Set a Workspace name').fill(params.name);
+
+ // click create button
+ await page.getByRole('button', { name: 'Create' }).click();
+
+ return page.waitForTimeout(300);
+}
diff --git a/tests/local-first-workspace-list.spec.ts b/tests/local-first-workspace-list.spec.ts
new file mode 100644
index 0000000000..132abb55b3
--- /dev/null
+++ b/tests/local-first-workspace-list.spec.ts
@@ -0,0 +1,40 @@
+import { expect } from '@playwright/test';
+import { test } from './libs/playwright.js';
+import { loadPage } from './libs/load-page.js';
+import { createWorkspace } from './libs/workspace-logic.js';
+loadPage();
+
+test.describe('Local first workspace list', () => {
+ test('just one item in the workspace list at first', async ({ page }) => {
+ const workspaceName = page.getByTestId('workspace-name');
+ await workspaceName.click();
+ expect(
+ page
+ .locator('div')
+ .filter({ hasText: 'AFFiNE TestLocal WorkspaceAvailable Offline' })
+ .nth(3)
+ ).not.toBeNull();
+ });
+
+ test('create one workspace in the workspace list', async ({ page }) => {
+ const newWorkspaceNameStr = 'New Workspace';
+ await createWorkspace({ name: newWorkspaceNameStr }, page);
+
+ // check new workspace name
+ const newWorkspaceName = page.getByTestId('workspace-name');
+ expect(await newWorkspaceName.textContent()).toBe(newWorkspaceNameStr);
+ });
+
+ test('create multi workspace in the workspace list', async ({ page }) => {
+ await createWorkspace({ name: 'New Workspace 2' }, page);
+ await createWorkspace({ name: 'New Workspace 3' }, page);
+
+ // show workspace list
+ const workspaceName = page.getByTestId('workspace-name');
+ await workspaceName.click();
+
+ //check workspace list length
+ const workspaceCards = await page.$$('data-testid=workspace-card');
+ expect(workspaceCards.length).toBe(3);
+ });
+});
From 4fed0de502e10cc3ec55c705d4f43b892b181320 Mon Sep 17 00:00:00 2001
From: tzhangchi
Date: Mon, 6 Feb 2023 22:36:40 +0800
Subject: [PATCH 08/13] feat: make 404 route faster
---
packages/app/src/pages/_app.tsx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/packages/app/src/pages/_app.tsx b/packages/app/src/pages/_app.tsx
index b881f9c07b..5f1c9499d3 100644
--- a/packages/app/src/pages/_app.tsx
+++ b/packages/app/src/pages/_app.tsx
@@ -67,8 +67,8 @@ const App = ({ Component, pageProps }: AppPropsWithLayout) => {
};
const AppDefender = ({ children }: PropsWithChildren) => {
- const { synced } = useAppState();
const router = useRouter();
+ const { synced } = useAppState();
useEffect(() => {
if (router.asPath === '/') {
@@ -76,6 +76,11 @@ const AppDefender = ({ children }: PropsWithChildren) => {
}
}, [router]);
+ // if you visit /404, you will see the children directly
+ if (router.route === '/404') {
+ return {children}
;
+ }
+
return ;
};
From efb5e8a504ee50e7c4a2a62a224e2f083aec8227 Mon Sep 17 00:00:00 2001
From: DarkSky
Date: Mon, 6 Feb 2023 23:21:23 +0800
Subject: [PATCH 09/13] chore: unit test & failure record
---
.github/workflows/build.yml | 52 ++++++++++++++++++++++++-------------
1 file changed, 34 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8f4319f95c..a41c84f4c3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,13 +72,11 @@ jobs:
needs: build
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 'latest'
-
- - name: Use Node.js
- uses: actions/setup-node@v2
+ - uses: actions/setup-node@v3
with:
node-version: 18.x
cache: 'pnpm'
@@ -96,8 +94,6 @@ jobs:
- name: Install dependencies
run: pnpm install
- env:
- NODE_AUTH_TOKEN: ${{ secrets.NPM_GITHUB_AUTH_TOKEN }}
- name: Download artifact
uses: actions/download-artifact@v3
@@ -105,20 +101,40 @@ jobs:
name: artifact
path: packages/app/.next/
- - name: Lint & E2E Test
+ - name: Lint & E2E Test & Unit Test
run: |
pnpm lint --max-warnings=0
- PLAYWRIGHT_BROWSERS_PATH=0 npx playwright install chromium
- PLAYWRIGHT_BROWSERS_PATH=0 pnpm test
- PLAYWRIGHT_BROWSERS_PATH=0 pnpm test:dc
- env:
- NEXT_PUBLIC_FIREBASE_API_KEY: ${{ secrets.NEXT_PUBLIC_FIREBASE_API_KEY }}
- NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN: ${{ secrets.NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN }}
- NEXT_PUBLIC_FIREBASE_PROJECT_ID: ${{ secrets.NEXT_PUBLIC_FIREBASE_PROJECT_ID }}
- NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET: ${{ secrets.NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET }}
- NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID: ${{ secrets.NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID }}
- NEXT_PUBLIC_FIREBASE_APP_ID: ${{ secrets.NEXT_PUBLIC_FIREBASE_APP_ID }}
- NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID: ${{ secrets.NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID }}
+ npx playwright install chromium
+ pnpm run test:coverage
+ pnpm run test:unit
+ # env:
+ # NEXT_PUBLIC_FIREBASE_API_KEY: ${{ secrets.NEXT_PUBLIC_FIREBASE_API_KEY }}
+ # NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN: ${{ secrets.NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN }}
+ # NEXT_PUBLIC_FIREBASE_PROJECT_ID: ${{ secrets.NEXT_PUBLIC_FIREBASE_PROJECT_ID }}
+ # NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET: ${{ secrets.NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET }}
+ # NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID: ${{ secrets.NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID }}
+ # NEXT_PUBLIC_FIREBASE_APP_ID: ${{ secrets.NEXT_PUBLIC_FIREBASE_APP_ID }}
+ # NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID: ${{ secrets.NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID }}
+
+ - name: Collect code coverage report
+ run: pnpm exec nyc report -t .nyc_output --report-dir .coverage --reporter=lcov
+
+ - name: Upload e2e test coverage results
+ uses: codecov/codecov-action@v3
+ with:
+ token: ${{ secrets.CODECOV_TOKEN }}
+ files: ./.coverage/lcov.info
+ flags: e2etest
+ name: affine
+ fail_ci_if_error: true
+
+ - name: Upload test results
+ if: ${{ failure() }}
+ uses: actions/upload-artifact@v2
+ with:
+ name: test-results-main
+ path: ./test-results
+ if-no-files-found: ignore
build-community:
name: Build Community
From e397fe09c7e9b86402b2478cbd511a1898fd1b4f Mon Sep 17 00:00:00 2001
From: DarkSky
Date: Mon, 6 Feb 2023 23:44:34 +0800
Subject: [PATCH 10/13] chore: remove duplicate tests
---
.github/workflows/tests.yml | 88 -------------------------------------
1 file changed, 88 deletions(-)
delete mode 100644 .github/workflows/tests.yml
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
deleted file mode 100644
index 94444eb35e..0000000000
--- a/.github/workflows/tests.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-name: Unit Tests
-on:
- push:
- branches: [master]
- pull_request:
- branches: [master]
-jobs:
- e2e-test:
- timeout-minutes: 60
- runs-on: self-hosted
-
- steps:
- - uses: actions/checkout@v3
-
- - uses: pnpm/action-setup@v2
- with:
- version: 'latest'
-
- - uses: actions/setup-node@v3
- with:
- node-version: 16
- registry-url: https://npm.pkg.github.com
- scope: '@toeverything'
- cache: 'pnpm'
-
- - run: node scripts/module-resolve/ci.cjs
-
- - name: Install dependencies
- run: pnpm install --no-frozen-lockfile
- env:
- NODE_AUTH_TOKEN: ${{ secrets.NPM_GITHUB_AUTH_TOKEN }}
-
- - name: Install Playwright browsers
- run: npx playwright install chromium
-
- - name: Run E2E tests
- run: pnpm run test:coverage
- # env:
- # NEXT_PUBLIC_FIREBASE_API_KEY: ${{ secrets.NEXT_PUBLIC_FIREBASE_API_KEY }}
- # NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN: ${{ secrets.NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN }}
- # NEXT_PUBLIC_FIREBASE_PROJECT_ID: ${{ secrets.NEXT_PUBLIC_FIREBASE_PROJECT_ID }}
- # NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET: ${{ secrets.NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET }}
- # NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID: ${{ secrets.NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID }}
- # NEXT_PUBLIC_FIREBASE_APP_ID: ${{ secrets.NEXT_PUBLIC_FIREBASE_APP_ID }}
- # NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID: ${{ secrets.NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID }}
-
- - name: Collect code coverage report
- run: pnpm exec nyc report -t .nyc_output --report-dir .coverage --reporter=lcov
-
- - name: Upload e2e test coverage results
- uses: codecov/codecov-action@v3
- with:
- token: ${{ secrets.CODECOV_TOKEN }}
- files: ./.coverage/lcov.info
- flags: e2etest
- name: affine
- fail_ci_if_error: true
-
- unit-test:
- timeout-minutes: 60
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
-
- - uses: pnpm/action-setup@v2
- with:
- version: 'latest'
-
- - uses: actions/setup-node@v3
- with:
- node-version: 16
- registry-url: https://npm.pkg.github.com
- scope: '@toeverything'
- cache: 'pnpm'
-
- - run: node scripts/module-resolve/ci.cjs
-
- - name: Install dependencies
- run: pnpm install --no-frozen-lockfile
- env:
- NODE_AUTH_TOKEN: ${{ secrets.NPM_GITHUB_AUTH_TOKEN }}
-
- - name: Install Playwright browsers
- run: npx playwright install chromium
-
- - name: Run Unit tests
- run: pnpm run test:unit
From 392c9cc0d6c663c63ad0f85671e84d81e13b6492 Mon Sep 17 00:00:00 2001
From: himself65
Date: Mon, 6 Feb 2023 10:59:47 -0600
Subject: [PATCH 11/13] fix: alias
---
packages/data-center/package.json | 1 -
packages/i18n/package.json | 1 -
packages/logger/package.json | 1 -
tsconfig.json | 5 ++++-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/packages/data-center/package.json b/packages/data-center/package.json
index 087fb0b33d..0f5a56ca79 100644
--- a/packages/data-center/package.json
+++ b/packages/data-center/package.json
@@ -6,7 +6,6 @@
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
"exports": {
- "./src/*": "./dist/src/*.js",
".": "./dist/src/index.js"
},
"scripts": {
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 29358083a3..b92bac2669 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -6,7 +6,6 @@
"type": "module",
"types": "dist/src/index.d.ts",
"exports": {
- "./src/*": "./dist/src/*.js",
".": "./dist/src/index.js"
},
"scripts": {
diff --git a/packages/logger/package.json b/packages/logger/package.json
index b1c858f613..e0295266b0 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -5,7 +5,6 @@
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
"exports": {
- "./src/*": "./dist/src/*.js",
".": "./dist/src/index.js"
},
"scripts": {
diff --git a/tsconfig.json b/tsconfig.json
index 592edefeb6..f197d7b026 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,7 +17,10 @@
"experimentalDecorators": true,
"baseUrl": ".",
"paths": {
- "@/*": ["src/*"]
+ "@/*": ["src/*"],
+ "@affine/datacenter": ["packages/datacenter/src"],
+ "@affine/i18n": ["packages/i18n/src"],
+ "@affine/logger": ["packages/logger/src"]
}
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
From ad3e18cb1aa489d9a022bef357becb5d879a8923 Mon Sep 17 00:00:00 2001
From: lawvs <18554747+lawvs@users.noreply.github.com>
Date: Tue, 7 Feb 2023 01:22:39 +0800
Subject: [PATCH 12/13] feat: enable github reporter
---
playwright.config.ts | 5 +++++
playwright.config.unit.ts | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/playwright.config.ts b/playwright.config.ts
index a8aa070449..1c1ff81bc1 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -39,6 +39,11 @@ const config: PlaywrightTestConfig = {
COVERAGE: process.env.COVERAGE || 'false',
},
},
+
+ // 'github' for GitHub Actions CI to generate annotations, plus a concise 'dot'
+ // default 'list' when running locally
+ // See https://playwright.dev/docs/test-reporters#github-actions-annotations
+ reporter: process.env.CI ? 'github' : 'list',
};
export default config;
diff --git a/playwright.config.unit.ts b/playwright.config.unit.ts
index 7a5651b631..69150b1426 100644
--- a/playwright.config.unit.ts
+++ b/playwright.config.unit.ts
@@ -23,6 +23,11 @@ const config: PlaywrightTestConfig = {
/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
trace: 'on-first-retry',
},
+
+ // 'github' for GitHub Actions CI to generate annotations, plus a concise 'dot'
+ // default 'list' when running locally
+ // See https://playwright.dev/docs/test-reporters#github-actions-annotations
+ reporter: process.env.CI ? 'github' : 'list',
};
export default config;
From b0bbe0eff3278fafccfd7f9f486ceda6e6d90490 Mon Sep 17 00:00:00 2001
From: DarkSky
Date: Tue, 7 Feb 2023 01:42:40 +0800
Subject: [PATCH 13/13] chore: temporarily disable unstable test
---
playwright.config.ts | 2 +-
tests/local-first-workspace-list.spec.ts | 2 +-
tests/quick-search.spec.ts | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/playwright.config.ts b/playwright.config.ts
index f5fd850114..d5c2944a26 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -28,7 +28,7 @@ const config: PlaywrightTestConfig = {
fullyParallel: true,
forbidOnly: !!process.env.CI,
- retries: process.env.CI ? 2 : 0,
+ retries: process.env.CI ? 3 : 0,
workers: process.env.CI ? '100%' : undefined,
webServer: {
diff --git a/tests/local-first-workspace-list.spec.ts b/tests/local-first-workspace-list.spec.ts
index 132abb55b3..095f139ced 100644
--- a/tests/local-first-workspace-list.spec.ts
+++ b/tests/local-first-workspace-list.spec.ts
@@ -16,7 +16,7 @@ test.describe('Local first workspace list', () => {
).not.toBeNull();
});
- test('create one workspace in the workspace list', async ({ page }) => {
+ test.skip('create one workspace in the workspace list', async ({ page }) => {
const newWorkspaceNameStr = 'New Workspace';
await createWorkspace({ name: newWorkspaceNameStr }, page);
diff --git a/tests/quick-search.spec.ts b/tests/quick-search.spec.ts
index b45e66ff94..d93b5fa355 100644
--- a/tests/quick-search.spec.ts
+++ b/tests/quick-search.spec.ts
@@ -74,7 +74,7 @@ test.describe('Add new page in quick search', () => {
});
test.describe('Search and select', () => {
- test('Create a new page and search this page', async ({ page }) => {
+ test.skip('Create a new page and search this page', async ({ page }) => {
await newPage(page);
await openQuickSearchByShortcut(page);
await page.keyboard.insertText('test123456');