@abgov/nx-adsp 13.31.0 → 13.31.2

package/src/generators/vue-admin-crud/vue-admin-crud.spec.ts

@@ -64,7 +64,9 @@ describe('Vue Admin CRUD Generator', () => {
     expect(view).toContain("await list('regions')");
     // The envelope shape is the adapter's business, not the view's.
     expect(view).not.toContain('data.results');
-    expect(view).toContain("import { WorkspaceTable } from '@proj/vue-components';");
+    expect(view).toContain(
+      "import { WorkspaceTable } from '@proj/vue-components';",
+    );
     expect(view).toContain('<WorkspaceTable');
     // No pagination props bound -- this is the "reused without its pagination/
     // filter props" case, unlike vue-workspace-view (the WorkspaceTable tag
@@ -76,7 +78,7 @@ describe('Vue Admin CRUD Generator', () => {
     expect(view).toContain('Create Regions');
     expect(view).toContain(':to="`/regions/${row.id}`"');
     // Checkbox field renders as a Yes/No badge in the list.
-    expect(view).toContain("#cell-active=\"{ row }\"");
+    expect(view).toContain('#cell-active="{ row }"');
     expect(view).toContain("row['active'] ? 'Yes' : 'No'");
   }, 30000);
 
@@ -87,8 +89,10 @@ describe('Vue Admin CRUD Generator', () => {
       .read('apps/test/src/views/RegionsEditView.vue')
       .toString();
     expect(view).toContain("idParam.value === 'new' || idParam.value === ''");
-    expect(view).toContain("import { GoabInput, GoabCheckbox } from '@proj/vue-components';");
-    expect(view).toContain("name.trim()");
+    expect(view).toContain(
+      "import { GoabInput, GoabCheckbox } from '@proj/vue-components';",
+    );
+    expect(view).toContain('name.trim()');
     expect(view).toContain("errors.name = 'Name is required.';");
     // Checkbox has no required-validation block.
     expect(view).not.toContain('errors.active');
@@ -149,7 +153,9 @@ describe('Vue Admin CRUD Generator', () => {
       expect(view).toContain('type="number"');
       expect(view).toContain('<GoabDatePicker v-model="form.effective"');
       expect(view).toContain('<GoabDropdown v-model="form.region"');
-      expect(view).toContain('<goa-dropdown-item value="north" label="North" />');
+      expect(view).toContain(
+        '<goa-dropdown-item value="north" label="North" />',
+      );
       expect(view).toContain('<GoabCheckbox v-model="form.active"');
     });
 
@@ -172,8 +178,12 @@ describe('Vue Admin CRUD Generator', () => {
       const view = host
         .read('apps/test/src/views/RegionsEditView.vue')
         .toString();
-      expect(view).toContain("quota: form.quota === '' ? null : Number(form.quota)");
-      expect(view).toContain('effective: toIsoDateString(form.effective) || null');
+      expect(view).toContain(
+        "quota: form.quota === '' ? null : Number(form.quota)",
+      );
+      expect(view).toContain(
+        'effective: toIsoDateString(form.effective) || null',
+      );
       // A stored YYYY-MM-DD comes back as a Date the picker can redisplay.
       expect(view).toContain("fromIsoDateString(data['effective'])");
     });
@@ -225,8 +235,12 @@ describe('Vue Admin CRUD Generator', () => {
       heading: 'Regions',
       singularLabel: 'Region',
     });
-    const list = host.read('apps/test/src/views/RegionsListView.vue').toString();
-    const edit = host.read('apps/test/src/views/RegionsEditView.vue').toString();
+    const list = host
+      .read('apps/test/src/views/RegionsListView.vue')
+      .toString();
+    const edit = host
+      .read('apps/test/src/views/RegionsEditView.vue')
+      .toString();
     expect(list).toContain('<h1>Regions</h1>');
     expect(list).toContain('Create Region');
     expect(edit).toContain('Create Region');
@@ -238,7 +252,9 @@ describe('Vue Admin CRUD Generator', () => {
       ...baseOptions,
       fields: [{ key: 'name', label: 'Name', required: false }],
     });
-    const edit = host.read('apps/test/src/views/RegionsEditView.vue').toString();
+    const edit = host
+      .read('apps/test/src/views/RegionsEditView.vue')
+      .toString();
     expect(edit).not.toContain("errors.name = 'Name is required.'");
     expect(edit).not.toContain('requirement="required"');
   }, 30000);
@@ -278,9 +294,7 @@ describe('Vue Admin CRUD Generator', () => {
     expect(routerTs).toContain(
       "component: () => import('../views/RegionsEditView.vue')",
     );
-    expect(
-      routerTs.split('requiresAuth: true').length - 1,
-    ).toBe(2);
+    expect(routerTs.split('requiresAuth: true').length - 1).toBe(2);
     // The existing route is untouched, not replaced.
     expect(routerTs).toContain("{ path: '/', component: HomeView }");
   }, 30000);
@@ -304,4 +318,73 @@ describe('Vue Admin CRUD Generator', () => {
     const after = readProjectConfiguration(host, 'test');
     expect(after).toEqual(before);
   }, 30000);
+
+  // Regression: both actions were gated on `kc.authenticated` unconditionally,
+  // ignoring --requiresAuth. With --requiresAuth=false a consumer got a fillable
+  // form whose only button was Cancel, and a list with no Create button, and no
+  // message explaining why. Access control belongs to the route guard (which
+  // already honours requiresAuth via route meta), not to markup in the view --
+  // and vue-intake-view never had this gate, so the two disagreed.
+  it('does not gate its actions on kc.authenticated', async () => {
+    await generator(host, { ...baseOptions, requiresAuth: false });
+    const list = host
+      .read('apps/test/src/views/RegionsListView.vue')
+      .toString();
+    const edit = host
+      .read('apps/test/src/views/RegionsEditView.vue')
+      .toString();
+    for (const view of [list, edit]) {
+      expect(view).not.toContain('kc.authenticated');
+      expect(view).not.toContain('useKeycloak');
+    }
+    // The actions themselves are still there, unconditionally. Matched loosely
+    // because formatFiles reflows the long button tag across lines.
+    expect(list).toContain('<router-link to="/regions/new">');
+    expect(edit).toMatch(/<goa-button[\s\S]{0,120}type="primary"/);
+    expect(edit).toContain('@_click="onSubmit"');
+  }, 30000);
+
+  it('renders a coded field using its label, not the stored code', async () => {
+    await generator(host, {
+      ...baseOptions,
+      fields: [
+        { key: 'name', label: 'Name' },
+        {
+          key: 'species',
+          label: 'Species',
+          type: 'select',
+          options: [{ value: 'cattle-mature', label: 'Cattle (mature)' }],
+        },
+      ],
+    });
+    const list = host
+      .read('apps/test/src/views/RegionsListView.vue')
+      .toString();
+    expect(list).toContain(
+      "optionLabel(fieldOptions['species'], row['species'])",
+    );
+    expect(list).toContain('Cattle (mature)');
+  }, 30000);
+
+  // Regression: goa-form-item's `mb` defaults to none, so stacked items rendered
+  // flush against each other -- a field's label sat directly on the previous
+  // field's input. `l` is the design system's own convention for vertical forms
+  // (110 uses against 11 of `xl` in GoA's reference app).
+  it('spaces stacked form items so fields do not sit flush', async () => {
+    await generator(host, baseOptions);
+    const edit = host
+      .read('apps/test/src/views/RegionsEditView.vue')
+      .toString();
+    // Counted per tag rather than as a contiguous string: formatFiles reflows a
+    // multi-attribute tag across lines, so `<goa-form-item mb="l"` is not a
+    // reliable substring.
+    const tags = edit
+      .split('<goa-form-item')
+      .slice(1)
+      .map((fragment) => fragment.slice(0, fragment.indexOf('>')));
+    expect(tags.length).toBeGreaterThan(0);
+    for (const tag of tags) {
+      expect(tag).toContain('mb="l"');
+    }
+  }, 30000);
 });

package/src/generators/vue-app/files/AGENTS.md__tmpl__

@@ -7,7 +7,7 @@ Generated by `nx g @abgov/nx-adsp:vue-app`.
 
 This app is paired with **`<%= pairedProject %>`** — the Express backend it talks to.
 API calls use the `/api/` prefix which the Vite dev proxy rewrites to `/<%= pairedProject %>/` on port 3333.
-When working on a feature that spans both projects, read `apps/<%= pairedProject %>/AGENTS.md` for the service context.
+When working on a feature that spans both projects, read `<%= pairedProjectRoot %>/AGENTS.md` for the service context.
 <% } %>
 ## Running Nx commands (coding agents)
 
@@ -157,9 +157,9 @@ Extra props/events fall through to the underlying `goa-*` element, so anything
 the design system supports still works. For components without a wrapper, use the
 `goa-*` element directly with the manual wiring above. The library is shared
 across every Vue app in this workspace — fix or extend a wrapper once in
-`libs/vue-components` (or run `nx g @abgov/nx-adsp:vue-components` to restore it).
+`<%= goaLibRoot %>` (or run `nx g @abgov/nx-adsp:vue-components` to restore it).
 
-> **Interim:** these wrappers (`libs/vue-components/src/lib/primitives/`) are a
+> **Interim:** these wrappers (`<%= goaLibRoot %>/src/lib/primitives/`) are a
 > stopgap until GoA DS ships an official `@abgov/vue-components`. When it lands,
 > delete `primitives/` and repoint imports at that package — the names/props are
 > intended to match, so it's a scope swap. This does **not** apply to the
@@ -176,7 +176,7 @@ from **`<%= goaImportPath %>`**, not hand-rolled markup:
 
 | Component | Purpose |
 |---|---|
-| `AppSideMenu` | `goa-work-side-menu`. Takes `heading`/`primaryItems`/`secondaryItems`/`accountItems` props (each item: `{ label, to?, icon?, badge?, current? }`) and emits `itemClick` — it doesn't know about routing or auth, so `App.vue` computes `current`/handles the click itself. `App.vue` currently only populates `accountItems` (a single Sign in/out item); add real nav items to `primaryItems`/`secondaryItems` as routes are added. **`icon` is effectively required** — `goa-work-side-menu-item` renders a blank item without it; use a GoA icon name (see [design.alberta.ca/components/icons](https://design.alberta.ca/components/icons)). Also owns the skip-to-main-content landmark for this layout — `AppLayout` deliberately doesn't duplicate it. Also takes an optional `#topbar` slot — a slim row above the routed content, for something like a notification bell; only renders when given content, unused by default |
+| `AppSideMenu` | `goa-work-side-menu`. Takes `heading`/`primaryItems`/`secondaryItems`/`accountItems` props (each item: `{ label, to?, icon?, badge?, current? }`) and emits `itemClick` — it doesn't know about routing or auth, so `App.vue` computes `current`/handles the click itself. `App.vue` seeds `primaryItems` with Home and an `accountItems` Sign in/out item; the `vue-*-view` generators append their own entries, and you can add more by hand. **`icon` is effectively required** — `goa-work-side-menu-item` renders a blank item without it; use a GoA icon name (see [design.alberta.ca/components/icons](https://design.alberta.ca/components/icons)). Also owns the skip-to-main-content landmark for this layout — `AppLayout` deliberately doesn't duplicate it. Also takes an optional `#topbar` slot — a slim row above the routed content, for something like a notification bell; only renders when given content, unused by default |
 | `AppLayout` | The content gutter every view renders inside (see the key files table) |
 | `SessionExpiredBanner` | A `v-model:show` banner with `signIn`/`dismiss` emits. Bound to the `useSessionStore()` Pinia store (`src/stores/session.ts`), which `main.ts`'s `onAuthRefreshError` hook flips when the refresh token itself has expired |
 
@@ -195,7 +195,7 @@ marketing chrome around a staff tool).
 | `SessionExpiredBanner` | A `v-model:show` banner with `signIn`/`dismiss` emits. Bound to the `useSessionStore()` Pinia store (`src/stores/session.ts`), which `main.ts`'s `onAuthRefreshError` hook flips when the refresh token itself has expired |
 <% } %>
 These are shared across every Vue app in this workspace — fix or extend one once
-in `libs/vue-components/src/lib/patterns/`, the same way as the `Goab*` wrappers.
+in `<%= goaLibRoot %>/src/lib/patterns/`, the same way as the `Goab*` wrappers.
 
 A second, **`--layout=<%= layout === 'internal' ? 'header' : 'internal' %>`** frontend
 can be scaffolded against the same backend with `nx g @abgov/nx-adsp:vue-app <name>
@@ -222,6 +222,22 @@ generator's own schema description for why). Only hand-author a view when none o
 match, or once a generator's output needs customization it doesn't cover — its own comments
 mark what's meant to be edited.
 
+### Options that decide what a person sees
+
+These are easy to omit and the result looks plausible until someone reads the screen, so
+they are worth getting right on the first run:
+
+| Pass | On | Or else |
+|---|---|---|
+| `options: [{ value, label }]` on a field/column | any generator, for any value stored as a code | the view renders the raw code — `northwest`, `cattle-mature` — including on the check-your-answers page, whose whole purpose is that the person can read back what they entered |
+| `badgeMap: { approved: 'success', declined: 'emergency' }` | a `badge` column/field | every status renders the same neutral blue, so a declined claim reads as routine |
+| `--referenceField=<key>` | `vue-intake-view` | the confirmation page falls back to the route id, presenting a storage id as "your reference number" (defaults to `reference`) |
+| `--icon=<name>` | `vue-workspace-view`, `vue-admin-crud` | defaults (`list`, `settings`) are used; pick one that suits the screen |
+
+The lookup itself is shared — `optionLabel` and `badgeType` in `<%= goaLibRoot %>/src/lib/formatters.ts`
+— so a hand-authored view should use them too rather than re-deriving a mapping. See that
+lib's own AGENTS.md for the full component catalog.
+
 1. Create `src/views/MyFeatureView.vue` as a `<script setup>` SFC. **Don't add your
    own page margins/centering** — every view renders inside `AppLayout`'s gutter, so
    any top-level tag (`<div>`, `<section>`, …) is already centered and padded.
@@ -247,15 +263,17 @@ mark what's meant to be edited.
    ```typescript
    const primaryItems = [
      { label: 'Home', to: '/', icon: 'home' },
-     { label: 'Review queue', to: '/queue' },   // added by vue-workspace-view
+     { label: 'Review queue', to: '/queue', icon: 'list' },   // added by vue-workspace-view
    ];
    ```
 
-   Two things worth adding by hand: **`icon`** is effectively required —
-   `goa-work-side-menu-item` renders a blank item without one, and the generators can't guess it
-   (icon names: [design.alberta.ca/components/icons](https://design.alberta.ca/components/icons)).
-   And **`current`** for active highlighting, e.g. `current: route.path.startsWith('/queue')`,
-   which needs the `route` already in scope.
+   **`icon`** is effectively required — `goa-work-side-menu-item` renders a blank item without
+   one — so the generators supply it: `vue-workspace-view` defaults to `list` and
+   `vue-admin-crud` to `settings`. Pass `--icon=<name>` to choose a better one for the screen
+   (names: [design.alberta.ca/components/icons](https://design.alberta.ca/components/icons)).
+
+   Still worth adding by hand: **`current`** for active highlighting, e.g.
+   `current: route.path.startsWith('/queue')`, which needs the `route` already in scope.
 
    The `header` layout has no side menu, so it has no `primaryItems` array and the generators
    skip the step silently — use route-level breadcrumbs or a nav inside the view instead.
@@ -304,6 +322,17 @@ await save('my-resource', id, payload)     // an id = update
 await action('my-resource', id, 'submit')  // POST /:id/submit
 ```
 
+These build their URL through `apiConvention.path()`, which resolves to
+`/api/v1/<resource>`. `/api/` is the dev-proxy and nginx location; `v1` is the version the
+paired `express-service` mounts its routers under (`/<service>/v1`), and the proxy rewrites
+`/api/` to `/<service>/`. If your API is versioned differently — or not at all — change
+`apiConvention` and nothing else: the views only ever call through that seam, so no view
+needs editing.
+
+In dev the rewrite lives in `vite.proxy.cjs`. That file is a CommonJS module rather than
+JSON on purpose: Vite rewrites a proxied path with a `rewrite` function, and a JSON config
+cannot hold a function. Add a route by appending a row to its `routes` array.
+
 Every wire-level detail these hide — the base path, whether paging is `page`/`limit` or
 `limit`/`offset`, whether rows arrive bare or under `results`/`entries`, whether an update is PUT
 or PATCH — lives in the **API convention adapter** at the top of
@@ -373,6 +402,22 @@ describe('MyComponent', () => {
 });
 ```
 
+### Accessibility check — expand its route list
+
+The generated e2e project ships `src/a11y.spec.ts`: an axe-core check scoped to WCAG 2.1
+A/AA, run as part of the normal `e2e` target. **It only covers the routes named in its own
+`ROUTES` array, which ships as `['/']`.**
+
+Add an entry whenever you add a route — whether a generator added it or you hand-edited the
+router. Nothing does this for you: no generator writes to that file (it is left alone once it
+exists so your edits survive), so a router that has grown past `/` while `ROUTES` has not is
+a check that has quietly stopped covering the app. `/` is mostly app shell, so it exercises
+almost none of the elements the rest of the app is built from.
+
+Expect real failures when you expand it, and triage before fixing: some violations originate
+inside `@abgov/web-components`' own shadow DOM and cannot be addressed from app code. Those
+need an upstream fix or a documented exclusion, not a workaround in your view.
+
 ## OpenShift targets
 
 ```bash

package/src/generators/vue-app/files/src/App.vue__tmpl__

@@ -37,7 +37,7 @@ function signInAgain() {
 // prune -- a generated app is a starting point, not a fixed shell. Items are
 // `{ label, to }`; add `icon` for a leading icon or `badge` for a count.
 const primaryItems = [
-  { label: 'Home', to: '/' },
+  { label: 'Home', to: '/', icon: 'home' },
 ];
 
 // AppSideMenu's items are presentational — it doesn't know about Keycloak or
@@ -64,6 +64,7 @@ function onItemClick(item: { to?: string }) {
 <% if (layout === 'internal') { %>
   <AppSideMenu
     heading="<%= projectName %>"
+    :user-name="kc.fullName"
     :primary-items="primaryItems"
     :account-items="accountItems"
     @item-click="onItemClick"

package/src/generators/vue-app/files/src/composables/useApi.spec.ts__tmpl__

@@ -7,9 +7,11 @@ import { apiConvention } from './useApi'
 // it -- a failure here means a generated view's assumptions moved.
 describe('apiConvention', () => {
   it('builds collection, record, and action paths', () => {
-    expect(apiConvention.path('widgets')).toBe('/api/widgets')
-    expect(apiConvention.path('widgets', 7)).toBe('/api/widgets/7')
-    expect(apiConvention.path('widgets', 7, 'submit')).toBe('/api/widgets/7/submit')
+    expect(apiConvention.path('widgets')).toBe('/api/v1/widgets')
+    expect(apiConvention.path('widgets', 7)).toBe('/api/v1/widgets/7')
+    expect(apiConvention.path('widgets', 7, 'submit')).toBe(
+      '/api/v1/widgets/7/submit',
+    )
   })
 
   it('maps a domain page/pageSize onto this API page/limit parameters', () => {

package/src/generators/vue-app/files/src/composables/useApi.ts__tmpl__

@@ -32,9 +32,21 @@ export interface ListResult<T = Record<string, unknown>> {
 }
 
 export const apiConvention = {
-  /** Path to a collection, one record, or a named action on a record. */
+  /**
+   * Path to a collection, one record, or a named action on a record.
+   *
+   * `/api/` is the dev-proxy and nginx location; `v1` is the API version the
+   * paired express-service mounts its routers under (`/<service>/v1`), and the
+   * proxy rewrites `/api/` to `/<service>/`. Dropping the version segment here
+   * (an earlier version of this file did) makes every list/get/save 404 against
+   * a generated backend, while HomeView and AGENTS.md -- which spell out
+   * `/api/v1/...` by hand -- keep working, so the mismatch is easy to miss.
+   *
+   * This is the one place to change if your API is versioned differently, or not
+   * at all: the views only ever call through this seam.
+   */
   path(resource: string, id?: string | number, action?: string): string {
-    const base = `/api/${resource}`
+    const base = `/api/v1/${resource}`
     if (id === undefined || id === null) return base
     return action ? `${base}/${id}/${action}` : `${base}/${id}`
   },

package/src/generators/vue-app/vue-app.js

@@ -12,6 +12,8 @@ const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const paired_project_1 = require("../../utils/paired-project");
 const nginx_1 = require("../../utils/nginx");
+const vue_eslint_1 = require("../../utils/vue-eslint");
+const vue_tsconfig_1 = require("../../utils/vue-tsconfig");
 const vue_components_1 = require("../vue-components/vue-components");
 function normalizeOptions(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -45,12 +47,23 @@ function addFiles(host, options) {
     var _a;
     const templateOptions = Object.assign(Object.assign(Object.assign({}, options), options.adsp), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), pairedProject: (_a = options.pairedProject) !== null && _a !== void 0 ? _a : null, 
         // Import specifier for the shared GoA wrapper lib (AGENTS.md references it).
-        goaImportPath: (0, vue_components_1.vueComponentsImportPath)(host), tmpl: '' });
+        goaImportPath: (0, vue_components_1.vueComponentsImportPath)(host), 
+        // Real workspace-relative roots, so AGENTS.md can point at files that exist.
+        // Hardcoding `libs/`/`apps/` made every path in the generated guidance wrong
+        // in a TS-solution workspace, where projects sit at the workspace root.
+        goaLibRoot: (0, vue_components_1.vueComponentsLibRoot)(host), pairedProjectRoot: options.pairedProject
+            ? (0, devkit_1.readProjectConfiguration)(host, options.pairedProject).root
+            : null, tmpl: '' });
     (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
-    host.write(`${options.projectRoot}/public/nginx.conf`, (0, nginx_1.generateNginxConf)({ proxyLocations: options.nginxProxies, silentCheckSso: true }));
+    host.write(`${options.projectRoot}/public/nginx.conf`, (0, nginx_1.generateNginxConf)({
+        proxyLocations: options.nginxProxies,
+        silentCheckSso: true,
+    }));
     const addProxyConf = options.nginxProxies.length > 0;
     if (addProxyConf) {
-        (0, devkit_1.writeJson)(host, `${options.projectRoot}/vite.proxy.json`, (0, paired_project_1.buildDevProxyConf)(options.nginxProxies));
+        // A .cjs module, not JSON: Vite rewrites a proxied path with a `rewrite`
+        // function and silently ignores the `pathRewrite` key JSON would carry.
+        host.write(`${options.projectRoot}/${paired_project_1.VITE_PROXY_FILENAME}`, (0, paired_project_1.buildViteDevProxyModule)((0, paired_project_1.viteDevProxyRoutes)(options.nginxProxies)));
     }
     return addProxyConf;
 }
@@ -85,9 +98,19 @@ function default_1(host, options) {
         // real current alternative — and GoA's own design-system docs don't list Vue
         // as a supported framework at all.
         yield (0, vue_components_1.default)(host);
+        // The shell projects into goa-one-column-layout's native `header`/`footer`
+        // slots, and app authors composing goa-* elements need the same attribute
+        // (goa-modal's `actions`, goa-app-header's `utilities`). Applied to both
+        // layouts, not just the one whose template emits it today -- scoping this to
+        // the single known call site is what let `nx lint` start failing on
+        // unmodified output when the shell adopted goa-one-column-layout.
+        (0, vue_eslint_1.disableSlotAttributeRule)(host, normalizedOptions.projectRoot, "The app shell projects into goa-one-column-layout's native `slot`");
+        // @nx/vue can leave the app's tsconfig with a bundler moduleResolution and no
+        // `module`, which is invalid against a TS-solution base -- see the util.
+        (0, vue_tsconfig_1.ensureBundlerModuleOption)(host, `${normalizedOptions.projectRoot}/tsconfig.json`);
         (0, devkit_1.addDependenciesToPackageJson)(host, {
-            '@abgov/design-tokens': '2.12.0',
-            '@abgov/web-components': '2.3.0',
+            '@abgov/design-tokens': '2.12.8',
+            '@abgov/web-components': '2.4.0',
             // keycloak-js is a transitive dependency of @dsb-norge/vue-keycloak-js;
             // don't pin it directly or the versions diverge into two copies.
             '@dsb-norge/vue-keycloak-js': '^3.0.0',
@@ -115,6 +138,10 @@ function default_1(host, options) {
             'src/components/AppLayout.vue',
             'src/views/AboutView.vue',
             'vite.config.mts',
+            // Superseded by vite.proxy.cjs. The JSON form could not express Vite's
+            // `rewrite` function, so it was inert -- leaving it would strand a file
+            // that looks like live proxy config but isn't referenced.
+            'vite.proxy.json',
         ]) {
             if (host.exists(`${normalizedOptions.projectRoot}/${f}`)) {
                 host.delete(`${normalizedOptions.projectRoot}/${f}`);
@@ -129,7 +156,7 @@ function default_1(host, options) {
         const config = (0, devkit_1.readProjectConfiguration)(host, options.name);
         // Wire the vite dev-server proxy when nginx proxy locations are configured.
         if (addedProxy && ((_a = config.targets.serve) === null || _a === void 0 ? void 0 : _a.options)) {
-            config.targets.serve.options = Object.assign(Object.assign({}, config.targets.serve.options), { proxyConfig: `${normalizedOptions.projectRoot}/vite.proxy.json` });
+            config.targets.serve.options = Object.assign(Object.assign({}, config.targets.serve.options), { proxyConfig: `${normalizedOptions.projectRoot}/${paired_project_1.VITE_PROXY_FILENAME}` });
         }
         // nginx.conf lives in the Vite publicDir
         // (<projectRoot>/public) so it's emitted to the build output root — the

package/src/generators/vue-app/vue-app.js.map

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