Merge branch 'main' into add-pagination-options

Author: colinrotherham

Procfile

@@ -0,0 +1 @@
+web: npm start --workspace @nhsuk/frontend-review

package-lock.json

@@ -21,6 +21,8 @@
     "clean": "del-cli dist/**",
     "prebuild": "npm run clean",
     "build": "npm run build --if-present --workspaces",
+    "heroku-postbuild": "npm run build",
+    "postheroku-postbuild": "NPM_CONFIG_PRODUCTION=true npm ci --omit=dev --omit=optional --workspace @nhsuk/frontend-review",
     "prestart": "npm run build",
     "start": "npm run watch",
     "watch": "concurrently npm:watch:* --kill-others --prefix-colors \"red.dim,blue.dim\"",
@@ -58,7 +60,7 @@
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^10.1.5",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-es-x": "^8.6.2",
+    "eslint-plugin-es-x": "^8.7.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest": "^28.12.0",
     "eslint-plugin-jest-dom": "^5.5.0",
@@ -70,7 +72,7 @@
     "html-validate": "^9.5.3",
     "jest": "^29.7.0",
     "jest-puppeteer": "^11.0.0",
-    "playwright-core": "^1.52.0",
+    "playwright-core": "^1.53.0",
     "postcss": "^8.5.4",
     "postcss-markdown": "^1.3.0",
     "postcss-scss": "^4.0.9",
@@ -84,5 +86,9 @@
   },
   "engines": {
     "node": "^20.9.0 || ^22.11.0"
+  },
+  "overrides": {
+    "playwright": "$playwright-core",
+    "puppeteer": "$puppeteer"
   }
 }

package.json

@@ -0,0 +1,51 @@
+const { join } = require('path')
+
+const { PORT = '3000' } = process.env
+
+/**
+ * Browsersync config
+ *
+ * @type {Options}
+ */
+module.exports = {
+  ghostMode: false,
+  host: '0.0.0.0',
+
+  // Redirect to start path
+  middleware: [
+    {
+      route: '/',
+      handle(req, res) {
+        res.writeHead(302, { location: '/nhsuk-frontend/' })
+        res.end()
+      }
+    }
+  ],
+
+  online: false,
+  open: false,
+  notify: false,
+  port: Number(PORT),
+
+  // Development server
+  server: {
+    baseDir: join(__dirname, 'dist'),
+    directory: true
+  },
+
+  // Match local paths to deployed preview
+  // https://nhsuk.github.io/nhsuk-frontend
+  serveStatic: [
+    {
+      route: '/nhsuk-frontend',
+      dir: join(__dirname, 'dist')
+    }
+  ],
+
+  // Show start path in console
+  startPath: '/nhsuk-frontend/'
+}
+
+/**
+ * @import { Options } from 'browser-sync'
+ */

packages/nhsuk-frontend-review/browsersync.config.js

@@ -9,12 +9,14 @@
     "build": "gulp build --color",
     "serve": "gulp serve --color",
     "watch": "gulp serve watch --color",
-    "start": "npm run watch"
+    "start": "browser-sync start --config browsersync.config.js"
+  },
+  "dependencies": {
+    "browser-sync": "^3.0.4"
   },
   "devDependencies": {
     "@nhsuk/frontend-config": "*",
     "@nhsuk/frontend-tasks": "*",
-    "browser-sync": "^3.0.4",
     "del-cli": "^6.0.0",
     "glob": "^11.0.2",
     "gulp": "^5.0.1",

packages/nhsuk-frontend-review/package.json

@@ -17,7 +17,7 @@
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
       <h1 class="nhsuk-heading-xl nhsuk-u-margin-bottom-4">NHS.UK frontend</h1>
-      <p class="nhsuk-body">Deployed automatically from <a href="https://github.com/nhsuk/nhsuk-frontend/commits/main" rel="noreferrer noopener" target="_blank"><code>main</code> branch (opens in new tab).</a></p>
+      <p class="nhsuk-body">Deployed automatically from <a href="https://github.com/nhsuk/nhsuk-frontend/commits/{{ branchName }}" rel="noreferrer noopener" target="_blank"><code>{{ branchName }}</code> branch (opens in new tab).</a></p>
 
       <h2 class="nhsuk-heading-l">Components and variants</h2>
       <p class="nhsuk-body">These examples are used for automated tests and may not follow service manual best practice.</p>