diff --git a/aidlc-docs/features/prerendering/aidlc-state.md b/aidlc-docs/features/prerendering/aidlc-state.md index 1d6ced4..06a40c8 100644 --- a/aidlc-docs/features/prerendering/aidlc-state.md +++ b/aidlc-docs/features/prerendering/aidlc-state.md @@ -5,8 +5,8 @@ - **Feature Slug**: prerendering - **Project Type**: Brownfield - **Start Date**: 2026-10-31T14:15:01Z -- **Current Stage**: CONSTRUCTION - Code Generation (unit 1): plan approved; batch B0 running -- **Branch**: feature/prerendering (from master c4c2f83) +- **Current Stage**: CONSTRUCTION - Code Generation (unit 1): B0 done; batch B1 (early proof) done, committed; B2 and B3 running, then B4 +- **Branch**: feature/prerendering (from master c4c2f83); commits and pushes allowed for this feature (owner, 2026-10-31) - **Worktree**: K:\Development\SlpSoftware\Projects\AndreaSlopFotografie-prerendering ## Workspace State diff --git a/aidlc-docs/features/prerendering/construction/plans/start-migration-code-generation-plan.md b/aidlc-docs/features/prerendering/construction/plans/start-migration-code-generation-plan.md index e5b07d4..320c39f 100644 --- a/aidlc-docs/features/prerendering/construction/plans/start-migration-code-generation-plan.md +++ b/aidlc-docs/features/prerendering/construction/plans/start-migration-code-generation-plan.md @@ -162,7 +162,7 @@ PBT-02 (round-trip): P3, P10. PBT-03 (invariant): P1, P2, P5, P6, P8, P14, P16. The unknowns that can invalidate the design come first. Steps 3 to 6 prove Start, `getRouter`, `shellComponent`, `src/client.tsx` and the test harness on the real app before the mechanical conversions. If an unknown fails, apply the STOP rule: report to the main session; do not improvise. -### Step 3: Remove what makes prerendering throw [ ] +### Step 3: Remove what makes prerendering throw [x] - Executor: Sonnet. - Implements: BR-HYD-02, 03, 04, 05, 07, 08 (media and breakpoint part), 09, 15; BR-MON-03; FR-PR-05, 08. @@ -177,8 +177,9 @@ The unknowns that can invalidate the design come first. Steps 3 to 6 prove Start - `web/src/components/Analytics/UmamiAnalytics.tsx`: `hostname` prop optional without a default; the effect uses `hostname ?? window.location.hostname`. - Done when: no `ssr: false` remains in `web/src` (`grep -rn "ssr: false" web/src` empty), `pnpm exec tsc --noEmit` is clean, `pnpm lint` is clean, and **CP0**: `pnpm test` passes without test changes. If an old test fails because it relied on first-render media values, fix the test per BR-TST-02 (wrap in `act`/`waitFor`) and list the changed tests in the Record line. - Record: a line in `code/verification-log.md` is not needed yet; list changed old tests (if any) under the step in this plan. +- Record (2026-10-31): CP0 green, 113 files, 888 tests. Changed old tests: `usePageLoaded.test.tsx` and `DeferredImage.test.tsx` (the mocked `readyState` must become `complete` when the `load` event fires, as in a browser, because the hook now reads a store snapshot); `useReveal.test.tsx` (first render assumes no reduced motion, so an observer starts and is disconnected at once; test expects all observers disconnected instead of none created). -### Step 4: Start setup and first prerender of the real app (V1, V3, V5, V6, V7, V11, V13, V15, V17) [ ] +### Step 4: Start setup and first prerender of the real app (V1, V3, V5, V6, V7, V11, V13, V15, V17) [x] - Executor: Sonnet. - Implements: BR-BLD-02, 03, 05, 06, 07, 08, 09 (plugin part), 10 (n/a here), 11; BR-ENT-01 to 05; BR-404-01, 02; BR-MON-01; D1, D5, D13; FR-PR-01, 02, 03, 04, 08, 14 (route part); NFR-PR-Q-04, SEC-02. @@ -196,8 +197,9 @@ The unknowns that can invalidate the design come first. Steps 3 to 6 prove Start 11. Run `pnpm exec tsc --noEmit`, then `pnpm build`. Inspect `web/dist/client`: list all files; the HTML set must be exactly the 11 pages plus `404.html` (`index.html`, `over-mij.html`, `soorten-fotoshoots.html`, `soorten-fotoshoots/<5 shoots>.html`, `contact.html`, `privacyverklaring.html`, `portfolio.html`, `404.html`); `sitemap.xml` exists once in `dist/client`; for every HTML file list its inline ` - - diff --git a/web/package.json b/web/package.json index 687667f..2c80d32 100644 --- a/web/package.json +++ b/web/package.json @@ -28,7 +28,6 @@ "@iconify/react": "^6.0.2", "@lhci/cli": "^0.15.1", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", "@testing-library/dom": "^10.4.2", "@testing-library/jest-dom": "^7.0.1", "@testing-library/react": "^16.3.3", @@ -44,6 +43,7 @@ "fast-check": "^4.10.2", "globals": "^17.13.0", "jsdom": "^30.1.3", + "playwright-core": "1.55.0", "prettier": "^3.9.9", "typescript": "~6.0.2", "typescript-eslint": "^8.71.2", @@ -56,7 +56,8 @@ "@fontsource/jost": "^5.3.0", "@fontsource/marcellus": "^5.3.0", "@sentry/react": "^11.8.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "1.170.46", + "@tanstack/react-start": "1.169.4", "react": "^19.3.0", "react-dom": "^19.3.0" } diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 66cc3a6..32c1156 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -166,6 +166,7 @@ overrides: source-map-js: ^1.2.2 seroval: ^1.6.8 seroval-plugins: ^1.6.8 + zod@4: ^4.6.6 importers: @@ -187,8 +188,11 @@ importers: specifier: ^11.8.0 version: 11.8.0(react@19.3.0) '@tanstack/react-router': - specifier: ^1.170.39 - version: 1.170.39(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + specifier: 1.170.46 + version: 1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@tanstack/react-start': + specifier: 1.169.4 + version: 1.169.4(esbuild@0.28.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(rolldown@1.2.11)(supports-color@5.5.0)(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)) react: specifier: ^19.3.0 version: 19.3.0 @@ -213,10 +217,7 @@ importers: version: 0.15.1(supports-color@5.5.0) '@tanstack/react-router-devtools': specifier: ^1.167.2 - version: 1.167.2(@tanstack/react-router@1.170.39(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(@tanstack/router-core@1.171.32)(csstype@3.2.3)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) - '@tanstack/router-plugin': - specifier: ^1.168.40 - version: 1.168.40(@tanstack/react-router@1.170.39(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(esbuild@0.28.2)(rolldown@1.2.11)(supports-color@5.5.0)(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)) + version: 1.167.2(@tanstack/react-router@1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(@tanstack/router-core@1.171.39)(csstype@3.2.3)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) '@testing-library/dom': specifier: ^10.4.2 version: 10.4.2 @@ -262,6 +263,9 @@ importers: jsdom: specifier: ^30.1.3 version: 30.1.3 + playwright-core: + specifier: 1.55.0 + version: 1.55.0 prettier: specifier: ^3.9.9 version: 3.9.9 @@ -826,6 +830,22 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} engines: {node: '>= 8'} + '@oozcitak/dom@2.0.2': + resolution: {integrity: sha512-GjpKhkSYC3Mj4+lfwEyI1dqnsKTgwGy48ytZEhm4A/xnH/8z9M3ZVXKr/YGQi3uCLs1AEBS+x5T2JPiueEDW8w==} + engines: {node: '>=20.0'} + + '@oozcitak/infra@2.0.2': + resolution: {integrity: sha512-2g+E7hoE2dgCz/APPOEK5s3rMhJvNxSMBrP+U+j1OWsIbtSpWxxlUjq1lU8RIsFJNYv7NMlnVsCuHcUzJW+8vA==} + engines: {node: '>=20.0'} + + '@oozcitak/url@3.0.0': + resolution: {integrity: sha512-ZKfET8Ak1wsLAiLWNfFkZc/BraDccuTJKR6svTYc7sVjbR+Iu0vtXdiDMY4o6jaFl5TW2TlS7jbLl4VovtAJWQ==} + engines: {node: '>=20.0'} + + '@oozcitak/util@10.0.0': + resolution: {integrity: sha512-hAX0pT/73190NLqBPPWSdBVGtbY6VOhWYK3qqHqtXQ1gK7kS2yz4+ivsN07hpJ6I3aeMtKP6J6npsEKOAzuTLA==} + engines: {node: '>=20.0'} + '@oxc-project/types@0.151.0': resolution: {integrity: sha512-J1yXrIlNDZVzE3ada310xeAw7nH8yCAyLPuUIsjKatFPmfn5bS1oW+cM+QsGOtVWd5nhSpbwZWx/rue+r5Z+PA==} @@ -1012,8 +1032,8 @@ packages: '@swc/helpers@0.5.23': resolution: {integrity: sha512-5lSsMOTXURePglDfvuAQUqkGek9Hg2kksOYay2m0+XR++b2NWYL/4sWyuvVBIs8oKnJaxkdi9whaL/sqN13afw==} - '@tanstack/history@1.162.4': - resolution: {integrity: sha512-utTS5L2OkeYUzXGohL1Z8sefu1GLNOJcxe8Hd6iIdc/Xo1K1nDB2JEp4iSFhvYh33xKC9V91TxrS8qfrpoKobQ==} + '@tanstack/history@1.162.5': + resolution: {integrity: sha512-w1+YvwmTkwt5n8yUqEH3IWZ9DsmorCZW/EQ3KYHnqEgIkOZpH54NvW6/Epq3Dzb8H0ifIeYX8PExvrNLIH5FIA==} engines: {node: '>=20.19'} '@tanstack/react-router-devtools@1.167.2': @@ -1028,21 +1048,69 @@ packages: '@tanstack/router-core': optional: true - '@tanstack/react-router@1.170.39': - resolution: {integrity: sha512-wLZi/hXW/kTeLlMIvI2VB8Oj38GLz8YkHmTM14lLScAzx79UZEwBHWMj6JZw/imuyuhrcmbe8KTFsFBHzJUftg==} + '@tanstack/react-router@1.170.46': + resolution: {integrity: sha512-ez1iNIhsPjGlaDHg3BXWs67EWVIYzB2tbopEHYDESdkO7owgkGb5de52+5Kv2v1fxdkggcNzo35bdk4arTVGQw==} engines: {node: '>=20.19'} peerDependencies: react: '>=18.0.0 || >=19.0.0' react-dom: '>=18.0.0 || >=19.0.0' - '@tanstack/react-store@0.11.1': - resolution: {integrity: sha512-HaIGKI3YLmjBYIvy5DFDY23oNaYZIsTZfngey07Uh5iLVJgM3bIGCnZeOFOqzjFld9JHWcaHJnasD/bKoGKwJQ==} + '@tanstack/react-start-client@1.168.44': + resolution: {integrity: sha512-WvrYhQ0EgwYpxnP9mFCCo+jctqXV3qq8GfIyiSGLiZzz4GDyw+GuQ2lyA3BTN64wbNNNVeMll+9PV5OlGYi2/w==} + engines: {node: '>=22.12.0'} + peerDependencies: + react: '>=18.0.0 || >=19.0.0' + react-dom: '>=18.0.0 || >=19.0.0' + + '@tanstack/react-start-rsc@0.1.65': + resolution: {integrity: sha512-5MmzmQoADjMA/d2XawkwKAkgBaQFrfifw/wn8qwCaLIntGYd2jkrCga/KdQW2xdjBu9IoP98WFhZilm7DfI/4g==} + engines: {node: '>=22.12.0'} + peerDependencies: + '@rspack/core': '>=2.0.0-0' + '@vitejs/plugin-rsc': '>=0.5.30' + react: '>=18.0.0 || >=19.0.0' + react-dom: '>=18.0.0 || >=19.0.0' + react-server-dom-rspack: '>=0.0.2' + peerDependenciesMeta: + '@rspack/core': + optional: true + '@vitejs/plugin-rsc': + optional: true + react-server-dom-rspack: + optional: true + + '@tanstack/react-start-server@1.167.52': + resolution: {integrity: sha512-131olF9oWx1CqZg8JYmIJbLNKqS/vN3UbYuc9a++pRtvfY67tpPmPzuYj4OXSxRAYalGW3f1yYlFozxqE1LE7w==} + engines: {node: '>=22.12.0'} + peerDependencies: + react: '>=18.0.0 || >=19.0.0' + react-dom: '>=18.0.0 || >=19.0.0' + + '@tanstack/react-start@1.169.4': + resolution: {integrity: sha512-+DmlNPeQ1rsvo025I79GrlNgDm+zVCVAGg9gMIGmAevK2TJRMpKahgEKZZ1j4VSxDxjfTpkfLyuXiUxxjMJCaw==} + engines: {node: '>=22.12.0'} + peerDependencies: + '@rsbuild/core': ^2.0.0 + '@vitejs/plugin-rsc': '*' + react: '>=18.0.0 || >=19.0.0' + react-dom: '>=18.0.0 || >=19.0.0' + vite: '>=8.0.0' + peerDependenciesMeta: + '@rsbuild/core': + optional: true + '@vitejs/plugin-rsc': + optional: true + vite: + optional: true + + '@tanstack/react-store@0.11.2': + resolution: {integrity: sha512-oj5O5DmiMWE+ih+SioX2ayC1kbK7d3fpLx0B75fPJr9nY3zU+hoW010yr64qXsY/9fyiLVE2bn5mGNV3owm8RQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 - '@tanstack/router-core@1.171.32': - resolution: {integrity: sha512-X86Jqk3vB2KJcUfS6oLi7B7yxbaa59QEhZRPPP1fRx3k+Jw/Fu1UYVBcRtdwK/OccQnrlQdVoKvNO3QXmyEBOw==} + '@tanstack/router-core@1.171.39': + resolution: {integrity: sha512-qUhoJ0meuSUqGYQbHbcJYdASr06YtK+bulbj6vtrhKYFkLgkSsZ6tXmMyym7sFxiSJSPYgasgozrL01LyyR/6A==} engines: {node: '>=20.19'} '@tanstack/router-devtools-core@1.168.2': @@ -1055,16 +1123,16 @@ packages: csstype: optional: true - '@tanstack/router-generator@1.167.38': - resolution: {integrity: sha512-lkqgFleDgfkW+QONVMKBs+ZGDUF0v9R9FkplS/GZvKDFpfnu+tZxmGlV2pryU1TDxyuSyjh56AtIla3NMrlScw==} + '@tanstack/router-generator@1.167.46': + resolution: {integrity: sha512-JSailAThcqPvqBzE3+MhNh6zQyZM2IdmIsHOxZgAc061Lh++SZqamNm/Whe7QNXWK5sLP4E0J1F8AI0hP8wTSw==} engines: {node: '>=20.19'} - '@tanstack/router-plugin@1.168.40': - resolution: {integrity: sha512-ifiXjjR4uivxwRDhgYAcfyrcu+Mwx+vlG0QjjQ7N5C5sKmzpt5UtsL21TNVvZDSZl2Vae8DcL84Z02fOs8ZZMQ==} + '@tanstack/router-plugin@1.168.48': + resolution: {integrity: sha512-oLDEZO/vhvF5JLrQ6qMNYcCjMMhlHA0Byx6ZXl9AHJ6qVLRxUeCU41vlZQ4buisONY2p0Zl9O09/qwLiVrIBCQ==} engines: {node: '>=20.19'} peerDependencies: '@rsbuild/core': '>=1.0.2 || ^2.0.0' - '@tanstack/react-router': ^1.170.38 + '@tanstack/react-router': ^1.170.46 vite: '>=5.0.0 || >=6.0.0 || >=7.0.0 || >=8.0.0' vite-plugin-solid: ^2.11.10 || ^3.0.0-0 webpack: '>=5.92.0' @@ -1080,12 +1148,40 @@ packages: webpack: optional: true - '@tanstack/router-utils@1.162.3': - resolution: {integrity: sha512-Icb0xGuG1+54IV0WMLRcc3ErTx2HeJWyPG661FkQ8UT6guoBq1FJjFRqlG/JS0xi4mFFkBhvwO7tbLa32f3yxA==} + '@tanstack/router-utils@1.162.4': + resolution: {integrity: sha512-3TSH3rwAQTqQOtTBF8IXMFXmGNJWnjwIm+l87uguyC/of0pSRKcU9GJrozaf0fY9it8dLQvUZJA2MOlfqbW1sA==} engines: {node: '>=20.19'} - '@tanstack/store@0.11.1': - resolution: {integrity: sha512-mzTOBhypOuDJAy/D8n2MfUZ1HFkXnmSETviRyhqEC8LUE7/IZQExOTxMANj3KjTofYTkFNpBY67qaVrT41YccA==} + '@tanstack/start-client-core@1.170.39': + resolution: {integrity: sha512-G0VJbZFf9/dYomQjZkWapaTjkjEI4vbk1jnxhhVtQ3nTRb3sIRc196j+S+qZcySfEV5W9TJHu4KatjSzjZZQwQ==} + engines: {node: '>=22.12.0'} + + '@tanstack/start-fn-stubs@1.162.0': + resolution: {integrity: sha512-QWfUZ3Yo923tdQn38LyKMU8rcTw69zc+T4dAvgTWV4O56SqFRsGfS0lSWIMhJRwXIx/bvdi7nTUBDdZtTHtpTQ==} + engines: {node: '>=22.12.0'} + + '@tanstack/start-plugin-core@1.171.55': + resolution: {integrity: sha512-8FjTuuxIE8MNJoveXahZPBCfEpm8p9tMFyWTvbllfqlysdhry34rw/nCwULfcVwTG39ezXEu/RYE83NSV+miog==} + engines: {node: '>=22.12.0'} + peerDependencies: + '@rsbuild/core': ^2.0.0 + vite: '>=8.0.0' + peerDependenciesMeta: + '@rsbuild/core': + optional: true + vite: + optional: true + + '@tanstack/start-server-core@1.169.45': + resolution: {integrity: sha512-fKySLUGIy7aVYR6ZRgjC19TQdsZ+q/54M9hVfHrJQQVpM/T5qq5djZ3gsqhugmrWP+gyd9qpa9D6cxRtR6CJvg==} + engines: {node: '>=22.12.0'} + + '@tanstack/start-storage-context@1.167.41': + resolution: {integrity: sha512-MY+Z4cZBPbH7hjORcROMX7K3kV1X25ArFKmRbks+EukPP9UVwCXbZFVzYkTt1u0AHthvQTcpa4J9B9i0o6fEnA==} + engines: {node: '>=22.12.0'} + + '@tanstack/store@0.11.2': + resolution: {integrity: sha512-sJ4mjol8uQsHV0gOJzzjwXfh2Fwm+Sz0+8deqiTm4jGbMdjzNSW+xZCFm0kUa870uhd8yi+DpKnZb5Kc4apa0Q==} '@tanstack/virtual-file-routes@1.162.0': resolution: {integrity: sha512-uhOeFyxLcU41HzvrxsGpiWdcMbScY1EDgbZ5K7DVRMYInbLYWAC0EA/kx9wXAoSM8q82bUG2hRl8+EAjE6XAbA==} @@ -2008,8 +2104,8 @@ packages: devtools-protocol@0.0.1608973: resolution: {integrity: sha512-Tpm17fxYzt+J7VrGdc1k8YdRqS3YV7se/M6KeemEqvUbq/n7At1rWVuXMxQgpWkdwSdIEKYbU//Bve+Shm4YNQ==} - diff@8.0.4: - resolution: {integrity: sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==} + diff@9.0.0: + resolution: {integrity: sha512-svtcdpS8CgJyqAjEQIXdb3OjhFVVYjzGAPO8WGCmRbrml64SPw/jJD4GoE98aR7r25A0XcgrK3F02yw9R/vhQw==} engines: {node: '>=0.3.1'} dom-accessibility-api@0.5.16: @@ -2202,6 +2298,9 @@ packages: resolution: {integrity: sha512-Bdcs4+3qlpVlx2NRn6fgX2Ue2/gGRaPeawebgclM0ERSCqDpA+owF1fdPwjJUTAJWMTuAaxjDf+hzb0/4eKvvw==} engines: {node: '>= 0.10.0'} + exsolve@1.2.0: + resolution: {integrity: sha512-h1pQPR9XoeSMdntRNCjyTznaume4UpfXrULBnlkZ2CUM/G5eSa+pBByGldO5uR8dxbPC+OuJXsPPNf+JZ81ADg==} + external-editor@3.1.0: resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==} engines: {node: '>=4'} @@ -2255,6 +2354,9 @@ packages: picomatch: optional: true + fetchdts@0.2.0: + resolution: {integrity: sha512-PJb4ZTGT2/wK78RmVrxZITStWabhZlKBsL52VOgq+c7clEkdHdEB+0rtzrXCbZJqeYJj+IwNWYqB5/G6vouA6A==} + figures@2.0.0: resolution: {integrity: sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==} engines: {node: '>=4'} @@ -3152,6 +3254,11 @@ packages: resolution: {integrity: sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==} engines: {node: '>=12'} + playwright-core@1.55.0: + resolution: {integrity: sha512-GvZs4vU3U5ro2nZpeiwyb0zuFaqb9sUiAJuyrWpcGouD8y9/HLgGbNRjIph7zU9D3hnPaisMl9zG9CgFi/biIg==} + engines: {node: '>=18'} + hasBin: true + possible-typed-array-names@1.1.0: resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==} engines: {node: '>= 0.4'} @@ -3459,6 +3566,10 @@ packages: resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} engines: {node: '>=0.10.0'} + source-map@0.7.6: + resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==} + engines: {node: '>= 12'} + speedline-core@1.4.3: resolution: {integrity: sha512-DI7/OuAUD+GMpR6dmu8lliO2Wg5zfeh+/xsdyJZCzd8o5JgFUjCeLsBDuZjIQJdwXS3J0L/uZYrELKYqx+PXog==} engines: {node: '>=8.0'} @@ -3466,6 +3577,11 @@ packages: sprintf-js@1.0.3: resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} + srvx@1.0.8: + resolution: {integrity: sha512-ngFS/J6St4PJfHRHGjr78xkPPtbyXtdMOLNE4x/XZunEK3OhV7aGUWMHf9WTUEy6wm1U0W4okkd82ZFFWRVQTw==} + engines: {node: '>=20.16.0'} + hasBin: true + statuses@2.0.2: resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==} engines: {node: '>= 0.8'} @@ -3677,6 +3793,9 @@ packages: engines: {node: '>=14.17'} hasBin: true + ufo@1.6.4: + resolution: {integrity: sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==} + unbox-primitive@1.1.0: resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==} engines: {node: '>= 0.4'} @@ -3813,6 +3932,14 @@ packages: yaml: optional: true + vitefu@1.1.3: + resolution: {integrity: sha512-ub4okH7Z5KLjb6hDyjqrGXqWtWvoYdU3IGm/NorpgHncKoLTCfRIbvlhBm7r0YstIaQRYlp4yEbFqDcKSzXSSg==} + peerDependencies: + vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 + peerDependenciesMeta: + vite: + optional: true + vitest@5.0.5: resolution: {integrity: sha512-cPODOMF8YnkiiYtDdHo6n4wWmBrOBBbOIYH2d33M4l3CdNn72h+qMmO6uXffUN6A5AZFXNND/d+krS9mgkXRfg==} engines: {node: ^22.12.0 || ^24.0.0 || >=26.0.0} @@ -3967,6 +4094,10 @@ packages: resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==} engines: {node: '>=18'} + xmlbuilder2@4.0.3: + resolution: {integrity: sha512-bx8Q1STctnNaaDymWnkfQLKofs0mGNN7rLLapJlGuV3VlvegD7Ls4ggMjE3aUSWItCCzU0PEv45lI87iSigiCA==} + engines: {node: '>=20.0'} + xmlchars@2.2.0: resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==} @@ -4014,13 +4145,13 @@ packages: resolution: {integrity: sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==} engines: {node: '>=18.0.0'} peerDependencies: - zod: ^3.25.0 || ^4.0.0 + zod: ^4.6.6 zod@3.25.76: resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==} - zod@4.6.5: - resolution: {integrity: sha512-v5l/aFXZQeai4awLbOpSoHecE9UiMrnfx75tEXLjNonXVARxQ5mOeipTjROUchszUNCqnE+hqAMujRsRHsut2Q==} + zod@4.6.7: + resolution: {integrity: sha512-g8W2D2kU6a8untc053fX1uVBKzM7yqAxW/3zwk83+6RyF2+SKOuV+c0wBDhUwzV1PaGapmZH+rmcUzPf+3CGwg==} snapshots: @@ -4707,6 +4838,23 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.20.3 + '@oozcitak/dom@2.0.2': + dependencies: + '@oozcitak/infra': 2.0.2 + '@oozcitak/url': 3.0.0 + '@oozcitak/util': 10.0.0 + + '@oozcitak/infra@2.0.2': + dependencies: + '@oozcitak/util': 10.0.0 + + '@oozcitak/url@3.0.0': + dependencies: + '@oozcitak/infra': 2.0.2 + '@oozcitak/util': 10.0.0 + + '@oozcitak/util@10.0.0': {} + '@oxc-project/types@0.151.0': {} '@pandacss/is-valid-prop@1.11.1': {} @@ -4860,76 +5008,145 @@ snapshots: dependencies: tslib: 2.8.1 - '@tanstack/history@1.162.4': {} + '@tanstack/history@1.162.5': {} - '@tanstack/react-router-devtools@1.167.2(@tanstack/react-router@1.170.39(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(@tanstack/router-core@1.171.32)(csstype@3.2.3)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)': + '@tanstack/react-router-devtools@1.167.2(@tanstack/react-router@1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(@tanstack/router-core@1.171.39)(csstype@3.2.3)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)': dependencies: - '@tanstack/react-router': 1.170.39(react-dom@19.3.0(react@19.3.0))(react@19.3.0) - '@tanstack/router-devtools-core': 1.168.2(@tanstack/router-core@1.171.32)(csstype@3.2.3) + '@tanstack/react-router': 1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@tanstack/router-devtools-core': 1.168.2(@tanstack/router-core@1.171.39)(csstype@3.2.3) react: 19.3.0 react-dom: 19.3.0(react@19.3.0) optionalDependencies: - '@tanstack/router-core': 1.171.32 + '@tanstack/router-core': 1.171.39 transitivePeerDependencies: - csstype - '@tanstack/react-router@1.170.39(react-dom@19.3.0(react@19.3.0))(react@19.3.0)': + '@tanstack/react-router@1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0)': dependencies: - '@tanstack/history': 1.162.4 - '@tanstack/react-store': 0.11.1(react-dom@19.3.0(react@19.3.0))(react@19.3.0) - '@tanstack/router-core': 1.171.32 + '@tanstack/history': 1.162.5 + '@tanstack/react-store': 0.11.2(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@tanstack/router-core': 1.171.39 isbot: 5.2.2 react: 19.3.0 react-dom: 19.3.0(react@19.3.0) - '@tanstack/react-store@0.11.1(react-dom@19.3.0(react@19.3.0))(react@19.3.0)': + '@tanstack/react-start-client@1.168.44(react-dom@19.3.0(react@19.3.0))(react@19.3.0)': dependencies: - '@tanstack/store': 0.11.1 + '@tanstack/react-router': 1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@tanstack/router-core': 1.171.39 + '@tanstack/start-client-core': 1.170.39 + react: 19.3.0 + react-dom: 19.3.0(react@19.3.0) + + '@tanstack/react-start-rsc@0.1.65(esbuild@0.28.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(rolldown@1.2.11)(supports-color@5.5.0)(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0))': + dependencies: + '@tanstack/react-router': 1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@tanstack/router-core': 1.171.39 + '@tanstack/router-utils': 1.162.4(supports-color@5.5.0) + '@tanstack/start-client-core': 1.170.39 + '@tanstack/start-fn-stubs': 1.162.0 + '@tanstack/start-plugin-core': 1.171.55(@tanstack/react-router@1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(esbuild@0.28.2)(rolldown@1.2.11)(supports-color@5.5.0)(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)) + '@tanstack/start-storage-context': 1.167.41 + pathe: 2.0.3 + react: 19.3.0 + react-dom: 19.3.0(react@19.3.0) + transitivePeerDependencies: + - '@farmfe/core' + - '@rsbuild/core' + - bun-types-no-globals + - esbuild + - rolldown + - rollup + - supports-color + - unloader + - vite + - vite-plugin-solid + - webpack + + '@tanstack/react-start-server@1.167.52(react-dom@19.3.0(react@19.3.0))(react@19.3.0)': + dependencies: + '@tanstack/react-router': 1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@tanstack/router-core': 1.171.39 + '@tanstack/start-server-core': 1.169.45 + react: 19.3.0 + react-dom: 19.3.0(react@19.3.0) + + '@tanstack/react-start@1.169.4(esbuild@0.28.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(rolldown@1.2.11)(supports-color@5.5.0)(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0))': + dependencies: + '@tanstack/react-router': 1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@tanstack/react-start-client': 1.168.44(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@tanstack/react-start-rsc': 0.1.65(esbuild@0.28.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(rolldown@1.2.11)(supports-color@5.5.0)(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)) + '@tanstack/react-start-server': 1.167.52(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@tanstack/router-utils': 1.162.4(supports-color@5.5.0) + '@tanstack/start-client-core': 1.170.39 + '@tanstack/start-plugin-core': 1.171.55(@tanstack/react-router@1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(esbuild@0.28.2)(rolldown@1.2.11)(supports-color@5.5.0)(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)) + '@tanstack/start-server-core': 1.169.45 + pathe: 2.0.3 + react: 19.3.0 + react-dom: 19.3.0(react@19.3.0) + optionalDependencies: + vite: 8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0) + transitivePeerDependencies: + - '@farmfe/core' + - '@rspack/core' + - bun-types-no-globals + - esbuild + - react-server-dom-rspack + - rolldown + - rollup + - supports-color + - unloader + - vite-plugin-solid + - webpack + + '@tanstack/react-store@0.11.2(react-dom@19.3.0(react@19.3.0))(react@19.3.0)': + dependencies: + '@tanstack/store': 0.11.2 react: 19.3.0 react-dom: 19.3.0(react@19.3.0) use-sync-external-store: 1.7.0(react@19.3.0) - '@tanstack/router-core@1.171.32': + '@tanstack/router-core@1.171.39': dependencies: - '@tanstack/history': 1.162.4 + '@tanstack/history': 1.162.5 cookie-es: 3.1.1 seroval: 1.7.3 seroval-plugins: 1.7.3(seroval@1.7.3) - '@tanstack/router-devtools-core@1.168.2(@tanstack/router-core@1.171.32)(csstype@3.2.3)': + '@tanstack/router-devtools-core@1.168.2(@tanstack/router-core@1.171.39)(csstype@3.2.3)': dependencies: - '@tanstack/router-core': 1.171.32 + '@tanstack/router-core': 1.171.39 clsx: 2.1.1 goober: 2.1.19(csstype@3.2.3) optionalDependencies: csstype: 3.2.3 - '@tanstack/router-generator@1.167.38(supports-color@5.5.0)': + '@tanstack/router-generator@1.167.46(supports-color@5.5.0)': dependencies: '@babel/types': 7.29.8 - '@tanstack/router-core': 1.171.32 - '@tanstack/router-utils': 1.162.3(supports-color@5.5.0) + '@tanstack/router-core': 1.171.39 + '@tanstack/router-utils': 1.162.4(supports-color@5.5.0) '@tanstack/virtual-file-routes': 1.162.0 jiti: 2.7.0 magic-string: 0.30.21 prettier: 3.9.9 - zod: 4.6.5 + zod: 4.6.7 transitivePeerDependencies: - supports-color - '@tanstack/router-plugin@1.168.40(@tanstack/react-router@1.170.39(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(esbuild@0.28.2)(rolldown@1.2.11)(supports-color@5.5.0)(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0))': + '@tanstack/router-plugin@1.168.48(@tanstack/react-router@1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(esbuild@0.28.2)(rolldown@1.2.11)(supports-color@5.5.0)(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0))': dependencies: '@babel/core': 7.29.7(supports-color@5.5.0) '@babel/template': 7.29.7 '@babel/types': 7.29.8 - '@tanstack/router-core': 1.171.32 - '@tanstack/router-generator': 1.167.38(supports-color@5.5.0) - '@tanstack/router-utils': 1.162.3(supports-color@5.5.0) + '@tanstack/router-core': 1.171.39 + '@tanstack/router-generator': 1.167.46(supports-color@5.5.0) + '@tanstack/router-utils': 1.162.4(supports-color@5.5.0) chokidar: 5.0.0 unplugin: 3.4.0(esbuild@0.28.2)(rolldown@1.2.11)(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)) - zod: 4.6.5 + zod: 4.6.7 optionalDependencies: - '@tanstack/react-router': 1.170.39(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@tanstack/react-router': 1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0) vite: 8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0) transitivePeerDependencies: - '@farmfe/core' @@ -4941,20 +5158,81 @@ snapshots: - supports-color - unloader - '@tanstack/router-utils@1.162.3(supports-color@5.5.0)': + '@tanstack/router-utils@1.162.4(supports-color@5.5.0)': dependencies: '@babel/generator': 7.29.8 '@babel/parser': 7.29.9 '@babel/types': 7.29.8 ansis: 4.4.0 babel-dead-code-elimination: 1.0.12(supports-color@5.5.0) - diff: 8.0.4 + diff: 9.0.0 pathe: 2.0.3 tinyglobby: 0.2.17 transitivePeerDependencies: - supports-color - '@tanstack/store@0.11.1': {} + '@tanstack/start-client-core@1.170.39': + dependencies: + '@tanstack/router-core': 1.171.39 + '@tanstack/start-fn-stubs': 1.162.0 + '@tanstack/start-storage-context': 1.167.41 + seroval: 1.7.3 + + '@tanstack/start-fn-stubs@1.162.0': {} + + '@tanstack/start-plugin-core@1.171.55(@tanstack/react-router@1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(esbuild@0.28.2)(rolldown@1.2.11)(supports-color@5.5.0)(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0))': + dependencies: + '@babel/code-frame': 7.29.7 + '@babel/core': 7.29.7(supports-color@5.5.0) + '@babel/types': 7.29.8 + '@jridgewell/remapping': 2.3.5 + '@tanstack/router-core': 1.171.39 + '@tanstack/router-generator': 1.167.46(supports-color@5.5.0) + '@tanstack/router-plugin': 1.168.48(@tanstack/react-router@1.170.46(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(esbuild@0.28.2)(rolldown@1.2.11)(supports-color@5.5.0)(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)) + '@tanstack/router-utils': 1.162.4(supports-color@5.5.0) + '@tanstack/start-server-core': 1.169.45 + exsolve: 1.2.0 + lightningcss: 1.33.0 + pathe: 2.0.3 + picomatch: 4.0.7 + seroval: 1.7.3 + source-map: 0.7.6 + srvx: 1.0.8 + tinyglobby: 0.2.17 + ufo: 1.6.4 + vitefu: 1.1.3(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)) + xmlbuilder2: 4.0.3 + zod: 4.6.7 + optionalDependencies: + vite: 8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0) + transitivePeerDependencies: + - '@farmfe/core' + - '@rspack/core' + - '@tanstack/react-router' + - bun-types-no-globals + - esbuild + - rolldown + - rollup + - supports-color + - unloader + - vite-plugin-solid + - webpack + + '@tanstack/start-server-core@1.169.45': + dependencies: + '@tanstack/history': 1.162.5 + '@tanstack/router-core': 1.171.39 + '@tanstack/start-client-core': 1.170.39 + '@tanstack/start-storage-context': 1.167.41 + cookie-es: 3.1.1 + fetchdts: 0.2.0 + seroval: 1.7.3 + + '@tanstack/start-storage-context@1.167.41': + dependencies: + '@tanstack/router-core': 1.171.39 + + '@tanstack/store@0.11.2': {} '@tanstack/virtual-file-routes@1.162.0': {} @@ -6244,7 +6522,7 @@ snapshots: devtools-protocol@0.0.1608973: {} - diff@8.0.4: {} + diff@9.0.0: {} dom-accessibility-api@0.5.16: {} @@ -6451,8 +6729,8 @@ snapshots: '@babel/parser': 7.29.9 eslint: 9.39.5(jiti@2.7.0)(supports-color@5.5.0) hermes-parser: 0.25.1 - zod: 4.6.5 - zod-validation-error: 4.0.2(zod@4.6.5) + zod: 4.6.7 + zod-validation-error: 4.0.2(zod@4.6.7) transitivePeerDependencies: - supports-color @@ -6578,6 +6856,8 @@ snapshots: transitivePeerDependencies: - supports-color + exsolve@1.2.0: {} + external-editor@3.1.0: dependencies: chardet: 0.7.0 @@ -6636,6 +6916,8 @@ snapshots: optionalDependencies: picomatch: 4.0.7 + fetchdts@0.2.0: {} + figures@2.0.0: dependencies: escape-string-regexp: 1.0.5 @@ -7532,6 +7814,8 @@ snapshots: picomatch@4.0.7: {} + playwright-core@1.55.0: {} + possible-typed-array-names@1.1.0: {} postcss@8.5.28: @@ -7890,6 +8174,8 @@ snapshots: source-map@0.6.1: {} + source-map@0.7.6: {} + speedline-core@1.4.3: dependencies: '@types/node': 26.6.5 @@ -7898,6 +8184,8 @@ snapshots: sprintf-js@1.0.3: {} + srvx@1.0.8: {} + statuses@2.0.2: {} std-env@4.3.0: {} @@ -8148,6 +8436,8 @@ snapshots: typescript@6.0.3: {} + ufo@1.6.4: {} + unbox-primitive@1.1.0: dependencies: call-bound: 1.0.4 @@ -8214,6 +8504,10 @@ snapshots: fsevents: 2.3.3 jiti: 2.7.0 + vitefu@1.1.3(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)): + optionalDependencies: + vite: 8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0) + vitest@5.0.5(@types/node@26.6.5)(@vitest/coverage-v8@5.0.5)(jsdom@30.1.3)(vite@8.3.1(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)): dependencies: '@types/chai': 5.2.3 @@ -8348,6 +8642,13 @@ snapshots: xml-name-validator@5.0.0: {} + xmlbuilder2@4.0.3: + dependencies: + '@oozcitak/dom': 2.0.2 + '@oozcitak/infra': 2.0.2 + '@oozcitak/util': 10.0.0 + js-yaml: 4.3.2 + xmlchars@2.2.0: {} y18n@4.0.3: {} @@ -8401,10 +8702,10 @@ snapshots: yocto-queue@0.1.0: {} - zod-validation-error@4.0.2(zod@4.6.5): + zod-validation-error@4.0.2(zod@4.6.7): dependencies: - zod: 4.6.5 + zod: 4.6.7 zod@3.25.76: {} - zod@4.6.5: {} + zod@4.6.7: {} diff --git a/web/pnpm-workspace.yaml b/web/pnpm-workspace.yaml index c186f53..9ba0895 100644 --- a/web/pnpm-workspace.yaml +++ b/web/pnpm-workspace.yaml @@ -7,3 +7,5 @@ overrides: # Veiligheidspatch (GHSA-97r2-qh9m-474h, GHSA-wp97-x4hv-qvhp, GHSA-7rv5-mrxv-xcr9) voor seroval, via @tanstack/router-core seroval: ^1.6.8 seroval-plugins: ^1.6.8 + # Veiligheidspatch (GHSA-mrhx-c7xc-m3w5) voor zod 4, via @tanstack/start-plugin-core en router-generator + zod@4: ^4.6.6 diff --git a/web/src/app.test.tsx b/web/src/app.test.tsx index b2d5f7a..716dd9e 100644 --- a/web/src/app.test.tsx +++ b/web/src/app.test.tsx @@ -626,7 +626,10 @@ describe('pagina-register', () => { it('bevat precies de routes van de route tree', async () => { const { router } = await renderApp('/'); - const routePaths = Object.keys(router.routesByPath).sort(); + // De vangroute (404) is geen pagina en staat niet in het register + const routePaths = Object.keys(router.routesByPath) + .filter((path) => path !== '/$') + .sort(); expect(Object.keys(sitePages).sort()).toEqual(routePaths); }); diff --git a/web/src/client.tsx b/web/src/client.tsx new file mode 100644 index 0000000..20dc0d3 --- /dev/null +++ b/web/src/client.tsx @@ -0,0 +1,18 @@ +import { StrictMode, startTransition } from 'react'; +import { hydrateRoot } from 'react-dom/client'; +import { StartClient } from '@tanstack/react-start/client'; +import { startSentry } from './monitoring/sentry'; + +// Foutmeldingen naar Sentry, alleen op test en productie (M1). Dit bestand +// draait alleen in de browser, dus niet tijdens het prerenderen, en loopt voor +// op het hydrateren zodat ook vroege fouten gemeld worden. +startSentry(); + +startTransition(() => { + hydrateRoot( + document, + + + , + ); +}); diff --git a/web/src/components/Analytics/UmamiAnalytics.tsx b/web/src/components/Analytics/UmamiAnalytics.tsx index f132ac0..89ab144 100644 --- a/web/src/components/Analytics/UmamiAnalytics.tsx +++ b/web/src/components/Analytics/UmamiAnalytics.tsx @@ -6,13 +6,12 @@ const SCRIPT_ELEMENT_ID = 'umami-analytics-script'; // Bezoekersstatistieken zonder cookies (M6). Alleen op een bekende host, met // de website van die omgeving; data-domains telt nergens anders mee en // data-do-not-track respecteert de Do Not Track-instelling van de browser. -export default function UmamiAnalytics({ - hostname = window.location.hostname, -}: { - hostname?: string; -}) { +export default function UmamiAnalytics({ hostname }: { hostname?: string }) { useEffect(() => { - const monitoring = monitoringFor(hostname); + // Read here, not as a default parameter: there is no window while + // prerendering + const host = hostname ?? window.location.hostname; + const monitoring = monitoringFor(host); if (!monitoring || document.getElementById(SCRIPT_ELEMENT_ID)) return; const script = document.createElement('script'); @@ -20,7 +19,7 @@ export default function UmamiAnalytics({ script.src = `${umamiOrigin}/script.js`; script.defer = true; script.dataset.websiteId = monitoring.umamiWebsiteId; - script.dataset.domains = hostname; + script.dataset.domains = host; script.dataset.doNotTrack = 'true'; document.head.appendChild(script); diff --git a/web/src/components/DeferredImage/DeferredImage.test.tsx b/web/src/components/DeferredImage/DeferredImage.test.tsx index b99ba09..175146d 100644 --- a/web/src/components/DeferredImage/DeferredImage.test.tsx +++ b/web/src/components/DeferredImage/DeferredImage.test.tsx @@ -40,12 +40,16 @@ describe('DeferredImage', () => { }); it('waits for the page load event, even when already in view', async () => { - vi.spyOn(document, 'readyState', 'get').mockReturnValue('interactive'); + const readyState = vi + .spyOn(document, 'readyState', 'get') + .mockReturnValue('interactive'); await renderWithProviders(); const img = screen.getByRole('img', { name: 'Een foto' }); expect(img).not.toHaveAttribute('src'); act(() => { + // The browser is 'complete' by the time the load event fires + readyState.mockReturnValue('complete'); window.dispatchEvent(new Event('load')); }); expect(img).toHaveAttribute('src', '/foto.jpg'); diff --git a/web/src/components/Hero/useHeroSlider.ts b/web/src/components/Hero/useHeroSlider.ts index f3e3941..008d6d8 100644 --- a/web/src/components/Hero/useHeroSlider.ts +++ b/web/src/components/Hero/useHeroSlider.ts @@ -1,4 +1,4 @@ -import { useEffect, useState } from 'react'; +import { useState, useSyncExternalStore } from 'react'; import { useMediaQuery } from '@chakra-ui/react'; import useSwipe from '@/hooks/useSwipe'; import { wrapIndex } from '@/lib/wrapIndex'; @@ -12,6 +12,11 @@ import { wrapIndex } from '@/lib/wrapIndex'; // leest een nieuwe naam van de knop met focus niet altijd voor. export type HeroAnnouncement = 'slide' | 'paused' | 'playing' | null; +const subscribeVisibility = (onChange: () => void) => { + document.addEventListener('visibilitychange', onChange); + return () => document.removeEventListener('visibilitychange', onChange); +}; + export default function useHeroSlider(count: number) { const [index, setIndex] = useState(0); const [announcement, setAnnouncement] = useState(null); @@ -19,23 +24,13 @@ export default function useHeroSlider(count: number) { const [stopped, setStopped] = useState(false); const [hovered, setHovered] = useState(false); const [focused, setFocused] = useState(false); - const [hidden, setHidden] = useState(() => document.hidden); - const [reducedMotion] = useMediaQuery( - ['(prefers-reduced-motion: reduce)'], - { - ssr: false, - }, + // Server and hydrating render say "visible", like the HTML + const hidden = useSyncExternalStore( + subscribeVisibility, + () => document.hidden, + () => false, ); - - useEffect(() => { - const onVisibilityChange = () => setHidden(document.hidden); - document.addEventListener('visibilitychange', onVisibilityChange); - return () => - document.removeEventListener( - 'visibilitychange', - onVisibilityChange, - ); - }, []); + const [reducedMotion] = useMediaQuery(['(prefers-reduced-motion: reduce)']); // Als de API minder slides teruggeeft dan de huidige index, begin vooraan. const active = index < count ? index : 0; diff --git a/web/src/components/NavigationBar/NavigationBar.tsx b/web/src/components/NavigationBar/NavigationBar.tsx index b66778c..19a9e2a 100644 --- a/web/src/components/NavigationBar/NavigationBar.tsx +++ b/web/src/components/NavigationBar/NavigationBar.tsx @@ -32,11 +32,9 @@ export default function NavigationBar() { const submenuToggleRef = useRef(null); // Het mobiele menu bestaat alleen onder lg; wordt het scherm breder, dan - // sluit de reducer het. Eerste render kan undefined geven: telt als mobiel. - const isDesktop = useBreakpointValue( - { base: false, lg: true }, - { ssr: false }, - ); + // sluit de reducer het. De eerste render geeft de waarde van `base` (zo ook + // in de voorgerenderde HTML): telt als mobiel. + const isDesktop = useBreakpointValue({ base: false, lg: true }); useEffect(() => { dispatch({ type: 'viewport', isDesktop: !!isDesktop }); }, [isDesktop]); diff --git a/web/src/components/home/ContactSection/ContactSection.tsx b/web/src/components/home/ContactSection/ContactSection.tsx index aaae4c7..31662f9 100644 --- a/web/src/components/home/ContactSection/ContactSection.tsx +++ b/web/src/components/home/ContactSection/ContactSection.tsx @@ -41,10 +41,7 @@ export default function ContactSection({ // continue keyboard and screen reader users here. This navigation // replaces the "Boek" click's before the router has scrolled for it, so // it must ask the router to scroll to #contact itself. - const [reducedMotion] = useMediaQuery( - ['(prefers-reduced-motion: reduce)'], - { ssr: false }, - ); + const [reducedMotion] = useMediaQuery(['(prefers-reduced-motion: reduce)']); useEffect(() => { if (pakket === undefined) return; void navigate({ diff --git a/web/src/components/home/Testimonials/TestimonialCarousel.tsx b/web/src/components/home/Testimonials/TestimonialCarousel.tsx index a1af221..b145499 100644 --- a/web/src/components/home/Testimonials/TestimonialCarousel.tsx +++ b/web/src/components/home/Testimonials/TestimonialCarousel.tsx @@ -27,10 +27,7 @@ export default function TestimonialCarousel({ testimonials: Testimonial[]; }) { const count = testimonials.length; - const [reducedMotion] = useMediaQuery( - ['(prefers-reduced-motion: reduce)'], - { ssr: false }, - ); + const [reducedMotion] = useMediaQuery(['(prefers-reduced-motion: reduce)']); // Empty on load; filled only by a change, so nothing is read out then const [announcement, setAnnouncement] = useState(''); const carousel = useCarousel({ diff --git a/web/src/hooks/useHydrated.ts b/web/src/hooks/useHydrated.ts new file mode 100644 index 0000000..0e08ae8 --- /dev/null +++ b/web/src/hooks/useHydrated.ts @@ -0,0 +1,14 @@ +import { useSyncExternalStore } from 'react'; + +const subscribeNoop = () => () => {}; + +// False while prerendering and during the hydrating render, true afterwards +// (and at once for components that mount later). Same behaviour as the +// useHydrated that the router keeps internally. +export default function useHydrated() { + return useSyncExternalStore( + subscribeNoop, + () => true, + () => false, + ); +} diff --git a/web/src/hooks/useInView.ts b/web/src/hooks/useInView.ts index 3cec008..320a814 100644 --- a/web/src/hooks/useInView.ts +++ b/web/src/hooks/useInView.ts @@ -1,4 +1,6 @@ -import { useEffect, useRef, useState } from 'react'; +import { useEffect, useRef, useState, useSyncExternalStore } from 'react'; + +const noopSubscribe = () => () => {}; type UseInViewOptions = { threshold?: number; @@ -8,21 +10,25 @@ type UseInViewOptions = { }; // Tells whether an element has come into (or near) the viewport, once. -// Without IntersectionObserver the element counts as in view right away, so -// content is never left hidden or unloaded. +// Without IntersectionObserver the element counts as in view (from the first +// render after hydration), so content is never left hidden or unloaded. export default function useInView({ threshold = 0, rootMargin = '0px', skip = false, }: UseInViewOptions = {}) { const ref = useRef(null); - const supported = typeof IntersectionObserver !== 'undefined'; + // The server cannot know, so prerender and hydration both assume support + const unsupported = useSyncExternalStore( + noopSubscribe, + () => typeof IntersectionObserver === 'undefined', + () => false, + ); const [intersected, setIntersected] = useState(false); - const immediate = skip || !supported; useEffect(() => { const element = ref.current; - if (!element || immediate || intersected) return; + if (!element || skip || unsupported || intersected) return; const observer = new IntersectionObserver( (entries) => { @@ -36,7 +42,7 @@ export default function useInView({ observer.observe(element); return () => observer.disconnect(); - }, [immediate, intersected, threshold, rootMargin]); + }, [skip, unsupported, intersected, threshold, rootMargin]); - return { ref, inView: immediate || intersected }; + return { ref, inView: skip || intersected || unsupported }; } diff --git a/web/src/hooks/usePageLoaded.test.tsx b/web/src/hooks/usePageLoaded.test.tsx index 1a060ed..8c3d655 100644 --- a/web/src/hooks/usePageLoaded.test.tsx +++ b/web/src/hooks/usePageLoaded.test.tsx @@ -9,11 +9,15 @@ describe('usePageLoaded', () => { }); it('turns true on the load event', () => { - vi.spyOn(document, 'readyState', 'get').mockReturnValue('interactive'); + const readyState = vi + .spyOn(document, 'readyState', 'get') + .mockReturnValue('interactive'); const { result } = renderHook(() => usePageLoaded()); expect(result.current).toBe(false); act(() => { + // The browser is 'complete' by the time the load event fires + readyState.mockReturnValue('complete'); window.dispatchEvent(new Event('load')); }); expect(result.current).toBe(true); diff --git a/web/src/hooks/usePageLoaded.ts b/web/src/hooks/usePageLoaded.ts index ac88811..e994fb9 100644 --- a/web/src/hooks/usePageLoaded.ts +++ b/web/src/hooks/usePageLoaded.ts @@ -1,17 +1,16 @@ -import { useEffect, useState } from 'react'; +import { useSyncExternalStore } from 'react'; -// True once the window's load event has fired (or had already fired). +const subscribe = (onChange: () => void) => { + window.addEventListener('load', onChange, { once: true }); + return () => window.removeEventListener('load', onChange); +}; + +// True once the window's load event has fired (or had already fired). While +// prerendering and hydrating it is false, like the HTML. export default function usePageLoaded() { - const [loaded, setLoaded] = useState( + return useSyncExternalStore( + subscribe, () => document.readyState === 'complete', + () => false, ); - - useEffect(() => { - if (loaded) return; - const onLoad = () => setLoaded(true); - window.addEventListener('load', onLoad, { once: true }); - return () => window.removeEventListener('load', onLoad); - }, [loaded]); - - return loaded; } diff --git a/web/src/hooks/useReveal.test.tsx b/web/src/hooks/useReveal.test.tsx index 70631c7..1d1ccd7 100644 --- a/web/src/hooks/useReveal.test.tsx +++ b/web/src/hooks/useReveal.test.tsx @@ -52,7 +52,11 @@ describe('useReveal', () => { mockReducedMotion(); renderProbe(); expect(screen.getByTestId('probe')).toHaveTextContent('visible'); - expect(FakeObserver.instances).toHaveLength(0); + // The first render still assumes motion is fine (as the prerendered + // HTML does), so an observer may start; it is stopped again at once + expect( + FakeObserver.instances.every((observer) => observer.disconnected), + ).toBe(true); }); it('stays hidden until the element scrolls into view, then stops observing', () => { diff --git a/web/src/hooks/useReveal.ts b/web/src/hooks/useReveal.ts index d230463..4081110 100644 --- a/web/src/hooks/useReveal.ts +++ b/web/src/hooks/useReveal.ts @@ -6,10 +6,7 @@ import useInView from './useInView'; // right at the bottom edge. When the visitor prefers reduced motion the // element counts as visible right away. export default function useReveal() { - const [reducedMotion] = useMediaQuery( - ['(prefers-reduced-motion: reduce)'], - { ssr: false }, - ); + const [reducedMotion] = useMediaQuery(['(prefers-reduced-motion: reduce)']); const { ref, inView } = useInView({ threshold: 0.12, rootMargin: '0px 0px -60px 0px', diff --git a/web/src/main.tsx b/web/src/main.tsx deleted file mode 100644 index 9b53ab9..0000000 --- a/web/src/main.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import { StrictMode } from 'react'; -import ReactDOM from 'react-dom/client'; -import { RouterProvider, createRouter } from '@tanstack/react-router'; -import { routeTree } from './routeTree.gen'; -import { ChakraProvider } from '@chakra-ui/react'; -import system from './theme.ts'; -import ErrorPage from './components/StatusPage/ErrorPage'; -import { startSentry } from './monitoring/sentry'; - -import '@fontsource/jost/300.css'; -import '@fontsource/jost/400.css'; -import '@fontsource/jost/500.css'; -import '@fontsource/marcellus/400.css'; - -// Foutmeldingen naar Sentry, alleen op test en productie (M1) -startSentry(); - -// Create a new router instance -const router = createRouter({ - routeTree, - // Nieuwe pagina begint bovenaan; terug/vooruit herstelt de positie (FR-08) - scrollRestoration: true, - // Fout in een pagina: foutpagina binnen de shell (FR-10) - defaultErrorComponent: ErrorPage, -}); - -// Register the router instance for type safety -declare module '@tanstack/react-router' { - interface Register { - router: typeof router; - } -} - -// De statische head-tags uit index.html zijn alleen voor crawlers zonder -// JavaScript. Vanaf hier beheren de routes ze, dus voorkom dubbele tags. -document.querySelectorAll('head [data-fallback]').forEach((el) => el.remove()); - -// Render the app -const rootElement = document.getElementById('root')!; -if (!rootElement.innerHTML) { - const root = ReactDOM.createRoot(rootElement); - root.render( - - {/* De site is alleen licht; de _dark-waarden in het thema blijven - staan voor een eventuele donkere modus later */} - - - - , - ); -} diff --git a/web/src/navigation.ts b/web/src/navigation.ts index e019ba0..205e35f 100644 --- a/web/src/navigation.ts +++ b/web/src/navigation.ts @@ -3,8 +3,9 @@ import { shootNavItems } from './lib/shootNavItems.ts'; import type { FileRoutesByTo } from './routeTree.gen.ts'; // Menu's verwijzen naar routes, en routes zijn code: het CMS kan geen -// pagina's toevoegen. Een tikfout in `to` is daardoor een typefout. -export type RoutePath = keyof FileRoutesByTo; +// pagina's toevoegen. Een tikfout in `to` is daardoor een typefout. De +// vangroute voor onbekende URL's is geen pagina: niet in menu's en register. +export type RoutePath = Exclude; export interface NavItem { to: RoutePath; diff --git a/web/src/routeTree.gen.ts b/web/src/routeTree.gen.ts index 55c6803..633c683 100644 --- a/web/src/routeTree.gen.ts +++ b/web/src/routeTree.gen.ts @@ -10,6 +10,7 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' +import { Route as SplatRouteImport } from './routes/$' import { Route as ContactRouteImport } from './routes/contact' import { Route as OverMijRouteImport } from './routes/over-mij' import { Route as PortfolioRouteImport } from './routes/portfolio' @@ -26,6 +27,11 @@ const IndexRoute = IndexRouteImport.update({ path: '/', getParentRoute: () => rootRouteImport, } as any) +const SplatRoute = SplatRouteImport.update({ + id: '/$', + path: '/$', + getParentRoute: () => rootRouteImport, +} as any) const ContactRoute = ContactRouteImport.update({ id: '/contact', path: '/contact', @@ -83,6 +89,7 @@ const SoortenFotoshootsZwangerschapRoute = export interface FileRoutesByFullPath { '/': typeof IndexRoute + '/$': typeof SplatRoute '/contact': typeof ContactRoute '/over-mij': typeof OverMijRoute '/portfolio': typeof PortfolioRoute @@ -96,6 +103,7 @@ export interface FileRoutesByFullPath { } export interface FileRoutesByTo { '/': typeof IndexRoute + '/$': typeof SplatRoute '/contact': typeof ContactRoute '/over-mij': typeof OverMijRoute '/portfolio': typeof PortfolioRoute @@ -110,6 +118,7 @@ export interface FileRoutesByTo { export interface FileRoutesById { __root__: typeof rootRouteImport '/': typeof IndexRoute + '/$': typeof SplatRoute '/contact': typeof ContactRoute '/over-mij': typeof OverMijRoute '/portfolio': typeof PortfolioRoute @@ -125,6 +134,7 @@ export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath fullPaths: | '/' + | '/$' | '/contact' | '/over-mij' | '/portfolio' @@ -138,6 +148,7 @@ export interface FileRouteTypes { fileRoutesByTo: FileRoutesByTo to: | '/' + | '/$' | '/contact' | '/over-mij' | '/portfolio' @@ -151,6 +162,7 @@ export interface FileRouteTypes { id: | '__root__' | '/' + | '/$' | '/contact' | '/over-mij' | '/portfolio' @@ -165,6 +177,7 @@ export interface FileRouteTypes { } export interface RootRouteChildren { IndexRoute: typeof IndexRoute + SplatRoute: typeof SplatRoute ContactRoute: typeof ContactRoute OverMijRoute: typeof OverMijRoute PortfolioRoute: typeof PortfolioRoute @@ -186,6 +199,13 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } + '/$': { + id: '/$' + path: '/$' + fullPath: '/$' + preLoaderRoute: typeof SplatRouteImport + parentRoute: typeof rootRouteImport + } '/contact': { id: '/contact' path: '/contact' @@ -261,6 +281,7 @@ declare module '@tanstack/react-router' { const rootRouteChildren: RootRouteChildren = { IndexRoute: IndexRoute, + SplatRoute: SplatRoute, ContactRoute: ContactRoute, OverMijRoute: OverMijRoute, PortfolioRoute: PortfolioRoute, @@ -275,3 +296,12 @@ const rootRouteChildren: RootRouteChildren = { export const routeTree = rootRouteImport ._addFileChildren(rootRouteChildren) ._addFileTypes() + +import type { getRouter } from './router.tsx' +import type { createStart } from '@tanstack/react-start' +declare module '@tanstack/react-start' { + interface Register { + ssr: true + router: Awaited> + } +} diff --git a/web/src/router.tsx b/web/src/router.tsx new file mode 100644 index 0000000..7ae502e --- /dev/null +++ b/web/src/router.tsx @@ -0,0 +1,27 @@ +import { createRouter } from '@tanstack/react-router'; +import { routeTree } from './routeTree.gen'; +import ErrorPage from './components/StatusPage/ErrorPage'; + +// Eén set opties voor de app en voor de tests (renderApp) +export function routerOptions() { + return { + routeTree, + // Nieuwe pagina begint bovenaan; terug/vooruit herstelt de positie (FR-08) + scrollRestoration: true, + // Fout in een pagina: foutpagina binnen de shell (FR-10) + defaultErrorComponent: ErrorPage, + }; +} + +// Start roept dit aan voor elke render: op de server per prerender-verzoek, +// in de browser één keer +export function getRouter() { + return createRouter(routerOptions()); +} + +// Register the router instance for type safety +declare module '@tanstack/react-router' { + interface Register { + router: ReturnType; + } +} diff --git a/web/src/routes/$.tsx b/web/src/routes/$.tsx new file mode 100644 index 0000000..078e385 --- /dev/null +++ b/web/src/routes/$.tsx @@ -0,0 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router'; +import NotFound from '../components/StatusPage/NotFound'; + +// Vangt elke onbekende URL op en wordt als 404.html voorgerenderd (BR-404-01). +// Geen head() en geen notFound(): Start laat de build falen bij een niet-OK +// antwoord, en NotFound zet zelf titel en noindex. +export const Route = createFileRoute('/$')({ + component: NotFound, +}); diff --git a/web/src/routes/__root.tsx b/web/src/routes/__root.tsx index d882348..7389a2e 100644 --- a/web/src/routes/__root.tsx +++ b/web/src/routes/__root.tsx @@ -1,10 +1,18 @@ import { lazy, Suspense } from 'react'; -import { createRootRoute, HeadContent } from '@tanstack/react-router'; +import type { ReactNode } from 'react'; +import { createRootRoute, HeadContent, Scripts } from '@tanstack/react-router'; +import { ChakraProvider } from '@chakra-ui/react'; import AppShell from '../components/AppShell'; import ErrorPage from '../components/StatusPage/ErrorPage'; import NotFound from '../components/StatusPage/NotFound'; import siteContent from '../content/siteContent'; import { siteHead } from '../seo'; +import system from '../theme'; + +import '@fontsource/jost/300.css'; +import '@fontsource/jost/400.css'; +import '@fontsource/jost/500.css'; +import '@fontsource/marcellus/400.css'; // Devtools alleen tijdens het ontwikkelen; ze komen niet in de productiebuild const RouterDevtools = import.meta.env.DEV @@ -15,10 +23,24 @@ const RouterDevtools = import.meta.env.DEV ) : () => null; +// Het hele document: Start rendert dit op de server en hydrateert het in de +// browser. Titel en meta-tags van de actieve route komen via HeadContent. +const RootDocument = ({ children }: { children: ReactNode }) => ( + + + + + + {/* De site is alleen licht; de _dark-waarden in het thema blijven + staan voor een eventuele donkere modus later */} + {children} + + + +); + const RootLayout = () => ( <> - {/* Titel en meta-tags van de actieve route; React zet ze in */} - @@ -27,7 +49,25 @@ const RootLayout = () => ( ); export const Route = createRootRoute({ - head: () => siteHead(siteContent), + head: () => { + const { meta, scripts } = siteHead(siteContent); + return { + meta: [ + { charSet: 'utf-8' }, + { + name: 'viewport', + content: 'width=device-width, initial-scale=1.0', + }, + ...meta, + ], + links: [ + { rel: 'icon', type: 'image/png', href: '/favicon.png' }, + { rel: 'apple-touch-icon', href: '/favicon.png' }, + ], + scripts, + }; + }, + shellComponent: RootDocument, component: RootLayout, // Onbekende URL: 404 binnen de shell (FR-09) notFoundComponent: NotFound, diff --git a/web/src/test/renderApp.tsx b/web/src/test/renderApp.tsx index 63eaef7..4942b39 100644 --- a/web/src/test/renderApp.tsx +++ b/web/src/test/renderApp.tsx @@ -2,22 +2,38 @@ import { ChakraProvider } from '@chakra-ui/react'; import { createMemoryHistory, createRouter, + HeadContent, RouterProvider, + rootRouteId, } from '@tanstack/react-router'; import { render, screen } from '@testing-library/react'; +import type { ReactNode } from 'react'; import { expect } from 'vitest'; -import ErrorPage from '../components/StatusPage/ErrorPage'; -import { routeTree } from '../routeTree.gen'; +import { routerOptions } from '../router'; import system from '../theme'; -// De echte app: route tree, router-opties en thema zoals in main.tsx +// De root route rendert in de browser het hele document (, ). Dat +// past niet in de testcontainer: React zou op het testdocument +// zetten en het thema twee keer wikkelen. Tests krijgen daarom een shell met +// alleen de head-tags; verder is het dezelfde route tree (V2, D12). +const TestShell = ({ children }: { children: ReactNode }) => ( + <> + + {children} + +); + +// De echte app: route tree en router-opties uit router.tsx, thema zoals in de +// shell van __root.tsx export async function renderApp(path: string) { const router = createRouter({ - routeTree, + ...routerOptions(), history: createMemoryHistory({ initialEntries: [path] }), - scrollRestoration: true, - defaultErrorComponent: ErrorPage, }); + const rootOptions = router.routesById[rootRouteId].options as { + shellComponent?: typeof TestShell; + }; + rootOptions.shellComponent = TestShell; await router.load(); const result = render( diff --git a/web/vite.config.ts b/web/vite.config.ts index fe7cca5..8237b61 100644 --- a/web/vite.config.ts +++ b/web/vite.config.ts @@ -1,9 +1,14 @@ /// import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react'; -import { tanstackRouter } from '@tanstack/router-plugin/vite'; +import { tanstackStart } from '@tanstack/react-start/plugin/vite'; import { securityHeaders } from './config/securityHeaders.ts'; import sitemapPlugin from './config/sitemapPlugin.ts'; +import sitePages from './src/sitePages.ts'; + +// Tijdelijk hier; Stap 7 maakt config/pageFiles.ts, Stap 24 schakelt over +const NOT_FOUND_PATH = '/404'; +const NOT_FOUND_FILE = '404.html'; // 100% dekking voor de pure functies (NFR-M-02); de rest wordt alleen gerapporteerd const fullCoverage = { @@ -14,16 +19,46 @@ const fullCoverage = { }; // https://vitejs.dev/config/ -export default defineConfig({ +export default defineConfig(({ mode }) => ({ plugins: [ - // Please make sure that '@tanstack/router-plugin' is passed before '@vitejs/plugin-react' - tanstackRouter({ - target: 'react', - autoCodeSplitting: true, - }), + // De Start-plugin hoort niet in Vitest (D12): de tests renderen + // componenten zonder document-shell. Hij brengt zijn eigen + // routegenerator en code splitting mee, vervangt dus de router-plugin. + ...(mode === 'test' + ? [] + : [ + tanstackStart({ + // Elke pagina uit het register wordt een eigen + // HTML-bestand; de lijst wordt nooit twee keer getypt. + pages: [ + ...Object.keys(sitePages).map((path) => ({ path })), + // De catch-all route als 404.html (BR-404-02) + { + path: NOT_FOUND_PATH, + prerender: { outputPath: `/${NOT_FOUND_FILE}` }, + }, + ], + prerender: { + enabled: true, + // /over-mij wordt over-mij.html, zonder map en + // zonder redirect naar een slash (BR-BLD-03) + autoSubfolderIndex: false, + // Alleen de pagina's hierboven (BR-BLD-04) + crawlLinks: false, + autoStaticPathsDiscovery: false, + }, + }), + ]), react(), sitemapPlugin(), ], + // Eén keer per build vastgelegd, zodat server- en clientbundel hetzelfde + // jaar tonen in de eerste render van de footer (BR-HYD-14) + define: { + 'import.meta.env.VITE_BUILD_YEAR': JSON.stringify( + String(new Date().getFullYear()), + ), + }, resolve: { tsconfigPaths: true, }, @@ -50,4 +85,4 @@ export default defineConfig({ }, }, }, -}); +}));