Skip to content

Commit

Permalink
revert jsondiffpatch to prev version because latest one is not cjs co…
Browse files Browse the repository at this point in the history
…mpatible (#660)
  • Loading branch information
ermalkaleci authored Jan 30, 2024
1 parent 50b2315 commit e1a4a71
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 26 deletions.
2 changes: 1 addition & 1 deletion packages/chopsticks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"dotenv": "^16.4.0",
"global-agent": "^3.0.0",
"js-yaml": "^4.1.0",
"jsondiffpatch": "^0.6.0",
"jsondiffpatch": "^0.5.0",
"lodash": "^4.17.21",
"ws": "^8.16.0",
"yargs": "^17.7.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/chopsticks/src/utils/decoder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import _ from 'lodash'

const diffPatcher = create({
arrays: { detectMove: false },
textDiff: { minLength: Number.MAX_VALUE } as any, // skip text diff
textDiff: { minLength: Number.MAX_VALUE }, // skip text diff
})

export const decodeStorageDiff = async (block: Block, diff: [HexString, HexString | null][]) => {
Expand Down
43 changes: 19 additions & 24 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ __metadata:
dotenv: "npm:^16.4.0"
global-agent: "npm:^3.0.0"
js-yaml: "npm:^4.1.0"
jsondiffpatch: "npm:^0.6.0"
jsondiffpatch: "npm:^0.5.0"
lodash: "npm:^4.17.21"
typescript: "npm:^5.3.3"
vitest: "npm:^1.2.1"
Expand Down Expand Up @@ -2290,13 +2290,6 @@ __metadata:
languageName: node
linkType: hard

"@types/diff-match-patch@npm:^1.0.36":
version: 1.0.36
resolution: "@types/diff-match-patch@npm:1.0.36"
checksum: 0bad011ab138baa8bde94e7815064bb881f010452463272644ddbbb0590659cb93f7aa2776ff442c6721d70f202839e1053f8aa62d801cc4166f7a3ea9130055
languageName: node
linkType: hard

"@types/estree@npm:^1.0.0":
version: 1.0.1
resolution: "@types/estree@npm:1.0.1"
Expand Down Expand Up @@ -3675,6 +3668,16 @@ __metadata:
languageName: node
linkType: hard

"chalk@npm:^3.0.0":
version: 3.0.0
resolution: "chalk@npm:3.0.0"
dependencies:
ansi-styles: "npm:^4.1.0"
supports-color: "npm:^7.1.0"
checksum: ee650b0a065b3d7a6fda258e75d3a86fc8e4effa55871da730a9e42ccb035bf5fd203525e5a1ef45ec2582ecc4f65b47eb11357c526b84dd29a14fb162c414d2
languageName: node
linkType: hard

"chalk@npm:^4.0.0, chalk@npm:^4.1.2":
version: 4.1.2
resolution: "chalk@npm:4.1.2"
Expand All @@ -3685,13 +3688,6 @@ __metadata:
languageName: node
linkType: hard

"chalk@npm:^5.3.0":
version: 5.3.0
resolution: "chalk@npm:5.3.0"
checksum: 8297d436b2c0f95801103ff2ef67268d362021b8210daf8ddbe349695333eb3610a71122172ff3b0272f1ef2cf7cc2c41fdaa4715f52e49ffe04c56340feed09
languageName: node
linkType: hard

"check-error@npm:^1.0.3":
version: 1.0.3
resolution: "check-error@npm:1.0.3"
Expand Down Expand Up @@ -4198,7 +4194,7 @@ __metadata:
languageName: node
linkType: hard

"diff-match-patch@npm:^1.0.5":
"diff-match-patch@npm:^1.0.0":
version: 1.0.5
resolution: "diff-match-patch@npm:1.0.5"
checksum: 142b6fad627b9ef309d11bd935e82b84c814165a02500f046e2773f4ea894d10ed3017ac20454900d79d4a0322079f5b713cf0986aaf15fce0ec4a2479980c86
Expand Down Expand Up @@ -6211,16 +6207,15 @@ __metadata:
languageName: node
linkType: hard

"jsondiffpatch@npm:^0.6.0":
version: 0.6.0
resolution: "jsondiffpatch@npm:0.6.0"
"jsondiffpatch@npm:^0.5.0":
version: 0.5.0
resolution: "jsondiffpatch@npm:0.5.0"
dependencies:
"@types/diff-match-patch": "npm:^1.0.36"
chalk: "npm:^5.3.0"
diff-match-patch: "npm:^1.0.5"
chalk: "npm:^3.0.0"
diff-match-patch: "npm:^1.0.0"
bin:
jsondiffpatch: bin/jsondiffpatch.js
checksum: f7822e48a8ef8b9f7c6024cc59b7d3707a9fe6d84fd776d169de5a1803ad551ffe7cfdc7587f3900f224bc70897355884ed43eb1c8ccd02e7f7b43a7ebcfed4f
jsondiffpatch: bin/jsondiffpatch
checksum: 272271b92b20ebd303c002b4ffad6bcbf52dadb667c338509296b3c25e954535e5aa86c3675df5ae1525edad9ea7f7191c8beb921f0ee87569a58b4810299d87
languageName: node
linkType: hard

Expand Down

0 comments on commit e1a4a71

Please sign in to comment.