chore: resolve Speakeasy package.json persistent-edit conflict (regen 1.3.22) - #1103
Merged
Merged
Conversation
… cleanly 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}
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
Ran speakeasy run, kept the generated package.json scripts (which include the unbarrel-imports build/compile steps), then speakeasy run --skip-versioning so gen.lock records that output as the pristine base. Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
|
Preview deployment for your docs. Learn more about Mintlify Previews.
|
|
Preview deployment for your docs. Learn more about Mintlify Previews.
|
devin-ai-integration
Bot
changed the title
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
Nightly Generate has failed since #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) could not stick.This PR applies Speakeasy's documented resolution with the pinned CLI (1.787.0):
speakeasy run -t openrouterreproduced the conflict locally.additionalScriptsfrom gen.yaml, sobuild/compilestaytsc && node scripts/unbarrel-imports.js.speakeasy run --skip-versioningrecorded 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 throughadditionalScriptsin 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.lockon main, which triggers Publish for 1.3.22.Earlier revision of this PR set
buildto plaintscand 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.
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