Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@electron-forge/plugin-fuses": "8.0.1",
"@electron-forge/plugin-vite": "8.0.0-alpha.10",
"@electron-forge/publisher-github": "8.0.0-alpha.10",
"@electron-forge/shared-types": "8.0.0-alpha.10",
"@electron-forge/shared-types": "8.0.1",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔴 CI and release jobs that run yarn install --immutable will probably fail after this merge, because the lockfile no longer agrees with the root resolution. The root resolutions in package.json:34 still pins @ electron-forge/shared-types to 8.0.0-alpha.10. Yarn rewrites every shared-types descriptor to that version, but the new yarn.lock has only an @ npm:8.0.1 entry. Even a non-immutable install would put alpha.10 back, so the bump changes nothing. Fix: make the root resolution and the app pin agree, then regenerate yarn.lock with flock /tmp/fiddle-2027-yarn.lock yarn install. Either bump the resolution to 8.0.1 together with the bump, or close this PR.

Why this was flagged

The root package.json:33-34 resolutions forces @ electron-forge/shared-types to 8.0.0-alpha.10 (alongside @ electron-forge/maker-base). On the base branch the lockfile honours this. yarn.lock:567 holds @ electron-forge/shared-types@ npm:8.0.0-alpha.10, and maker-base also stays at alpha.10 even though maker-squirrel asks for npm:8.0.1. This diff replaces that entry with @ electron-forge/shared-types@ npm:8.0.1 and adds @ electron-forge/tracer@ npm:8.0.1 and the listr2 11 tree. It leaves the resolution unchanged, so most Forge packages still reference npm:8.0.0-alpha.10 (yarn.lock:359, 377, 409 and others) with no lockfile entry to resolve to. .github/workflows/ci.yml:56 and :138, and release.yml:57, :127 and :220, run yarn install --immutable. Yarn re-resolves through the resolution to alpha.10, needs to change the lockfile, and so fails the install, which the base branch does not. Running a plain install instead puts the alpha.10 entry back, so the 8.0.1 bump never takes effect.

Verification: normal. This happens on every CI or release run of yarn install --immutable after the merge. Root package.json:34 is untouched by the diff and still pins @ electron-forge/shared-types to 8.0.0-alpha.10, but the diff replaces yarn.lock line 567 with "@ electron-forge/shared-types@ npm:8.0.1", so there is no longer any shared-types alpha.10 key. So an immutable install sees that the lockfile would change and fails.

"@electron/fuses": "^2.1.3",
"@marshallofsound/ipc": "^2.7.1",
"@reforged/maker-appimage": "^5.3.1",
Expand Down
167 changes: 154 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -564,15 +564,15 @@ __metadata:
languageName: node
linkType: hard

"@electron-forge/shared-types@npm:8.0.0-alpha.10":
version: 8.0.0-alpha.10
resolution: "@electron-forge/shared-types@npm:8.0.0-alpha.10"
"@electron-forge/shared-types@npm:8.0.1":
version: 8.0.1
resolution: "@electron-forge/shared-types@npm:8.0.1"
dependencies:
"@electron-forge/tracer": "npm:8.0.0-alpha.10"
"@electron/packager": "npm:^20.0.1"
"@electron/rebuild": "npm:^4.0.1"
listr2: "npm:^7.0.2"
checksum: 10c0/458221fe0a4df475811f4a973648af5e20bc689bef79d14e7246984112cc2774a7cdcad0fba425fc22c0375c81de2b5efc3d8e2e7d5c4dd741bb2ce3e63e76b2
"@electron-forge/tracer": "npm:8.0.1"
"@electron/packager": "npm:^20.3.0"
"@electron/rebuild": "npm:^4.2.0"
listr2: "npm:^11.1.0"
checksum: 10c0/756a9633b66fe6a7ccc75fd3958aebc398518b2ae34279f15abbf9475b0a3851b5f6e329fe7f1ff85864e2de61ad993717f3115ac62306491be53383140f29b2
languageName: node
linkType: hard

Expand All @@ -585,6 +585,15 @@ __metadata:
languageName: node
linkType: hard

"@electron-forge/tracer@npm:8.0.1":
version: 8.0.1
resolution: "@electron-forge/tracer@npm:8.0.1"
dependencies:
chrome-trace-event: "npm:^1.0.3"
checksum: 10c0/22c340c95b886806e35c8f257461d1c95522000e458c01775db0022818603a8013c82a3987708d9c8cec0ae184ea5d17499a727cd35a0f0aa861bbd03ad816bf
languageName: node
linkType: hard

"@electron-internal/extract-zip@npm:^1.0.1":
version: 1.0.5
resolution: "@electron-internal/extract-zip@npm:1.0.5"
Expand Down Expand Up @@ -690,7 +699,7 @@ __metadata:
languageName: node
linkType: hard

"@electron/packager@npm:^20.0.1":
"@electron/packager@npm:^20.0.1, @electron/packager@npm:^20.3.0":
version: 20.3.0
resolution: "@electron/packager@npm:20.3.0"
dependencies:
Expand Down Expand Up @@ -2070,6 +2079,15 @@ __metadata:
languageName: node
linkType: hard

"ansi-escapes@npm:^7.3.0":
version: 7.3.0
resolution: "ansi-escapes@npm:7.3.0"
dependencies:
environment: "npm:^1.0.0"
checksum: 10c0/068961d99f0ef28b661a4a9f84a5d645df93ccf3b9b93816cc7d46bbe1913321d4cdf156bb842a4e1e4583b7375c631fa963efb43001c4eb7ff9ab8f78fc0679
languageName: node
linkType: hard

"ansi-regex@npm:^5.0.1":
version: 5.0.1
resolution: "ansi-regex@npm:5.0.1"
Expand Down Expand Up @@ -2100,7 +2118,7 @@ __metadata:
languageName: node
linkType: hard

"ansi-styles@npm:^6.0.0, ansi-styles@npm:^6.1.0":
"ansi-styles@npm:^6.0.0, ansi-styles@npm:^6.1.0, ansi-styles@npm:^6.2.3":
version: 6.2.3
resolution: "ansi-styles@npm:6.2.3"
checksum: 10c0/23b8a4ce14e18fb854693b95351e286b771d23d8844057ed2e7d083cd3e708376c3323707ec6a24365f7d7eda3ca00327fe04092e29e551499ec4c8b7bfac868
Expand Down Expand Up @@ -2335,6 +2353,15 @@ __metadata:
languageName: node
linkType: hard

"cli-cursor@npm:^5.0.0":
version: 5.0.0
resolution: "cli-cursor@npm:5.0.0"
dependencies:
restore-cursor: "npm:^5.0.0"
checksum: 10c0/7ec62f69b79f6734ab209a3e4dbdc8af7422d44d360a7cb1efa8a0887bbe466a6e625650c466fe4359aee44dbe2dc0b6994b583d40a05d0808a5cb193641d220
languageName: node
linkType: hard

"cli-truncate@npm:^3.1.0":
version: 3.1.0
resolution: "cli-truncate@npm:3.1.0"
Expand All @@ -2345,6 +2372,16 @@ __metadata:
languageName: node
linkType: hard

"cli-truncate@npm:^6.1.1":
version: 6.1.1
resolution: "cli-truncate@npm:6.1.1"
dependencies:
slice-ansi: "npm:^9.0.0"
string-width: "npm:^8.2.0"
checksum: 10c0/56760fd0987d1c93711ce603510cce12a97f91d7b4a4f892402a586522aa14633caca86fe410defcfac256f56ea88de757d82d5c874a20eb5861b24d5eebcffb
languageName: node
linkType: hard

"client-only@npm:^0.0.1":
version: 0.0.1
resolution: "client-only@npm:0.0.1"
Expand Down Expand Up @@ -2586,7 +2623,7 @@ __metadata:
"@electron-forge/plugin-fuses": "npm:8.0.1"
"@electron-forge/plugin-vite": "npm:8.0.0-alpha.10"
"@electron-forge/publisher-github": "npm:8.0.0-alpha.10"
"@electron-forge/shared-types": "npm:8.0.0-alpha.10"
"@electron-forge/shared-types": "npm:8.0.1"
"@electron-internal/extract-zip": "npm:^1.0.1"
"@electron/asar": "npm:^4.0.1"
"@electron/fiddle-core": "workspace:*"
Expand Down Expand Up @@ -2774,6 +2811,13 @@ __metadata:
languageName: node
linkType: hard

"environment@npm:^1.0.0":
version: 1.1.0
resolution: "environment@npm:1.1.0"
checksum: 10c0/fb26434b0b581ab397039e51ff3c92b34924a98b2039dcb47e41b7bca577b9dbf134a8eadb364415c74464b682e2d3afe1a4c0eb9873dc44ea814c5d3103331d
languageName: node
linkType: hard

"err-code@npm:^2.0.2":
version: 2.0.3
resolution: "err-code@npm:2.0.3"
Expand Down Expand Up @@ -3156,6 +3200,13 @@ __metadata:
languageName: node
linkType: hard

"get-east-asian-width@npm:^1.3.1, get-east-asian-width@npm:^1.5.0":
version: 1.7.0
resolution: "get-east-asian-width@npm:1.7.0"
checksum: 10c0/680a5f611a186e4a065291f31821f7e4ad7742625be814e05b8ab5535c6fa53562bc0333a83138fca5f2e1030ed960a561b2fd4629e0cff0dc68b19cf46d7c53
languageName: node
linkType: hard

"get-folder-size@npm:^2.0.1":
version: 2.0.1
resolution: "get-folder-size@npm:2.0.1"
Expand Down Expand Up @@ -3362,6 +3413,15 @@ __metadata:
languageName: node
linkType: hard

"is-fullwidth-code-point@npm:^5.1.0":
version: 5.1.0
resolution: "is-fullwidth-code-point@npm:5.1.0"
dependencies:
get-east-asian-width: "npm:^1.3.1"
checksum: 10c0/c1172c2e417fb73470c56c431851681591f6a17233603a9e6f94b7ba870b2e8a5266506490573b607fb1081318589372034aa436aec07b465c2029c0bc7f07a4
languageName: node
linkType: hard

"is-glob@npm:^4.0.0, is-glob@npm:^4.0.3":
version: 4.0.3
resolution: "is-glob@npm:4.0.3"
Expand Down Expand Up @@ -3681,6 +3741,17 @@ __metadata:
languageName: node
linkType: hard

"listr2@npm:^11.1.0":
version: 11.4.0
resolution: "listr2@npm:11.4.0"
dependencies:
cli-truncate: "npm:^6.1.1"
log-update: "npm:^8.0.0"
wrap-ansi: "npm:^10.0.2"
checksum: 10c0/7112c97dea479c4925ef8aa1dc1681046eb06e34c1a2d189b6f049bfe3645e76bb01fa72cfa52630b7669603d267c38cd0b077c7985f60cc2e298cc8e0b12f87
languageName: node
linkType: hard

"listr2@npm:^7.0.2":
version: 7.0.2
resolution: "listr2@npm:7.0.2"
Expand Down Expand Up @@ -3731,6 +3802,20 @@ __metadata:
languageName: node
linkType: hard

"log-update@npm:^8.0.0":
version: 8.0.0
resolution: "log-update@npm:8.0.0"
dependencies:
ansi-escapes: "npm:^7.3.0"
cli-cursor: "npm:^5.0.0"
slice-ansi: "npm:^9.0.0"
string-width: "npm:^8.2.0"
strip-ansi: "npm:^7.2.0"
wrap-ansi: "npm:^10.0.0"
checksum: 10c0/15292232a491d214c7ad5f2f42d96decfc3f65f0ffbd4d8dc141b5dc825e9a94d922f3b0d62c4d1aaf3d9dea0a3559f28dcc77a8cbe3fd2389e55382736b57bb
languageName: node
linkType: hard

"lru-cache@npm:^11.0.0":
version: 11.5.2
resolution: "lru-cache@npm:11.5.2"
Expand Down Expand Up @@ -3822,6 +3907,13 @@ __metadata:
languageName: node
linkType: hard

"mimic-function@npm:^5.0.0":
version: 5.0.1
resolution: "mimic-function@npm:5.0.1"
checksum: 10c0/f3d9464dd1816ecf6bdf2aec6ba32c0728022039d992f178237d8e289b48764fee4131319e72eedd4f7f094e22ded0af836c3187a7edc4595d28dd74368fd81d
languageName: node
linkType: hard

"minimatch@npm:^10.0.1, minimatch@npm:^10.2.2, minimatch@npm:^10.2.4, minimatch@npm:^10.2.5":
version: 10.2.6
resolution: "minimatch@npm:10.2.6"
Expand Down Expand Up @@ -4026,6 +4118,15 @@ __metadata:
languageName: node
linkType: hard

"onetime@npm:^7.0.0":
version: 7.0.0
resolution: "onetime@npm:7.0.0"
dependencies:
mimic-function: "npm:^5.0.0"
checksum: 10c0/5cb9179d74b63f52a196a2e7037ba2b9a893245a5532d3f44360012005c9cadb60851d56716ebff18a6f47129dab7168022445df47c2aff3b276d92585ed1221
languageName: node
linkType: hard

"optionator@npm:^0.9.3":
version: 0.9.4
resolution: "optionator@npm:0.9.4"
Expand Down Expand Up @@ -4408,6 +4509,16 @@ __metadata:
languageName: node
linkType: hard

"restore-cursor@npm:^5.0.0":
version: 5.1.0
resolution: "restore-cursor@npm:5.1.0"
dependencies:
onetime: "npm:^7.0.0"
signal-exit: "npm:^4.1.0"
checksum: 10c0/c2ba89131eea791d1b25205bdfdc86699767e2b88dee2a590b1a6caa51737deac8bad0260a5ded2f7c074b7db2f3a626bcf1fcf3cdf35974cbeea5e2e6764f60
languageName: node
linkType: hard

"retry@npm:*":
version: 0.13.1
resolution: "retry@npm:0.13.1"
Expand Down Expand Up @@ -4563,7 +4674,7 @@ __metadata:
languageName: node
linkType: hard

"signal-exit@npm:*":
"signal-exit@npm:*, signal-exit@npm:^4.1.0":
version: 4.1.0
resolution: "signal-exit@npm:4.1.0"
checksum: 10c0/41602dce540e46d599edba9d9860193398d135f7ff72cab629db5171516cfae628d21e7bfccde1bbfdf11c48726bc2a6d1a8fb8701125852fbfda7cf19c6aa83
Expand All @@ -4587,6 +4698,16 @@ __metadata:
languageName: node
linkType: hard

"slice-ansi@npm:^9.0.0":
version: 9.0.1
resolution: "slice-ansi@npm:9.0.1"
dependencies:
ansi-styles: "npm:^6.2.3"
is-fullwidth-code-point: "npm:^5.1.0"
checksum: 10c0/473c26448a6b94bc05788fb764403e1f30c7bf8e94994bbde49ba0a66377e2daf6da77c8e41dbe652367aa384fe9f770395e3dbdf680bbc36eac742c1edc8e40
languageName: node
linkType: hard

"source-map-js@npm:^1.2.1":
version: 1.2.2
resolution: "source-map-js@npm:1.2.2"
Expand Down Expand Up @@ -4623,6 +4744,16 @@ __metadata:
languageName: node
linkType: hard

"string-width@npm:^8.2.0":
version: 8.3.0
resolution: "string-width@npm:8.3.0"
dependencies:
get-east-asian-width: "npm:^1.5.0"
strip-ansi: "npm:^7.1.2"
checksum: 10c0/bc354b27772777c314e6792106f01586e959f36abb3d4b8ad46c4d4ee92d5e906acb10c1f3be97a85ae0ba1b11389094bc5672999fc5f03f12d22a4725fa30fe
languageName: node
linkType: hard

"strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
version: 6.0.1
resolution: "strip-ansi@npm:6.0.1"
Expand All @@ -4632,7 +4763,7 @@ __metadata:
languageName: node
linkType: hard

"strip-ansi@npm:^7.0.1":
"strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.2, strip-ansi@npm:^7.2.0":
version: 7.2.0
resolution: "strip-ansi@npm:7.2.0"
dependencies:
Expand Down Expand Up @@ -5225,6 +5356,16 @@ __metadata:
languageName: node
linkType: hard

"wrap-ansi@npm:^10.0.0, wrap-ansi@npm:^10.0.2":
version: 10.0.2
resolution: "wrap-ansi@npm:10.0.2"
dependencies:
ansi-styles: "npm:^6.2.3"
string-width: "npm:^8.2.0"
checksum: 10c0/b9f7be64b91cf4b4e5bc74df6e280cb4e1fed438ce38ac8cc433705cf3371fe9cdcd2e4bb7f508d73f1f4cf302dbc6c7b5e8bed5ce47cb82d22bef256a79fc0b
languageName: node
linkType: hard

"wrap-ansi@npm:^7.0.0":
version: 7.0.0
resolution: "wrap-ansi@npm:7.0.0"
Expand Down
Loading