Skip to content

Release: merge beta into main - #1302

Merged
rubenvdlinde merged 23 commits into
mainfrom
beta
Aug 31, 2026
Merged

Release: merge beta into main#1302
rubenvdlinde merged 23 commits into
mainfrom
beta

Conversation

@rubenvdlinde

@rubenvdlinde rubenvdlinde commented Aug 31, 2026

Copy link
Copy Markdown
Collaborator

Second hop of the promotion. development → beta already merged; this carries beta to main, which is the branch Dependabot alerts and the Security (composer) gate actually read. Until it lands, the fixes on development drain nothing measurable.

Safe on the certificate front: this app's <id> in appinfo/info.xml is identical on beta and main, so signing is unaffected. Nextcloud issues one certificate per id, and an app whose id moves on promotion cannot sign a release until a new one is issued.

⚠️ Merge with --merge, never squash. Squashing a promotion rewrites the target's history and reverts commits already on main.

⏳ Do not merge before ~07:00 UTC. The Nextcloud App Store is rate-limiting this account: the current refusal is 429 ... available in 25043 seconds. The backoff escalates on every retry (3889s → 7010s → 25043s across today's attempts), so merging now would fail the App Store publish and risk pushing the window out further for every other app queued behind it. The GitHub release and tag are created regardless; only the store listing lags.

🤖 Generated with Claude Code

github-actions Bot and others added 13 commits August 30, 2026 19:11
@github-actions
chore(sync): carry main back into beta
5e1c631
@github-actions
chore(release): sync beta back into development
9464e80 
The 2.0.4-beta.20260830190919 release bumped the version on beta. Without this,
development stays behind beta and the next development -> beta promotion
conflicts on the version file.

Version files resolve to development's side, which is the higher line,
so this never moves a version backwards.
@rubenvdlinde
Merge pull request #1284 from ConductionNL/sync/main-to-beta-20260830…
a0b9380 
…191140

chore(sync): carry main back into beta
@github-actions
chore(sync): carry beta back into development
8990c2b
@rubenvdlinde
Merge pull request #1286 from ConductionNL/sync/beta-to-development-2…
f40ffe4 
…0260830191147

chore(sync): carry beta back into development
@rubenvdlinde
chore(dependabot): hold back vue-router 5 as well (#1291)
b930dcd 
vue-router 5 peers `vite: ^7.3.0 || ^8.0.0` and expects a Vite toolchain. These
apps build with webpack, which cannot resolve it at all: the build dies on
`Can't resolve 'vue-router'` from src and from @nextcloud/vue's own chunks.
Adopting it is a Vite migration, not a version bump.

Dependabot proposed it across 8 repositories in a single run, and merging any
one of them takes that app's build from green to red with no code change that
can fix it.

versioniq already builds with Vite and is the natural pilot if the fleet does
move. Lift this when an app's toolchain can actually take it.
@rubenvdlinde
docs(dependabot): correct the vue-router holdback to what was measured (
0e865f8 
#1292)

The comment claimed these apps "cannot resolve it at all". That is not what the
evidence shows, and a comment that overstates its case is worse than none: the
next person reads it, tries vue-router 5 somewhere it works, and stops trusting
the file.

Measured across four apps: integriq and zaakafhandelapp fail their build on
`Can't resolve 'vue-router'`, while openregister and learniq build clean on
5.3.0. The holdback still stands, for the honest reason rather than the
overstated one: a major that breaks some apps and not others cannot be merged
unattended, and the difference between them is not yet understood.

No behaviour change. The ignore rule is unchanged; only the reasoning is.
@github-actions
chore(release): sync main back into development
2785a46 
The 2.0.6 release bumped the version on main. Without this,
development stays behind main and the next development -> main promotion
conflicts on the version file.

Version files resolve to development's side, which is the higher line,
so this never moves a version backwards.
@github-actions
chore(sync): carry main back into beta
dbc9c50
@rubenvdlinde
Merge pull request #1297 from ConductionNL/sync/main-to-beta-20260830…
88b20c9 
…225450

chore(sync): carry main back into beta
@github-actions
chore(sync): carry beta back into development
37a64e5
@rubenvdlinde
Merge pull request #1298 from ConductionNL/sync/beta-to-development-2…
4c6231c 
…0260830225458

chore(sync): carry beta back into development
@rubenvdlinde @dependabot
chore(deps): bump the npm_and_yarn group across 1 directory with 19 u…
1fd9d4a 
…pdates (#1242) (#1281)

Bumps the npm_and_yarn group with 14 updates in the /docs directory:

| Package | From | To |
| --- | --- | --- |
| [@babel/plugin-transform-modules-systemjs](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-modules-systemjs) | `7.25.9` | `7.29.8` |
| [brace-expansion](https://github.com/juliangruber/brace-expansion) | `1.1.11` | `1.1.18` |
| [body-parser](https://github.com/expressjs/body-parser) | `1.20.3` | `1.20.6` |
| [dompurify](https://github.com/cure53/DOMPurify) | `3.2.4` | `3.4.14` |
| [fast-uri](https://github.com/fastify/fast-uri) | `3.0.6` | `3.1.6` |
| [follow-redirects](https://github.com/follow-redirects/follow-redirects) | `1.15.9` | `1.16.0` |
| [js-yaml](https://github.com/nodeca/js-yaml) | `3.14.1` | `3.15.2` |
| [launch-editor](https://github.com/vitejs/launch-editor) | `2.10.0` | `2.14.1` |
| [mermaid](https://github.com/mermaid-js/mermaid) | `11.5.0` | `11.17.2` |
| [nanoid](https://github.com/ai/nanoid) | `3.3.9` | `3.3.18` |
| [node-forge](https://github.com/digitalbazaar/forge) | `1.3.1` | `1.4.0` |
| [svgo](https://github.com/svg/svgo) | `3.3.2` | `3.3.5` |
| [ws](https://github.com/websockets/ws) | `7.5.10` | `7.5.13` |
| [websocket-driver](https://github.com/faye/websocket-driver-node) | `0.7.4` | `0.7.5` |



Updates `@babel/plugin-transform-modules-systemjs` from 7.25.9 to 7.29.8
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.29.8/packages/babel-plugin-transform-modules-systemjs)

Updates `brace-expansion` from 1.1.11 to 1.1.18
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](juliangruber/brace-expansion@1.1.11...v1.1.18)

Updates `body-parser` from 1.20.3 to 1.20.6
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](expressjs/body-parser@1.20.3...1.20.6)

Updates `dompurify` from 3.2.4 to 3.4.14
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](cure53/DOMPurify@3.2.4...3.4.14)

Updates `fast-uri` from 3.0.6 to 3.1.6
- [Release notes](https://github.com/fastify/fast-uri/releases)
- [Commits](fastify/fast-uri@v3.0.6...v3.1.6)

Updates `fast-xml-parser` from 4.5.3 to 5.11.1
- [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases)
- [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md)
- [Commits](NaturalIntelligence/fast-xml-parser@v4.5.3...v5.11.1)

Updates `follow-redirects` from 1.15.9 to 1.16.0
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.9...v1.16.0)

Updates `js-yaml` from 3.14.1 to 3.15.2
- [Changelog](https://github.com/nodeca/js-yaml/blob/3.15.2/CHANGELOG.md)
- [Commits](nodeca/js-yaml@3.14.1...3.15.2)

Updates `launch-editor` from 2.10.0 to 2.14.1
- [Commits](vitejs/launch-editor@v2.10.0...v2.14.1)

Updates `lodash` from 4.17.21 to 4.18.1
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.21...4.18.1)

Updates `mermaid` from 11.5.0 to 11.17.2
- [Release notes](https://github.com/mermaid-js/mermaid/releases)
- [Commits](https://github.com/mermaid-js/mermaid/compare/mermaid@11.5.0...mermaid@11.17.2)

Updates `nanoid` from 3.3.9 to 3.3.18
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/3.3.18/CHANGELOG.md)
- [Commits](ai/nanoid@3.3.9...3.3.18)

Updates `node-forge` from 1.3.1 to 1.4.0
- [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md)
- [Commits](digitalbazaar/forge@v1.3.1...v1.4.0)

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

Updates `qs` from 6.13.0 to 6.15.3
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](ljharb/qs@v6.13.0...v6.15.3)

Updates `shell-quote` from 1.8.2 to 1.10.0
- [Changelog](https://github.com/ljharb/shell-quote/blob/main/CHANGELOG.md)
- [Commits](ljharb/shell-quote@v1.8.2...v1.10.0)

Updates `svgo` from 3.3.2 to 3.3.5
- [Release notes](https://github.com/svg/svgo/releases)
- [Commits](svg/svgo@v3.3.2...v3.3.5)

Updates `ws` from 7.5.10 to 7.5.13
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](websockets/ws@7.5.10...7.5.13)

Updates `websocket-driver` from 0.7.4 to 0.7.5
- [Changelog](https://github.com/faye/websocket-driver-node/blob/main/CHANGELOG.md)
- [Commits](faye/websocket-driver-node@0.7.4...0.7.5)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-modules-systemjs"
  dependency-version: 7.29.8
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 1.1.18
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: body-parser
  dependency-version: 1.20.6
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: dompurify
  dependency-version: 3.4.14
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: fast-uri
  dependency-version: 3.1.6
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: fast-xml-parser
  dependency-version: 5.11.1
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: follow-redirects
  dependency-version: 1.16.0
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: js-yaml
  dependency-version: 3.15.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: launch-editor
  dependency-version: 2.14.1
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: lodash
  dependency-version: 4.18.1
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: mermaid
  dependency-version: 11.17.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: nanoid
  dependency-version: 3.3.18
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: node-forge
  dependency-version: 1.4.0
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: postcss
  dependency-version: 8.5.3
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: qs
  dependency-version: 6.15.3
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: shell-quote
  dependency-version: 1.10.0
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: svgo
  dependency-version: 3.3.5
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: ws
  dependency-version: 7.5.13
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: websocket-driver
  dependency-version: 0.7.5
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@github-actions

github-actions Bot commented Aug 31, 2026

Copy link
Copy Markdown

Quality Report — ConductionNL/opencatalogi @ 7651559

Check PHP Vue Security License Tests
lint ✅
phpcs ✅
phpmd ✅
psalm ✅
phpstan ✅
phpmetrics ✅
eslint ✅
stylelint ✅
build ✅
check-l10n ✅
check-manifest ✅
format ✅
check-schema-l10n ✅
check-l10n-js ✅
composer ✅ ✅ 129/129
npm ✅ ✅ 881/881
app:check-code ⏭️
info.xml ✅
REUSE ❌
PHPUnit ✅
Newman ✅
Playwright ✅
Hydra gates ✅

Quality workflow — 2026-08-31 00:49 UTC

Download the full PDF report from the workflow artifacts.

rubenvdlinde and others added 5 commits August 31, 2026 03:25
@rubenvdlinde
chore(deps): take @conduction/nextcloud-vue 2.25.1 for the KPI card (#…
cc389cc 
…1303)

2.25.x makes the canonical KPI card flat and horizontal, so dashboards stop
drawing a grey box inside the white card CnWidgetWrapper already draws, and
2.25.1 fixes the narrow-tile step-down that 2.25.0 shipped inert (a source-order
bug left KPI values clipped on a three-column tile).

The caret range already allowed both; only the lockfile pinned this app back.
Lockfile only.
@github-actions
chore(sync): carry main back into beta
1727f4f
@rubenvdlinde
Merge pull request #1305 from ConductionNL/sync/main-to-beta-20260831…
0c673ce 
…034740

chore(sync): carry main back into beta
@github-actions
chore(sync): carry beta back into development
c01269f
@rubenvdlinde
Merge pull request #1306 from ConductionNL/sync/beta-to-development-2…
f94b28f 
…0260831034747

chore(sync): carry beta back into development
@github-actions

github-actions Bot commented Aug 31, 2026

Copy link
Copy Markdown

Quality Report — ConductionNL/opencatalogi @ ef771db

Check PHP Vue Security License Tests
lint ✅
phpcs ✅
phpmd ✅
psalm ✅
phpstan ✅
phpmetrics ✅
eslint ✅
stylelint ✅
build ✅
check-l10n ✅
check-manifest ✅
format ✅
check-schema-l10n ✅
check-l10n-js ✅
composer ✅ ✅ 129/129
npm ✅ ✅ 881/881
app:check-code ⏭️
info.xml ✅
REUSE ❌
PHPUnit ✅
Newman ✅
Playwright ✅
Hydra gates ✅

Quality workflow — 2026-08-31 04:05 UTC

Download the full PDF report from the workflow artifacts.

rubenvdlinde and others added 5 commits August 31, 2026 07:30
@rubenvdlinde
Merge pull request #1285 from ConductionNL/sync/beta-to-development-2…
1847a7b 
….0.4-beta.20260830190919

chore(release): sync beta back into development
@rubenvdlinde
Merge pull request #1295 from ConductionNL/sync/main-to-development-2…
92f9fb6 
….0.6

chore(release): sync main back into development
@github-actions
chore(release): 2.0.7-unstable.20260831053058 (#1309)
650ef17 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@rubenvdlinde
chore(deps): take @conduction/nextcloud-vue 2.27.0 (#1311)
3783a07 
Carries the two KPI-card fixes this dashboard reads: the canonical card is flat
and horizontal (no grey box inside the white card CnWidgetWrapper already
draws), and a calendar-aligned date range follows the reader's calendar rather
than UTC — "Current month" previously showed a To of 1 September in CEST on
31 August.

The caret range already allowed it; only the lockfile pinned this app back.
Lockfile only, and npm pruned nothing.
@rubenvdlinde
Merge pull request #1288 from ConductionNL/development
ee15525 
Release: merge development into beta
@github-actions

github-actions Bot commented Aug 31, 2026

Copy link
Copy Markdown

Quality Report — ConductionNL/opencatalogi @ f04f411

Check PHP Vue Security License Tests
lint ✅
phpcs ✅
phpmd ✅
psalm ✅
phpstan ✅
phpmetrics ✅
eslint ✅
stylelint ✅
build ✅
check-l10n ✅
check-manifest ✅
format ✅
check-schema-l10n ✅
check-l10n-js ✅
composer ✅ ✅ 129/129
npm ✅ ✅ 881/881
app:check-code ⏭️
info.xml ✅
REUSE ❌
PHPUnit ✅
Newman ✅
Playwright ✅
Hydra gates ✅

Quality workflow — 2026-08-31 10:59 UTC

Download the full PDF report from the workflow artifacts.

@rubenvdlinde
rubenvdlinde merged commit ea78a24 into main Aug 31, 2026
89 of 90 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Rem-Dam Rem-Dam Awaiting requested review from Rem-Dam Rem-Dam is a code owner
@SudoThijn SudoThijn Awaiting requested review from SudoThijn SudoThijn is a code owner
@remko48 remko48 Awaiting requested review from remko48 remko48 is a code owner
@bbrands02 bbrands02 Awaiting requested review from bbrands02 bbrands02 is a code owner
@rjzondervan rjzondervan Awaiting requested review from rjzondervan rjzondervan is a code owner
@WilcoLouwerse WilcoLouwerse Awaiting requested review from WilcoLouwerse WilcoLouwerse is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@rubenvdlinde