From 344483e4361d3e301fdaa6b953dc19d818d80eaa Mon Sep 17 00:00:00 2001 From: lawvs <18554747+lawvs@users.noreply.github.com> Date: Wed, 26 Oct 2022 17:26:51 +0800 Subject: [PATCH 01/13] fix: edgeless not work --- packages/app/src/components/editor.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/app/src/components/editor.tsx b/packages/app/src/components/editor.tsx index 4dcf1792e2..1735a62a57 100644 --- a/packages/app/src/components/editor.tsx +++ b/packages/app/src/components/editor.tsx @@ -27,7 +27,7 @@ const BlockSuiteEditor = forwardRef(({}, ref) => { editor.remove(); }; }, [ref]); - return
; + return
; }); export const Editor = () => { @@ -67,6 +67,7 @@ declare global { namespace JSX { interface IntrinsicElements { + // TODO fix types on react 'editor-container': EditorContainer; } } From 7c6a4749293f9b52afe64330b32cd28d953756ac Mon Sep 17 00:00:00 2001 From: Whitewater Date: Wed, 26 Oct 2022 01:48:25 -0800 Subject: [PATCH 02/13] chore: bump blocksuite (#506) --- packages/app/package.json | 4 ++-- pnpm-lock.yaml | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index 85ec3b0ed9..cda28673b9 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -9,8 +9,8 @@ "lint": "next lint" }, "dependencies": { - "@blocksuite/blocks": "^0.2.19", - "@blocksuite/editor": "^0.2.19", + "@blocksuite/blocks": "^0.2.21", + "@blocksuite/editor": "^0.2.21", "@emotion/css": "^11.10.0", "@emotion/react": "^11.10.4", "@emotion/server": "^11.10.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4d04beb5b2..6c3da43b72 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: packages/app: specifiers: - '@blocksuite/blocks': ^0.2.19 - '@blocksuite/editor': ^0.2.19 + '@blocksuite/blocks': ^0.2.21 + '@blocksuite/editor': ^0.2.21 '@emotion/css': ^11.10.0 '@emotion/react': ^11.10.4 '@emotion/server': ^11.10.0 @@ -48,8 +48,8 @@ importers: react-dom: 18.2.0 typescript: 4.8.3 dependencies: - '@blocksuite/blocks': 0.2.19 - '@blocksuite/editor': 0.2.19 + '@blocksuite/blocks': 0.2.21 + '@blocksuite/editor': 0.2.21 '@emotion/css': 11.10.0 '@emotion/react': 11.10.4_w5j4k42lgipnm43s3brx6h3c34 '@emotion/server': 11.10.0_@emotion+css@11.10.0 @@ -166,10 +166,10 @@ packages: to-fast-properties: 2.0.0 dev: false - /@blocksuite/blocks/0.2.19: - resolution: {integrity: sha512-Xg1d8dIOb4qCYJ1u63zfgGdYfrV7S926srflCzbWuJOMAQ1auRPypHVCxidOir/S583B3l6t80vIhy0Xmu3+2Q==} + /@blocksuite/blocks/0.2.21: + resolution: {integrity: sha512-2Q1RnYjvhWJqt0Zy9kxfeaavvMa3CgDdxhQCN88FwxEVkbo2Sgt1vLeh1kHQU5bJXMghARPCgR4KFB2CkpaMNw==} dependencies: - '@blocksuite/store': 0.2.19 + '@blocksuite/store': 0.2.21 hotkeys-js: 3.10.0 lit: 2.4.0 quill: 1.3.7 @@ -180,11 +180,11 @@ packages: - utf-8-validate dev: false - /@blocksuite/editor/0.2.19: - resolution: {integrity: sha512-KYgn+fvBSCEbo8XBVQd/NNSTw2xV+Ysyec1l+Jv6ukW22ezf05HZlG+tMgg2JDLEsiDHgVhqvqBAZA8BtYF6qw==} + /@blocksuite/editor/0.2.21: + resolution: {integrity: sha512-41M6rnvMjzflY9YEwJDPyF+kkczUBlOF1aeNJP37bV3UNVlVGVTSfW1A1N/orOxcLN2xy3vzpa8Q8wdV1rUJXQ==} dependencies: - '@blocksuite/blocks': 0.2.19 - '@blocksuite/store': 0.2.19 + '@blocksuite/blocks': 0.2.21 + '@blocksuite/store': 0.2.21 lit: 2.4.0 marked: 4.1.1 turndown: 7.1.1 @@ -194,8 +194,8 @@ packages: - utf-8-validate dev: false - /@blocksuite/store/0.2.19: - resolution: {integrity: sha512-/MSuLTd9zNJj7Mxmj6GC1NMzSQ6HHZJdbevn3/o3Sp41KKI2TYygmk26xwvi5duaNgw2GQISWDdHuHnweh8p8w==} + /@blocksuite/store/0.2.21: + resolution: {integrity: sha512-dg/Vpupn+M/8mXfc/g/n9yTU3X7WiPo++MiMO9YHZkjGnLPF3vasbqqrRVyVbuwXIuTQEltv9K3Sgyka2Aqa5g==} dependencies: lib0: 0.2.52 y-protocols: 1.0.5 @@ -1438,7 +1438,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.38.0_76twfck5d7crjqrmw4yltga7zm + '@typescript-eslint/parser': 5.38.0_eslint@8.22.0 debug: 3.2.7 eslint: 8.22.0 eslint-import-resolver-node: 0.3.6 @@ -1457,7 +1457,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.38.0_76twfck5d7crjqrmw4yltga7zm + '@typescript-eslint/parser': 5.38.0_eslint@8.22.0 array-includes: 3.1.5 array.prototype.flat: 1.3.0 debug: 2.6.9 From da30e50e140f14f27d67f31eaedc8f622bcb1fa4 Mon Sep 17 00:00:00 2001 From: DiamondThree Date: Wed, 26 Oct 2022 19:32:58 +0800 Subject: [PATCH 03/13] feat: publish new version (#507) --- packages/app/package.json | 4 ++-- pnpm-lock.yaml | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index cda28673b9..55f231b965 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -9,8 +9,8 @@ "lint": "next lint" }, "dependencies": { - "@blocksuite/blocks": "^0.2.21", - "@blocksuite/editor": "^0.2.21", + "@blocksuite/blocks": "^0.2.22", + "@blocksuite/editor": "^0.2.22", "@emotion/css": "^11.10.0", "@emotion/react": "^11.10.4", "@emotion/server": "^11.10.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6c3da43b72..8231fc0496 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: packages/app: specifiers: - '@blocksuite/blocks': ^0.2.21 - '@blocksuite/editor': ^0.2.21 + '@blocksuite/blocks': ^0.2.22 + '@blocksuite/editor': ^0.2.22 '@emotion/css': ^11.10.0 '@emotion/react': ^11.10.4 '@emotion/server': ^11.10.0 @@ -48,8 +48,8 @@ importers: react-dom: 18.2.0 typescript: 4.8.3 dependencies: - '@blocksuite/blocks': 0.2.21 - '@blocksuite/editor': 0.2.21 + '@blocksuite/blocks': 0.2.22 + '@blocksuite/editor': 0.2.22 '@emotion/css': 11.10.0 '@emotion/react': 11.10.4_w5j4k42lgipnm43s3brx6h3c34 '@emotion/server': 11.10.0_@emotion+css@11.10.0 @@ -166,10 +166,10 @@ packages: to-fast-properties: 2.0.0 dev: false - /@blocksuite/blocks/0.2.21: - resolution: {integrity: sha512-2Q1RnYjvhWJqt0Zy9kxfeaavvMa3CgDdxhQCN88FwxEVkbo2Sgt1vLeh1kHQU5bJXMghARPCgR4KFB2CkpaMNw==} + /@blocksuite/blocks/0.2.22: + resolution: {integrity: sha512-66HqtUlXI44MZSffxF3uCDhaoMsMBABw4WKZxjCwFYxa2eeddm2Vl6+qNDrmsOK6ype5uVzY2u3BBis3k8A0Cw==} dependencies: - '@blocksuite/store': 0.2.21 + '@blocksuite/store': 0.2.22 hotkeys-js: 3.10.0 lit: 2.4.0 quill: 1.3.7 @@ -180,11 +180,11 @@ packages: - utf-8-validate dev: false - /@blocksuite/editor/0.2.21: - resolution: {integrity: sha512-41M6rnvMjzflY9YEwJDPyF+kkczUBlOF1aeNJP37bV3UNVlVGVTSfW1A1N/orOxcLN2xy3vzpa8Q8wdV1rUJXQ==} + /@blocksuite/editor/0.2.22: + resolution: {integrity: sha512-TgJTNeNXynbYZW39hYBs/Z84Cha3wuNm2AngSa1f/GQV8Bbi0Q1C8KtBXATQ+WkHAAfZ7K1HXx0jrFbsiLk1sg==} dependencies: - '@blocksuite/blocks': 0.2.21 - '@blocksuite/store': 0.2.21 + '@blocksuite/blocks': 0.2.22 + '@blocksuite/store': 0.2.22 lit: 2.4.0 marked: 4.1.1 turndown: 7.1.1 @@ -194,8 +194,8 @@ packages: - utf-8-validate dev: false - /@blocksuite/store/0.2.21: - resolution: {integrity: sha512-dg/Vpupn+M/8mXfc/g/n9yTU3X7WiPo++MiMO9YHZkjGnLPF3vasbqqrRVyVbuwXIuTQEltv9K3Sgyka2Aqa5g==} + /@blocksuite/store/0.2.22: + resolution: {integrity: sha512-sc85o52s3ga3ZtOXzqkRUw763+JxQsvPnVK905QaQyoQLcbtfJx3yx0iVUGcturGaNCkiUFwJsUQHLOiDvRTMA==} dependencies: lib0: 0.2.52 y-protocols: 1.0.5 From 04c413e8e13538266c9f456fa0144004f1bdb619 Mon Sep 17 00:00:00 2001 From: logopolop Date: Wed, 26 Oct 2022 17:26:14 +0200 Subject: [PATCH 04/13] Update README.md Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3a8717d9b3..e580557cc4 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ Before we tell you how to get started with AFFiNE, we'd like to shamelessly plug **Clean, intuitive design** — With AFFiNE you can concentrate on editing with a clean and modern interface. Which is responsive, so it looks great on tablets too, and mobile support is coming in the future. -**Seamless transtions** — However you want your data displayed, whichever viewing mode you use, AFFiNE supports easy transitions to allow you to quickly and effortlessly view your data in the way you want. +**Seamless transitions** — However you want your data displayed, whichever viewing mode you use, AFFiNE supports easy transitions to allow you to quickly and effortlessly view your data in the way you want. **Markdown support** — When you write in AFFiNE you can use Markdown syntax which helps create an easier editing experience, that can be experienced with just a keyboard. And this allows you to export your data cleanly into Markdown.