@dwp/govuk-casa 8.0.0-alpha2 → 8.0.0-beta1

package/dist/lib/index.js

@@ -0,0 +1,54 @@
+"use strict";
+/**
+ * Just used to collate type information for intellisense. This should not get
+ * imported anywhere in code, other than JSDoc references.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waypointUrl = exports.ValidatorFactory = exports.ValidationError = exports.utils = exports.Plan = exports.MutableRouter = exports.JourneyContext = exports.PageField = exports.field = exports.endSession = exports.configurationIngestor = exports.configure = exports.CasaTemplateLoader = void 0;
+const CasaTemplateLoader_js_1 = __importDefault(require("./CasaTemplateLoader.js"));
+exports.CasaTemplateLoader = CasaTemplateLoader_js_1.default;
+const configure_js_1 = __importDefault(require("./configure.js"));
+exports.configure = configure_js_1.default;
+const configuration_ingestor_js_1 = __importDefault(require("./configuration-ingestor.js"));
+exports.configurationIngestor = configuration_ingestor_js_1.default;
+const end_session_js_1 = __importDefault(require("./end-session.js"));
+exports.endSession = end_session_js_1.default;
+const field_js_1 = __importStar(require("./field.js"));
+exports.field = field_js_1.default;
+Object.defineProperty(exports, "PageField", { enumerable: true, get: function () { return field_js_1.PageField; } });
+const JourneyContext_js_1 = __importDefault(require("./JourneyContext.js"));
+exports.JourneyContext = JourneyContext_js_1.default;
+const MutableRouter_js_1 = __importDefault(require("./MutableRouter.js"));
+exports.MutableRouter = MutableRouter_js_1.default;
+const Plan_js_1 = __importDefault(require("./Plan.js"));
+exports.Plan = Plan_js_1.default;
+const ValidationError_js_1 = __importDefault(require("./ValidationError.js"));
+exports.ValidationError = ValidationError_js_1.default;
+const ValidatorFactory_js_1 = __importDefault(require("./ValidatorFactory.js"));
+exports.ValidatorFactory = ValidatorFactory_js_1.default;
+const waypoint_url_js_1 = __importDefault(require("./waypoint-url.js"));
+exports.waypointUrl = waypoint_url_js_1.default;
+const utils = __importStar(require("./utils.js"));
+exports.utils = utils;

package/dist/lib/logger.d.ts

@@ -1,4 +1,4 @@
-export default function _default(ns: any): {
+declare function _default(ns: any): {
     trace: any;
     debug: any;
     info: any;
@@ -6,3 +6,4 @@ export default function _default(ns: any): {
     error: any;
     fatal: any;
 };
+export default _default;

package/dist/lib/logger.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const debug_1 = __importDefault(require("debug"));
 const casaDebugger = (0, debug_1.default)('casa');
-function default_1(ns) {
+exports.default = (ns) => {
     const logger = casaDebugger.extend(ns);
     return {
         trace: logger.extend('trace'),
@@ -15,5 +15,4 @@ function default_1(ns) {
         error: logger.extend('error'),
         fatal: logger.extend('fatal'),
     };
-}
-exports.default = default_1;
+};

package/dist/lib/utils.d.ts

@@ -1,3 +1,12 @@
+/**
+ * @typedef {import('./configuration-ingestor').GlobalHook} GlobalHook
+ */
+/**
+ * @typedef {import('./configuration-ingestor').PageHook} PageHook
+ */
+/**
+ * @typedef {GlobalHook | PageHook} Hook
+ */
 /**
  * Test is a value can be stringifed (numbers or strings)
  *
@@ -27,6 +36,13 @@ export function isEmpty(val: any): boolean;
  * @param {string} hookName Hook name (including scope prefix)
  * @param {string} path URL path to match (relative to mountUrl)
  * @param {Hook[]} hooks Hooks to be applied at the page level
- * @returns {function[]} An array of middleware that should be applied
+ * @returns {Function[]} An array of middleware that should be applied
  */
-export function resolveMiddlewareHooks(hookName: string, path: string, hooks?: any[]): Function[];
+export function resolveMiddlewareHooks(hookName: string, path: string, hooks?: Hook[]): Function[];
+export function validateWaypoint(waypoint: any): void;
+export function validateView(view: any): void;
+export function validateHookName(hookName: any): void;
+export function validateHookPath(path: any): void;
+export type GlobalHook = import('./configuration-ingestor').GlobalHook;
+export type PageHook = import('./configuration-ingestor').PageHook;
+export type Hook = GlobalHook | PageHook;

package/dist/lib/utils.js

@@ -1,6 +1,15 @@
 "use strict";
+/**
+ * @typedef {import('./configuration-ingestor').GlobalHook} GlobalHook
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveMiddlewareHooks = exports.isEmpty = exports.stringifyInput = exports.isStringable = void 0;
+exports.validateHookPath = exports.validateHookName = exports.validateView = exports.validateWaypoint = exports.resolveMiddlewareHooks = exports.isEmpty = exports.stringifyInput = exports.isStringable = void 0;
+/**
+ * @typedef {import('./configuration-ingestor').PageHook} PageHook
+ */
+/**
+ * @typedef {GlobalHook | PageHook} Hook
+ */
 /**
  * Test is a value can be stringifed (numbers or strings)
  *
@@ -49,7 +58,7 @@ exports.isEmpty = isEmpty;
  * @param {string} hookName Hook name (including scope prefix)
  * @param {string} path URL path to match (relative to mountUrl)
  * @param {Hook[]} hooks Hooks to be applied at the page level
- * @returns {function[]} An array of middleware that should be applied
+ * @returns {Function[]} An array of middleware that should be applied
  */
 function resolveMiddlewareHooks(hookName, path, hooks = []) {
     /* eslint-disable-next-line max-len */
@@ -57,3 +66,46 @@ function resolveMiddlewareHooks(hookName, path, hooks = []) {
     return hooks.filter((h) => h.hook === hookName).filter(pathMatch).map((h) => h.middleware);
 }
 exports.resolveMiddlewareHooks = resolveMiddlewareHooks;
+/* ------------------------------------------------ validation / sanitisation */
+function validateWaypoint(waypoint) {
+    if (typeof waypoint !== 'string') {
+        throw new TypeError('Waypoint must be a string');
+    }
+    if (!waypoint.length) {
+        throw new SyntaxError('Waypoint must not be empty');
+    }
+    if (waypoint.match(/[^/a-z0-9_-]/)) {
+        throw new SyntaxError('Waypoint must contain only a-z, 0-9, -, _ and / characters');
+    }
+}
+exports.validateWaypoint = validateWaypoint;
+function validateView(view) {
+    if (typeof view !== 'string') {
+        throw new TypeError('View must be a string');
+    }
+    if (!view.length) {
+        throw new SyntaxError('View must not be empty');
+    }
+    if (!view.match(/^[a-z0-9/_-]+\.njk$/i)) {
+        throw new SyntaxError('View must contain only a-z, 0-9, -, _ and / characters, and end in .njk');
+    }
+}
+exports.validateView = validateView;
+function validateHookName(hookName) {
+    if (typeof hookName !== 'string') {
+        throw new TypeError('Hook name must be a string');
+    }
+    if (!hookName.length) {
+        throw new SyntaxError('Hook name must not be empty');
+    }
+    if (!hookName.match(/^([a-z]+\.|)[a-z]+$/i)) {
+        throw new SyntaxError('Hook name must match either <scope>.<hookname> or <hookname> formats');
+    }
+}
+exports.validateHookName = validateHookName;
+function validateHookPath(path) {
+    if (typeof path !== 'string' && !(path instanceof RegExp)) {
+        throw new TypeError('Hook path must be a string or RegExp');
+    }
+}
+exports.validateHookPath = validateHookPath;

package/dist/lib/waypoint-url.d.ts

@@ -14,9 +14,10 @@
 export default function waypointUrl({ waypoint, mountUrl, journeyContext, edit, editOrigin, skipTo, routeName, }?: {
     waypoint: string;
     mountUrl: string;
-    journeyContext: any;
+    journeyContext: JourneyContext;
     edit: boolean;
     editOrigin: string;
     skipTo: boolean;
     routeName: string;
 }): string;
+export type JourneyContext = import('./index').JourneyContext;

package/dist/lib/waypoint-url.js

@@ -1,4 +1,7 @@
 "use strict";
+/**
+ * @typedef {import('./index').JourneyContext} JourneyContext
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 const reUrlProtocolExtract = /^url:\/\/(.+)$/i;
 const sanitiseWaypoint = (w) => w.replace(/[^/a-z0-9_-]/ig, '').replace(/\/+/g, '/');

package/dist/middleware/body-parser.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = require("express");
 function bodyParserMiddleware() {
     const rProto = /__proto__/i;
-    const rPrototype = /prototype[=[\]]/i;
-    const rConstructor = /constructor[=[\]]/i;
+    const rPrototype = /prototype[='"[\]]/i;
+    const rConstructor = /constructor[='"[\]]/i;
     return [
         (0, express_1.urlencoded)({
             extended: true,

package/dist/middleware/data.d.ts

@@ -1,6 +1,5 @@
-export default function dataMiddleware({ plan, mountUrl, serviceName, events, }: {
+export default function dataMiddleware({ plan, mountUrl, events, }: {
     plan: any;
     mountUrl: any;
-    serviceName: any;
     events: any;
 }): ((req: any, res: any, next: any) => void)[];

package/dist/middleware/data.js

@@ -18,7 +18,7 @@ const editOrigin = (req) => {
     }
     return '';
 };
-function dataMiddleware({ plan, mountUrl, serviceName, events, }) {
+function dataMiddleware({ plan, mountUrl, events, }) {
     return [
         (req, res, next) => {
             /* ------------------------------------------------ Request decorations */
@@ -37,18 +37,14 @@ function dataMiddleware({ plan, mountUrl, serviceName, events, }) {
             // CASA and userland templates
             res.locals.casa = {
                 mountUrl,
-                serviceName,
             };
             res.locals.locale = req.language;
             // Used by govuk-frontend template
             // - req.language is provided by i18n-http-middleware
             res.locals.htmlLang = req.language;
-            // res.locals.makeLink
-            // res.locals.casa.journeyPreviousUrl
-            // req.session.journeyContext
-            // req.session.language
-            // req.editOriginUrl
-            // req.inEditMode
+            // Function for building URLs. This will be curried with the `mountUrl`
+            // and `journeyContext` for convenience
+            res.locals.waypointUrl = (args) => (0, waypoint_url_js_1.default)(Object.assign({ mountUrl, journeyContext: req.casa.journeyContext }, args));
             // req.editSearchParams
             next();
         },

package/dist/middleware/dirname.d.cts

@@ -0,0 +1,2 @@
+declare const _exports: string;
+export = _exports;

package/dist/middleware/gather-fields.d.ts

@@ -1,5 +1,6 @@
 declare function _default({ waypoint, fields, }: {
     waypoint: string;
-    fields?: any[] | undefined;
+    fields?: import("../lib/field").PageField[] | undefined;
 }): any[];
 export default _default;
+export type PageField = import('../lib/field').PageField;

package/dist/middleware/gather-fields.js

@@ -8,6 +8,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const JourneyContext_js_1 = __importDefault(require("../lib/JourneyContext.js"));
+/**
+ * @typedef {import('../lib/field').PageField} PageField
+ */
 /**
  * Gather the field data from `req.body` into the current JourneyContext
  * - Store in the current session

package/dist/middleware/post.js

@@ -26,31 +26,31 @@ function postMiddleware({ mountUrl, }) {
             // CSRF token is invalid in some way
             if ((err === null || err === void 0 ? void 0 : err.code) === 'EBADCSRFTOKEN') {
                 log.info('CSRF validation has failed. This may be caused by the user submitting a stale form from a previous session [EBADCSRFTOKEN]');
-                return res.status(403).render(TEMPLATE);
+                return res.status(403).render(TEMPLATE, { errorCode: 'bad_csrf_token' });
             }
             // Body parsing verification check failed
             if ((err === null || err === void 0 ? void 0 : err.type) === 'entity.verify.failed') {
                 log.info('Body parser verification has failed. This has been caused by the user submitting a payload containing invalid data [entity.verify.failed]');
-                return res.status(403).render(TEMPLATE);
+                return res.status(403).render(TEMPLATE, { errorCode: 'invalid_payload' });
             }
             // Too many parameters submitted
             if ((err === null || err === void 0 ? void 0 : err.type) === 'parameters.too.many') {
                 log.info('The request contains more parameters than is currently allowed [parameters.too.many]');
-                return res.status(413).render(TEMPLATE);
+                return res.status(413).render(TEMPLATE, { errorCode: 'parameter_limit_exceeded' });
             }
             // Overall payload too large
             if ((err === null || err === void 0 ? void 0 : err.type) === 'entity.too.large') {
                 log.info(`The request payload is too large. Received ${err.length}b with a maximum of ${err.limit}b [parameters.too.many]`);
-                return res.status(413).render(TEMPLATE);
+                return res.status(413).render(TEMPLATE, { errorCode: 'payload_size_exceeded' });
             }
             // Unaccept request method
             if ((err === null || err === void 0 ? void 0 : err.code) === 'unaccepted_request_method') {
                 log.info(err.message);
-                return res.status(400).render(TEMPLATE);
+                return res.status(400).render(TEMPLATE, { errorCode: 'unaccepted_request_method' });
             }
             // Unknown error
             log.error(`Unknown error: ${err.message}; stacktrace: ${err.stack}`);
-            return res.render(TEMPLATE);
+            return res.status(200).render(TEMPLATE);
         },
     ];
 }

package/dist/middleware/sanitise-fields.js

@@ -11,10 +11,10 @@ const field_js_1 = __importDefault(require("../lib/field.js"));
 const JourneyContext_js_1 = __importDefault(require("../lib/JourneyContext.js"));
 exports.default = ({ waypoint, fields = [], }) => {
     // Add some common, transient fields to ensure they survive beyond this sanitisation process
-    fields.push((0, field_js_1.default)('_csrf', { persist: false }).processor(((value) => String(value))));
-    fields.push((0, field_js_1.default)('contextid', { persist: false }).processor(((value) => String(value))));
-    fields.push((0, field_js_1.default)('edit', { persist: false }).processor(((value) => String(value))));
-    fields.push((0, field_js_1.default)('editorigin', { persist: false }).processor(((value) => String(value))));
+    fields.push((0, field_js_1.default)('_csrf', { persist: false }).processor((value) => String(value)));
+    fields.push((0, field_js_1.default)('contextid', { persist: false }).processor((value) => String(value)));
+    fields.push((0, field_js_1.default)('edit', { persist: false }).processor((value) => String(value)));
+    fields.push((0, field_js_1.default)('editorigin', { persist: false }).processor((value) => String(value)));
     // Middleware
     return [
         (req, res, next) => {

package/dist/middleware/session.d.ts

@@ -1,4 +1,4 @@
-export default function sessionMiddleware({ cookieParserMiddleware, secret, name, secure, ttl, mountUrl, cookieSameSite, store, }: {
+export default function sessionMiddleware({ cookieParserMiddleware, secret, name, secure, ttl, mountUrl, cookieSameSite, cookiePath, store, }: {
     cookieParserMiddleware: any;
     secret: any;
     name: any;
@@ -6,5 +6,6 @@ export default function sessionMiddleware({ cookieParserMiddleware, secret, name
     ttl: any;
     mountUrl?: string | undefined;
     cookieSameSite?: boolean | undefined;
+    cookiePath?: string | undefined;
     store?: any;
 }): any[];

package/dist/middleware/session.js

@@ -32,10 +32,10 @@ const log = (0, logger_js_1.default)('middleware:session');
 // - set the session cookie
 // - parse request cookies
 // - handle expiry of server-side session
-function sessionMiddleware({ cookieParserMiddleware, secret, name, secure, ttl, mountUrl = '/', cookieSameSite = true, store = new express_session_1.MemoryStore(), }) {
+function sessionMiddleware({ cookieParserMiddleware, secret, name, secure, ttl, mountUrl = '/', cookieSameSite = true, cookiePath = '/', store = new express_session_1.MemoryStore(), }) {
     const commonCookieOptions = {
         httpOnly: true,
-        path: '/',
+        path: cookiePath,
         secure,
     };
     if (cookieSameSite !== false) {

package/dist/middleware/steer-journey.d.ts

@@ -1,6 +1,7 @@
 declare function _default({ waypoint, plan, mountUrl, }: {
     waypoint: string;
-    plan: any;
+    plan: Plan;
     mountUrl: string;
 }): void;
 export default _default;
+export type Plan = typeof import("../lib/Plan");

package/dist/middleware/steer-journey.js

@@ -8,6 +8,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const waypoint_url_js_1 = __importDefault(require("../lib/waypoint-url.js"));
 const logger_js_1 = __importDefault(require("../lib/logger.js"));
 const log = (0, logger_js_1.default)('middleware:steer-journey');
+/**
+ * @typedef {import('../lib/Plan')} Plan
+ */
 /**
  * This sits in front of all other journey middleware and prevents the user from
  * "jumping ahead" in the Plan.

package/dist/routes/ancillary.d.ts

@@ -1,4 +1,11 @@
+/**
+ * Create an instance of the ancillary router.
+ *
+ * @param {Object} options = Optiona
+ * @param {number} options.sessionTtl Session timeout (seconds)
+ * @returns {MutableRouter} Mutable router
+ */
 export default function ancillaryRouter({ sessionTtl, }: {
-    sessionTtl: any;
+    sessionTtl: number;
 }): MutableRouter;
 import MutableRouter from "../lib/MutableRouter.js";

package/dist/routes/ancillary.js

@@ -4,6 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const MutableRouter_js_1 = __importDefault(require("../lib/MutableRouter.js"));
+/**
+ * Create an instance of the ancillary router.
+ *
+ * @param {Object} options = Optiona
+ * @param {number} options.sessionTtl Session timeout (seconds)
+ * @returns {MutableRouter} Mutable router
+ */
 function ancillaryRouter({ sessionTtl, }) {
     // Router
     const router = new MutableRouter_js_1.default();

package/dist/routes/dirname.d.cts

@@ -0,0 +1,2 @@
+declare const _exports: string;
+export = _exports;

package/dist/routes/journey.js

@@ -80,13 +80,20 @@ function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, mountUrl, })
         const { waypoint, view, hooks: pageHooks = [], fields } = page;
         const formUrl = (0, waypoint_url_js_1.default)({ mountUrl, waypoint });
         const waypointPath = `/${waypoint}`;
-        const commonWaypointMiddleware = [
+        let commonWaypointMiddleware = [
             (req, res, next) => {
                 req.casa.waypoint = waypoint;
+                res.locals.casa.waypoint = waypoint;
                 next();
             },
-            ...(0, skip_waypoint_js_1.default)({ mountUrl, waypoint }),
         ];
+        if (plan.isSkippable(waypoint)) {
+            log.info(`Configuring "${waypoint}" as a skippable waypoint`);
+            commonWaypointMiddleware = [
+                ...commonWaypointMiddleware,
+                ...(0, skip_waypoint_js_1.default)({ mountUrl, waypoint }),
+            ];
+        }
         router.get(waypointPath, ...commonMiddleware, ...commonWaypointMiddleware, ...(0, utils_js_1.resolveMiddlewareHooks)('journey.presteer', waypointPath, [...globalHooks, ...pageHooks]), ...(0, steer_journey_js_1.default)({ waypoint, mountUrl, plan }), ...(0, utils_js_1.resolveMiddlewareHooks)('journey.poststeer', waypointPath, [...globalHooks, ...pageHooks]), ...(0, utils_js_1.resolveMiddlewareHooks)('journey.prerender', waypointPath, [...globalHooks, ...pageHooks]), renderMiddlewareFactory(view, (req) => ({
             formUrl,
             formData: req.casa.journeyContext.getDataForPage(waypoint),

package/dist/routes/static.js

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const express_1 = require("express");
+const express_1 = __importDefault(require("express"));
 const fs_1 = require("fs");
 const url_1 = require("url");
 const path_1 = require("path");
 const module_1 = require("module");
 const dirname_cjs_1 = __importDefault(require("./dirname.cjs"));
 const MutableRouter_js_1 = __importDefault(require("../lib/MutableRouter.js"));
+const { static: ExpressStatic } = express_1.default; // CommonJS
 const oneDay = 86400000;
 /**
  * @typedef {object} StaticOptions Options to configure static router
@@ -56,8 +57,8 @@ function staticRouter({ mountUrl = '/', maxAge = 3600000, }) {
     // The static middleware will only server GET/HEAD requests, so we can mount
     // the middleware using `use()` rather than resorting to `get()`
     const govukFrontendDirectory = (0, path_1.resolve)((0, module_1.createRequire)(dirname_cjs_1.default).resolve('govuk-frontend'), '../../');
-    router.use('/govuk/assets/js/all.js', (0, express_1.static)(`${govukFrontendDirectory}/govuk/all.js`, staticConfig));
-    router.use('/govuk/assets', (0, express_1.static)(`${govukFrontendDirectory}/govuk/assets`, staticConfig));
+    router.use('/govuk/assets/js/all.js', ExpressStatic(`${govukFrontendDirectory}/govuk/all.js`, staticConfig));
+    router.use('/govuk/assets', ExpressStatic(`${govukFrontendDirectory}/govuk/assets`, staticConfig));
     router.use('/govuk/assets', notFoundHandler);
     router.use('/casa/assets/css/casa.css', setHeaders, (req, res) => res.send(casaCss));
     router.use('/casa/assets/css/casa-ie8.css', setHeaders, (req, res) => res.send(casaCssIe8));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwp/govuk-casa",
-  "version": "8.0.0-alpha2",
+  "version": "8.0.0-beta1",
   "description": "A framework for building GOVUK Collect-And-Submit-Applications",
   "main": "dist/casa.js",
   "module": "dist/mjs/casa.js",
@@ -18,58 +18,68 @@
     "node": ">=14.17.2"
   },
   "scripts": {
+    "pipeline": "npm test && npm run test:e2e && npm run lint",
     "test": "mocha './tests/**/*.test.js'",
     "test:e2e": "spiderplan --worker-init ./tests/e2e/worker-init.js --language en ./tests/e2e/personas/**/*.yaml",
+    "test:combined": "npm test; npm run test:e2e",
+    "lint": "eslint .",
+    "coverage": "c8 npm run test:combined",
     "build": "npm run build:prepare && npm run build:sources && npm run build:css-assets",
     "build:prepare": "rm -rf dist/* && mkdir -p dist/assets/js/ && mkdir -p dist/assets/css/",
     "build:sources": "tsc -p tsconfig-cjs.json && ./scripts/fixup.sh",
     "build:css-assets": "node scripts/compile-sass.js",
-    "prepare": "npm run build"
+    "prepare": "npm run build",
+    "upgrade-deps": "OD=$(npm outdated --long --parseable); echo \"$OD\" | grep ':devDependencies:' | awk -F: '{ print $4 }' | xargs npm i -DE; echo \"$OD\" | grep ':dependencies:' | awk -F: '{ print $4 }' | xargs npm i -E"
   },
   "keywords": [],
   "author": "DWP Digital",
   "license": "ISC",
   "type": "module",
   "dependencies": {
-    "cookie-parser": "1.4.5",
+    "cookie-parser": "1.4.6",
     "csurf": "1.11.0",
-    "debug": "4.3.2",
+    "debug": "4.3.3",
     "deepmerge": "4.2.2",
     "express": "4.17.1",
     "express-session": "1.17.2",
     "govuk-frontend": "3.14.0",
     "graphlib": "2.1.8",
     "helmet": "4.6.0",
-    "i18next": "21.3.2",
+    "i18next": "21.6.0",
     "i18next-http-middleware": "3.1.4",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
-    "luxon": "2.0.2",
+    "luxon": "2.1.1",
     "nunjucks": "3.2.3",
     "uuid": "8.3.2",
-    "validator": "^13.6.0"
+    "validator": "^13.7.0"
   },
   "devDependencies": {
-    "@babel/core": "7.15.8",
-    "@babel/eslint-parser": "7.15.8",
-    "@babel/preset-env": "7.15.8",
+    "@babel/core": "7.16.0",
+    "@babel/eslint-parser": "7.16.3",
+    "@babel/preset-env": "7.16.4",
+    "@commitlint/config-conventional": "15.0.0",
     "@dwp/casa-spiderplan": "2.0.0",
     "@dwp/casa-spiderplan-a11y-plugin": "0.1.3",
     "@dwp/casa-spiderplan-zap-plugin": "0.1.1",
-    "@dwp/commitlint-config-base": "1.2.0",
     "@dwp/eslint-config-base": "5.0.1",
     "@types/express": "4.17.13",
-    "@types/node": "16.11.1",
+    "@types/node": "16.11.12",
     "@types/nunjucks": "3.2.0",
     "babel-eslint": "10.1.0",
+    "c8": "7.10.0",
     "chai": "4.3.4",
-    "commitlint": "13.2.1",
+    "commitlint": "15.0.0",
     "eslint": "7.32.0",
     "eslint-plugin-no-unsafe-regex": "1.0.0",
-    "eslint-plugin-sonarjs": "0.10.0",
-    "husky": "7.0.2",
+    "eslint-plugin-sonarjs": "0.11.0",
+    "fast-check": "2.20.0",
+    "husky": "7.0.4",
     "mocha": "9.1.3",
-    "sass": "1.43.2",
-    "typescript": "4.4.4"
+    "sass": "1.44.0",
+    "sinon": "12.0.1",
+    "sinon-chai": "3.7.0",
+    "supertest": "6.1.6",
+    "typescript": "4.5.3"
   }
 }

package/views/casa/layouts/main.njk

@@ -10,7 +10,7 @@
   {# Harcoding content for the skip link as t() may not be availble on some error pages #}
   {{ govukSkipLink({
     href: '#main-content',
-    text: 'Neidio i\'r prif gynnwys' if locale === 'cy' else 'Skip to main content'
+    text: "Neidio i'r prif gynnwys" if locale === 'cy' else 'Skip to main content'
   }) }}
 {% endblock %}
 
@@ -18,7 +18,7 @@
 {% block header %}
   {{ govukHeader({
     assetsPath: assetPath + "/images",
-    serviceName: t(casa.serviceName) if t else '',
+    serviceName: t('common:serviceName') if t else '',
     serviceUrl: casa.mountUrl,
     homepageUrl: "https://www.gov.uk/"
   }) }}