fix(deps): resolve unresolved merge-conflict markers in package.json - #406
Open
thlpkee20-wq wants to merge 1 commit into
Open
fix(deps): resolve unresolved merge-conflict markers in package.json#406thlpkee20-wq wants to merge 1 commit into
thlpkee20-wq wants to merge 1 commit into
Conversation
The pr-404 merge left literal <<<<<<</=======/>>>>>>> markers in devDependencies, producing invalid JSON and breaking npm install for every contributor. Resolves to typescript@^6.0.3 with typescript-eslint@^8.65.0: the currently published typescript-eslint (8.65.0) only supports typescript <6.1.0, so pairing it with the typescript@^7.0.2 side of the conflict leaves the dependency tree unresolvable.
This was referenced Jul 28, 2026
Contributor
|
thanks @thlpkee20-wq! please add a |
3 tasks
Contributor
|
thanks @thlpkee20-wq! please add a |
2 similar comments
Contributor
|
thanks @thlpkee20-wq! please add a |
Contributor
|
thanks @thlpkee20-wq! please add a |
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
2 participants
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
maincurrently has literal<<<<<<</=======/>>>>>>>conflict markersleft in
devDependenciesfrom thepr-404merge, makingpackage.jsoninvalid JSON and breaking
npm installfor every contributor (includingevery other PR in this GrantFox campaign).
Fix
Resolved to
typescript@^6.0.3+typescript-eslint@^8.65.0. Thecurrently published
typescript-eslint(8.65.0) declares a peer range oftypescript >=4.8.4 <6.1.0, so pairing it with thetypescript@^7.0.2sideof the conflict leaves the dependency tree unresolvable (
ERESOLVE).Regenerated
package-lock.jsonaccordingly.Test plan
npm installresolves cleanly (noERESOLVE)npm run buildnpm run lintnpm test(ran the suite; all executed cases passed)This is a build-blocking prerequisite fix, not tied to a specific GrantFox
issue.