fix: update 20-keymap patch context for vscode 1.124.0#14
Closed
claude[bot] wants to merge 1 commit into
Closed
Conversation
In vscode 1.124.0, playwright-core was bumped from 1.59.1 to 1.61.0-alpha-2026-06-04 and node-addon-api was added as a new dependency, shifting line numbers in package-lock.json (57→62) and package.json (134→144). The patch context referencing the old playwright-core version no longer matched, causing: error: patch failed: package-lock.json:57 error: patch failed: package.json:134 Regenerated the patch against upstream commit 1b50d58d73426c9171299ec4037d01365d995b78 (tag 1.124.0) so context lines match the current upstream. Also updates upstream/stable.json to pin 1.124.0.
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.
Root Cause
In vscode 1.124.0, two changes broke the
20-keymap-use-custom-lib.patchapply:playwright-corewas bumped from1.59.1→1.61.0-alpha-2026-06-04node-addon-apiwas added as a new top-level dependencyTogether these shifted the
native-keymapentry in both files:package-lock.json: line 57 → 62package.json: line 134 → 144The patch context included the old
playwright-coreversion as a trailing context line, sogit applycould not find the hunk:All other hunks in the patch (6 out of 8) applied cleanly with offset.
Fix
Regenerated
20-keymap-use-custom-lib.patchagainst upstream commit1b50d58d73426c9171299ec4037d01365d995b78(tag 1.124.0). The logical changes are identical — only the context line numbers andplaywright-coreversion string in the context are updated.Also bumps
upstream/stable.jsonto pin 1.124.0 so this PR's CI build targets the same upstream.Verified with:
Refs #12