Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-07-16 17:46:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump blocksuite (#7360)

Browse Source
This commit is contained in:
EYHN
2024-06-27 17:53:42 +08:00
committed by GitHub
parent 81462fe000
commit 3b3b7ec054
7 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/common/env/package.json
Vendored
+2 -2
View File
@@ -3,8 +3,8 @@
"private": true,
"type": "module",
"devDependencies": {
"@blocksuite/global": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/store": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/global": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/store": "0.15.0-canary-202406270845-0db1a0f",
"react": "18.3.1",
"react-dom": "18.3.1",
"vitest": "1.6.0"
packages/common/infra/package.json
+5 -5
View File
@@ -13,9 +13,9 @@
"@affine/debug": "workspace:*",
"@affine/env": "workspace:*",
"@affine/templates": "workspace:*",
"@blocksuite/blocks": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/global": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/store": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/blocks": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/global": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/store": "0.15.0-canary-202406270845-0db1a0f",
"@datastructures-js/binary-search-tree": "^5.3.2",
"foxact": "^0.2.33",
"jotai": "^2.8.0",
@@ -29,8 +29,8 @@
"devDependencies": {
"@affine-test/fixtures": "workspace:*",
"@affine/templates": "workspace:*",
"@blocksuite/block-std": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/presets": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/block-std": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/presets": "0.15.0-canary-202406270845-0db1a0f",
"@testing-library/react": "^16.0.0",
"async-call-rpc": "^6.4.0",
"react": "^18.2.0",
packages/frontend/component/package.json
+5 -5
View File
@@ -75,12 +75,12 @@
"zod": "^3.22.4"
},
"devDependencies": {
"@blocksuite/block-std": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/blocks": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/global": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/block-std": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/blocks": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/global": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/icons": "2.1.58",
"@blocksuite/presets": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/store": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/presets": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/store": "0.15.0-canary-202406270845-0db1a0f",
"@storybook/addon-actions": "^7.6.17",
"@storybook/addon-essentials": "^7.6.17",
"@storybook/addon-interactions": "^7.6.17",
packages/frontend/core/package.json
+6 -6
View File
@@ -19,13 +19,13 @@
"@affine/graphql": "workspace:*",
"@affine/i18n": "workspace:*",
"@affine/templates": "workspace:*",
"@blocksuite/block-std": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/blocks": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/global": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/block-std": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/blocks": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/global": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/icons": "2.1.58",
"@blocksuite/inline": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/presets": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/store": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/inline": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/presets": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/store": "0.15.0-canary-202406270845-0db1a0f",
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/modifiers": "^7.0.0",
"@dnd-kit/sortable": "^8.0.0",
packages/frontend/electron/package.json
+4 -4
View File
@@ -29,10 +29,10 @@
"@affine/env": "workspace:*",
"@affine/i18n": "workspace:*",
"@affine/native": "workspace:*",
"@blocksuite/block-std": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/blocks": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/presets": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/store": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/block-std": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/blocks": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/presets": "0.15.0-canary-202406270845-0db1a0f",
"@blocksuite/store": "0.15.0-canary-202406270845-0db1a0f",
"@electron-forge/cli": "^7.3.0",
"@electron-forge/core": "^7.3.0",
"@electron-forge/core-utils": "^7.3.0",
tools/cli/package.json
+1 -1
View File
@@ -6,7 +6,7 @@
"@affine/env": "workspace:*",
"@affine/templates": "workspace:*",
"@aws-sdk/client-s3": "3.592.0",
"@blocksuite/presets": "0.15.0-canary-202406261546-9adba83",
"@blocksuite/presets": "0.15.0-canary-202406270845-0db1a0f",
"@clack/core": "^0.3.4",
"@clack/prompts": "^0.7.0",
"@magic-works/i18n-codegen": "^0.6.0",
yarn.lock
+71 -71
View File
@@ -226,7 +226,7 @@ __metadata:
"@affine/env": "workspace:*"
"@affine/templates": "workspace:*"
"@aws-sdk/client-s3": "npm:3.592.0"
"@blocksuite/presets": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/presets": "npm:0.15.0-canary-202406270845-0db1a0f"
"@clack/core": "npm:^0.3.4"
"@clack/prompts": "npm:^0.7.0"
"@magic-works/i18n-codegen": "npm:^0.6.0"
@@ -282,12 +282,12 @@ __metadata:
"@affine/electron-api": "workspace:*"
"@affine/graphql": "workspace:*"
"@affine/i18n": "workspace:*"
"@blocksuite/block-std": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/blocks": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/global": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/block-std": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/blocks": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/global": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/icons": "npm:2.1.58"
"@blocksuite/presets": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/store": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/presets": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/store": "npm:0.15.0-canary-202406270845-0db1a0f"
"@dnd-kit/core": "npm:^6.1.0"
"@dnd-kit/modifiers": "npm:^7.0.0"
"@dnd-kit/sortable": "npm:^8.0.0"
@@ -383,13 +383,13 @@ __metadata:
"@affine/graphql": "workspace:*"
"@affine/i18n": "workspace:*"
"@affine/templates": "workspace:*"
"@blocksuite/block-std": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/blocks": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/global": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/block-std": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/blocks": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/global": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/icons": "npm:2.1.58"
"@blocksuite/inline": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/presets": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/store": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/inline": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/presets": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/store": "npm:0.15.0-canary-202406270845-0db1a0f"
"@dnd-kit/core": "npm:^6.1.0"
"@dnd-kit/modifiers": "npm:^7.0.0"
"@dnd-kit/sortable": "npm:^8.0.0"
@@ -514,10 +514,10 @@ __metadata:
"@affine/env": "workspace:*"
"@affine/i18n": "workspace:*"
"@affine/native": "workspace:*"
"@blocksuite/block-std": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/blocks": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/presets": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/store": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/block-std": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/blocks": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/presets": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/store": "npm:0.15.0-canary-202406270845-0db1a0f"
"@electron-forge/cli": "npm:^7.3.0"
"@electron-forge/core": "npm:^7.3.0"
"@electron-forge/core-utils": "npm:^7.3.0"
@@ -573,8 +573,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@affine/env@workspace:packages/common/env"
dependencies:
"@blocksuite/global": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/store": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/global": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/store": "npm:0.15.0-canary-202406270845-0db1a0f"
lit: "npm:^3.1.2"
react: "npm:18.3.1"
react-dom: "npm:18.3.1"
@@ -4105,35 +4105,35 @@ __metadata:
languageName: node
linkType: hard
"@blocksuite/block-std@npm:0.15.0-canary-202406261546-9adba83":
version: 0.15.0-canary-202406261546-9adba83
resolution: "@blocksuite/block-std@npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/block-std@npm:0.15.0-canary-202406270845-0db1a0f":
version: 0.15.0-canary-202406270845-0db1a0f
resolution: "@blocksuite/block-std@npm:0.15.0-canary-202406270845-0db1a0f"
dependencies:
"@blocksuite/global": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/global": "npm:0.15.0-canary-202406270845-0db1a0f"
lit: "npm:^3.1.3"
lz-string: "npm:^1.5.0"
w3c-keyname: "npm:^2.2.8"
zod: "npm:^3.23.8"
peerDependencies:
"@blocksuite/inline": 0.15.0-canary-202406261546-9adba83
"@blocksuite/store": 0.15.0-canary-202406261546-9adba83
checksum: 10/5427fe5bf0bbf51ee92f5e4f2258b6727d8b0fa228761f43b799522253fc8791043b33d4f3d90069eaafffef0b34de2e7a610247f95c89ed936c48b717ddbcd2
"@blocksuite/inline": 0.15.0-canary-202406270845-0db1a0f
"@blocksuite/store": 0.15.0-canary-202406270845-0db1a0f
checksum: 10/3c6ec7f214c4b1842621d2a308d82b6b8ea4758d0cd5e053a390a3b46110326a79f5a9f9fa5de76e161da3fd795907290ea8bcd14629fddb9d69cb1709a17ce8
languageName: node
linkType: hard
"@blocksuite/blocks@npm:0.15.0-canary-202406261546-9adba83":
version: 0.15.0-canary-202406261546-9adba83
resolution: "@blocksuite/blocks@npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/blocks@npm:0.15.0-canary-202406270845-0db1a0f":
version: 0.15.0-canary-202406270845-0db1a0f
resolution: "@blocksuite/blocks@npm:0.15.0-canary-202406270845-0db1a0f"
dependencies:
"@blocksuite/block-std": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/global": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/inline": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/store": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/block-std": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/global": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/inline": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/store": "npm:0.15.0-canary-202406270845-0db1a0f"
"@dotlottie/player-component": "npm:^2.7.12"
"@floating-ui/dom": "npm:^1.6.5"
"@lit/context": "npm:^1.1.1"
"@sgtpooki/file-type": "npm:1.0.1"
"@toeverything/theme": "npm:^0.7.33"
"@toeverything/theme": "npm:^0.7.35"
"@types/hast": "npm:^3.0.4"
"@types/mdast": "npm:^4.0.4"
"@types/sortablejs": "npm:^1.15.8"
@@ -4165,17 +4165,17 @@ __metadata:
sortablejs: "npm:^1.15.2"
unified: "npm:^11.0.4"
zod: "npm:^3.23.8"
checksum: 10/6616625acb0190765479840e2c62ba72b8bb0dc6704fc7c6fc20d0cf6c2fda322264757e9d4ece414a2f17f8e20c448c2ef5f1448f293c9c1021d2fb7a43d7da
checksum: 10/da12fbd7ade81f8b7d71588e8919b2a2697fb10ca7d421fe3db27229d6aec95dcf62e38fc846d9041ea068543882ce0233b5729d042d72f450db256a7ae0b22e
languageName: node
linkType: hard
"@blocksuite/global@npm:0.15.0-canary-202406261546-9adba83":
version: 0.15.0-canary-202406261546-9adba83
resolution: "@blocksuite/global@npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/global@npm:0.15.0-canary-202406270845-0db1a0f":
version: 0.15.0-canary-202406270845-0db1a0f
resolution: "@blocksuite/global@npm:0.15.0-canary-202406270845-0db1a0f"
dependencies:
lib0: "npm:^0.2.94"
zod: "npm:^3.23.8"
checksum: 10/1c4b0ac2eb43301558e4aa527ab88084bed247f4b9a1ede0f6ce32cebea2daeb793c1ad03490e610eb374844fc9de5029c1d4ff327ea812fc788a06a6a4bfd39
checksum: 10/83c528a3f3bc4104af21ba165186939ae77bb6cbc966d8b4ca16331c98f0efd43b616cd30f8fa01f9d2def91b6cfc96c68e45d2ae899eab0fc1a46a06de8b1a2
languageName: node
linkType: hard
@@ -4195,45 +4195,45 @@ __metadata:
languageName: node
linkType: hard
"@blocksuite/inline@npm:0.15.0-canary-202406261546-9adba83":
version: 0.15.0-canary-202406261546-9adba83
resolution: "@blocksuite/inline@npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/inline@npm:0.15.0-canary-202406270845-0db1a0f":
version: 0.15.0-canary-202406270845-0db1a0f
resolution: "@blocksuite/inline@npm:0.15.0-canary-202406270845-0db1a0f"
dependencies:
"@blocksuite/global": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/global": "npm:0.15.0-canary-202406270845-0db1a0f"
zod: "npm:^3.23.8"
peerDependencies:
lit: ^3.1.1
yjs: ^13.6.15
checksum: 10/ab5261d6c70645b2a3c870181d6f5f65e7df758f58ba137f1fbb0204ecfea63c589cfb387084a4aeebd351895fe8b6f60d2c70ea3c4cbd47f15f4439470ca45d
checksum: 10/0818ccf47e1514fdce436766f69b61a9829dbff8bab198e0e198e2cc1181e45a4d7657686bf6b7090c5e507bcf0b53c88743173a7907ae2f3e9ad295f836a50c
languageName: node
linkType: hard
"@blocksuite/presets@npm:0.15.0-canary-202406261546-9adba83":
version: 0.15.0-canary-202406261546-9adba83
resolution: "@blocksuite/presets@npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/presets@npm:0.15.0-canary-202406270845-0db1a0f":
version: 0.15.0-canary-202406270845-0db1a0f
resolution: "@blocksuite/presets@npm:0.15.0-canary-202406270845-0db1a0f"
dependencies:
"@blocksuite/block-std": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/blocks": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/global": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/inline": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/store": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/block-std": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/blocks": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/global": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/inline": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/store": "npm:0.15.0-canary-202406270845-0db1a0f"
"@dotlottie/player-component": "npm:^2.7.12"
"@fal-ai/serverless-client": "npm:^0.10.0"
"@floating-ui/dom": "npm:^1.6.5"
"@toeverything/theme": "npm:^0.7.33"
"@toeverything/theme": "npm:^0.7.35"
lit: "npm:^3.1.3"
openai: "npm:^4.47.2"
checksum: 10/8fd0f27a0a728e5e6eddc2a5b529a2121b0d879cbac0f1075b0f75e118adb80fa0f4ebf59304f7208182617ea571653fcac7377711feea279b086d6d6ae5b9eb
checksum: 10/3d699277f9ac42e6a5c323363ace311d428f35caa4efb8636527aa901228101a1d4e2f0122e0255dab2c5d1e51ccd8a9e01504bff1036236d617bda184cbe9a9
languageName: node
linkType: hard
"@blocksuite/store@npm:0.15.0-canary-202406261546-9adba83":
version: 0.15.0-canary-202406261546-9adba83
resolution: "@blocksuite/store@npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/store@npm:0.15.0-canary-202406270845-0db1a0f":
version: 0.15.0-canary-202406270845-0db1a0f
resolution: "@blocksuite/store@npm:0.15.0-canary-202406270845-0db1a0f"
dependencies:
"@blocksuite/global": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/inline": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/sync": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/global": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/inline": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/sync": "npm:0.15.0-canary-202406270845-0db1a0f"
"@types/flexsearch": "npm:^0.7.6"
flexsearch: "npm:0.7.43"
lib0: "npm:^0.2.94"
@@ -4244,21 +4244,21 @@ __metadata:
zod: "npm:^3.23.8"
peerDependencies:
yjs: ^13.6.15
checksum: 10/74695fd427f4a15c21a300784bc154659c1a30a02104e6ee76421d44c0c6b9589d5fcc94bfd44eb5a443905e953710e3b8a1bd0859130df68bccba3070ccb33e
checksum: 10/2108907409455ea76a566bc9331da6786d74c3dc02897a9da33b8ffb35a977215d1da7cd94f1cdb2d97ad09dbafe420029a16aa37faa223f55b5b691982ed79d
languageName: node
linkType: hard
"@blocksuite/sync@npm:0.15.0-canary-202406261546-9adba83":
version: 0.15.0-canary-202406261546-9adba83
resolution: "@blocksuite/sync@npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/sync@npm:0.15.0-canary-202406270845-0db1a0f":
version: 0.15.0-canary-202406270845-0db1a0f
resolution: "@blocksuite/sync@npm:0.15.0-canary-202406270845-0db1a0f"
dependencies:
"@blocksuite/global": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/global": "npm:0.15.0-canary-202406270845-0db1a0f"
idb: "npm:^8.0.0"
idb-keyval: "npm:^6.2.1"
y-protocols: "npm:^1.0.6"
peerDependencies:
yjs: ^13.6.15
checksum: 10/43c24a35d8c5b8239632fb986dd82857c5171b101c4de9b4fd00440ee8eab56b26d21aa8371f39e06df7dd0cc759751214303516e7e59f6926a7e3d93c41bc0d
checksum: 10/8ad8e64624e49aa40b58fd0ac65b2b50a83ffbe8605912e8e0e76a699cad6b9bf225af131c09882ca260417b37749c85af112e787274b02e4592921a2a056ab8
languageName: node
linkType: hard
@@ -15649,11 +15649,11 @@ __metadata:
"@affine/debug": "workspace:*"
"@affine/env": "workspace:*"
"@affine/templates": "workspace:*"
"@blocksuite/block-std": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/blocks": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/global": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/presets": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/store": "npm:0.15.0-canary-202406261546-9adba83"
"@blocksuite/block-std": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/blocks": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/global": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/presets": "npm:0.15.0-canary-202406270845-0db1a0f"
"@blocksuite/store": "npm:0.15.0-canary-202406270845-0db1a0f"
"@datastructures-js/binary-search-tree": "npm:^5.3.2"
"@testing-library/react": "npm:^16.0.0"
async-call-rpc: "npm:^6.4.0"
@@ -15692,7 +15692,7 @@ __metadata:
languageName: unknown
linkType: soft
"@toeverything/theme@npm:^0.7.33, @toeverything/theme@npm:^0.7.35":
"@toeverything/theme@npm:^0.7.35":
version: 0.7.35
resolution: "@toeverything/theme@npm:0.7.35"
checksum: 10/e97ce7a900dcc76dea0573158c2423ba2c94dcbbf4785c99ba92dc245b2ac5c394a73e3d2da28f8e8abadbd7b7cabf22376a6b1d60d0b402c45bc3466b7be98a