Merge remote-tracking branch 'origin/main' into 4959-accessibility-page-components

Author: n-lark

.eleventy.js

@@ -36,7 +36,10 @@ function renderDocsAlertBox(content, tone = 'note', title = '') {
 }
 
 // Skip slow optimizations when developing i.e. serve/watch or Netlify deploy preview
-const DEV_MODE = process.env.ELEVENTY_RUN_MODE !== "build" || process.env.CONTEXT === "deploy-preview" || process.env.SKIP_IMAGES === 'true'
+const DEV_MODE = process.env.ELEVENTY_RUN_MODE !== "build" || process.env.CONTEXT === "deploy-preview"
+// Image processing is skipped in dev mode or when explicitly requested via SKIP_IMAGES.
+// Kept separate from DEV_MODE so build-time image flags never affect analytics/consent script inclusion.
+const SKIP_IMAGES = DEV_MODE || process.env.SKIP_IMAGES === 'true'
 const DEPLOY_PREVIEW = process.env.CONTEXT === "deploy-preview";
 const IMAGE_BUILD_PROFILE = process.env.IMAGE_BUILD_PROFILE || "full";
 
@@ -1062,7 +1065,7 @@ module.exports = function(eleventyConfig) {
 
     // Eleventy Image shortcode
     // https://www.11ty.dev/docs/plugins/image/
-    if (DEV_MODE) {
+    if (SKIP_IMAGES) {
         console.info(`[11ty] Image pipeline is enabled in dev mode, copying images without any conversion or resizing`)
     } else {
         console.info(`[11ty] Image pipeline is enabled in prod mode, expect a wait for first build while images are converted and resized`)
@@ -1072,7 +1075,7 @@ module.exports = function(eleventyConfig) {
         const title = null
         const currentWorkingFilePath = this.page.inputPath
 
-        return await imageHandler(src, alt, title, widths, sizes, currentWorkingFilePath, eleventyConfig, async=true, DEV_MODE)
+        return await imageHandler(src, alt, title, widths, sizes, currentWorkingFilePath, eleventyConfig, async=true, SKIP_IMAGES)
     });
 
     eleventyConfig.addAsyncShortcode("tileImage", async function(item, image, defaultImage, defaultDescription, imageSize, title = null, priority = false) {
@@ -1094,7 +1097,7 @@ module.exports = function(eleventyConfig) {
 
         const currentWorkingFilePath = this.page.inputPath;
 
-        return await imageHandler(imageSrc, imageDescription, title, [imageSize], null, currentWorkingFilePath, eleventyConfig, async=true, DEV_MODE, priority);
+        return await imageHandler(imageSrc, imageDescription, title, [imageSize], null, currentWorkingFilePath, eleventyConfig, async=true, SKIP_IMAGES, priority);
     });
 
     // Create a collection for sidebar navigation
@@ -1393,7 +1396,7 @@ module.exports = function(eleventyConfig) {
         const async = false // cannot run async inside markdown
 
         try {
-            let imageHtml = imageHandler(imgSrc, imgAlt, imgTitle, widths, htmlSizes, folderPath, eleventyConfig, async, DEV_MODE)
+            let imageHtml = imageHandler(imgSrc, imgAlt, imgTitle, widths, htmlSizes, folderPath, eleventyConfig, async, SKIP_IMAGES)
 
             // Add the additional attributes to the image
             for (let attr in attributes) {

.github/dependabot.yml

@@ -4,3 +4,5 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    cooldown:
+      default-days: 1

.github/workflows/build.yml

@@ -24,7 +24,7 @@ jobs:
           path: 'flowfuse'
       - name: Generate a token
         id: generate_token
-        uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         with:
           client-id: ${{ secrets.GH_BOT_APP_ID }}
           private-key: ${{ secrets.GH_BOT_APP_KEY }}

.github/workflows/sast-scan.yml

@@ -16,4 +16,4 @@ concurrency:
 jobs:
   scan:
     name: SAST Scan
-    uses : flowfuse/github-actions-workflows/.github/workflows/sast_scan.yaml@v0.76.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/sast_scan.yaml@sast_scan/v1

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate_token
-        uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         with:
           client-id: ${{ secrets.GH_CI_READONLY_APP_ID }}
           private-key: ${{ secrets.GH_CI_READONLY_APP_KEY }}

nuxt/components/AppFooter.vue

@@ -0,0 +1,14 @@
+<template>
+  <div class="font-sans ff-website leading-normal tracking-normal gradient text-gray-500 min-h-screen flex flex-col">
+    <a href="#main-content" class="skip-to-main">Skip to main content</a>
+    <div class="flex-grow base">
+      <div class="w-full">
+        <AppHeader />
+        <main id="main-content" class="flex flex-col mx-auto items-center justify-center gradient-bg">
+          <slot />
+        </main>
+      </div>
+    </div>
+    <AppFooter />
+  </div>
+</template>

nuxt/components/AppHeader.vue

@@ -1,19 +1,34 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
-const isDev = process.env.NODE_ENV !== 'production'
-
 export default defineNuxtConfig({
     devtools: { enabled: true },
 
+    app: {
+        head: {
+            link: [
+                { rel: 'stylesheet', href: '/css/style.css' },
+                { rel: 'preconnect', href: 'https://fonts.googleapis.com' },
+                { rel: 'preconnect', href: 'https://fonts.gstatic.com', crossorigin: '' },
+                { rel: 'stylesheet', href: 'https://fonts.googleapis.com/css2?family=Heebo:wght@100..900&display=swap' },
+                { rel: 'apple-touch-icon', sizes: '180x180', href: '/apple-touch-icon.png' },
+                { rel: 'icon', type: 'image/png', sizes: '32x32', href: '/favicon-32x32.png' },
+                { rel: 'icon', type: 'image/png', sizes: '16x16', href: '/favicon-16x16.png' },
+                { rel: 'mask-icon', href: '/safari-pinned-tab.svg', color: '#aa4444' },
+            ],
+            meta: [
+                { name: 'msapplication-TileColor', content: '#00aba9' },
+                { name: 'theme-color', content: '#ffffff' },
+            ]
+        }
+    },
+
     nitro: {
         preset: 'static',
         prerender: {
-            routes: [],
-            crawlLinks: false // remove when Nuxt pages exist; enables auto-discovery of routes
+            routes: ['/terms'],
+            crawlLinks: false
         }
     },
 
-    routeRules: isDev ? {
-        // In development, proxy all routes to the legacy 11ty dev server
-        '/**': { proxy: 'http://localhost:8080/**' }
-    } : {}
+    // Dev proxying to 11ty is handled by server/middleware/legacy.ts
+    // to allow per-route exclusions as pages are migrated.
 })