Merge remote-tracking branch 'origin' into feat/poc

This commit is contained in:
DiamondThree
2023-01-09 12:04:58 +08:00
8 changed files with 69 additions and 18 deletions

73
pnpm-lock.yaml generated
View File

@@ -43,10 +43,10 @@ importers:
packages/app:
specifiers:
'@affine/datacenter': workspace:*
'@blocksuite/blocks': '=0.3.1-20230106060050-1aad55d'
'@blocksuite/editor': '=0.3.1-20230106060050-1aad55d'
'@blocksuite/blocks': 0.3.1-20230109032243-37ad3ba
'@blocksuite/editor': 0.3.1-20230109032243-37ad3ba
'@blocksuite/icons': ^2.0.2
'@blocksuite/store': '=0.3.1-20230106060050-1aad55d'
'@blocksuite/store': 0.3.1-20230109032243-37ad3ba
'@emotion/css': ^11.10.0
'@emotion/react': ^11.10.4
'@emotion/server': ^11.10.0
@@ -85,10 +85,10 @@ importers:
yjs: ^13.5.44
dependencies:
'@affine/datacenter': link:../data-center
'@blocksuite/blocks': 0.3.1-20230106060050-1aad55d_yjs@13.5.44
'@blocksuite/editor': 0.3.1-20230106060050-1aad55d_yjs@13.5.44
'@blocksuite/blocks': 0.3.1-20230109032243-37ad3ba_yjs@13.5.44
'@blocksuite/editor': 0.3.1-20230109032243-37ad3ba_yjs@13.5.44
'@blocksuite/icons': 2.0.4_w5j4k42lgipnm43s3brx6h3c34
'@blocksuite/store': 0.3.1-20230106060050-1aad55d_yjs@13.5.44
'@blocksuite/store': 0.3.1-20230109032243-37ad3ba_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
@@ -1463,11 +1463,31 @@ packages:
- yjs
dev: false
/@blocksuite/editor/0.3.1-20230106060050-1aad55d_yjs@13.5.44:
resolution: {integrity: sha512-wSlAF9XVxIkHFJ1qCzn7oQ/gwXybFYMrzRl35UTJV509D+DuWZefRZWvpdIDCOUJ24uQscr1HxwsON11ltfWgA==}
/@blocksuite/blocks/0.3.1-20230109032243-37ad3ba_yjs@13.5.44:
resolution: {integrity: sha512-UTlbk0Is7TMRBbvUyM2nivbqM/TLwRj1qArMYbOmvDGUNYadWo68cTwv/Ej2WwiKn22q4/4JHryGsv3gTCRz1Q==}
dependencies:
'@blocksuite/blocks': 0.3.1-20230106060050-1aad55d_yjs@13.5.44
'@blocksuite/store': 0.3.1-20230106060050-1aad55d_yjs@13.5.44
'@blocksuite/phasor': 0.3.1-20230109032243-37ad3ba_yjs@13.5.44
'@blocksuite/store': 0.3.1-20230109032243-37ad3ba_yjs@13.5.44
'@tldraw/intersect': 1.8.0
autosize: 5.0.2
highlight.js: 11.7.0
hotkeys-js: 3.10.1
lit: 2.5.0
perfect-freehand: 1.2.0
quill: 1.3.7
quill-cursors: 4.0.0
transitivePeerDependencies:
- bufferutil
- supports-color
- utf-8-validate
- yjs
dev: false
/@blocksuite/editor/0.3.1-20230109032243-37ad3ba_yjs@13.5.44:
resolution: {integrity: sha512-bYbMn4EL/od+xP4K3u2kJT08kJBpK6H7b4cbRb9No3SUwgNHvvVNxia/QH1AQXyKaZQj/DHFgVxrw9GKo2GIPA==}
dependencies:
'@blocksuite/blocks': 0.3.1-20230109032243-37ad3ba_yjs@13.5.44
'@blocksuite/store': 0.3.1-20230109032243-37ad3ba_yjs@13.5.44
lit: 2.5.0
marked: 4.2.5
turndown: 7.1.1
@@ -1488,6 +1508,14 @@ packages:
react: 18.2.0
dev: false
/@blocksuite/phasor/0.3.1-20230109032243-37ad3ba_yjs@13.5.44:
resolution: {integrity: sha512-mL1gSQ3rzrjdQSbWPtgyMXpbbl266UUjw26d0aIjkOh+iMMI6rWtmKWDoiDkO7tejIjwSNQ4w5zJOjJRIj+mSA==}
peerDependencies:
yjs: ^13
dependencies:
yjs: 13.5.44
dev: false
/@blocksuite/phasor/0.3.1_yjs@13.5.44:
resolution: {integrity: sha512-aJmAQn2qoF6HxFZWgq7xa/pWVyzg3MmD6dynIHAKdfN7rBdKk3PNA+lRX919QkD2e270N/zgHEGFFQI1Nj5xrA==}
peerDependencies:
@@ -1517,6 +1545,27 @@ packages:
- utf-8-validate
dev: false
/@blocksuite/store/0.3.1-20230109032243-37ad3ba_yjs@13.5.44:
resolution: {integrity: sha512-zOUz19jfhuhsUkx9BGEQPZWbPyD/AgX0LB7ShVRdd3YM73x25hD6tPLLz1HEV2b69XokC0P9oSru4aNomm4jkg==}
peerDependencies:
yjs: ^13
dependencies:
'@types/flexsearch': 0.7.3
'@types/quill': 1.3.10
buffer: 6.0.3
flexsearch: 0.7.21
idb-keyval: 6.2.0
ky: 0.33.1
lib0: 0.2.58
y-protocols: 1.0.5
y-webrtc: 10.2.3
yjs: 13.5.44
transitivePeerDependencies:
- bufferutil
- supports-color
- utf-8-validate
dev: false
/@changesets/apply-release-plan/6.1.3:
resolution: {integrity: sha512-ECDNeoc3nfeAe1jqJb5aFQX7CqzQhD2klXRez2JDb/aVpGUbX673HgKrnrgJRuQR/9f2TtLoYIzrGB9qwD77mg==}
dependencies:
@@ -6416,8 +6465,8 @@ packages:
/lit-element/3.2.2:
resolution: {integrity: sha512-6ZgxBR9KNroqKb6+htkyBwD90XGRiqKDHVrW/Eh0EZ+l+iC+u+v+w3/BA5NGi4nizAVHGYvQBHUDuSmLjPp7NQ==}
dependencies:
'@lit/reactive-element': 1.4.1
lit-html: 2.4.0
'@lit/reactive-element': 1.5.0
lit-html: 2.5.0
dev: false
/lit-html/2.4.0: