Skip to content

chore: merge main into campaign/integration - #109

Merged
Upd4ting merged 9 commits into
campaign/integrationfrom
chore/merge-main-2026-11-03
Nov 3, 2026
Merged

Upd4ting merged 9 commits into
campaign/integrationfrom
chore/merge-main-2026-11-03

Conversation

@Upd4ting

@Upd4ting Upd4ting commented Nov 2, 2026 •

Copy link
Copy Markdown
Member

Why

Antony's joint release needs every campaign/integration branch to be 0 behind its default branch (release rehearsal 2026-11-02, blocker 1). This PR merges main into a branch cut from campaign/integration. Nothing is pushed to main.

What changed

Merges main at 73aabf1 into campaign/integration at 78f995c. Commits from main brought in:

Releases merged in:

  • chore(release): v0.4.0

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/tgz tarballs (including dms, dms-frontend, mongodb as devDependencies); main raised the dms range to >=0.13.1. Kept integration's tarball pins except @antelopejs/dms (devDependency and pnpm.overrides entry), which takes main's published range >=0.13.1 <1.0.0 in a follow-up commit: main's extended lint script calls check-api-error-presentation.mjs from node_modules/@antelopejs/dms, which the campaign dms tarball lacks, so pnpm run checks failed with the tarball. Main's version 0.4.0 and the extended lint script merged on their own.
  • playground/package.json: integration pins the playground's dependencies to tarballs; main raised dms to >=0.13.1. Kept integration's tarball pins.
  • playground/pnpm-lock.yaml and pnpm-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 root pnpm-lock.yaml then changed for the dms range, by a non-frozen pnpm install in the follow-up commit; playground/pnpm-lock.yaml is unchanged from integration.

Proofs

  • GITHUB_BASE_REF=campaign/integration pnpm run checks on head dd4ddbe: exit 0. Last lines of the run:
> @antelopejs/dms-database@0.4.0 checks /home/antony/.cache/campaign/h8/work/merge-main/dms-database/dms-database
> antelopejs-checks
Checks: 8 passed, 0 failed.
  • The merge commit went through the repository's pre-commit hooks.
  • CI: the checks on this PR.

Re-pin to dms 4358eef

@antelopejs/dms now resolves .campaign/tgz/antelopejs-dms-4358eef.tgz. tgz.sh packed that tarball from the dms merge-main head (AntelopeJS/dms#699 at 4358eef, version 0.15.0, sha256 df070013f126df0c85dd3cfdae3fec26575dc6aa84e309483540eb4f4a76d5f1). It ships main's useApiErrorPresenter and check-api-error-presentation.mjs. campaign/tools/use-tgz.sh applied the pin, so the lockfiles come from the tool, not from hand edits.

  • ee6a39b build(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 from 80e4dc1 to 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.tsv prints nothing (every committed tarball matches SHA256SUMS and the index).
  • CI: ci / checks success, frontend success, ubuntu success.

Attention

  • Root manifest version: integration 0.3.1, main 0.4.0, this head 0.4.0. Versions come in from main as they are; this PR sets none.
  • Main published 0.4.0 (chore(release): v0.4.0), the version the campaign planned for this package (rehearsal blocker 2); integration's manifest was 0.3.1. This merge brings 0.4.0 as published, so the release plan target must move to the next free version (the plan names 0.5.0) when recomputed from this tip.
  • Lockfile regeneration: root pnpm-lock.yaml regenerated with a non-frozen pnpm install for that range change (6 insertions, 8 deletions at the time of writing; see the diff stat in this PR). playground/pnpm-lock.yaml is unchanged.
  • Re-pin: the dms tarball now ships check-api-error-presentation.mjs, and the renderer mismatch with published dms 0.14.0 is gone. frontend is green.

Upd4ting and others added 9 commits November 1, 2026 00:47
…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.
@Upd4ting
Upd4ting marked this pull request as ready for review November 3, 2026 02:18
@Upd4ting
Upd4ting merged commit aa64765 into campaign/integration Nov 3, 2026
8 checks passed
@Upd4ting
Upd4ting deleted the chore/merge-main-2026-11-03 branch November 3, 2026 02:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants