@abgov/nx-adsp 13.30.0 → 13.31.1

package/src/generators/vue-workspace-view/schema.json

@@ -25,7 +25,7 @@
     },
     "resource": {
       "type": "string",
-      "description": "API resource path segment -- the view fetches /api/<resource>?page=&limit=&search=&sortBy=&sortDir=."
+      "description": "API resource path segment -- the view fetches /api/v1/<resource>?page=&limit=&search=&sortBy=&sortDir=."
     },
     "route": {
       "type": "string",
@@ -33,7 +33,7 @@
     },
     "columns": {
       "type": "string",
-      "description": "JSON array of table columns, in display order -- e.g. '[{\"key\":\"status\",\"label\":\"Status\",\"type\":\"badge\",\"sortable\":true}]'. Each item: { key, label, type?: \"text\"|\"date\"|\"currency\"|\"badge\" (default \"text\"), sortable?: boolean }. A plain array is also accepted when this generator is invoked programmatically. Nx's CLI option coercion only supports comma-separated primitive lists for array-typed schema properties, not JSON -- a JSON string is the only CLI syntax that actually survives Nx's own arg parsing for a structured list like this."
+      "description": "JSON array of table columns, in display order -- e.g. '[{\"key\":\"status\",\"label\":\"Status\",\"type\":\"badge\",\"sortable\":true}]'. Each item: { key, label, type?: \"text\"|\"date\"|\"currency\"|\"badge\" (default \"text\"), sortable?: boolean, options?: [{value,label}], badgeMap?: {value: badgeType} }. Supply `options` for any column whose stored value is a code, or the table renders the raw code. Supply `badgeMap` on a `badge` column to give each status its colour (e.g. {\"approved\":\"success\",\"declined\":\"emergency\"}); unmapped values render neutral. A plain array is also accepted when this generator is invoked programmatically. Nx's CLI option coercion only supports comma-separated primitive lists for array-typed schema properties, not JSON -- a JSON string is the only CLI syntax that actually survives Nx's own arg parsing for a structured list like this."
     },
     "filters": {
       "type": "string",
@@ -57,18 +57,17 @@
       "description": "Whether to generate a debounced search input above the table.",
       "default": true
     },
+    "icon": {
+      "type": "string",
+      "description": "Ionicon name for the generated side-menu entry, e.g. `list`. goa-work-side-menu-item renders a blank item without one.",
+      "default": "list"
+    },
     "requiresAuth": {
       "type": "boolean",
       "description": "Whether the generated route requires authentication.",
       "default": true
     }
   },
-  "required": [
-    "project",
-    "name",
-    "resource",
-    "route",
-    "columns"
-  ],
+  "required": ["project", "name", "resource", "route", "columns"],
   "additionalProperties": false
 }

package/src/generators/vue-workspace-view/vue-workspace-view.js

@@ -51,11 +51,16 @@ function normalizeOptions(host, options) {
 }
 function default_1(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        var _a;
         const normalizedOptions = normalizeOptions(host, options);
         // Idempotent -- ensures WorkspaceTable exists even in a project scaffolded
         // before vue-components carried it.
         yield (0, vue_components_1.default)(host);
-        (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), normalizedOptions.projectRoot, Object.assign(Object.assign({}, normalizedOptions), { goaImportPath: (0, vue_components_1.vueComponentsImportPath)(host), tmpl: '' }));
+        (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), normalizedOptions.projectRoot, Object.assign(Object.assign({}, normalizedOptions), { goaImportPath: (0, vue_components_1.vueComponentsImportPath)(host), 
+            // Derived here rather than tested inline in the template: EJS throws a
+            // ReferenceError on a bare undefined variable, so a flag the template
+            // reads must always be defined.
+            hasCodedColumns: normalizedOptions.columns.some((column) => { var _a; return (_a = column.options) === null || _a === void 0 ? void 0 : _a.length; }), hasBadgeColumns: normalizedOptions.columns.some((column) => column.type === 'badge'), tmpl: '' }));
         (0, vue_router_1.insertVueRoute)(host, normalizedOptions.projectRoot, normalizedOptions.project, {
             path: normalizedOptions.route,
             componentImportPath: `../views/${normalizedOptions.viewFileName}.vue`,
@@ -67,6 +72,7 @@ function default_1(host, options) {
         (0, vue_side_menu_1.insertSideMenuItem)(host, normalizedOptions.projectRoot, {
             label: normalizedOptions.heading,
             to: normalizedOptions.route,
+            icon: (_a = normalizedOptions.icon) !== null && _a !== void 0 ? _a : 'list',
         });
         yield (0, devkit_1.formatFiles)(host);
     });

package/src/generators/vue-workspace-view/vue-workspace-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"vue-workspace-view.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/vue-workspace-view/vue-workspace-view.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vue-workspace-view.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/vue-workspace-view/vue-workspace-view.ts"],"names":[],"mappings":"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"}

package/src/generators/vue-workspace-view/vue-workspace-view.spec.ts

@@ -125,7 +125,9 @@ describe('Vue Workspace View Generator', () => {
     expect(view).toContain('let loadSequence = 0');
     expect(view).toContain('const sequence = ++loadSequence');
     expect(view).toContain('if (sequence !== loadSequence) return;');
-    expect(view).toContain('if (sequence === loadSequence) loading.value = false;');
+    expect(view).toContain(
+      'if (sequence === loadSequence) loading.value = false;',
+    );
 
     // The debounce timer must not outlive the component.
     expect(view).toContain('onUnmounted(');
@@ -138,7 +140,7 @@ describe('Vue Workspace View Generator', () => {
     expect(view).not.toContain('Intl.');
     expect(view).not.toContain('function formatCurrency');
     expect(view).toContain(
-      "<goa-badge type=\"information\" :content=\"String(row['status'] ?? '—')\" />",
+      "badgeType(columnBadgeTypes['status'], row['status'])",
     );
     // A type: 'date' column is a calendar date -- formatDate, not
     // formatDateTime, which would show an invented midnight.
@@ -205,11 +207,11 @@ describe('Vue Workspace View Generator', () => {
       await expect(
         generator(host, {
           ...baseOptions,
-          filters: JSON.stringify([
-            { key: 'x', label: 'X', type: 'checkbox' },
-          ]),
+          filters: JSON.stringify([{ key: 'x', label: 'X', type: 'checkbox' }]),
         }),
-      ).rejects.toThrow('--filters[].type must be "dropdown" or "date"; got "checkbox" for "x".');
+      ).rejects.toThrow(
+        '--filters[].type must be "dropdown" or "date"; got "checkbox" for "x".',
+      );
     });
 
     it('accepts a real array, the form a programmatic caller passes', async () => {
@@ -265,7 +267,11 @@ describe('Vue Workspace View Generator', () => {
   }, 30000);
 
   it('respects an explicit --heading and --pageSize', async () => {
-    await generator(host, { ...baseOptions, heading: 'Grant Applications', pageSize: 50 });
+    await generator(host, {
+      ...baseOptions,
+      heading: 'Grant Applications',
+      pageSize: 50,
+    });
     const view = host
       .read('apps/test/src/views/ApplicationsListView.vue')
       .toString();
@@ -318,4 +324,64 @@ describe('Vue Workspace View Generator', () => {
     const after = readProjectConfiguration(host, 'test');
     expect(after).toEqual(before);
   }, 30000);
+
+  // Regression: every badge column was hardcoded type="information", so a
+  // declined claim rendered neutral blue -- a badge's colour is the fastest thing
+  // a reader takes in, so the wrong one actively misinforms.
+  it('maps badge values to semantic types and labels', async () => {
+    await generator(host, {
+      ...baseOptions,
+      columns: [
+        { key: 'reference', label: 'Reference' },
+        {
+          key: 'status',
+          label: 'Status',
+          type: 'badge',
+          options: [{ value: 'declined', label: 'Declined' }],
+          badgeMap: { approved: 'success', declined: 'emergency' },
+        },
+      ],
+    });
+    const view = host
+      .read('apps/test/src/views/ApplicationsListView.vue')
+      .toString();
+    // Quote style depends on whether formatFiles ran, so match the pairs.
+    expect(view).toMatch(/["']?declined["']?\s*:\s*["']emergency["']/);
+    expect(view).toMatch(/["']?approved["']?\s*:\s*["']success["']/);
+    expect(view).toContain("badgeType(columnBadgeTypes['status']");
+    expect(view).toContain("optionLabel(columnOptions['status']");
+  }, 30000);
+
+  it('renders a coded non-badge column using its label', async () => {
+    await generator(host, {
+      ...baseOptions,
+      columns: [
+        {
+          key: 'region',
+          label: 'Region',
+          options: [{ value: 'northwest', label: 'North west' }],
+        },
+      ],
+    });
+    const view = host
+      .read('apps/test/src/views/ApplicationsListView.vue')
+      .toString();
+    expect(view).toContain(
+      "optionLabel(columnOptions['region'], row['region'])",
+    );
+    expect(view).toContain('North west');
+  }, 30000);
+
+  it('omits the lookup maps entirely when no column needs them', async () => {
+    await generator(host, {
+      ...baseOptions,
+      columns: [{ key: 'reference', label: 'Reference' }],
+    });
+    const view = host
+      .read('apps/test/src/views/ApplicationsListView.vue')
+      .toString();
+    expect(view).not.toContain('columnOptions');
+    expect(view).not.toContain('columnBadgeTypes');
+    expect(view).not.toContain('optionLabel');
+  }, 30000);
 });

package/src/utils/paired-project.d.ts

@@ -11,6 +11,16 @@ type DevProxyEntry = {
     pathRewrite: Record<string, string>;
 };
 export declare function buildDevProxyConf(nginxProxies: NginxProxyConfiguration[]): Record<string, DevProxyEntry>;
+export declare const VITE_PROXY_FILENAME = "vite.proxy.cjs";
+export interface ViteProxyRoute {
+    location: string;
+    target: string;
+    secure: boolean;
+    rewriteTo?: string;
+}
+export declare function parseViteDevProxyRoutes(source: string): ViteProxyRoute[];
+export declare function viteDevProxyRoutes(nginxProxies: NginxProxyConfiguration[]): ViteProxyRoute[];
+export declare function buildViteDevProxyModule(routes: ViteProxyRoute[]): string;
 export declare function resolvePairedProjectProxy(host: Tree, pairedProject: string | undefined): PairedProjectProxy | undefined;
 export interface PairedFrontendApp {
     tag: string;

package/src/utils/paired-project.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.VITE_PROXY_FILENAME = void 0;
 exports.buildDevProxyConf = buildDevProxyConf;
+exports.parseViteDevProxyRoutes = parseViteDevProxyRoutes;
+exports.viteDevProxyRoutes = viteDevProxyRoutes;
+exports.buildViteDevProxyModule = buildViteDevProxyModule;
 exports.resolvePairedProjectProxy = resolvePairedProjectProxy;
 exports.resolvePairedFrontendApp = resolvePairedFrontendApp;
 exports.applyProxyToExistingFrontend = applyProxyToExistingFrontend;
@@ -8,9 +12,10 @@ const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const express_service_port_1 = require("./express-service-port");
 const frontend_app_port_1 = require("./frontend-app-port");
-// Builds the dev-server proxy JSON (vite.proxy.json / proxy.conf.json) from a set of nginx
-// proxy entries. Shared by vue-app, react-app, angular-app, and the retroactive express-service
-// proxy wiring so the format stays consistent.
+// Builds the webpack-dev-server proxy JSON (proxy.conf.json) from a set of nginx proxy
+// entries. React/Angular only -- their dev servers are webpack-based and do honour
+// `pathRewrite`. Vue goes through buildViteDevProxyModule instead; see the note there for
+// why a JSON file cannot work for Vite.
 function buildDevProxyConf(nginxProxies) {
     return nginxProxies.reduce((proxyConf, nginxProxy) => {
         const upstreamUrl = new URL(nginxProxy.proxyPass);
@@ -25,6 +30,82 @@ function buildDevProxyConf(nginxProxies) {
         return Object.assign(Object.assign({}, proxyConf), { [nginxProxy.location]: entry });
     }, {});
 }
+// Vue's dev proxy filename. A module, not JSON -- see buildViteDevProxyModule.
+exports.VITE_PROXY_FILENAME = 'vite.proxy.cjs';
+// Extracts the routes out of a previously generated vite proxy module, so a second paired
+// project merges into the file instead of replacing it. Regex rather than a parser because
+// this module's shape is entirely generator-owned (see buildViteDevProxyModule) and never
+// hand-authored -- and it returns [] on anything it doesn't recognise, so the caller can
+// tell "no routes" from "not our format" by comparing against file existence.
+//
+// Tolerates the trailing comma and multi-line layout formatFiles introduces: the file on
+// disk is the *formatted* output, not the string this module emitted, and a regex anchored
+// on `}` immediately after the last field silently matches nothing there -- which would
+// drop every existing route the next time a project is paired.
+function parseViteDevProxyRoutes(source) {
+    const routes = [];
+    const entry = /\{\s*location:\s*'([^']+)',\s*target:\s*'([^']+)',\s*secure:\s*(true|false)(?:,\s*rewriteTo:\s*'([^']*)')?\s*,?\s*\}/g;
+    let match;
+    while ((match = entry.exec(source)) !== null) {
+        routes.push(Object.assign({ location: match[1], target: match[2], secure: match[3] === 'true' }, (match[4] ? { rewriteTo: match[4] } : {})));
+    }
+    return routes;
+}
+function viteDevProxyRoutes(nginxProxies) {
+    return nginxProxies.map((nginxProxy) => {
+        const upstreamUrl = new URL(nginxProxy.proxyPass);
+        return Object.assign({ location: nginxProxy.location, target: `${upstreamUrl.protocol}//localhost${upstreamUrl.port ? ':' + upstreamUrl.port : ''}`, secure: upstreamUrl.protocol === 'https:' }, (upstreamUrl.pathname.length > 1
+            ? { rewriteTo: upstreamUrl.pathname }
+            : {}));
+    });
+}
+// Builds the Vue dev-server proxy as a CommonJS module rather than JSON.
+//
+// Vite's proxy honours a `rewrite` FUNCTION and has nothing named `pathRewrite` -- that is
+// http-proxy-middleware/webpack-dev-server syntax. Vite ignores unknown keys silently, so a
+// JSON file carrying `pathRewrite` produces a dev server that proxies to the right host and
+// then forwards the path unrewritten: every generated API call 404s, with no warning
+// anywhere. A JSON file cannot express the fix, because the fix is a function.
+//
+// @nx/vite `require()`s whatever `proxyConfig` names (getViteServerProxyConfigPath only
+// checks existsSync), so a module works and can hold the function. `.cjs`, not `.js`, so it
+// stays CommonJS even if the consuming workspace sets `"type": "module"`.
+//
+// Emitted as data-plus-loop rather than a literal per entry so a second paired project can
+// be merged by appending one row -- see parseViteDevProxyRoutes.
+function buildViteDevProxyModule(routes) {
+    const rows = routes
+        .map(({ location, target, secure, rewriteTo }) => `  { location: '${location}', target: '${target}', secure: ${secure}` +
+        `${rewriteTo ? `, rewriteTo: '${rewriteTo}'` : ''} },`)
+        .join('\n');
+    return `// Vite dev-server proxy. Generated by @abgov/nx-adsp.
+//
+// A CommonJS module, not JSON, because Vite rewrites a proxied path with a \`rewrite\`
+// function. The webpack-dev-server key for this is a different name that Vite does not
+// implement, and it ignores unknown keys silently -- so a JSON proxy file forwards the
+// path unrewritten and every API call 404s.
+//
+// Add a route by appending a row below; \`rewriteTo\` replaces the matched \`location\`
+// prefix (so '/api/' -> '/my-service/' turns /api/v1/things into /my-service/v1/things).
+const routes = [
+${rows}
+];
+
+module.exports = Object.fromEntries(
+  routes.map(({ location, target, secure, rewriteTo }) => [
+    location,
+    {
+      target,
+      secure,
+      changeOrigin: false,
+      ...(rewriteTo
+        ? { rewrite: (urlPath) => urlPath.replace(new RegExp('^' + location), rewriteTo) }
+        : {}),
+    },
+  ]),
+);
+`;
+}
 const PAIRED_PROJECT_LOCATION = '/api/';
 // Resolves a frontend's --pairedProject into the nginx/dev-server proxy entry that routes API
 // calls to it, plus the `adsp:proxy-service:<name>:<port>` tag the sandbox executor reads to
@@ -68,13 +149,13 @@ function resolvePairedFrontendApp(host, pairedProject) {
 // frontend generator does when the frontend runs first. Safe to call when the frontend doesn't
 // exist yet (composite generator ordering — backend is scaffolded before frontend); returns early.
 function applyProxyToExistingFrontend(host, pairedFrontend, backendProjectName) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const frontendName = (0, devkit_1.names)(pairedFrontend).fileName;
     let frontendConfig;
     try {
         frontendConfig = (0, devkit_1.readProjectConfiguration)(host, frontendName);
     }
-    catch (_k) {
+    catch (_m) {
         // Frontend not scaffolded yet (composite generator ordering).
         return;
     }
@@ -118,33 +199,59 @@ function applyProxyToExistingFrontend(host, pairedFrontend, backendProjectName)
                 existingNginx.slice(serverCloseIdx));
         }
     }
-    // 2. Write (or merge into) the dev proxy config file.
-    const devProxyFilename = isVue ? 'vite.proxy.json' : 'proxy.conf.json';
+    // 2. Write (or merge into) the dev proxy config file. Vue gets a .cjs module
+    // (Vite needs a `rewrite` function, which JSON cannot hold); React/Angular
+    // keep the webpack-dev-server JSON, which does honour `pathRewrite`.
+    const devProxyFilename = isVue ? exports.VITE_PROXY_FILENAME : 'proxy.conf.json';
     const devProxyPath = path.join(projectRoot, devProxyFilename);
-    const existingProxy = host.exists(devProxyPath)
-        ? (0, devkit_1.readJson)(host, devProxyPath)
-        : {};
-    if (!existingProxy[nginxProxy.location]) {
-        (0, devkit_1.writeJson)(host, devProxyPath, Object.assign(Object.assign({}, existingProxy), buildDevProxyConf([nginxProxy])));
+    if (isVue) {
+        const existingSource = (_d = (_c = host.read(devProxyPath)) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : '';
+        const existingRoutes = parseViteDevProxyRoutes(existingSource);
+        const alreadyRouted = existingRoutes.some((route) => route.location === nginxProxy.location);
+        // Rewrites the whole module from the union rather than splicing a row in:
+        // the format is generator-owned, so regenerating is safer than editing.
+        if (!alreadyRouted) {
+            host.write(devProxyPath, buildViteDevProxyModule([
+                ...existingRoutes,
+                ...viteDevProxyRoutes([nginxProxy]),
+            ]));
+        }
+        // A pre-existing app may still carry the inert JSON form; drop it so there
+        // aren't two files that look like proxy config.
+        const staleJsonPath = path.join(projectRoot, 'vite.proxy.json');
+        if (host.exists(staleJsonPath)) {
+            host.delete(staleJsonPath);
+        }
+    }
+    else {
+        const existingProxy = host.exists(devProxyPath)
+            ? (0, devkit_1.readJson)(host, devProxyPath)
+            : {};
+        if (!existingProxy[nginxProxy.location]) {
+            (0, devkit_1.writeJson)(host, devProxyPath, Object.assign(Object.assign({}, existingProxy), buildDevProxyConf([nginxProxy])));
+        }
     }
     // 3. Patch the frontend's project configuration.
     const proxyTag = `adsp:proxy-service:${backendService}:${port}`;
-    if (!((_c = frontendConfig.tags) !== null && _c !== void 0 ? _c : []).includes(proxyTag)) {
-        frontendConfig.tags = [...((_d = frontendConfig.tags) !== null && _d !== void 0 ? _d : []), proxyTag];
+    if (!((_e = frontendConfig.tags) !== null && _e !== void 0 ? _e : []).includes(proxyTag)) {
+        frontendConfig.tags = [...((_f = frontendConfig.tags) !== null && _f !== void 0 ? _f : []), proxyTag];
     }
-    if (((_f = (_e = frontendConfig.targets) === null || _e === void 0 ? void 0 : _e.serve) === null || _f === void 0 ? void 0 : _f.options) &&
+    if (((_h = (_g = frontendConfig.targets) === null || _g === void 0 ? void 0 : _g.serve) === null || _h === void 0 ? void 0 : _h.options) &&
         !frontendConfig.targets.serve.options.proxyConfig) {
         frontendConfig.targets.serve.options = Object.assign(Object.assign({}, frontendConfig.targets.serve.options), { proxyConfig: devProxyPath });
     }
     // React/Angular only: add nginx.conf as a webpack build asset so it lands in the output root.
     // Vue's @nx/vite:build copies public/ automatically — no asset glob needed.
-    if (isRootNginx && ((_h = (_g = frontendConfig.targets) === null || _g === void 0 ? void 0 : _g.build) === null || _h === void 0 ? void 0 : _h.options)) {
-        const assets = (_j = frontendConfig.targets.build.options.assets) !== null && _j !== void 0 ? _j : [];
+    if (isRootNginx && ((_k = (_j = frontendConfig.targets) === null || _j === void 0 ? void 0 : _j.build) === null || _k === void 0 ? void 0 : _k.options)) {
+        const assets = (_l = frontendConfig.targets.build.options.assets) !== null && _l !== void 0 ? _l : [];
         const hasNginxAsset = assets.some((a) => typeof a === 'object' &&
             a.glob === 'nginx.conf' &&
             a.input === projectRoot);
         if (!hasNginxAsset) {
-            frontendConfig.targets.build.options = Object.assign(Object.assign({}, frontendConfig.targets.build.options), { assets: [...assets, { glob: 'nginx.conf', input: projectRoot, output: './' }] });
+            frontendConfig.targets.build.options = Object.assign(Object.assign({}, frontendConfig.targets.build.options), { assets: [
+                    ...assets,
+                    { glob: 'nginx.conf', input: projectRoot, output: './' },
+                ] });
         }
     }
     (0, devkit_1.updateProjectConfiguration)(host, frontendName, frontendConfig);

package/src/utils/paired-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"paired-project.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/paired-project.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"paired-project.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/paired-project.ts"],"names":[],"mappings":"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"}

package/src/utils/paired-project.spec.ts

@@ -0,0 +1,126 @@
+import {
+  buildViteDevProxyModule,
+  parseViteDevProxyRoutes,
+  viteDevProxyRoutes,
+  ViteProxyRoute,
+} from './paired-project';
+
+// Evaluates the emitted module the way @nx/vite does (it `require()`s the file
+// named by proxyConfig), so these assert what Vite will actually receive rather
+// than the text of a config that has to behave.
+function loadProxy(source: string) {
+  const module = { exports: {} };
+  new Function('module', 'exports', source)(module, module.exports);
+  return module.exports as Record<
+    string,
+    { target: string; secure: boolean; rewrite?: (path: string) => string }
+  >;
+}
+
+describe('vite dev proxy module', () => {
+  const route: ViteProxyRoute = {
+    location: '/api/',
+    target: 'http://localhost:3333',
+    secure: false,
+    rewriteTo: '/my-service/',
+  };
+
+  it('rewrites the location prefix to the service mount point', () => {
+    const proxy = loadProxy(buildViteDevProxyModule([route]));
+    expect(proxy['/api/'].target).toBe('http://localhost:3333');
+    expect(proxy['/api/'].rewrite?.('/api/v1/things')).toBe(
+      '/my-service/v1/things',
+    );
+  });
+
+  it('replaces only the leading occurrence of the location', () => {
+    const proxy = loadProxy(buildViteDevProxyModule([route]));
+    expect(proxy['/api/'].rewrite?.('/api/a/api/b')).toBe('/my-service/a/api/b');
+  });
+
+  it('omits rewrite entirely when the upstream has no path prefix', () => {
+    const proxy = loadProxy(
+      buildViteDevProxyModule([
+        { location: '/api/', target: 'http://localhost:3333', secure: false },
+      ]),
+    );
+    expect(proxy['/api/'].rewrite).toBeUndefined();
+  });
+
+  it('derives routes from an nginx proxy configuration', () => {
+    const [derived] = viteDevProxyRoutes([
+      { location: '/api/', proxyPass: 'http://my-service:3333/my-service/' },
+    ]);
+    expect(derived).toEqual({
+      location: '/api/',
+      target: 'http://localhost:3333',
+      secure: false,
+      rewriteTo: '/my-service/',
+    });
+  });
+
+  describe('parseViteDevProxyRoutes', () => {
+    it('round-trips what buildViteDevProxyModule emits', () => {
+      expect(parseViteDevProxyRoutes(buildViteDevProxyModule([route]))).toEqual([
+        route,
+      ]);
+    });
+
+    // The file on disk is the *formatted* output, not the string the builder
+    // returned: formatFiles reflows each row across lines and adds a trailing
+    // comma. A regex anchored on `}` immediately after the last field matches
+    // nothing here, and the merge path would then drop every existing route --
+    // silently un-pairing an already-paired frontend.
+    it('parses the multi-line, trailing-comma layout formatFiles produces', () => {
+      const formatted = `const routes = [
+  {
+    location: '/api/',
+    target: 'http://localhost:3333',
+    secure: false,
+    rewriteTo: '/my-service/',
+  },
+];
+`;
+      expect(parseViteDevProxyRoutes(formatted)).toEqual([route]);
+    });
+
+    it('parses a formatted row that has no rewriteTo', () => {
+      const formatted = `const routes = [
+  {
+    location: '/api/',
+    target: 'http://localhost:3333',
+    secure: false,
+  },
+];
+`;
+      expect(parseViteDevProxyRoutes(formatted)).toEqual([
+        { location: '/api/', target: 'http://localhost:3333', secure: false },
+      ]);
+    });
+
+    it('preserves an existing route when a second is appended', () => {
+      const first = buildViteDevProxyModule([route]);
+      const merged = buildViteDevProxyModule([
+        ...parseViteDevProxyRoutes(first),
+        {
+          location: '/other/',
+          target: 'http://localhost:4444',
+          secure: false,
+          rewriteTo: '/other-service/',
+        },
+      ]);
+      const proxy = loadProxy(merged);
+      expect(Object.keys(proxy)).toEqual(['/api/', '/other/']);
+      expect(proxy['/api/'].rewrite?.('/api/v1/x')).toBe('/my-service/v1/x');
+      expect(proxy['/other/'].rewrite?.('/other/v1/y')).toBe(
+        '/other-service/v1/y',
+      );
+    });
+
+    it('returns no routes for a file that is not this format', () => {
+      expect(parseViteDevProxyRoutes('{ "/api/": { "target": "x" } }')).toEqual(
+        [],
+      );
+    });
+  });
+});

package/src/utils/quality.js

@@ -138,17 +138,51 @@ import AxeBuilder from '@axe-core/playwright';
 // here means the WCAG 2.1 A/AA baseline, not full accessibility conformance.
 const WCAG_TAGS = ['wcag2a', 'wcag2aa', 'wcag21a', 'wcag21aa'];
 
-test('has no WCAG 2.1 A/AA accessibility violations', async ({ page }) => {
-  await page.goto('/');
+// ADD YOUR ROUTES HERE. Coverage is exactly this list — a route that is not in
+// it is never checked, so this array, not the spec, is what decides how much of
+// the app is actually held to the WCAG baseline.
+//
+// It ships with only '/' because that is the sole route a freshly generated app
+// has. Do not read a green run against it as a meaningful result: the landing
+// page is mostly app shell, so it exercises almost none of the goa-* elements
+// the rest of the app is built from — tables, dropdowns, date pickers,
+// steppers, side-menu items, form steps. Those are where accessibility defects
+// actually live.
+//
+// Nothing keeps this list in sync for you. Routes arrive both from the
+// \`nx g @abgov/nx-adsp:vue-*-view\` generators and from hand-editing the router,
+// and no generator writes to this file — it is deliberately left alone once it
+// exists so your edits survive re-running them. Adding a route to the router and
+// not adding it here is the normal way this check silently stops covering the
+// app.
+//
+// Two things to watch when you add one:
+//
+//  - Point at a path that renders real content. A detail or edit route needs an
+//    id that resolves against whatever the dev server talks to; otherwise the
+//    view renders its error state and the check passes against an empty screen.
+//  - Triage a failure before assuming it is yours. Some violations come from
+//    inside @abgov/web-components' own shadow DOM (a decorative icon with
+//    \`role="img"\` and an empty \`aria-label\`, a \`role="menuitem"\` with no menu
+//    parent) and cannot be fixed from app code. Those need an upstream fix or a
+//    documented exclusion — not a workaround in your view.
+const ROUTES = ['/'];
 
-  const results = await new AxeBuilder({ page }).withTags(WCAG_TAGS).analyze();
+for (const route of ROUTES) {
+  test(\`has no WCAG 2.1 A/AA accessibility violations: \${route}\`, async ({
+    page,
+  }) => {
+    await page.goto(route);
 
-  const summary = results.violations.map(
-    (v) =>
-      \`[\${v.impact}] \${v.id}: \${v.help} (\${v.nodes.length} node(s)) \${v.helpUrl}\`,
-  );
-  expect(summary, summary.join('\\n')).toEqual([]);
-});
+    const results = await new AxeBuilder({ page }).withTags(WCAG_TAGS).analyze();
+
+    const summary = results.violations.map(
+      (v) =>
+        \`[\${v.impact}] \${v.id}: \${v.help} (\${v.nodes.length} node(s)) \${v.helpUrl}\`,
+    );
+    expect(summary, \`\${route}\\n\${summary.join('\\n')}\`).toEqual([]);
+  });
+}
 `;
 /**
  * Writes a Playwright + axe-core accessibility spec into the generated e2e