Repository navigation
feat(tokens): ship Sittard-Geleen and Vidar, built from their upstream generators - #1719
Open
rubenvdlinde wants to merge 9 commits into
Open
rubenvdlinde wants to merge 9 commits into
rubenvdlinde wants to merge 9 commits into
Conversation
…aan Zee Upstream builds a theme from src/tokens.json as well as src/*.tokens.json, and Voorne aan Zee keeps its Tokens Studio export there (its figma/ export is an empty file). The reader now takes src/tokens.json too, and reads any file carrying $metadata.tokenSetOrder as a Tokens Studio export. Voorne aan Zee joins as a restricted set: its LICENSE.md reserves logo and house style to the municipality, the same text Epe ships. No logo is vendored, so the coverage allowlist records why the Nextcloud logo stays. The golden fixtures and the shell catalogue are re-recorded for the new set. The upstream "example" theme is kept out: thematiq ships its own example-* sets. Assisted-by: ClaudeCode:claude-opus-5-5
…c-src-tokens-json
Assisted-by: ClaudeCode:claude-opus-5-5
…m generators Upstream generates both themes in TypeScript (src/build-theme.mts) and keeps no token files for them, so the sync skipped them. The nightly job now installs the themes workspace (Node 24, lifecycle scripts off) and runs each generated theme's build; the reader takes its tmp/generated.tokens.json, and names a theme whose build did not run. A failed install or build leaves the theme skipped and the rest of the sync going. Neither theme ships a licence file of its own (the EUPL in their npm package is the themes repository's), so both join as restricted sets with the same "No licence text published" note as Purmerend. Both name Roobert, a retail typeface, so each carries a font block asking for an upload. No logo is vendored; the coverage allowlist says why. Assisted-by: ClaudeCode:claude-opus-5-5
…c-src-tokens-json # Conflicts: # scripts/sync-upstream-tokens.mjs
Contributor
Quality Report — ConductionNL/thematiq @
|
| Check | PHP | Vue | Security | License | Tests |
|---|---|---|---|---|---|
| lint | ✅ | ||||
| phpcs | ✅ | ||||
| phpmd | ❌ | ||||
| psalm | ❌ | ||||
| phpstan | ✅ | ||||
| phpmetrics | ✅ | ||||
| eslint | ✅ | ||||
| stylelint | ✅ | ||||
| build | ✅ | ||||
| check-manifest | ✅ | ||||
| test-l10n | ✅ | ||||
| format | ❌ | ||||
| test-fonts | ✅ | ||||
| test-token-set-coverage | ✅ | ||||
| composer | ❌ | ✅ 111/111 | |||
| npm | ✅ | ✅ 2/2 | |||
| app:check-code | ⏭️ | ||||
| info.xml | ✅ | ||||
| REUSE | ✅ | ||||
| lockfile sync | ✅ | ||||
| PHPUnit | ❌ 2938/2945 | ||||
| Newman | ✅ 182/182 | ||||
| Playwright | ⏭️ deferred: E2E runs locally and on the promotion path only. This pull request targets development, so the suite is asked once per promotion into beta and main rather than once per push per open pull request. Run it locally with npx playwright test, or from the Actions tab on a branch with no open pull request into development. |
||||
| Hydra gates | ❌ |
Quality workflow — 2026-11-17 14:53 UTC
Download the full PDF report from the workflow artifacts.
…kip ci] The upstream theme builds run third-party code, so they now run in their own job with contents: read and no checkout of this repository. That job hands only the generated token files to the sync job as an artifact; the sync job clones the same upstream commit and converts as before. Assisted-by: ClaudeCode:claude-opus-5-5
This branch has not been deployed
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.
Sittard-Geleen and Vidar are in nl-design-system/themes but were never in thematiq. Upstream generates both in TypeScript (
src/build-theme.mts, Vidar on top of Sittard-Geleen) and keeps no token files for them, so the sync skipped them with "no *.tokens.json files upstream". Stacked on #1714; it contains that PR's commits and should merge after it.Change
^24.22.3; thematiq's engines allow^24). A new step finds everyproprietary/*/src/build-theme.mts, installs only those workspaces (pnpm install --frozen-lockfile --ignore-scripts, filtered), and runs each build. A failed install or build is a warning: that theme stays skipped as before and the rest of the sync goes on.readUpstreamTokens()reads a generated theme'stmp/generated.tokens.json, and when the build did not run it says so in the report instead of "no token files".sittard-geleenandvidarship as restricted sets. Neither has a licence file of its own: the EUPL-1.2 in the npm package is the themes repository's own licence, copied in at publish. So they get the same "No licence text published" note as Purmerend and Riddeliemers, an entry in the restricted list and the licence table, and a logo allowlist entry (no vendored logo).fontblock that asks the administrator for an upload.Verified locally
tmp/generated.tokens.json, and both converted. Vidar's primary is#00577e, as its generator sets it.bash scripts/token-set-gate.shwith both sets in: exit 0 (437 PHPUnit token-set tests, 469 vitest). Its first run caught the missing font blocks.phpunit-unit.xml, no coverage): 2933 tests OK, on the tree merged with feat(tokens): the token sync reads src/tokens.json, and ships Voorne aan Zee #1714 and development.hydra/scripts/diff-check.shwith hydra gates: green. vitestsyncUpstreamTokens.spec.js: 28 passed (1 new). shellcheck on the new step: clean.npm run lint: exit 0.composer check:strictonce: only the inheritedlib/failures fix(tokens): the nightly token sync finishes inside its hour again #1713 and feat(tokens): the token sync reads src/tokens.json, and ships Voorne aan Zee #1714 list; this PR touches nolib/PHP.Not verified: the step itself in Actions. It only runs from
development(the job checks outdevelopment), so the first nightly after merge is its first real run.Assisted-by: ClaudeCode:claude-opus-5-5