hof 24.5.0 → 24.6.0

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## 2026-10-07 Version 24.5.2 (Stable), @vivekkumar-ho
+
+### Fixes
+- Preserved original Notify errors and their response payloads, and removed duplicate failure logging.
+
+### Chore & Maintenance
+- Replaced Notify email reference generation with Node.js `crypto.randomUUID`.
+- Added Notify coverage for email payloads, UUID references, attachments, and error propagation and logging.
+
+## 2026-09-14 Version 24.5.1 (Stable), @nzorba @dk4g @dalglishdhandaHO
+
+### Changed
+- Removed jQuery from the session timeout dialog and replaced its DOM operations with native browser APIs.
+- Removed the jQuery dependency and updated frontend tests to use native DOM APIs and `fetch`.
+- Migrated from `momentjs` to `dayjs`
+
+### Fixes
+- Added missing Welsh cookie page translation entries to match the English cookie configuration ((#710)[https://github.com/UKHomeOfficeForms/hof/pull/710])
+
+### Chore & Maintenance
+- Removed the vulnerable PhantomJS-based functional test driver stack and migrated the functional test browser runner to Playwright ((#699)[https://github.com/UKHomeOfficeForms/hof/pull/699])
+- Updated node and Redis versions in testing matrix ((#700)[https://github.com/UKHomeOfficeForms/hof/pull/700])
+
 ## 2026-07-01, Version 24.4.0 (Stable), @vivekkumar-ho
 
 ### Security

package/components/notify/notify.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const NotifyClient = require('notifications-node-client').NotifyClient;
-const { v4: uuidv4 } = require('uuid');
+const { randomUUID } = require('node:crypto');
 const config = require('../../config/hof-defaults');
 const logger = require('../../lib/logger');
 
@@ -10,41 +10,42 @@ module.exports = class Notify {
     const options = opts || {};
     this.options = options;
     this.logger = logger(config);
-    this.notifyClient =  new NotifyClient(options.notifyApiKey);
+    this.notifyClient = new NotifyClient(options.notifyApiKey);
     this.notifyTemplate = options.notifyTemplate;
   }
 
   async sendEmail(templateId, recipient, personalisation) {
-    const reference = uuidv4();
+    const reference = randomUUID();
 
     try {
       await this.notifyClient.sendEmail(templateId, recipient, {
         personalisation: personalisation,
-        reference });
+        reference
+      });
       this.logger.log('info', 'Email sent');
     } catch (error) {
-      this.logger.log('error', error.response ? error.response.data : error.message);
-      throw new Error(error.response ? error.response.data : error.message);
+      this.logger.log(
+        'error',
+        error.response ? error.response.data : error.message
+      );
+      // Preserve the original Notify error and its response payload.
+      throw error;
     }
   }
 
   async send(email) {
-    let personalisation = {
+    const personalisation = {
       'email-subject': email.subject,
       'email-body': email.body
     };
 
-    if (email.attachment && email.attachment !== undefined) {
-      personalisation = Object.assign({'email-attachment':
-        this.notifyClient.prepareUpload(email.attachment)}, personalisation);
+    if (email.attachment) {
+      personalisation['email-attachment'] = this.notifyClient.prepareUpload(
+        email.attachment
+      );
     }
 
-    try {
-      await this.sendEmail(this.notifyTemplate, email.recipient, personalisation);
-    } catch (error) {
-      this.logger.log('error', error.response ? error.response.data : error.message);
-      throw new Error(error.response ? error.response.data : error.message);
-    }
+    await this.sendEmail(this.notifyTemplate, email.recipient, personalisation);
   }
 };
 

package/controller/validation/validators.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const moment = require('moment');
+const dayjs = require('dayjs');
+const customParseFormat = require('dayjs/plugin/customParseFormat');
 const _ = require('lodash');
 const libPhoneNumber = require('libphonenumber-js/max');
 const deprecate = require('deprecate');
@@ -11,6 +12,8 @@ const emailValidator = require('./email');
 const dateFormat = 'YYYY-MM-DD';
 let Validators;
 
+dayjs.extend(customParseFormat);
+
 module.exports = Validators = {
 
   string(value) {
@@ -113,7 +116,7 @@ module.exports = Validators = {
   },
 
   date(value) {
-    return value === '' || Validators.regex(value, /\d{4}\-\d{2}\-\d{2}/) && moment(value, dateFormat).isValid();
+    return value === '' || Validators.regex(value, /\d{4}\-\d{2}\-\d{2}/) && dayjs(value, dateFormat, true).isValid();
   },
 
   'date-year'(value) {
@@ -131,12 +134,12 @@ module.exports = Validators = {
   // eslint-disable-next-line no-inline-comments, spaced-comment
   before(value, date) {
     // validator can also do before(value, [diff, unit][, diff, unit])
-    let valueDate = moment(value, dateFormat);
+    let valueDate = dayjs(value, dateFormat, true);
     let comparator;
     if (arguments.length === 2) {
       comparator = date;
     } else {
-      comparator = moment();
+      comparator = dayjs();
       const args = [].slice.call(arguments, 1);
       let diff;
       let unit;
@@ -151,12 +154,12 @@ module.exports = Validators = {
 
   after(value, date) {
     // validator can also do after(value, [diff, unit][, diff, unit])
-    let valueDate = moment(value, dateFormat);
+    let valueDate = dayjs(value, dateFormat, true);
     let comparator;
     if (arguments.length === 2) {
       comparator = date;
     } else {
-      comparator = moment();
+      comparator = dayjs();
       const args = [].slice.call(arguments, 1);
       let diff;
       let unit;

package/frontend/template-mixins/mixins/helpers.js

@@ -3,7 +3,7 @@
 
 const querystring = require('querystring');
 const path = require('path');
-const moment = require('moment');
+const { formatDate } = require('../../../utilities/date');
 
 const renderer = require('./render');
 
@@ -33,7 +33,7 @@ module.exports = options => (req, res, next) => {
     return function (txt) {
       txt = (txt || '').split('|');
       const value = hoganRender(txt[0], this);
-      return moment(value).format(txt[1] || 'D MMMM YYYY');
+      return formatDate(value, txt[1]);
     };
   };
 

package/frontend/template-partials/translations/src/cy/cookies.json

@@ -1,7 +1,7 @@
 {
   "banner": {
-    "message": "Mae GOV.UK yn defnyddio cwcis i wneud y safle’n symlach",
-    "link": "Darganfyddwch fwy am gwcis"
+    "message": "Rydym yn defnyddio rhai cwcis hanfodol i wneud i'r wefan hon weithio.",
+    "link": "Gweld cwcis"
   },
   "header": "Cwcis",
   "intro": "Mae’r gwasanaeth hwn yn gosod ffeiliau bychan (a elwir yn ‘cwcis’) ar eich cyfrifiadur er mwyn:",
@@ -39,6 +39,11 @@
         "seen_cookie_message",
         "Yn gadael i ni wybod eich bod wedi gweld ein neges cwcis yn barod",
         "1 mis"
+      ],
+      [
+        "cookie_preferences",
+        "Rhowch wybod i ni eich bod wedi cadw eich gosodiadau caniatâd cwci",
+        "1 mis"
       ]
     ]
   },
@@ -56,6 +61,8 @@
   },
   "no-identify": "Nid oes unrhyw fanylion personol yn cael eu storio gyda’r wybodaeth hon, felly ni ellir eich adnabod.",
   "analytics-table": {
+    "containerIdExpires": "2 flynedd",
+    "containerIdPurpose": "Defnyddir er mwyn parhau'r sesiwn",
     "headers": [
       "Enw",
       "Pwrpas",
@@ -71,6 +78,11 @@
         "_gat",
         "Defnyddir i wasgu’r gyfradd ceisiadau",
         "10 munud"
+      ],
+      [
+        "_gid",
+        "Defnyddir i gyfrif ac olrhain y tudalennau rydych yn eu gweld",
+        "24 awr"
       ]
     ]
   },

package/frontend/themes/gov-uk/client-js/session-timeout-dialog.js

@@ -1,40 +1,55 @@
 /* eslint max-len: 0 */
 'use strict';
 
-const $ = require('jquery');
 window.dialogPolyfill = require('dialog-polyfill');
 
+function getTextContent(selector) {
+  const element = document.querySelector(selector);
+  return element ? element.textContent : '';
+}
+
+function dialogDatasetValue(key) {
+  const element = document.getElementById('js-modal-dialog');
+  return element ? element.dataset[key] : undefined;
+}
+
+function parseTimeout(value, fallback) {
+  const parsedValue = parseInt(value, 10);
+  return Number.isNaN(parsedValue) ? fallback : parsedValue;
+}
+
 // Modal dialog prototype
 window.GOVUK.sessionDialog = {
   el: document.getElementById('js-modal-dialog'),
-  $el: $('#js-modal-dialog'),
-  $lastFocusedEl: null,
-  $closeButton: $('.modal-dialog .js-dialog-close'),
-  $fallBackElement: $('.govuk-timeout-warning-fallback'),
+  lastFocusedEl: null,
+  closeButton: document.querySelector('.modal-dialog .js-dialog-close'),
+  fallBackElement: document.querySelector('.govuk-timeout-warning-fallback'),
   dialogIsOpenClass: 'dialog-is-open',
   timers: [],
-  warningTextPrefix: $('.dialog-text-prefix').text(),
+  warningTextPrefix: getTextContent('.dialog-text-prefix'),
   warningTextSuffix: '.',
-  warningText: $('.dialog-text').text(),
+  warningText: getTextContent('.dialog-text'),
   warningTextExtra: '',
 
   // Timer specific markup. If these are not present, timeout and redirection are disabled
-  $timer: $('#js-modal-dialog .timer'),
-  $accessibleTimer: $('#js-modal-dialog .at-timer'),
+  timer: document.querySelector('#js-modal-dialog') ? document.querySelector('#js-modal-dialog .timer') : null,
+  accessibleTimer: document.querySelector('#js-modal-dialog') ? document.querySelector('#js-modal-dialog .at-timer') : null,
 
-  secondsSessionTimeout: parseInt($('#js-modal-dialog').data('session-timeout'), 10 || 1800),
-  secondsTimeoutWarning: parseInt($('#js-modal-dialog').data('session-timeout-warning'), 10 || 300),
-  timeoutRedirectUrl: $('#js-modal-dialog').data('url-redirect'),
+  secondsSessionTimeout: parseTimeout(dialogDatasetValue('sessionTimeout'), 1800),
+  secondsTimeoutWarning: parseTimeout(dialogDatasetValue('sessionTimeoutWarning'), 300),
+  timeoutRedirectUrl: dialogDatasetValue('urlRedirect'),
   timeSessionRefreshed: new Date(),
 
   bindUIElements: function () {
-    window.GOVUK.sessionDialog.$closeButton.on('click', function (e) {
-      e.preventDefault();
-      window.GOVUK.sessionDialog.closeDialog();
-    });
+    if (window.GOVUK.sessionDialog.closeButton) {
+      window.GOVUK.sessionDialog.closeButton.addEventListener('click', function (e) {
+        e.preventDefault();
+        window.GOVUK.sessionDialog.closeDialog();
+      });
+    }
 
     // Close modal when ESC pressed
-    $(document).keydown(function (e) {
+    document.addEventListener('keydown', function (e) {
       if (window.GOVUK.sessionDialog.isDialogOpen() && e.keyCode === 27) {
         window.GOVUK.sessionDialog.closeDialog();
       }
@@ -46,8 +61,8 @@ window.GOVUK.sessionDialog = {
   },
 
   isConfigured: function () {
-    return window.GOVUK.sessionDialog.$timer.length > 0 &&
-      window.GOVUK.sessionDialog.$accessibleTimer.length > 0 &&
+    return window.GOVUK.sessionDialog.timer &&
+      window.GOVUK.sessionDialog.accessibleTimer &&
       window.GOVUK.sessionDialog.secondsSessionTimeout &&
       window.GOVUK.sessionDialog.secondsTimeoutWarning &&
       window.GOVUK.sessionDialog.timeoutRedirectUrl;
@@ -55,7 +70,8 @@ window.GOVUK.sessionDialog = {
 
   openDialog: function () {
     if (!window.GOVUK.sessionDialog.isDialogOpen()) {
-      $('html, body').addClass(window.GOVUK.sessionDialog.dialogIsOpenClass);
+      document.documentElement.classList.add(window.GOVUK.sessionDialog.dialogIsOpenClass);
+      document.body.classList.add(window.GOVUK.sessionDialog.dialogIsOpenClass);
       window.GOVUK.sessionDialog.saveLastFocusedEl();
       window.GOVUK.sessionDialog.makePageContentInert();
       window.GOVUK.sessionDialog.el.showModal();
@@ -65,7 +81,8 @@ window.GOVUK.sessionDialog = {
 
   closeDialog: function () {
     if (window.GOVUK.sessionDialog.isDialogOpen()) {
-      $('html, body').removeClass(window.GOVUK.sessionDialog.dialogIsOpenClass);
+      document.documentElement.classList.remove(window.GOVUK.sessionDialog.dialogIsOpenClass);
+      document.body.classList.remove(window.GOVUK.sessionDialog.dialogIsOpenClass);
       window.GOVUK.sessionDialog.el.close();
       window.GOVUK.sessionDialog.el.open = false;
       window.GOVUK.sessionDialog.setFocusOnLastFocusedEl();
@@ -75,19 +92,19 @@ window.GOVUK.sessionDialog = {
   },
 
   saveLastFocusedEl: function () {
-    window.GOVUK.sessionDialog.$lastFocusedEl = document.activeElement;
-    if (!window.GOVUK.sessionDialog.$lastFocusedEl || window.GOVUK.sessionDialog.$lastFocusedEl === document.body) {
-      window.GOVUK.sessionDialog.$lastFocusedEl = null;
+    window.GOVUK.sessionDialog.lastFocusedEl = document.activeElement;
+    if (!window.GOVUK.sessionDialog.lastFocusedEl || window.GOVUK.sessionDialog.lastFocusedEl === document.body) {
+      window.GOVUK.sessionDialog.lastFocusedEl = null;
     } else if (document.querySelector) {
-      window.GOVUK.sessionDialog.$lastFocusedEl = document.querySelector(':focus');
+      window.GOVUK.sessionDialog.lastFocusedEl = document.querySelector(':focus');
     }
   },
 
   // Set focus back on last focused el when modal closed
   setFocusOnLastFocusedEl: function () {
-    if (window.GOVUK.sessionDialog.$lastFocusedEl) {
+    if (window.GOVUK.sessionDialog.lastFocusedEl) {
       window.setTimeout(function () {
-        window.GOVUK.sessionDialog.$lastFocusedEl.focus();
+        window.GOVUK.sessionDialog.lastFocusedEl.focus();
       }, 0);
     }
   },
@@ -222,15 +239,15 @@ window.GOVUK.sessionDialog = {
   },
 
   startCountdown: function () {
-    const $timer = window.GOVUK.sessionDialog.$timer;
-    const $accessibleTimer = window.GOVUK.sessionDialog.$accessibleTimer;
+    const timer = window.GOVUK.sessionDialog.timer;
+    const accessibleTimer = window.GOVUK.sessionDialog.accessibleTimer;
     let timerRunOnce = false;
     const iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
 
     const seconds = window.GOVUK.sessionDialog.secondsUntilSessionTimeout();
     const minutes = seconds / 60;
 
-    $timer.text(minutes + ' minute' + (minutes > 1 ? 's' : ''));
+    timer.textContent = minutes + ' minute' + (minutes > 1 ? 's' : '');
 
     (function countdown() {
       const secondsUntilSessionTimeout = window.GOVUK.sessionDialog.secondsUntilSessionTimeout();
@@ -250,17 +267,17 @@ window.GOVUK.sessionDialog = {
         const atText = window.GOVUK.sessionDialog.warningTextPrefix + countdownAtText + window.GOVUK.sessionDialog.warningTextSuffix + ' ' + window.GOVUK.sessionDialog.warningText;
         const extraText = '\n' + window.GOVUK.sessionDialog.warningTextExtra;
 
-        $timer.html(text + ' ' + extraText);
+        timer.innerHTML = text + ' ' + extraText;
 
         // Update screen reader friendly content every 20 secs
         if (secondsLeft % 20 === 0) {
           // Read out the extra content only once.
           // Don't read out on iOS VoiceOver which stalls on the longer text
           if (!timerRunOnce && !iOS) {
-            $accessibleTimer.text(atText + extraText);
+            accessibleTimer.textContent = atText + extraText;
             timerRunOnce = true;
           } else {
-            $accessibleTimer.text(atText);
+            accessibleTimer.textContent = atText;
           }
         }
 
@@ -277,10 +294,17 @@ window.GOVUK.sessionDialog = {
   },
 
   refreshSession: function () {
-    $.get('')
-      .done(function () {
+    return fetch('')
+      .then(function (response) {
+        if (!response.ok) {
+          throw new Error('Session refresh failed');
+        }
         window.GOVUK.sessionDialog.timeSessionRefreshed = new Date();
         window.GOVUK.sessionDialog.controller();
+      })
+      .catch(function (error) {
+        // eslint-disable-next-line no-console
+        console.error(error);
       });
   },
 
@@ -327,7 +351,7 @@ window.GOVUK.sessionDialog = {
   },
 
   init: function (options) {
-    $.extend(window.GOVUK.sessionDialog, options);
+    Object.assign(window.GOVUK.sessionDialog, options);
     if (window.GOVUK.sessionDialog.el && window.GOVUK.sessionDialog.isConfigured()) {
       // Native dialog is not supported by some browsers so use polyfill
       if (typeof HTMLDialogElement !== 'function') {
@@ -336,7 +360,7 @@ window.GOVUK.sessionDialog = {
           return true;
         } catch (error) {
           // Doesn't support polyfill (IE8) - display fallback element
-          window.GOVUK.sessionDialog.$fallBackElement.classList.add('govuk-!-display-block');
+          window.GOVUK.sessionDialog.fallBackElement.classList.add('govuk-!-display-block');
           return false;
         }
       }

package/middleware/rate-limiter.js

@@ -1,5 +1,5 @@
 
-const moment = require('moment');
+const dayjs = require('dayjs');
 const redis = require('redis');
 const config = require('./../config/hof-defaults');
 
@@ -36,8 +36,8 @@ module.exports = (options, rateLimitType) => {
           logger.log('error', `Error with requesting redis session for rate limiting: ${err}`);
           return await closeConnection();
         }
-        const currentRequestTime = moment();
-        const windowStartTimestamp = moment().subtract(WINDOW_SIZE_IN_MINUTES, 'minutes').unix();
+        let currentRequestTime = dayjs();
+        const windowStartTimestamp = dayjs().subtract(WINDOW_SIZE_IN_MINUTES, 'minutes').unix();
         let oldRecord = false;
         let data;
         //  if no record is found , create a new record for user and store to redis
@@ -74,9 +74,9 @@ module.exports = (options, rateLimitType) => {
         }
         // if number of requests made is less than allowed maximum, log new entry
         const lastRequestLog = data[data.length - 1];
-        const potentialCurrentWindowIntervalStartTimeStamp = currentRequestTime
-          .subtract(WINDOW_LOG_INTERVAL_IN_MINUTES, 'minutes')
-          .unix();
+        currentRequestTime = currentRequestTime
+          .subtract(WINDOW_LOG_INTERVAL_IN_MINUTES, 'minutes');
+        const potentialCurrentWindowIntervalStartTimeStamp = currentRequestTime.unix();
         //  if interval has not passed since last request log, increment counter
         if (lastRequestLog[timestampName] > potentialCurrentWindowIntervalStartTimeStamp) {
           lastRequestLog[countName]++;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "24.5.0",
+  "version": "24.6.0",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
@@ -24,7 +24,7 @@
     "unit": "LOG_LEVEL=error nyc _mocha \"test/**/*.spec.js\" \"sandbox/test/**/*.spec.js\"",
     "unit:nocov": "LOG_LEVEL=error mocha \"test/**/*.spec.js\" \"sandbox/test/**/*.spec.js\"",
     "test:lint": "eslint . --config ./.eslintrc.hof-wrapper.js",
-    "test:functional": "funkie mocha ./test/functional-tests --timeout 20000 --exit",
+    "test:functional": "mocha ./test/functional-tests --timeout 20000 --exit",
     "test:vite": "vitest run --config test/frontend/toolkit/vitest.config.js",
     "test:jest": "jest test/frontend/jest test/integration/index test/utilities/helpers/jest",
     "test:acceptance": "TAGS=\"${TAGS:=@feature}\" yarn run test:cucumber",
@@ -34,13 +34,13 @@
     "postversion": "git push && git push --tags"
   },
   "dependencies": {
-    "@aws-sdk/client-sesv2": "^3.907.0",
-    "@rollup/plugin-commonjs": "^29.0.0",
+    "@aws-sdk/client-sesv2": "^3.1109.0",
+    "@rollup/plugin-commonjs": "^29.0.3",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "aliasify": "^2.1.0",
-    "axios": "^1.16.0",
+    "axios": "^1.19.0",
     "bluebird": "^3.7.2",
-    "body-parser": "^1.20.3",
+    "body-parser": "^1.20.6",
     "callsite": "^1.0.0",
     "chalk": "^2.4.2",
     "chokidar": "^3.6.0",
@@ -48,16 +48,17 @@
     "cookie-parser": "^1.4.7",
     "cp": "^0.2.0",
     "csrf": "^3.1.0",
+    "dayjs": "^1.11.23",
     "debug": "^4.4.3",
     "deprecate": "^1.1.1",
     "dialog-polyfill": "^0.5.6",
-    "dotenv": "^16.0.0",
+    "dotenv": "^16.6.1",
     "duplexify": "^3.7.1",
     "exorcist": "^2.0.0",
-    "express": "^4.21.2",
+    "express": "^4.22.2",
     "express-healthcheck": "^0.1.0",
     "express-partial-templates": "^0.2.1",
-    "express-session": "^1.18.2",
+    "express-session": "^1.19.0",
     "findup": "^0.1.5",
     "glob": "^7.2.3",
     "govuk-elements-sass": "^3.1.3",
@@ -70,24 +71,22 @@
     "i18n-future": "^2.0.1",
     "i18n-lookup": "^0.1.0",
     "is-pdf": "^1.0.0",
-    "jquery": "^3.7.1",
-    "libphonenumber-js": "^1.12.23",
+    "libphonenumber-js": "^1.13.10",
     "lodash": "^4.18.1",
-    "markdown-it": "^14.2.0",
-    "minimatch": "^4.2.5",
+    "markdown-it": "^14.3.0",
+    "minimatch": "^4.2.6",
     "minimist": "^1.2.8",
     "mixwith": "^0.1.1",
-    "moment": "^2.30.1",
-    "morgan": "^1.10.1",
+    "morgan": "^1.11.0",
     "mustache": "^4.2.0",
-    "notifications-node-client": "^8.4.0",
+    "notifications-node-client": "^8.5.0",
     "redis": "^3.1.2",
     "reqres": "^3.0.1",
     "rimraf": "^3.0.2",
-    "sass": "^1.93.2",
-    "serve-static": "^1.16.2",
+    "sass": "^1.102.0",
+    "serve-static": "^1.16.3",
     "uglify-js": "^3.19.3",
-    "underscore": "^1.13.7",
+    "underscore": "^1.13.8",
     "urijs": "^1.19.11",
     "uuid": "^11.1.1",
     "winston": "^3.18.3",
@@ -95,10 +94,10 @@
   },
   "devDependencies": {
     "@cucumber/cucumber": "^7.3.2",
-    "@cucumber/pretty-formatter": "^4.0.0",
+    "@cucumber/pretty-formatter": "^4.0.1",
     "@types/jest": "^30.0.0",
-    "@vitest/coverage-v8": "^4.0.8",
-    "@xmldom/xmldom": "~0.8.11",
+    "@vitest/coverage-v8": "^4.1.10",
+    "@xmldom/xmldom": "~0.9.11",
     "chai": "^3.5.0",
     "chai-as-promised": "^7.1.2",
     "chai-subset": "^1.6.0",
@@ -106,28 +105,24 @@
     "csv": "^5.5.3",
     "eslint": "^8.57.1",
     "eslint-config-hof": "^1.3.4",
-    "funkie": "0.0.5",
-    "funkie-phantom": "0.0.1",
     "istanbul": "^0.4.5",
     "jest": "^30.4.2",
     "jest-environment-jsdom": "^30.4.1",
-    "jquery": "^3.7.1",
-    "mocha": "^11.7.6",
+    "mocha": "^11.8.0",
     "mocha-sandbox": "^1.0.0",
-    "node-mocks-http": "^1.17.2",
+    "node-mocks-http": "^1.18.1",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
-    "playwright": "^1.56.0",
-    "postcode": "0.2.2",
+    "playwright": "^1.62.1",
+    "postcode": "0.2.5",
     "proxyquire": "^1.8.0",
     "release-it": "^20.2.1",
     "sinon": "^11.1.2",
     "sinon-chai": "^3.7.0",
     "supertest": "^3.4.2",
     "travis-conditions": "0.0.0",
-    "vitest": "^4.0.8",
-    "watchify": "^4.0.0",
-    "webdriverio": "^5.0.0"
+    "vitest": "^4.1.10",
+    "watchify": "^4.0.0"
   },
   "jest": {
     "testEnvironment": "jsdom"
@@ -140,12 +135,12 @@
     "exit": "true"
   },
   "resolutions": {
+    "vite": "^7.3.6",
     "form-data": "^4.0.6",
     "js-yaml": "^4.2.0",
     "qs": "^6.14.1",
     "serialize-javascript": "^7.0.3",
     "tough-cookie": "^4.1.3",
-    "vite": "^7.3.6",
     "esbuild": "^0.28.1"
   }
 }

package/sandbox/apps/sandbox/sections/summary-data-sections.js

@@ -1,4 +1,4 @@
-const moment = require('moment');
+const { formatDate } = require('../../../../utilities/date');
 const PRETTY_DATE_FORMAT = 'Do MMMM YYYY';
 const APPEAL_STAGES = require('../lib/staticAppealStages').getstaticAppealStages();
 const _ = require('lodash');
@@ -8,7 +8,7 @@ module.exports = {
     'name',
     {
       field: 'dateOfBirth',
-      parse: d => d && moment(d).format(PRETTY_DATE_FORMAT)
+      parse: d => d && formatDate(d, PRETTY_DATE_FORMAT)
     }
   ],
   address: [

package/sandbox/assets/js/index.js

@@ -3,68 +3,15 @@
 
 require('../../../frontend/themes/gov-uk/client-js');
 
-var $ = require('jquery');
-var typeahead = require('typeahead-aria');
-var Bloodhound = require('typeahead-aria').Bloodhound;
-
-typeahead.loadjQueryPlugin();
-
-$('.typeahead').each(function applyTypeahead() {
-  var $el = $(this);
-  var $parent = $el.parent();
-  var attributes = $el.prop('attributes');
-  var $input = $('<input/>');
-  var selectedValue = $el.val();
-  var typeaheadList = $el.find('option').map(function mapOptions() {
-    if (this.value === '') {
-      return undefined;
-    }
-    return this.value;
-  }).get();
-
-  // remove the selectbox
-  $el.remove();
-
-  $.each(attributes, function applyAttributes() {
-    $input.attr(this.name, this.value);
-  });
-
-  $input.removeClass('js-hidden');
-  $input.addClass('form-control');
-  $input.val(selectedValue);
-
-  $parent.append($input);
-
-  $input.typeahead({
-    hint: false
-  }, {
-    source: new Bloodhound({
-      datumTokenizer: Bloodhound.tokenizers.whitespace,
-      queryTokenizer: Bloodhound.tokenizers.whitespace,
-      local: typeaheadList,
-      sorter: function sorter(a, b) {
-        var input = $input.val();
-        var startsWithInput = function startsWithInput(x) {
-          return x.toLowerCase().substr(0, input.length) === input.toLowerCase() ? -1 : 1;
-        };
-
-        var compareAlpha = function compareAlpha(x, y) {
-          var less = x < y ? -1 : 1;
-          return x === y ? 0 : less;
-        };
-
-        var compareStartsWithInput = function compareStartsWithInput(x, y) {
-          var startsWithFirst = startsWithInput(x);
-          var startsWithSecond = startsWithInput(y);
-
-          return startsWithFirst === startsWithSecond ? 0 : startsWithFirst;
-        };
-
-        var first = compareStartsWithInput(a, b);
-
-        return first === 0 ? compareAlpha(a, b) : first;
-      }
-    }),
-    limit: 100
-  });
+const accessibleAutocomplete = require('accessible-autocomplete');
+
+document.addEventListener('DOMContentLoaded', function onDOMContentLoaded() {
+  document
+    .querySelectorAll('.typeahead')
+    .forEach(function applyTypeahead(element) {
+      accessibleAutocomplete.enhanceSelectElement({
+        defaultValue: '',
+        selectElement: element
+      });
+    });
 });

package/sandbox/assets/scss/app.scss

@@ -1,27 +1,2 @@
-
 @import "../../../frontend/themes/gov-uk/styles/govuk";
-
-//autocomplete styling
-.tt-menu {
-    background-color: #fff;
-    border: 1px solid #ccc;
-    width: 65%;
-  }
-  
-.tt-suggestion {
-  padding: 0.5em;
-
-  &:hover,
-  &.tt-cursor {
-    color: #fff;
-    background-color: #0097cf;
-  }
-
-  &:hover {
-    cursor: pointer;
-  }
-}
-
-.twitter-typeahead {
-  width: 100%;
-}
+@import "./autocomplete.scss";

package/sandbox/assets/scss/autocomplete.scss

@@ -0,0 +1,143 @@
+// Accessible autocomplete
+.autocomplete__wrapper {
+  position: relative;
+}
+
+.autocomplete__hint,
+.autocomplete__input {
+  -webkit-appearance: none;
+  border: 2px solid #0b0c0c;
+  border-radius: 0; /* Safari 10 on iOS adds implicit border rounding. */
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  margin-bottom: 0; /* BUG: Safari 10 on macOS seems to add an implicit margin. */
+  width: 100%;
+}
+
+.autocomplete__input {
+  background-color: transparent;
+  position: relative;
+}
+
+.autocomplete__hint {
+  color: #b1b4b6;
+  position: absolute;
+}
+
+.autocomplete__input--default {
+  padding: 5px;
+}
+
+.autocomplete__input--focused {
+  outline: 3px solid #fd0;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 2px;
+}
+
+.autocomplete__input--show-all-values {
+  padding: 5px 34px 5px 5px; /* Space for arrow. Other padding should match .autocomplete__input--default. */
+  cursor: pointer;
+}
+
+.autocomplete__dropdown-arrow-down{
+  z-index: -1;
+  display: inline-block;
+  position: absolute;
+  right: 8px;
+  width: 24px;
+  height: 24px;
+  top: 10px;
+}
+
+.autocomplete__menu {
+  background-color: #fff;
+  border: 2px solid #0B0C0C;
+  border-top: 0;
+  color: #0B0C0C;
+  margin: 0;
+  max-height: 342px;
+  overflow-x: hidden;
+  padding: 0;
+  width: 100%;
+  width: calc(100% - 4px);
+}
+
+.autocomplete__menu--visible {
+  display: block;
+}
+
+.autocomplete__menu--hidden {
+  display: none;
+}
+
+.autocomplete__menu--overlay {
+  box-shadow: rgba(0, 0, 0, 0.256863) 0px 2px 6px;
+  left: 0;
+  position: absolute;
+  top: 100%;
+  z-index: 100;
+}
+
+.autocomplete__menu--inline {
+  position: relative;
+}
+
+.autocomplete__option {
+  border-bottom: solid #b1b4b6;
+  border-width: 1px 0;
+  cursor: pointer;
+  display: block;
+  position: relative;
+}
+
+.autocomplete__option > * {
+  pointer-events: none;
+}
+
+.autocomplete__option:first-of-type {
+  border-top-width: 0;
+}
+
+.autocomplete__option:last-of-type {
+  border-bottom-width: 0;
+}
+
+.autocomplete__option--odd {
+  background-color: #FAFAFA;
+}
+
+.autocomplete__option--focused,
+.autocomplete__option:hover {
+  background-color: #1d70b8;
+  border-color: #1d70b8;
+  color: white;
+  outline: none;
+}
+
+.autocomplete__option--no-results {
+  background-color: #FAFAFA;
+  color: #646b6f;
+  cursor: not-allowed;
+}
+
+.autocomplete__hint,
+.autocomplete__input,
+.autocomplete__option {
+  font-size: 16px;
+  line-height: 1.25;
+}
+
+.autocomplete__hint,
+.autocomplete__option {
+  padding: 5px;
+}
+
+@media (min-width: 641px) {
+  .autocomplete__hint,
+  .autocomplete__input,
+  .autocomplete__option {
+    font-size: 19px;
+    line-height: 1.31579;
+  }
+}

package/sandbox/package.json

@@ -15,15 +15,11 @@
   },
   "author": "",
   "dependencies": {
+    "accessible-autocomplete": "^3.0.1",
     "govuk-frontend": "4.10",
-    "jquery": "^3.7.1",
-    "sass": "^1.101.0",
-    "typeahead-aria": "^1.0.4"
+    "sass": "^1.104.1"
   },
   "devDependencies": {
     "nodemon": "^3.1.14"
-  },
-  "resolutions": {
-    "picomatch": "^2.3.2"
   }
 }

package/sandbox/yarn.lock

@@ -91,6 +91,11 @@
     "@parcel/watcher-win32-ia32" "2.5.6"
     "@parcel/watcher-win32-x64" "2.5.6"
 
+accessible-autocomplete@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/accessible-autocomplete/-/accessible-autocomplete-3.0.1.tgz#8ddf4934d0b4ba6acb28de486dd505e062cdc86e"
+  integrity sha512-xMshgc2LT5addvvfCTGzIkRrvhbOFeylFSnSMfS/PdjvvvElZkakCwxO3/yJYBWyi1hi3tZloqOJQ5kqqJtH4g==
+
 anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
@@ -220,16 +225,6 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-jquery@>=1.11:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-4.0.0.tgz#95c33ac29005ff72ec444c5ba1cf457e61404fbb"
-  integrity sha512-TXCHVR3Lb6TZdtw1l3RTLf8RBWVGexdxL6AC8/e0xZKEpBflBsjh9/8LXw+dkNFuOyW9B7iB3O1sP7hS0Kiacg==
-
-jquery@^3.7.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
-  integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
-
 minimatch@^10.2.1:
   version "10.2.5"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.5.tgz#bd48687a0be38ed2961399105600f832095861d1"
@@ -268,11 +263,16 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.2, picomatch@^4.0.3:
+picomatch@^2.0.4, picomatch@^2.2.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"
   integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==
 
+picomatch@^4.0.3:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.7.tgz#6313360034ccb36b3dc61ecbdff78121f90fe21f"
+  integrity sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==
+
 pstree.remy@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a"
@@ -290,10 +290,10 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-sass@^1.101.0:
-  version "1.101.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.101.0.tgz#c2db5bbf2f956be7277f6223b899d0d4be3c899b"
-  integrity sha512-OL3GoQyoUdDt843DpVmDO6y2k1sc5IhUDSpu8XucEI+35neq5QivZ1iuegnpraEVTJXlQGK1gl27zKcTLEPbQw==
+sass@^1.104.1:
+  version "1.104.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.104.1.tgz#29a4bdb33c48a8bb656e300a33afcafbfcbc8491"
+  integrity sha512-yDA+1aIG3EHgN4V/BvuhCvu61FF6hEd4e+9DxikUm9U0CAGuvdIZ/UYy7qbOxjhbbWQraoyLlMuzdRGOSV5Bmw==
   dependencies:
     chokidar "^5.0.0"
     immutable "^5.1.5"
@@ -337,13 +337,6 @@ touch@^3.1.0:
   resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.1.tgz#097a23d7b161476435e5c1344a95c0f75b4a5694"
   integrity sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==
 
-typeahead-aria@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/typeahead-aria/-/typeahead-aria-1.0.4.tgz#d2829cc01c0226a367627f3098a468c4e0343f00"
-  integrity sha512-6g0XtcM1AiPMlyXOuAb90Lg0WGi9PdbH68La7kUJmZwxUdpE80IC6tewBg0a/ug1Betoz1xCfEqTgkhuN6wo4w==
-  dependencies:
-    jquery ">=1.11"
-
 undefsafe@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"

package/utilities/date.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const dayjs = require('dayjs');
+const advancedFormat = require('dayjs/plugin/advancedFormat');
+
+dayjs.extend(advancedFormat);
+
+const DEFAULT_DATE_FORMAT = 'D MMMM YYYY';
+
+const formatDate = (value, format = DEFAULT_DATE_FORMAT) => dayjs(value).format(format);
+
+module.exports = {
+  formatDate
+};

package/utilities/index.js

@@ -3,6 +3,7 @@
 module.exports = {
   autofill: require('./autofill'),
   countries: require('./countries'),
+  date: require('./date'),
   helpers: require('./helpers'),
   reqres: require('./reqres'),
   testData: require('./test-data')