hof 24.4.0 → 24.5.0-jquery-removal-beta.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 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/README.md

@@ -139,6 +139,16 @@ Each task (except Vite) has a common configuration format with the following opt
 - `match` - defines the pattern for files to watch to trigger a rebuild of this task
 - `restart` - defines if this task should result in a server restart
 
+For Vite, the following configuration can be specified:
+- `outDir` - Specifies the output directory (relative to project root). Only changes only the build output location, does not change runtime static mounting.
+Example from hof settings:
+```js
+  "js": {
+    "outDir": './dist/public'
+  }
+```
+
+
 Additionally the server instance created by `watch` can be configured by setting `server` config. Available options are:
 
 - `cmd` - defines the command used to start the server

package/build/tasks/vite/index.js

@@ -7,18 +7,23 @@ const hofDefaults = require('../../../config/hof-defaults');
 
 module.exports = config => {
   process.env.NODE_ENV = hofDefaults.env;
+  const publicDirectory = path.resolve(process.cwd(), config.js.outDir || 'public');
 
   if(!config.production) {
     return vite.build({
       configFile: viteConfig,
       mode: 'development',
       build: {
-        sourcemap: config.js.sourceMaps
+        sourcemap: config.js.sourceMaps,
+        outDir: publicDirectory
       }
     });
   }
   return vite.build({
-    configFile: viteConfig
+    configFile: viteConfig,
+    build: {
+      outDir: publicDirectory
+    }
   });
 };
 module.exports.task = 'vite';

package/build/tasks/vite/vite.config.js

@@ -7,7 +7,6 @@ import fs from 'fs';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 
-const publicDirectory = resolve(process.cwd(), 'public');
 const entryFile = (() => {
   const src = resolve(process.cwd(), 'assets/js/index.js');
   if (fs.existsSync(src)) return src;
@@ -49,7 +48,6 @@ export default defineConfig({
   base: '/assets/',
   publicDir: 'static', // static files copied as-is
   build: {
-    outDir: publicDirectory,
     emptyOutDir: false,
     sourcemap: false,
     rollupOptions: {

package/config/builder-defaults.js

@@ -15,7 +15,8 @@ module.exports = {
     sourceMaps: false
   },
   js: {
-    sourceMaps: false
+    sourceMaps: false,
+    outDir: 'public'
   },
   translate: {
     src: 'apps/**/translations/src',

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/govuk-template/govuk_template_generated.html

@@ -0,0 +1,118 @@
+
+<!DOCTYPE html>
+<!--[if lt IE 9]><html class="lte-ie8" lang="{{htmlLang}}"><![endif]-->
+<!--[if gt IE 8]><!--><html lang="{{htmlLang}}" class="govuk-template--rebranded"><!--<![endif]-->
+  <head>
+    <meta charset="utf-8" />
+    <title>{{$pageTitle}}{{/pageTitle}}</title>
+    {{$head}}{{/head}}
+    <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
+    <meta name="theme-color" content="#1d70b8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="icon" sizes="48x48" href="{{govukAssetPath}}rebrand/images/favicon.ico">
+    <link rel="icon" sizes="any" href="{{govukAssetPath}}rebrand/images/favicon.svg" type="image/svg+xml">
+    <link rel="mask-icon" href="{{govukAssetPath}}rebrand/images/govuk-icon-mask.svg" color="#1d70b8">
+    <link rel="apple-touch-icon" href="{{govukAssetPath}}rebrand/images/govuk-icon-180.png">
+    <link rel="manifest" href="{{govukAssetPath}}rebrand/manifest.json">
+    <meta property="og:image" content="{{govukAssetPath}}rebrand/images/govuk-opengraph-image.png">
+  </head>
+
+  <body class="{{$bodyClasses}}{{/bodyClasses}} govuk-template__body  js-enabled" >
+    <script {{#nonce}}nonce="{{nonce}}"{{/nonce}}>document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');</script>
+
+
+    <div id="global-cookie-message" class="gem-c-cookie-banner govuk-clearfix" data-module="cookie-banner" role="region" aria-label="cookie banner" data-nosnippet="">
+       {{$cookieMessage}}{{/cookieMessage}}
+    </div>
+
+	{{$bodyStart}}{{/bodyStart}}
+
+    <header role="banner" id="govuk-header" class="{{$headerClass}}{{/headerClass}}">
+      <div class="govuk-header__container govuk-width-container">
+
+          <div class="govuk-header__logo">
+            <a href="{{$homepageUrl}}https://www.gov.uk{{/homepageUrl}}" title="{{$logoLinkTitle}}Go to the GOV.UK homepage{{/logoLinkTitle}}" id="logo" class="govuk-header__link govuk-header__link--homepage" target="_blank" data-module="track-click" data-track-category="homeLinkClicked" data-track-action="homeHeader">
+                <!--[if gt IE 8]><!-->
+                <div id="govuk-header__logo"></div>
+                <img src="/public/images/govuk-logo.svg" id="govuk-header__logo" alt="Logo" loading="lazy" />
+                  <!--<![endif]-->
+                  <!--[if IE 8]>
+                  <img src="{{govukAssetPath}}rebrand/images/govuk-logotype-tudor-crown.png" class="govuk-header__logotype-crown-fallback-image" width="32" height="30" alt="">
+                  <![endif]-->
+            </a>
+          </div>
+          {{$insideHeader}}{{/insideHeader}}
+
+        {{$propositionHeader}}{{/propositionHeader}}
+      </div>
+    </header>
+
+
+    {{$afterHeader}}{{/afterHeader}}
+
+
+    {{$main}}{{/main}}
+
+    <footer class="govuk-footer">
+      <div class="govuk-width-container">
+        <svg
+          focusable="false"
+          role="presentation"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 64 60"
+          height="30"
+          width="32"
+          fill="currentcolor" class="govuk-footer__crown">
+          <g>
+            <circle cx="20" cy="17.6" r="3.7" />
+            <circle cx="10.2" cy="23.5" r="3.7" />
+            <circle cx="3.7" cy="33.2" r="3.7" />
+            <circle cx="31.7" cy="30.6" r="3.7" />
+            <circle cx="43.3" cy="17.6" r="3.7" />
+            <circle cx="53.2" cy="23.5" r="3.7" />
+            <circle cx="59.7" cy="33.2" r="3.7" />
+            <circle cx="31.7" cy="30.6" r="3.7" />
+            <path d="M33.1,9.8c.2-.1.3-.3.5-.5l4.6,2.4v-6.8l-4.6,1.5c-.1-.2-.3-.3-.5-.5l1.9-5.9h-6.7l1.9,5.9c-.2.1-.3.3-.5.5l-4.6-1.5v6.8l4.6-2.4c.1.2.3.3.5.5l-2.6,8c-.9,2.8,1.2,5.7,4.1,5.7h0c3,0,5.1-2.9,4.1-5.7l-2.6-8ZM37,37.9s-3.4,3.8-4.1,6.1c2.2,0,4.2-.5,6.4-2.8l-.7,8.5c-2-2.8-4.4-4.1-5.7-3.8.1,3.1.5,6.7,5.8,7.2,3.7.3,6.7-1.5,7-3.8.4-2.6-2-4.3-3.7-1.6-1.4-4.5,2.4-6.1,4.9-3.2-1.9-4.5-1.8-7.7,2.4-10.9,3,4,2.6,7.3-1.2,11.1,2.4-1.3,6.2,0,4,4.6-1.2-2.8-3.7-2.2-4.2.2-.3,1.7.7,3.7,3,4.2,1.9.3,4.7-.9,7-5.9-1.3,0-2.4.7-3.9,1.7l2.4-8c.6,2.3,1.4,3.7,2.2,4.5.6-1.6.5-2.8,0-5.3l5,1.8c-2.6,3.6-5.2,8.7-7.3,17.5-7.4-1.1-15.7-1.7-24.5-1.7h0c-8.8,0-17.1.6-24.5,1.7-2.1-8.9-4.7-13.9-7.3-17.5l5-1.8c-.5,2.5-.6,3.7,0,5.3.8-.8,1.6-2.3,2.2-4.5l2.4,8c-1.5-1-2.6-1.7-3.9-1.7,2.3,5,5.2,6.2,7,5.9,2.3-.4,3.3-2.4,3-4.2-.5-2.4-3-3.1-4.2-.2-2.2-4.6,1.6-6,4-4.6-3.7-3.7-4.2-7.1-1.2-11.1,4.2,3.2,4.3,6.4,2.4,10.9,2.5-2.8,6.3-1.3,4.9,3.2-1.8-2.7-4.1-1-3.7,1.6.3,2.3,3.3,4.1,7,3.8,5.4-.5,5.7-4.2,5.8-7.2-1.3-.2-3.7,1-5.7,3.8l-.7-8.5c2.2,2.3,4.2,2.7,6.4,2.8-.7-2.3-4.1-6.1-4.1-6.1h10.6,0Z" />
+          </g>
+        </svg>
+        <div class="govuk-footer__meta">
+          <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
+            <h2 class="govuk-visually-hidden">Support links</h2>
+            {{$footerSupportLinks}}{{/footerSupportLinks}}
+            <svg
+              aria-hidden="true"
+              focusable="false"
+              class="govuk-footer__licence-logo"
+              xmlns="http://www.w3.org/2000/svg"
+              viewBox="0 0 483.2 195.7"
+              height="17"
+              width="41">
+              <path
+                fill="currentColor"
+                d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145" />
+            </svg>
+            <span class="govuk-footer__licence-description">
+                {{$licenceMessage}}All content is available under the <a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" id="open-government-licence" class="govuk-footer__link" target="_blank" rel="license">Open Government Licence v3.0</a>, except where otherwise stated{{/licenceMessage}}
+            </span>
+          </div>
+          <div class="govuk-footer__meta-item">
+            <a
+              class="govuk-footer__link govuk-footer__copyright-logo"
+              href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">
+              {{$crownCopyrightMessage}}© Crown copyright{{/crownCopyrightMessage}}
+            </a>
+          </div>
+        </div>
+      </div>
+    </footer>
+
+    <div id="global-app-error" class="app-error hidden"></div>
+
+
+    {{$bodyEnd}}{{/bodyEnd}}
+
+
+    <script  {{#nonce}}nonce="{{nonce}}"{{/nonce}}>if (typeof window.GOVUK === 'undefined') document.body.className = document.body.className.replace('js-enabled', '');</script>
+
+  </body>
+</html>

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]++;