Skip to content

chore: Back-port 5.4.2 fixes to v6 (#298, #302, #303, #304)#305

Merged
rickbutterfield merged 5 commits into
v6/devfrom
v6/chore/backport-fixes
Jun 30, 2026
Merged

chore: Back-port 5.4.2 fixes to v6 (#298, #302, #303, #304)#305
rickbutterfield merged 5 commits into
v6/devfrom
v6/chore/backport-fixes

Conversation

@rickbutterfield

Copy link
Copy Markdown
Owner

Back-ports the four fixes merged into v5/dev onto v6/dev, ahead of a 6.0.1 patch release. Done by cherry-picking each PR merge commit (-m 1).

Conflict resolutions

  • version.json untouched → stays 6.1.0-alpha.
  • UI package.json: kept v6's @hey-api/openapi-ts@0.97.1 / @umbraco-cms/backoffice@18.0.0, added fix: resolve nodeKey for previews nested in block lists #298's test-infra devDeps.
  • Acceptance package.json: kept @umbraco/json-models-builders@^18.0.2, migrated helper to @umbraco-cms/acceptance-test-helpers@^18.0.0.
  • Rebuilt the frontend bundle from merged source; regenerated both lockfiles.

Verification

  • UI unit tests (web-test-runner): 8 passed (the nodeKey-resolution suite runs against backoffice 18).
  • npm run build (tsc + vite): clean.
  • dotnet build of the package + test site: 0 errors.

🤖 Generated with Claude Code

rickbutterfield and others added 5 commits June 30, 2026 16:09
…ck-list-nodekey

fix: resolve nodeKey for previews nested in block lists
…rs-migration

test: Migrate acceptance tests to @umbraco-cms/acceptance-test-helpers
…uild

ci: Build frontend assets before packing in release workflow
…-preview

fix: Render RTE block previews nested in a side-panel modal (#300)
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@rickbutterfield rickbutterfield merged commit 7271b78 into v6/dev Jun 30, 2026
@rickbutterfield rickbutterfield deleted the v6/chore/backport-fixes branch June 30, 2026 15:42
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.

1 participant