Skip to content

Commit 87e7e09

Browse files
chloeYuecursoragent
andcommitted
fix(yarn.lock): restore to release/7.79.0 baseline
The merge of stable into release/7.79.0 used `-X ours` which only applies "ours" at conflict markers; non-conflicting hunks of yarn.lock auto-merged from stable, mixing stable's older dependency resolutions (e.g. @metamask/ramps-controller @14.0.0 dep on assets-controller @106.x) with release/7.79.0's package.json which expects newer versions. This made `yarn install --immutable` fail in CI with YN0028 "The lockfile would have been modified by this install". Replace yarn.lock with origin/release/7.79.0:yarn.lock byte-for-byte. package.json wasn't changed by the merge (kept --ours), so this pair is exactly what release/7.79.0 had passing CI before, plus this PR brings no package.json changes. Verified locally: `yarn install --immutable` exits 0. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent d352e35 commit 87e7e09

1 file changed

Lines changed: 5 additions & 17 deletions

File tree

yarn.lock

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7574,11 +7574,11 @@ __metadata:
75747574
version: 7.1.2
75757575
resolution: "@metamask/address-book-controller@npm:7.1.2"
75767576
dependencies:
7577-
"@metamask/base-controller": "npm:^9.0.1"
7578-
"@metamask/controller-utils": "npm:^11.19.0"
7579-
"@metamask/messenger": "npm:^1.0.0"
7577+
"@metamask/base-controller": "npm:^9.1.0"
7578+
"@metamask/controller-utils": "npm:^12.0.0"
7579+
"@metamask/messenger": "npm:^1.2.0"
75807580
"@metamask/utils": "npm:^11.9.0"
7581-
checksum: 10/0e61958eab6c7f1472d270156398c819c648c9a3a093ed63abaadd7554330befa8149b929c8cb803f4b959fd0ceb71b42bf67b8680ea296f5e224df9b0216b44
7581+
checksum: 10/e15140418452a80d51fec783003144add72a50a4fe362377481de83c7858860f641a3cfb1575f4b802b1eb1e873b3efd03bb4183afcbee77f95c7525e05aaed4
75827582
languageName: node
75837583
linkType: hard
75847584

@@ -9503,18 +9503,6 @@ __metadata:
95039503
languageName: node
95049504
linkType: hard
95059505

9506-
"@metamask/ramps-controller@npm:^14.0.0":
9507-
version: 14.0.0
9508-
resolution: "@metamask/ramps-controller@npm:14.0.0"
9509-
dependencies:
9510-
"@metamask/base-controller": "npm:^9.1.0"
9511-
"@metamask/controller-utils": "npm:^12.1.0"
9512-
"@metamask/messenger": "npm:^1.2.0"
9513-
"@metamask/profile-sync-controller": "npm:^28.1.0"
9514-
checksum: 10/b00541d2be062af2170a70004ee4b19b850abe271f77077057d26e9c019191202474ebedb15d0a3182ffd2957a1ae3e19ea103d080360e69c94d36e39f326866
9515-
languageName: node
9516-
linkType: hard
9517-
95189506
"@metamask/react-data-query@npm:^0.2.0":
95199507
version: 0.2.0
95209508
resolution: "@metamask/react-data-query@npm:0.2.0"
@@ -10366,7 +10354,7 @@ __metadata:
1036610354
"@metamask/messenger": "npm:^1.2.0"
1036710355
"@metamask/metamask-eth-abis": "npm:^3.1.1"
1036810356
"@metamask/network-controller": "npm:^32.0.0"
10369-
"@metamask/ramps-controller": "npm:^14.0.0"
10357+
"@metamask/ramps-controller": "npm:^13.3.1"
1037010358
"@metamask/remote-feature-flag-controller": "npm:^4.2.1"
1037110359
"@metamask/transaction-controller": "npm:^66.0.0"
1037210360
"@metamask/utils": "npm:^11.9.0"

0 commit comments

Comments
 (0)