feat(WP-67): merge behandelportal into this repo as a monorepo
Restructures into apps/ssp + apps/behandelportal (two Angular projects) plus libs/shared + libs/beheer (cross-app libraries), replacing WP-61's separate sibling repo. That split had already produced real drift: a hand-vendored copy of the backend's OpenAPI doc, a shared/ui+layout tree forked and silently diverging (7 files), and beheer + the styles.scss token bridge duplicated byte-for-byte across both repos. - git mv the SSP's src/app/* into apps/ssp/; fold shared/, beheer/, environments/, the Storybook docs/*.mdx, and styles.scss into libs/shared + libs/beheer (all confirmed identical between the two repos before merging). auth stays deliberately duplicated per ADR-0002 (actor-specific, expected to diverge) - amended there. - One generated API client (libs/shared), no more vendored swagger.json. - .dependency-cruiser split into a base factory + one config per app, and Storybook into .storybook-ssp/.storybook-behandelportal - both forced by the @auth/* alias resolving to different directories per app. - SiteHeaderComponent/ShellComponent gained HEADER_NAV_ITEMS/ HEADER_ADMIN_LINKS/DEBUG_PANEL injection tokens so each app supplies its own nav/admin-links/dev-panel instead of one being hardcoded. - CLAUDE.md, ARCHITECTURE.md, dependencies.md, and ADR-0002 updated; WP-67 backlog entry documents the full decision trail. npm run ci green (lint, dep:check x2, 360 tests across ssp/ behandelportal/shared/beheer, both localized builds, backend tests, snippet + api-client drift); both dev servers, both Storybook instances, and docker compose verified working. The old sibling repo (/home/eho/repos/behandelportal) is left untouched, not deleted. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Claude Sonnet 5
@@ -11,7 +11,7 @@
|
||||
# false positive (a colour word inside a comment or a data-URI). Keep the bar high.
|
||||
set -uo pipefail
|
||||
|
||||
hits=$(grep -rnE '#[0-9a-fA-F]{3,8}\b|rgba?\(|hsla?\(' src/app --include='*.component.ts' | grep -v 'token-ok' || true)
|
||||
hits=$(grep -rnE '#[0-9a-fA-F]{3,8}\b|rgba?\(|hsla?\(' apps libs --include='*.component.ts' | grep -v 'token-ok' || true)
|
||||
if [ -n "$hits" ]; then
|
||||
echo "$hits"
|
||||
echo 'FAIL: hardcoded colours in components (use --rhc-*/--app-* tokens, or add a `token-ok` marker + reason)'
|
||||
|
||||
+3
-3
@@ -16,11 +16,11 @@ step "dependency boundaries"; npm run dep:check
|
||||
step "format:check (prettier)"; npm run format:check
|
||||
step "check:tokens"; npm run check:tokens
|
||||
step "test (vitest + coverage)"; npm run test:coverage
|
||||
step "build --localize (nl+en)"; npx ng build --localize
|
||||
step "build --localize (nl+en)"; npx ng build ssp --localize && npx ng build behandelportal --localize
|
||||
step "npm audit (shipped deps)"; npm audit --omit=dev
|
||||
step "backend format + tests"; ( cd backend && dotnet format BigRegister.slnx --verify-no-changes && dotnet test BigRegister.slnx --filter "Category!=Integration" )
|
||||
step "showcase snippets drift"; npm run gen:snippets && git diff --exit-code src/app/showcase/snippets.generated.ts
|
||||
step "api-client drift"; npm run gen:api && git diff --exit-code src/app/shared/infrastructure/api-client.ts backend/swagger.json
|
||||
step "showcase snippets drift"; npm run gen:snippets && git diff --exit-code apps/ssp/src/app/showcase/snippets.generated.ts
|
||||
step "api-client drift"; npm run gen:api && git diff --exit-code libs/shared/src/infrastructure/api-client.ts backend/swagger.json
|
||||
|
||||
if [[ "${1:-}" == "--full" ]]; then
|
||||
step "storybook build + axe"; npm run build-storybook && npm run test-storybook:ci
|
||||
|
||||
+26
-11
@@ -1,26 +1,41 @@
|
||||
#!/usr/bin/env bash
|
||||
# Regenerate the architecture dependency graph (WP-38) as a mermaid diagram embedded in a
|
||||
# markdown file, so it renders on the git host and can be linked from the docs. Contexts ×
|
||||
# atomic layers; edges are real imports. Boundaries are enforced separately by `npm run
|
||||
# dep:check`. Run this after a structural change; commit the result.
|
||||
# Regenerate the architecture dependency graph (WP-38, updated WP-67) as mermaid diagrams
|
||||
# embedded in a markdown file, so it renders on the git host and can be linked from the docs.
|
||||
# One diagram per app (ssp, behandelportal) plus the shared libraries — each app is cruised
|
||||
# separately since a single tsconfig can't resolve both apps' `@auth/*` alias at once (see
|
||||
# .dependency-cruiser.base.js). Boundaries are enforced separately by `npm run dep:check`.
|
||||
# Run this after a structural change; commit the result.
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")/.."
|
||||
|
||||
OUT=docs/reference/architecture/dependency-graph.md
|
||||
|
||||
graph() {
|
||||
local app="$1" root="$2"
|
||||
npx depcruise "$root" libs \
|
||||
--config ".dependency-cruiser.${app}.js" \
|
||||
--collapse "^(apps/[^/]+/src/app|libs/[^/]+/src)/[^/]+" \
|
||||
--output-type mermaid
|
||||
}
|
||||
|
||||
{
|
||||
echo "# Dependency graph"
|
||||
echo
|
||||
echo "_Generated by \`npm run dep:graph\` — do not edit by hand._ Nodes are context × atomic"
|
||||
echo "layer (\`src/app/<context>/<layer>\`); edges are real imports. The allowed edges are"
|
||||
echo "enforced by \`npm run dep:check\` (dependency-cruiser); see [dependencies.md](./dependencies.md)."
|
||||
echo "layer (\`apps/<app>/src/app/<context>/<layer>\` or \`libs/<lib>/src/<layer>\`); edges are"
|
||||
echo "real imports. The allowed edges are enforced by \`npm run dep:check\` (dependency-cruiser,"
|
||||
echo "one config per app — see [dependencies.md](./dependencies.md))."
|
||||
echo
|
||||
echo "## ssp"
|
||||
echo
|
||||
echo '```mermaid'
|
||||
npx depcruise src/app \
|
||||
--config .dependency-cruiser.js \
|
||||
--include-only "^src/app/" \
|
||||
--collapse "^src/app/[^/]+/[^/]+" \
|
||||
--output-type mermaid
|
||||
graph ssp apps/ssp/src
|
||||
echo '```'
|
||||
echo
|
||||
echo "## behandelportal"
|
||||
echo
|
||||
echo '```mermaid'
|
||||
graph behandelportal apps/behandelportal/src
|
||||
echo '```'
|
||||
} >"$OUT"
|
||||
|
||||
|
||||
+14
-13
@@ -1,21 +1,22 @@
|
||||
#!/usr/bin/env node
|
||||
// Extract `// #region showcase:<name>` … `// #endregion showcase:<name>` blocks from real
|
||||
// source files into src/app/showcase/snippets.generated.ts (WP-39). The teaching showcase
|
||||
// renders these, so the code it shows IS the code that ships — it can't drift. A CI drift
|
||||
// gate (`npm run gen:snippets && git diff --exit-code`) forces a regen after any edit to a
|
||||
// marked region. Mirrors the gen:api pattern. Run: `npm run gen:snippets`.
|
||||
// source files into apps/ssp/src/app/showcase/snippets.generated.ts (WP-39). showcase is
|
||||
// SSP-only (CLAUDE.md), so this stays scoped to that app + the shared library. The teaching
|
||||
// showcase renders these, so the code it shows IS the code that ships — it can't drift. A CI
|
||||
// drift gate (`npm run gen:snippets && git diff --exit-code`) forces a regen after any edit to
|
||||
// a marked region. Mirrors the gen:api pattern. Run: `npm run gen:snippets`.
|
||||
import { readFileSync, writeFileSync } from 'node:fs';
|
||||
|
||||
// Real source files that carry showcase regions. Add a file here + a #region marker there
|
||||
// to expose a new snippet; no other change needed.
|
||||
const SOURCES = [
|
||||
'src/app/registratie/domain/registration.ts',
|
||||
'src/app/shared/application/remote-data.ts',
|
||||
'src/app/registratie/domain/value-objects/postcode.ts',
|
||||
'src/app/registratie/domain/change-request.machine.ts',
|
||||
'src/app/herregistratie/domain/intake.machine.ts',
|
||||
'src/app/shared/kernel/bsn.ts',
|
||||
'src/app/shared/kernel/pii.ts',
|
||||
'apps/ssp/src/app/registratie/domain/registration.ts',
|
||||
'libs/shared/src/application/remote-data.ts',
|
||||
'apps/ssp/src/app/registratie/domain/value-objects/postcode.ts',
|
||||
'apps/ssp/src/app/registratie/domain/change-request.machine.ts',
|
||||
'apps/ssp/src/app/herregistratie/domain/intake.machine.ts',
|
||||
'libs/shared/src/kernel/bsn.ts',
|
||||
'libs/shared/src/kernel/pii.ts',
|
||||
];
|
||||
|
||||
const START = /\/\/\s*#region showcase:([\w-]+)/;
|
||||
@@ -62,7 +63,7 @@ export const SNIPPETS: Record<string, string> = {
|
||||
${body}
|
||||
};
|
||||
`;
|
||||
writeFileSync('src/app/showcase/snippets.generated.ts', out);
|
||||
writeFileSync('apps/ssp/src/app/showcase/snippets.generated.ts', out);
|
||||
console.log(
|
||||
`wrote src/app/showcase/snippets.generated.ts (${names.length} snippets: ${names.join(', ')})`,
|
||||
`wrote apps/ssp/src/app/showcase/snippets.generated.ts (${names.length} snippets: ${names.join(', ')})`,
|
||||
);
|
||||
|
||||
@@ -8,7 +8,8 @@ import { createServer, request as httpRequest } from 'node:http';
|
||||
import { readFile } from 'node:fs/promises';
|
||||
import { join, extname, normalize } from 'node:path';
|
||||
|
||||
const ROOT = 'dist/atomic-design-poc/browser';
|
||||
// WP-67: two apps now share this script — APP_DIST_ROOT picks which one (defaults to the SSP).
|
||||
const ROOT = process.env.APP_DIST_ROOT ?? 'dist/ssp/browser';
|
||||
const PORT = Number(process.env.PORT ?? 4300);
|
||||
// Reverse-proxy /api → backend so the served app is the whole demo, not just static pages.
|
||||
// Docker sets API_PROXY_TARGET=http://api:5000; locally it defaults to the dev backend.
|
||||
|
||||
Reference in New Issue
Block a user