[6.x] Inertia route settings

.github/workflows/js-ci.yml

@@ -11,62 +11,139 @@ concurrency:
   group: js-ci-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  NODE_VERSION: '22'
+  PHP_VERSION: '8.5'
+
 jobs:
-  eslint:
-    name: 'Code Quality / ESLint'
+  setup:
+    name: 'Setup / Install + Build + Generate'
     runs-on: ubuntu-latest
-    timeout-minutes: 5
-
+    timeout-minutes: 15
+    outputs:
+      cache-key: ${{ steps.cache-key.outputs.value }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ env.PHP_VERSION }}
+
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: '22'
+          node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
 
-      - name: Install dependencies
+      - name: Compute cache key
+        id: cache-key
+        # Hash everything that can affect installed deps, the cp build, or the
+        # generated TS/wayfinder files. PHP source is included because both
+        # `testbench typescript:transform` and `testbench wayfinder:generate`
+        # derive their output from controllers, DTOs, and routes in src/.
+        run: |
+          echo "value=js-ci-v2-${{ runner.os }}-${{ hashFiles('package-lock.json', 'composer.lock', 'package.json', 'packages/*/package.json', 'packages/craftcms-cp/src/**', 'packages/craftcms-cp/tsconfig*.json', 'packages/craftcms-cp/vite.config.*', 'packages/craftcms-cp/tsdown.config.*', 'src/**/*.php') }}" >> "$GITHUB_OUTPUT"
+
+      - name: Restore install + build + generated cache
+        id: cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/craftcms-cp/dist
+            vendor
+            resources/js/actions
+            resources/js/routes
+            resources/js/wayfinder
+            resources/js/generated
+          key: ${{ steps.cache-key.outputs.value }}
+
+      - name: Install Composer dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: composer install --no-interaction --no-progress
+
+      - name: Install npm dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
         run: npm ci
 
       - name: Build @craftcms/cp
+        if: steps.cache.outputs.cache-hit != 'true'
         run: npm run build:cp
 
+      - name: Generate TypeScript types
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: npm run generate:types
+
+      - name: Generate Wayfinder routes
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: npm run generate:wayfinder
+
+  eslint:
+    name: 'Code Quality / ESLint'
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    needs: setup
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: 'npm'
+
+      - name: Restore install + build + generated cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/craftcms-cp/dist
+            vendor
+            resources/js/actions
+            resources/js/routes
+            resources/js/wayfinder
+            resources/js/generated
+          key: ${{ needs.setup.outputs.cache-key }}
+
       - name: Run ESLint
         run: npm run lint:js
 
   typecheck:
     name: 'Code Quality / TypeScript'
     runs-on: ubuntu-latest
-    timeout-minutes: 10
-
+    timeout-minutes: 5
+    needs: setup
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.5'
-
-      - name: Install Composer dependencies
-        run: composer install --no-interaction --no-progress
-
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: '22'
+          node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
 
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build @craftcms/cp
-        run: npm run build:cp
-
-      - name: Generate Wayfinder types
-        run: ./vendor/bin/testbench wayfinder:generate --path=resources/js
-
+      - name: Restore install + build + generated cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/craftcms-cp/dist
+            vendor
+            resources/js/actions
+            resources/js/routes
+            resources/js/wayfinder
+            resources/js/generated
+          key: ${{ needs.setup.outputs.cache-key }}
+
+      # Skip the `pretypecheck` hook (it would re-run generate:types +
+      # generate:wayfinder, which need PHP/Composer that this job doesn't set
+      # up — the setup job already produced and cached the output).
       - name: Run TypeScript type check
         run: npm run typecheck

package.json

@@ -13,6 +13,8 @@
     "dev": "vite",
     "lint:js": "eslint resources/js/",
     "lint:styles": "stylelint \"resources/**/*.css\"",
+    "generate:types": "./vendor/bin/testbench typescript:transform",
+    "generate:wayfinder": "./vendor/bin/testbench wayfinder:generate --path resources/js",
     "typecheck": "vue-tsc --noEmit",
     "lint": "npm run lint:js && npm run lint:styles && npm run typecheck",
     "build:bundles": "cd ./packages/craftcms-legacy && npm run build",

packages/craftcms-cp/src/styles/form.styles.ts

@@ -28,7 +28,10 @@ export const baseInputStyles = css`
 `;
 
 export const baseFieldStyles = css`
-  :host(:not([label-sr-only])) .form-field__group-one {
+  :host(:not([label-sr-only]))
+    .form-field__group-one
+    .form-field__label
+    slot:not(:empty) {
     margin-block-end: var(--c-spacing-sm);
   }
 

resources/build/assets/CpQueueIndicator-BAvg0Brd.js → resources/build/assets/CpQueueIndicator-Dee2JP4f.js

@@ -1,4 +1,4 @@
-import{n as e}from"./rolldown-runtime-DXc-PV0M.js";import{h as t,p as n}from"./cp-CSaoIAcR.js";import{c as r,f as i,r as a,t as o}from"./lit-BpPOIUnZ.js";import{a as s,o as c}from"./decorators-BOwDFZC2.js";import{t as l}from"./decorate-BM_SnROF.js";var u={Pending:1,Reserved:2,Done:3,Failed:4,Delayed:5,Cancelled:6},d=e({default:()=>p}),f=class extends o{constructor(...e){super(...e),this.displayedJob=null,this.hasReservedJobs=!1,this.hasWaitingJobs=!1,this.#e=n.getInstance(),this.#t=t.getInstance(),this.#n=e=>{this.displayedJob=e.detail.displayedJob}}static{this.styles=i`
+import{n as e}from"./rolldown-runtime-DXc-PV0M.js";import{h as t,p as n}from"./cp-DpSwX5ei.js";import{c as r,f as i,r as a,t as o}from"./lit-BpPOIUnZ.js";import{a as s,o as c}from"./decorators-BOwDFZC2.js";import{t as l}from"./decorate-DQXQhzse.js";var u={Pending:1,Reserved:2,Done:3,Failed:4,Delayed:5,Cancelled:6},d=e({default:()=>p}),f=class extends o{constructor(...e){super(...e),this.displayedJob=null,this.hasReservedJobs=!1,this.hasWaitingJobs=!1,this.#e=n.getInstance(),this.#t=t.getInstance(),this.#n=e=>{this.displayedJob=e.detail.displayedJob}}static{this.styles=i`
     :host {
       display: contents;
     }