diff --git a/.npmrc b/.npmrc index 3bd3b7de7d..ac5f060b27 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1,2 @@ shell-emulator=true +electron_mirror="https://cdn.npmmirror.com/binaries/electron/" diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 7601ef3090..6080c26457 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -14,10 +14,10 @@ "build:app": "tauri build" }, "dependencies": { - "@blocksuite/blocks": "0.5.0-20230320034723-8dfc65e", - "@blocksuite/editor": "0.5.0-20230320034723-8dfc65e", + "@blocksuite/blocks": "0.5.0-20230320164115-e612d17", + "@blocksuite/editor": "0.5.0-20230320164115-e612d17", "@blocksuite/icons": "2.0.23", - "@blocksuite/store": "0.5.0-20230320034723-8dfc65e", + "@blocksuite/store": "0.5.0-20230320164115-e612d17", "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", "@tauri-apps/api": "^1.2.0", diff --git a/apps/web/package.json b/apps/web/package.json index 67cd37a441..7ff06e7b98 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -14,11 +14,10 @@ "@affine/debug": "workspace:*", "@affine/env": "workspace:*", "@affine/i18n": "workspace:*", - "@blocksuite/blocks": "0.5.0-20230320034723-8dfc65e", - "@blocksuite/editor": "0.5.0-20230320034723-8dfc65e", + "@blocksuite/blocks": "0.5.0-20230320164115-e612d17", + "@blocksuite/editor": "0.5.0-20230320164115-e612d17", "@blocksuite/icons": "2.0.23", - "@blocksuite/react": "0.5.0-20230320034723-8dfc65e", - "@blocksuite/store": "0.5.0-20230320034723-8dfc65e", + "@blocksuite/store": "0.5.0-20230320164115-e612d17", "@emotion/cache": "^11.10.5", "@emotion/react": "^11.10.6", "@emotion/server": "^11.10.0", diff --git a/package.json b/package.json index 50e7cc1306..70d615f7f3 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "build": "yarn workspace @affine/app build", "build:client": "yarn workspace @affine/client-app build:app", "build:storybook": "yarn workspace @affine/component build-storybook", + "bump:nightly": "./scripts/bump-blocksuite.sh", "export": "yarn workspace @affine/app export", "start": "yarn workspace @affine/app start", "lint": "eslint . --ext .js,mjs,.ts,.tsx", diff --git a/packages/component/package.json b/packages/component/package.json index c7e8f91575..1df8e34bf8 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -15,12 +15,11 @@ "dependencies": { "@affine/debug": "workspace:*", "@affine/i18n": "workspace:*", - "@blocksuite/blocks": "0.5.0-20230320034723-8dfc65e", - "@blocksuite/editor": "0.5.0-20230320034723-8dfc65e", - "@blocksuite/global": "0.5.0-20230320034723-8dfc65e", + "@blocksuite/blocks": "0.5.0-20230320164115-e612d17", + "@blocksuite/editor": "0.5.0-20230320164115-e612d17", + "@blocksuite/global": "0.5.0-20230320164115-e612d17", "@blocksuite/icons": "2.0.23", - "@blocksuite/react": "0.5.0-20230320034723-8dfc65e", - "@blocksuite/store": "0.5.0-20230320034723-8dfc65e", + "@blocksuite/store": "0.5.0-20230320164115-e612d17", "@emotion/cache": "^11.10.5", "@emotion/react": "^11.10.6", "@emotion/server": "^11.10.0", diff --git a/packages/data-center/package.json b/packages/data-center/package.json index 64fea79e48..c2bb258bb1 100644 --- a/packages/data-center/package.json +++ b/packages/data-center/package.json @@ -14,8 +14,8 @@ }, "dependencies": { "@affine/debug": "workspace:*", - "@blocksuite/blocks": "0.5.0-20230320034723-8dfc65e", - "@blocksuite/store": "0.5.0-20230320034723-8dfc65e", + "@blocksuite/blocks": "0.5.0-20230320164115-e612d17", + "@blocksuite/store": "0.5.0-20230320164115-e612d17", "@tauri-apps/api": "^1.2.0", "encoding": "^0.1.13", "firebase": "^9.18.0", diff --git a/packages/env/package.json b/packages/env/package.json index 63525e6e40..0a6a81d676 100644 --- a/packages/env/package.json +++ b/packages/env/package.json @@ -9,7 +9,7 @@ "zod": "^3.21.4" }, "dependencies": { - "@blocksuite/global": "0.5.0-20230320034723-8dfc65e", + "@blocksuite/global": "0.5.0-20230320164115-e612d17", "lit": "^2.6.1" } } diff --git a/scripts/bump-blocksuite.sh b/scripts/bump-blocksuite.sh new file mode 100755 index 0000000000..4af3e9a2d5 --- /dev/null +++ b/scripts/bump-blocksuite.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +LATEST_NIGHTLY=$(npm view @blocksuite/editor@nightly version | cut -d ':' -f 2 | tr -d '[:space:]') +echo "Bump to latest BlockSuite nightly version: $LATEST_NIGHTLY" + +yarn up "@blocksuite/store@${LATEST_NIGHTLY}" +yarn up "@blocksuite/blocks@${LATEST_NIGHTLY}" +yarn up "@blocksuite/editor@${LATEST_NIGHTLY}" +yarn up "@blocksuite/global@${LATEST_NIGHTLY}" diff --git a/yarn.lock b/yarn.lock index 3e3e1a7c4e..ff1ce9e7aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21,11 +21,10 @@ __metadata: "@affine/debug": "workspace:*" "@affine/env": "workspace:*" "@affine/i18n": "workspace:*" - "@blocksuite/blocks": 0.5.0-20230320034723-8dfc65e - "@blocksuite/editor": 0.5.0-20230320034723-8dfc65e + "@blocksuite/blocks": 0.5.0-20230320164115-e612d17 + "@blocksuite/editor": 0.5.0-20230320164115-e612d17 "@blocksuite/icons": 2.0.23 - "@blocksuite/react": 0.5.0-20230320034723-8dfc65e - "@blocksuite/store": 0.5.0-20230320034723-8dfc65e + "@blocksuite/store": 0.5.0-20230320164115-e612d17 "@emotion/cache": ^11.10.5 "@emotion/react": ^11.10.6 "@emotion/server": ^11.10.0 @@ -71,10 +70,10 @@ __metadata: version: 0.0.0-use.local resolution: "@affine/client-app@workspace:apps/desktop" dependencies: - "@blocksuite/blocks": 0.5.0-20230320034723-8dfc65e - "@blocksuite/editor": 0.5.0-20230320034723-8dfc65e + "@blocksuite/blocks": 0.5.0-20230320164115-e612d17 + "@blocksuite/editor": 0.5.0-20230320164115-e612d17 "@blocksuite/icons": 2.0.23 - "@blocksuite/store": 0.5.0-20230320034723-8dfc65e + "@blocksuite/store": 0.5.0-20230320164115-e612d17 "@emotion/react": ^11.10.6 "@emotion/styled": ^11.10.6 "@tauri-apps/api": ^1.2.0 @@ -106,12 +105,11 @@ __metadata: dependencies: "@affine/debug": "workspace:*" "@affine/i18n": "workspace:*" - "@blocksuite/blocks": 0.5.0-20230320034723-8dfc65e - "@blocksuite/editor": 0.5.0-20230320034723-8dfc65e - "@blocksuite/global": 0.5.0-20230320034723-8dfc65e + "@blocksuite/blocks": 0.5.0-20230320164115-e612d17 + "@blocksuite/editor": 0.5.0-20230320164115-e612d17 + "@blocksuite/global": 0.5.0-20230320164115-e612d17 "@blocksuite/icons": 2.0.23 - "@blocksuite/react": 0.5.0-20230320034723-8dfc65e - "@blocksuite/store": 0.5.0-20230320034723-8dfc65e + "@blocksuite/store": 0.5.0-20230320164115-e612d17 "@emotion/cache": ^11.10.5 "@emotion/react": ^11.10.6 "@emotion/server": ^11.10.0 @@ -150,8 +148,8 @@ __metadata: resolution: "@affine/datacenter@workspace:packages/data-center" dependencies: "@affine/debug": "workspace:*" - "@blocksuite/blocks": 0.5.0-20230320034723-8dfc65e - "@blocksuite/store": 0.5.0-20230320034723-8dfc65e + "@blocksuite/blocks": 0.5.0-20230320164115-e612d17 + "@blocksuite/store": 0.5.0-20230320164115-e612d17 "@tauri-apps/api": ^1.2.0 encoding: ^0.1.13 fake-indexeddb: 4.0.1 @@ -204,7 +202,7 @@ __metadata: version: 0.0.0-use.local resolution: "@affine/env@workspace:packages/env" dependencies: - "@blocksuite/global": 0.5.0-20230320034723-8dfc65e + "@blocksuite/global": 0.5.0-20230320164115-e612d17 lit: ^2.6.1 next: =13.2.3 react: ^18.2.0 @@ -1741,13 +1739,13 @@ __metadata: languageName: node linkType: hard -"@blocksuite/blocks@npm:0.5.0-20230320034723-8dfc65e": - version: 0.5.0-20230320034723-8dfc65e - resolution: "@blocksuite/blocks@npm:0.5.0-20230320034723-8dfc65e" +"@blocksuite/blocks@npm:0.5.0-20230320164115-e612d17": + version: 0.5.0-20230320164115-e612d17 + resolution: "@blocksuite/blocks@npm:0.5.0-20230320164115-e612d17" dependencies: - "@blocksuite/global": 0.5.0-20230320034723-8dfc65e - "@blocksuite/phasor": 0.5.0-20230320034723-8dfc65e - "@blocksuite/virgo": 0.5.0-20230320034723-8dfc65e + "@blocksuite/global": 0.5.0-20230320164115-e612d17 + "@blocksuite/phasor": 0.5.0-20230320164115-e612d17 + "@blocksuite/virgo": 0.5.0-20230320164115-e612d17 "@popperjs/core": ^2.11.6 highlight.js: ^11.7.0 hotkeys-js: ^3.10.1 @@ -1757,29 +1755,29 @@ __metadata: turndown: ^7.1.1 zod: ^3.21.4 peerDependencies: - "@blocksuite/store": 0.5.0-20230320034723-8dfc65e - checksum: 33e15b2fa6c0792254492d62867d2f0791efd0759b600b1c8e81785d57f0a04c4f6066c5fff1b1c42e945e5a860dd7a591c5a2f41977b89ae8db2bf635b9af1c + "@blocksuite/store": 0.5.0-20230320164115-e612d17 + checksum: ebbe156f0e0320ecac28e744bde121671d7c2eedfb222a89c454c98662d27a59dc362f9b1d00c236ac5e8ffd5af900e70b4fe0e8d2c6e5acea3260ea96bd9ce7 languageName: node linkType: hard -"@blocksuite/editor@npm:0.5.0-20230320034723-8dfc65e": - version: 0.5.0-20230320034723-8dfc65e - resolution: "@blocksuite/editor@npm:0.5.0-20230320034723-8dfc65e" +"@blocksuite/editor@npm:0.5.0-20230320164115-e612d17": + version: 0.5.0-20230320164115-e612d17 + resolution: "@blocksuite/editor@npm:0.5.0-20230320164115-e612d17" dependencies: - "@blocksuite/global": 0.5.0-20230320034723-8dfc65e + "@blocksuite/global": 0.5.0-20230320164115-e612d17 lit: ^2.6.1 marked: ^4.2.12 turndown: ^7.1.1 peerDependencies: - "@blocksuite/blocks": 0.5.0-20230320034723-8dfc65e - "@blocksuite/store": 0.5.0-20230320034723-8dfc65e - checksum: d348e7475f46615c0bf461985f5736d2acc9d6fea3ebc62e4d2be1d61363017274011252eb66cf8eb950301c794c4a934b759d3888e7a2ff41b269e0b0b33c78 + "@blocksuite/blocks": 0.5.0-20230320164115-e612d17 + "@blocksuite/store": 0.5.0-20230320164115-e612d17 + checksum: 8e797059cd2df4ae3f17d9c39ae3b8493d40cb26303a0aee53113a6dc5d60943fc7bea008f8928543267e2883fb729230aedb90a142b5c01c330d044befbb0a3 languageName: node linkType: hard -"@blocksuite/global@npm:0.5.0-20230320034723-8dfc65e": - version: 0.5.0-20230320034723-8dfc65e - resolution: "@blocksuite/global@npm:0.5.0-20230320034723-8dfc65e" +"@blocksuite/global@npm:0.5.0-20230320164115-e612d17": + version: 0.5.0-20230320164115-e612d17 + resolution: "@blocksuite/global@npm:0.5.0-20230320164115-e612d17" dependencies: ansi-colors: ^4.1.3 zod: ^3.21.4 @@ -1788,7 +1786,7 @@ __metadata: peerDependenciesMeta: lit: optional: true - checksum: 9f07c7e31d1967fd66760f3faed539127e57d3538ea46eb99880fed9812e279f02ca9967f90153d7e03e5dfd5061b4c0db3a104e28af4c90eeb19f93bc7939c9 + checksum: 78f4b473a7d0fa1caa9c4fccb020064f56ca8d9d7585fdd706d8a6bd88e5abeda899596bce56cb7ef19309535144ec817267b032a8567f179ea6e580e1b57526 languageName: node linkType: hard @@ -1802,42 +1800,26 @@ __metadata: languageName: node linkType: hard -"@blocksuite/phasor@npm:0.5.0-20230320034723-8dfc65e": - version: 0.5.0-20230320034723-8dfc65e - resolution: "@blocksuite/phasor@npm:0.5.0-20230320034723-8dfc65e" +"@blocksuite/phasor@npm:0.5.0-20230320164115-e612d17": + version: 0.5.0-20230320164115-e612d17 + resolution: "@blocksuite/phasor@npm:0.5.0-20230320164115-e612d17" dependencies: - "@blocksuite/global": 0.5.0-20230320034723-8dfc65e + "@blocksuite/global": 0.5.0-20230320164115-e612d17 fractional-indexing: ^3.2.0 - nanoid: ^4.0.1 perfect-freehand: ^1.2.0 peerDependencies: + nanoid: ^4 yjs: ^13 - checksum: af70de030b825b5234561b811814cc9e16b8e8e9936d99973ecda7b13d21cc10210e51d31026ff2fc2154bbd214ab6efab49db042e419a2ec4d6e7ff513ccedb + checksum: 06fb6d531aa84838cbcaf0b5ddb0e1da40a98da165e570ac70348e76e459a6a9c93ee71bd4b536b05e4dd51e89bf243d96eb6add755ffda20d2dcd6e497bd2fa languageName: node linkType: hard -"@blocksuite/react@npm:0.5.0-20230320034723-8dfc65e": - version: 0.5.0-20230320034723-8dfc65e - resolution: "@blocksuite/react@npm:0.5.0-20230320034723-8dfc65e" +"@blocksuite/store@npm:0.5.0-20230320164115-e612d17": + version: 0.5.0-20230320164115-e612d17 + resolution: "@blocksuite/store@npm:0.5.0-20230320164115-e612d17" dependencies: - "@blocksuite/global": 0.5.0-20230320034723-8dfc65e - zustand: ^4.3.6 - peerDependencies: - "@blocksuite/blocks": 0.5.0-20230320034723-8dfc65e - "@blocksuite/editor": 0.5.0-20230320034723-8dfc65e - "@blocksuite/store": 0.5.0-20230320034723-8dfc65e - react: ">=18.0.0" - react-dom: ">=18.0.0" - checksum: c972b68946d83160297ab94f33c13335826d5b8c80d591288dd2dd74b18e8ca0ffe134ac5044b88f5f685c575382a2edcff232655f67c61a5dcac25909431c12 - languageName: node - linkType: hard - -"@blocksuite/store@npm:0.5.0-20230320034723-8dfc65e": - version: 0.5.0-20230320034723-8dfc65e - resolution: "@blocksuite/store@npm:0.5.0-20230320034723-8dfc65e" - dependencies: - "@blocksuite/global": 0.5.0-20230320034723-8dfc65e - "@blocksuite/virgo": 0.5.0-20230320034723-8dfc65e + "@blocksuite/global": 0.5.0-20230320164115-e612d17 + "@blocksuite/virgo": 0.5.0-20230320164115-e612d17 "@types/flexsearch": ^0.7.3 buffer: ^6.0.3 flexsearch: 0.7.21 @@ -1851,20 +1833,20 @@ __metadata: zod: ^3.21.4 peerDependencies: yjs: ^13 - checksum: 77b39d98ff45c35a1dc4f3efe899bf25925554ed55b008a3e7f8a28650d2239f0882761b25b1b8bd198cb0633c0f48d3d1747575358d1aaac22344330849cb99 + checksum: 5e8f0f6d37a2ae66bd3df1cca67fb21322a78220cbc4114ba19e6486c6e9edab9b24bd14e99045822eae4af9c0116c86de463e87ad45503268d71a96dbc126b0 languageName: node linkType: hard -"@blocksuite/virgo@npm:0.5.0-20230320034723-8dfc65e": - version: 0.5.0-20230320034723-8dfc65e - resolution: "@blocksuite/virgo@npm:0.5.0-20230320034723-8dfc65e" +"@blocksuite/virgo@npm:0.5.0-20230320164115-e612d17": + version: 0.5.0-20230320164115-e612d17 + resolution: "@blocksuite/virgo@npm:0.5.0-20230320164115-e612d17" dependencies: - "@blocksuite/global": 0.5.0-20230320034723-8dfc65e + "@blocksuite/global": 0.5.0-20230320164115-e612d17 zod: ^3.21.4 peerDependencies: lit: ^2 yjs: ^13 - checksum: 7126e7d6227c429b9db56895fc8bb3a1e587a438493fc5f2bc10b9d0bd943004f00fcdb87f3ae4a0811952cf959a5ea170e2111a90bfbb63692051d99f3457ed + checksum: 3e9154f4abe501f5a880a4c2fed45077451b55bbf6386cb1cd8fb7efd4e621818961b9cdcadcd1f00d1b97760b6b509557b866addd9b18fab0f8410f7ac9139c languageName: node linkType: hard @@ -19689,7 +19671,7 @@ __metadata: languageName: node linkType: hard -"use-sync-external-store@npm:1.2.0, use-sync-external-store@npm:^1.2.0": +"use-sync-external-store@npm:^1.2.0": version: 1.2.0 resolution: "use-sync-external-store@npm:1.2.0" peerDependencies: @@ -20604,23 +20586,6 @@ __metadata: languageName: node linkType: hard -"zustand@npm:^4.3.6": - version: 4.3.6 - resolution: "zustand@npm:4.3.6" - dependencies: - use-sync-external-store: 1.2.0 - peerDependencies: - immer: ">=9.0" - react: ">=16.8" - peerDependenciesMeta: - immer: - optional: true - react: - optional: true - checksum: 4d3cec03526f04ff3de6dc45b6f038c47f091836af9660fbf5f682cae1628221102882df20e4048dfe699a43f67424e5d6afc1116f3838a80eea5dd4f95ddaed - languageName: node - linkType: hard - "zx@npm:^7.2.1": version: 7.2.1 resolution: "zx@npm:7.2.1"