Repository navigation
chore: merge main into campaign/integration - #109
Merged
Merged
Conversation
…ild (#61) Run the .amp dev frontend from the playground project and ignore .dms-frontend.
* test(frontend): reproduce duplicate diagram failure toast * fix(frontend): route API failures through the core presenter Keep SQL diagnostics inline and let the shared presenter translate and deduplicate transport failures. * docs(readme): require the current DMS error contract
…ge-main head 4358eef Main's frontend lint and presenter test need dms 0.15, and published dms 0.14 asks for renderer 0.9 while integration pins dms-frontend 0.10. The root devDependency and override move from main's registry range back to a campaign tarball, and the playground pin moves from 80e4dc1 to the same tarball.
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
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.
Why
Antony's joint release needs every
campaign/integrationbranch to be 0 behind its default branch (release rehearsal 2026-11-02, blocker 1). This PR mergesmaininto a branch cut fromcampaign/integration. Nothing is pushed tomain.What changed
Merges
mainat73aabf1intocampaign/integrationat78f995c. Commits frommainbrought in:73aabf1docs(github): send questions and ideas to Discord (docs(github): send questions and ideas to Discord #106)e4839d4chore(release): v0.4.021137dbfix(frontend): present API errors through the core contract (fix(frontend): present API errors through the core contract #100)da460eefix(amp): start the dev frontend in the playground, and ignore its build (fix(amp): start the dev frontend in the playground, and ignore its build #61)07d8922docs(readme): use one Discord invite (docs(readme): use one Discord invite #90)5245f56docs(readme): link the DMS in the opening line (docs(readme): link the DMS in the opening line #92)Releases merged in:
Conflicts
README.md: integration replaced the version table with the generated compatibility block and one sentence on the DMS backend, the renderer range and the database implementation; main bumped the table (dms >=0.13.1) and dropped the "On DMS 0.10 or earlier" line. Kept integration's text, because the compatibility block follows the manifests and the docs rewrite is the standard; main's Discord invite and DMS link in the opening lines merged on their own.package.json: integration pins every@antelopejs/*dependency to.campaign/tgztarballs (includingdms,dms-frontend,mongodbas devDependencies); main raised thedmsrange to>=0.13.1. Kept integration's tarball pins except@antelopejs/dms(devDependency andpnpm.overridesentry), which takes main's published range>=0.13.1 <1.0.0in a follow-up commit: main's extendedlintscript callscheck-api-error-presentation.mjsfromnode_modules/@antelopejs/dms, which the campaign dms tarball lacks, sopnpm run checksfailed with the tarball. Main's version0.4.0and the extendedlintscript merged on their own.playground/package.json: integration pins the playground's dependencies to tarballs; main raiseddmsto>=0.13.1. Kept integration's tarball pins.playground/pnpm-lock.yamlandpnpm-lock.yaml: the manifests end identical to integration's apart from the version and the lint script, so integration's lockfiles are kept as they are (main's lockfile edits only followed range bumps that the tarball pins supersede). The rootpnpm-lock.yamlthen changed for thedmsrange, by a non-frozenpnpm installin the follow-up commit;playground/pnpm-lock.yamlis unchanged from integration.Proofs
GITHUB_BASE_REF=campaign/integration pnpm run checkson headdd4ddbe: exit 0. Last lines of the run:Re-pin to dms 4358eef
@antelopejs/dmsnow resolves.campaign/tgz/antelopejs-dms-4358eef.tgz.tgz.shpacked that tarball from the dms merge-main head (AntelopeJS/dms#699 at4358eef, version 0.15.0, sha256df070013f126df0c85dd3cfdae3fec26575dc6aa84e309483540eb4f4a76d5f1). It ships main'suseApiErrorPresenterandcheck-api-error-presentation.mjs.campaign/tools/use-tgz.shapplied the pin, so the lockfiles come from the tool, not from hand edits.ee6a39bbuild(deps): pin @antelopejs/dms to the 0.15.0 tarball of the dms merge-main head 4358eef: the root devDependency and its override go from main's registry range back to the tarball. The playground pin and override move from80e4dc1to the new tarball.Proofs on head
ee6a39b:GITHUB_BASE_REF=campaign/integration pnpm run checks:Checks: 8 passed, 0 failed.verify-tgz.sh .campaign/tgz ~/.cache/campaign2/tgz/index.tsvprints nothing (every committed tarball matches SHA256SUMS and the index).ci / checkssuccess,frontendsuccess,ubuntusuccess.Attention
0.3.1,main0.4.0, this head0.4.0. Versions come in frommainas they are; this PR sets none.0.4.0(chore(release): v0.4.0), the version the campaign planned for this package (rehearsal blocker 2); integration's manifest was0.3.1. This merge brings0.4.0as published, so the release plan target must move to the next free version (the plan names 0.5.0) when recomputed from this tip.pnpm-lock.yamlregenerated with a non-frozenpnpm installfor that range change (6 insertions, 8 deletions at the time of writing; see the diff stat in this PR).playground/pnpm-lock.yamlis unchanged.check-api-error-presentation.mjs, and the renderer mismatch with published dms 0.14.0 is gone.frontendis green.