Repository navigation
fix: match package.json script order to Speakeasy output - #1102
Merged
Merged
Conversation
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Contributor
|
I'll fix CI failures and address comments from users with write access that start with 'DevinAI' or '@devin'.
Original prompt from Robert
|
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
sunwrobert
added a commit
that referenced
this pull request
Sep 24, 2026
… 1.3.22) (#1103) ## Summary Nightly Generate has failed since [#1095](#1095) with `both modified: package.json`. The hand-edited scripts block differed from Speakeasy's pristine base, and Speakeasy emits the scripts in a different order each run, so the 3-way merge overlapped every time. Reordering to match one run ([#1102](#1102)) could not stick. This PR applies Speakeasy's documented resolution with the pinned CLI (1.787.0): 1. `speakeasy run -t openrouter` reproduced the conflict locally. 2. Took the generated side of package.json. It already contains the `additionalScripts` from gen.yaml, so `build`/`compile` stay `tsc && node scripts/unbarrel-imports.js`. 3. `speakeasy run --skip-versioning` recorded that output as the new pristine base (`refs/speakeasy/gen/50695a38…`, pushed to origin). Committed package.json now equals the pristine blob (`2f282a2`), so future regens merge cleanly regardless of script order, as long as scripts are changed only through `additionalScripts` in gen.yaml. The diff also carries the pending spec regen and the version bump to 1.3.22, which is exactly what the failed Generate runs would have produced. **Merging changes `.speakeasy/gen.lock` on main, which triggers Publish for 1.3.22.** Earlier revision of this PR set `build` to plain `tsc` and broke the unbarrel compiled-output test. That is fixed here. Verified locally: `pnpm run build` (unbarrel rewrote 211 files), `pnpm run lint`, `vitest --run --exclude 'tests/e2e/**'` 211/211. Existing PR search: continuing this PR, which supersedes [#1102](#1102). Link to Devin session: https://openrouter.devinenterprise.com/sessions/a07494c1b0f84282bc49206285c9b5b8 Open in Devin Desktop: https://openrouter.devinenterprise.com/desktop/session/a07494c1b0f84282bc49206285c9b5b8?variant=devin Requested by: @sunwrobert <!-- devin-review-badge-begin --> --- <a href="https://openrouter.devinenterprise.com/review/openrouterteam/typescript-sdk/pull/1103" target="_blank"><picture><source media="(prefers-color-scheme: dark)" srcset="https://static.devin.ai/assets/gh-devin-review-dark.svg?v=4"><img src="https://static.devin.ai/assets/gh-devin-review-light.svg?v=4" alt="Devin Review"></picture></a> <!-- devin-review-badge-end --> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
![https://static.devin.ai/assets/gh-devin-review-dark.svg?v=4"><img](https://static.devin.ai/assets/gh-devin-review-dark.svg?v=4"><img){kind=link}
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
This unblocks the nightly Generate workflow. Run 35939188224 failed with
could not apply persistent edits for "typescript": merge conflicts detected in 1 file(s)(both modified: package.json).The conflict comes from #1095. That PR edited the
buildandcompilelines in package.json by hand and movedbuildintoadditionalScriptsin gen.yaml. On the next regen, Speakeasy produced the same commands but wrote the scripts block in a new order. The committed file and the generated file then disagreed on the same lines, so the 3-way merge stopped with a conflict.This PR reorders the
scriptsblock to match Speakeasy's output, taken fromrefs/speakeasy/gen/212a8ac8-0d2c-4924-bdb8-24c73935fd2d(the ref the failed run pushed). No script values change.After this PR, the scripts block is the same as the generated one. The only other differences from the generated file are the version bump and the whitespace in
peerDependencies. Both of those were already present in the runs that passed before #1095.Searched existing PRs and found none that match.
After merge, the Generate workflow needs a manual rerun, or it will run on its own tonight.
Link to Devin session: https://openrouter.devinenterprise.com/sessions/a07494c1b0f84282bc49206285c9b5b8
Open in Devin Desktop: https://openrouter.devinenterprise.com/desktop/session/a07494c1b0f84282bc49206285c9b5b8?variant=devin
Requested by: @sunwrobert