patches: retire awk-comma-continuation and jq-permissive-control-chars#14
Merged
subsetpark merged 1 commit intoMay 19, 2026
Merged
Conversation
Both upstreamed: - awk-comma-continuation: vercel-labs#206 (merged 2026-04-29, brought in via the just-bash@2.14.4 sync). The lexer now swallows newlines after continuation-allowing tokens (`,`, `{`, `&&`, `||`, `?`, `:`, `do`, `else`, `if`, `while`) per POSIX. Our 3-line patch from 58a69ce is now fully absorbed — `git diff upstream/main..flowglad-main -- commands/awk/` is empty. - jq-permissive-control-chars: vercel-labs#214 (merged 2026-05-05, also upstream-authored by zd@zdsmith.com after carrying it here first). Upstream's jq scanner now tolerates literal newlines/tabs in JSON strings the same way the carry did. `git diff upstream/main..flowglad-main -- commands/jq/` is empty. Drop both describe blocks from flowglad-patches.integration.test.ts and both rows from README.md's patch table. Update the intro from "three patches" to "one patch". Add a note pointing readers to the upstreaming PRs so the history is discoverable. The remaining carry is sqlite3-dot-commands. That's also pending upstream in vercel-labs#249; once it lands the README patch table goes to zero and this section can be retired along with the integration test fixture. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
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 patches have been absorbed by upstream:
awk-comma-continuation— upstreamed in vercel-labs#206 (merged 2026-04-29, brought in via the just-bash@2.14.4 sync). Upstream's lexer now swallows newlines after the continuation-allowing tokens (,,{,&&,||,?,:,do,else,if,while) per POSIX. Our 3-line patch from58a69ceis now fully redundant —git diff upstream/main..flowglad-main -- packages/just-bash/src/commands/awk/is empty.jq-permissive-control-chars— upstreamed in vercel-labs#214 (merged 2026-05-05; happens to also be flowglad-authored, contributed upstream after we'd carried it locally first). Upstream's jq scanner now tolerates literal newlines/tabs in JSON strings the same way the carry did.git diff upstream/main..flowglad-main -- packages/just-bash/src/commands/jq/is also empty.Changes
packages/just-bash/src/flowglad-patches.integration.test.ts— drop theawk-comma-continuationandjq-permissive-control-charsdescribe blocks. The release-gating integration test now exercises only thesqlite3-dot-commandscarry (4 tests, all passing).README.md— drop both rows from the patch table; intro goes from "three patches" to "one patch". Added a one-liner pointing readers at the upstreaming PRs so the history stays discoverable.Test plan
pnpm --filter just-bash exec vitest run src/flowglad-patches.integration.test.ts— 4/4 pass (only sqlite3-dot-commands)git diff upstream/main..flowglad-main -- packages/just-bash/src/commands/awk/ packages/just-bash/src/commands/jq/— empty, confirming both surfaces match upstream byte-for-byteForward outlook
The remaining
sqlite3-dot-commandscarry is also pending upstream in vercel-labs#249 (with #250 covering the BuncoerceDbBufferfix as a separate concern). Once those land and we sync, the entireflowglad-patches.integration.test.tsfixture and the README fork-notes section can be retired.🤖 Generated with Claude Code