Fix CI: repair broken package.json / pnpm-lock.yaml from unresolved merge conflict - #123
Open
prodbycorne wants to merge 1 commit into
Open
Fix CI: repair broken package.json / pnpm-lock.yaml from unresolved merge conflict#123prodbycorne wants to merge 1 commit into
prodbycorne wants to merge 1 commit into
Conversation
…ck.yaml A prior merge left both sides of a conflict concatenated instead of resolved: package.json had a duplicate "playwright" script key with a missing comma before it (invalid JSON, breaking `npm ci` on every job with EJSONPARSE), and pnpm-lock.yaml had duplicate "version:" mapping keys under @vitest/coverage-v8 and vitest (invalid YAML, breaking `pnpm install --frozen-lockfile` with ERR_PNPM_BROKEN_LOCKFILE). Removed the duplicate script entry and regenerated the lockfile with pnpm 9 (matching CI's pnpm/action-setup version) so it resolves cleanly against the now-valid package.json. Verified locally: `npm ci` + `npm run build` (Deploy to GitHub Pages' exact steps) succeed, and `pnpm install --frozen-lockfile` (E2E Tests' exact step) now passes instead of failing on the broken lockfile.
✅ Deploy Preview for spiffy-melomakarona-eb1e8a ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
✅ Deploy Preview for smart-drop ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Both CI workflows (`E2E Tests`, `Deploy to GitHub Pages`) have been failing on every run on `main` since PR #58 merged. Root cause: that merge left both sides of a conflict concatenated instead of resolved.
Fix
Test plan