Skip to content

Merge v17/main into v18/main (2026-10-26) - #1142

Merged
KevinJump merged 35 commits into
v18/mainfrom
merge/v17-to-v18-2026-10-26
Oct 26, 2026
Merged

KevinJump merged 35 commits into
v18/mainfrom
merge/v17-to-v18-2026-10-26

Conversation

@KevinJump

@KevinJump KevinJump commented Oct 26, 2026 •

Copy link
Copy Markdown
Owner

Fixes and features:

Dependencies:

Repo and CI:

Conflict resolution:

  • Directory.Packages.props and package.json: kept v18's Umbraco,
    @Umbraco-CMS and @Jumoo pins and its dependency list (v18 already dropped
    @jumoo/translate, rm-rs, node-resolve and vite-plugin-checker from
    history-client), taking the newer version of each shared package.
  • dependabot.yml: took v17's newer template version.
  • Lock files kept from v18/main and regenerated (npm install,
    dotnet restore --force-evaluate).

Checks: dotnet build (Release) passes, and all 258 tests in uSync.Tests pass. npm run build passes for both clients.

Please merge with a merge commit, not a squash, so the next forward port can use the shared history.

.github/dependabot.yml: on v18 the TypeScript ignore is loosened to >= 7.0.0 (v18 already uses TypeScript 6).

🤖 Generated with Claude Code

KevinJump and others added 30 commits October 13, 2026 17:31
Ignores Umbraco.*, Jumoo.*, TypeScript 6+ and hey-api minors, and groups
minor+patch updates into one weekly PR per ecosystem.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps the npm-dependencies group in /uSync.Backoffice.Management.Client/usync-assets with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [@microsoft/signalr](https://github.com/dotnet/aspnetcore) | `10.0.0` | `10.0.11` |
| [eslint](https://github.com/eslint/eslint) | `10.2.0` | `10.12.0` |
| [lit](https://github.com/lit/lit/tree/HEAD/packages/lit) | `3.3.2` | `3.3.3` |
| [prettier](https://github.com/prettier/prettier) | `3.8.1` | `3.9.10` |
| [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) | `8.0.16` | `8.3.4` |


Updates `@microsoft/signalr` from 10.0.0 to 10.0.11
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](dotnet/aspnetcore@v10.0.0...v10.0.11)

Updates `eslint` from 10.2.0 to 10.12.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](eslint/eslint@v10.2.0...v10.12.0)

Updates `lit` from 3.3.2 to 3.3.3
- [Release notes](https://github.com/lit/lit/releases)
- [Changelog](https://github.com/lit/lit/blob/main/packages/lit/CHANGELOG.md)
- [Commits](https://github.com/lit/lit/commits/lit@3.3.3/packages/lit)

Updates `prettier` from 3.8.1 to 3.9.10
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.8.1...3.9.10)

Updates `vite` from 8.0.16 to 8.3.4
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v8.3.4/packages/vite)

---
updated-dependencies:
- dependency-name: "@microsoft/signalr"
  dependency-version: 10.0.11
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-dependencies
- dependency-name: eslint
  dependency-version: 10.12.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
- dependency-name: lit
  dependency-version: 3.3.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-dependencies
- dependency-name: prettier
  dependency-version: 3.9.10
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
- dependency-name: vite
  dependency-version: 8.3.4
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps the npm-dependencies group in /uSync.History/history-client with 4 updates: [lit](https://github.com/lit/lit/tree/HEAD/packages/lit), [prettier](https://github.com/prettier/prettier), [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) and [vite-plugin-checker](https://github.com/fi3ework/vite-plugin-checker).


Updates `lit` from 3.3.2 to 3.3.3
- [Release notes](https://github.com/lit/lit/releases)
- [Changelog](https://github.com/lit/lit/blob/main/packages/lit/CHANGELOG.md)
- [Commits](https://github.com/lit/lit/commits/lit@3.3.3/packages/lit)

Updates `prettier` from 3.8.1 to 3.9.10
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.8.1...3.9.10)

Updates `vite` from 8.0.16 to 8.3.4
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v8.3.4/packages/vite)

Updates `vite-plugin-checker` from 0.12.0 to 0.14.5
- [Release notes](https://github.com/fi3ework/vite-plugin-checker/releases)
- [Commits](https://github.com/fi3ework/vite-plugin-checker/compare/vite-plugin-checker@0.12.0...v0.14.5)

---
updated-dependencies:
- dependency-name: lit
  dependency-version: 3.3.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-dependencies
- dependency-name: prettier
  dependency-version: 3.9.10
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
- dependency-name: vite
  dependency-version: 8.3.4
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
- dependency-name: vite-plugin-checker
  dependency-version: 0.14.5
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@rollup/plugin-node-resolve](https://github.com/rollup/plugins/tree/HEAD/packages/node-resolve) from 15.3.1 to 16.0.3.
- [Changelog](https://github.com/rollup/plugins/blob/master/packages/node-resolve/CHANGELOG.md)
- [Commits](https://github.com/rollup/plugins/commits/node-resolve-v16.0.3/packages/node-resolve)

---
updated-dependencies:
- dependency-name: "@rollup/plugin-node-resolve"
  dependency-version: 16.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps Microsoft.NET.Test.Sdk from 18.4.0 to 18.11.0
Bumps Microsoft.SourceLink.GitHub from 10.0.201 to 10.0.402
Bumps NJsonSchema from 11.5.2 to 11.6.1
Bumps NUnit3TestAdapter from 6.2.0 to 6.3.1

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-version: 18.11.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-dependencies
- dependency-name: Microsoft.SourceLink.GitHub
  dependency-version: 10.0.402
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-dependencies
- dependency-name: NJsonSchema
  dependency-version: 11.6.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-dependencies
- dependency-name: NUnit3TestAdapter
  dependency-version: 6.3.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Umbraco 17.8 resolves %7BlocalLink:guid%7D as well as {localLink:guid}
(umbraco/Umbraco-CMS#23767). Extend the regex to match either form and
read the guid from a named group rather than trimming braces.

Refs #1132

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Umbraco 17.8 elects the server role before UmbracoApplicationStartingNotification
(umbraco/Umbraco-CMS#23801), so the Subscriber check in the startup handler
now fires on election-based load-balanced sites. Log the resolved role at
Information to help support, and note in FirstBootMigration that package
migrations still run before the election.

Refs #1132

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The SyncHub connection had no automatic reconnect and captured the access
token once, so after a server restart or network blip the dashboard lost
live progress until the page was reloaded. Add withAutomaticReconnect with a
local copy of Umbraco 17.8's capped-backoff policy (importing theirs breaks
17.3-17.7), fetch the latest token on each (re)connect, and track the
connected state through reconnecting/reconnected.

Refs #1132

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Match URL-encoded localLink tags in RTE dependencies
Log the server role at startup and document 17.8 election
Reconnect the uSync SignalR hub automatically
SyncDocumentUrlCleaner removed umbracoDocumentUrl rows for the old key but
left umbracoDocumentUrlAlias rows behind. IDocumentUrlAliasRepository has
DeleteByDocumentKey from Umbraco 17.2, so it is safe on the 17.3 floor.

Refs #1132

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…change

Clean URL alias rows for the old key on a content key change
…ions/checkout-7

Bump actions/checkout from 4 to 7
…encies-1033f429c8

Bump the nuget-dependencies group with 4 updates
….Backoffice.Management.Client/usync-assets/npm-dependencies-74045e0e80

Bump the npm-dependencies group in /uSync.Backoffice.Management.Client/usync-assets with 5 updates
….History/history-client/npm-dependencies-866dcc2fd2

Bump the npm-dependencies group in /uSync.History/history-client with 4 updates
….History/history-client/rollup/plugin-node-resolve-16.0.3

Bump @rollup/plugin-node-resolve from 15.3.1 to 16.0.3 in /uSync.History/history-client
Bumps [vite-plugin-dts](https://github.com/qmhc/unplugin-dts/tree/HEAD/packages/vite-plugin-dts) from 4.5.4 to 5.1.2.
- [Release notes](https://github.com/qmhc/unplugin-dts/releases)
- [Changelog](https://github.com/qmhc/unplugin-dts/blob/main/packages/vite-plugin-dts/CHANGELOG.md)
- [Commits](https://github.com/qmhc/unplugin-dts/commits/vite-plugin-dts@5.1.2/packages/vite-plugin-dts)

---
updated-dependencies:
- dependency-name: vite-plugin-dts
  dependency-version: 5.1.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [chalk](https://github.com/chalk/chalk) from 5.6.2 to 6.0.1.
- [Release notes](https://github.com/chalk/chalk/releases)
- [Commits](chalk/chalk@v5.6.2...v6.0.1)

---
updated-dependencies:
- dependency-name: chalk
  dependency-version: 6.0.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
….Backoffice.Management.Client/usync-assets/vite-plugin-dts-5.1.2

Bump vite-plugin-dts from 4.5.4 to 5.1.2 in /uSync.Backoffice.Management.Client/usync-assets
….History/history-client/chalk-6.0.1

Bump chalk from 5.6.2 to 6.0.1 in /uSync.History/history-client
Bumps the npm-dependencies group in /uSync.Backoffice.Management.Client/usync-assets with 1 update: [eslint](https://github.com/eslint/eslint).


Updates `eslint` from 10.12.0 to 10.13.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](eslint/eslint@v10.12.0...v10.13.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-version: 10.13.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
….Backoffice.Management.Client/usync-assets/npm-dependencies-0a04ba22e9

Bump eslint from 10.12.0 to 10.13.0 in /uSync.Backoffice.Management.Client/usync-assets in the npm-dependencies group
Picks up the eslint bump from #1138.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.4.15 to 3.4.17.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](cure53/DOMPurify@3.4.15...3.4.17)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-version: 3.4.17
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.4.16 to 3.4.17.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](cure53/DOMPurify@3.4.16...3.4.17)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-version: 3.4.17
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
KevinJump and others added 5 commits October 26, 2026 11:04
uSync 17.5.0: Umbraco 17.8 readiness
….Backoffice.Management.Client/usync-assets/dompurify-3.4.17

Bump dompurify from 3.4.15 to 3.4.17 in /uSync.Backoffice.Management.Client/usync-assets
….History/history-client/dompurify-3.4.17

Bump dompurify from 3.4.16 to 3.4.17 in /uSync.History/history-client
Fixes and features:
- #1133 Match URL-encoded localLink tags in RTE dependencies
- #1134 Log the server role at startup and document 17.8 election
- #1135 Reconnect the uSync SignalR hub automatically
- #1136 Clean URL alias rows for the old key on a content key change

Dependencies:
- #1131 Bump the nuget-dependencies group with 4 updates
- #1124, #1125 Bump the npm-dependencies groups
- #1126 Bump vite-plugin-dts in usync-assets
- #1127 Bump chalk to 6.0.1 in history-client
- #1128 Bump @rollup/plugin-node-resolve in history-client
- #1138 Bump eslint
- #1140, #1141 Bump dompurify to 3.4.17

Repo and CI:
- #1123 Bump actions/checkout to v7; dependabot config from the
  jumoo-context template
- #1137, #1139 17.5.0 release prep merges (no further changes)

Conflict resolution:
- Directory.Packages.props and package.json: kept v18's Umbraco,
  @Umbraco-CMS and @Jumoo pins and its dependency list (v18 already dropped
  @jumoo/translate, rm-rs, node-resolve and vite-plugin-checker from
  history-client), taking the newer version of each shared package.
- dependabot.yml: took v17's newer template version.
- Lock files kept from v18/main and regenerated (npm install,
  dotnet restore --force-evaluate).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
v18's clients can move to TypeScript 6. Only TypeScript 7 is held back
until @hey-api/openapi-ts supports it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@KevinJump
KevinJump merged commit 175c211 into v18/main Oct 26, 2026
3 checks passed
@KevinJump
KevinJump deleted the merge/v17-to-v18-2026-10-26 branch October 26, 2026 15:16
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