@defra/forms-engine-plugin 0.1.26 → 0.1.28

package/.server/server/plugins/nunjucks/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","names":["readFileSync","basename","join","Boom","StatusCodes","config","createLogger","checkFormStatus","encodeUrl","safeGenerateCrumb","logger","webpackManifest","context","request","params","response","isPreview","isPreviewMode","state","formState","isResponseOK","isBoom","statusCode","OK","pluginStorage","server","plugins","consumerViewContext","Error","baseLayoutPath","viewContext","ctx","crumb","currentPath","path","url","search","previewMode","undefined","slug","devtoolContext","_request","manifestPath","get","JSON","parse","error","cdpEnvironment","designerUrl","feedbackLink","phaseTag","serviceName","serviceVersion","assetPath","getDxtAssetPath","asset"],"sources":["../../../../src/server/plugins/nunjucks/context.js"],"sourcesContent":["import { readFileSync } from 'node:fs'\nimport { basename, join } from 'node:path'\n\nimport Boom from '@hapi/boom'\nimport { StatusCodes } from 'http-status-codes'\n\nimport { config } from '~/src/config/index.js'\nimport { createLogger } from '~/src/server/common/helpers/logging/logger.js'\nimport {\n  checkFormStatus,\n  encodeUrl,\n  safeGenerateCrumb\n} from '~/src/server/plugins/engine/helpers.js'\n\nconst logger = createLogger()\n\n/** @type {Record<string, string> | undefined} */\nlet webpackManifest\n\n/**\n * @param {FormRequest | FormRequestPayload | null} request\n */\nexport async function context(request) {\n  const { params, response } = request ?? {}\n\n  const { isPreview: isPreviewMode, state: formState } = checkFormStatus(params)\n\n  // Only add the slug in to the context if the response is OK.\n  // Footer meta links are not rendered when the slug is missing.\n  const isResponseOK =\n    !Boom.isBoom(response) && response?.statusCode === StatusCodes.OK\n\n  const pluginStorage = request?.server.plugins['forms-engine-plugin']\n\n  let consumerViewContext = {}\n\n  if (!pluginStorage) {\n    throw Error('context called before plugin registered')\n  }\n\n  if (!pluginStorage.baseLayoutPath) {\n    throw Error('Missing baseLayoutPath in plugin.options.nunjucks')\n  }\n\n  if (typeof pluginStorage.viewContext === 'function') {\n    consumerViewContext = await pluginStorage.viewContext(request)\n  }\n\n  /** @type {ViewContext} */\n  const ctx = {\n    // take consumers props first so we can override it\n    ...consumerViewContext,\n    baseLayoutPath: pluginStorage.baseLayoutPath,\n    crumb: safeGenerateCrumb(request),\n    currentPath: `${request.path}${request.url.search}`,\n    previewMode: isPreviewMode ? formState : undefined,\n    slug: isResponseOK ? params?.slug : undefined\n  }\n\n  return ctx\n}\n\n/**\n * Returns the context for the devtool. Consumers won't have access to this.\n * @param {FormRequest | FormRequestPayload | null} _request\n * @returns {Record<string, unknown> & { assetPath: string, getDxtAssetPath: (asset: string) => string }}\n */\nexport function devtoolContext(_request) {\n  const manifestPath = join(config.get('publicDir'), 'assets-manifest.json')\n\n  if (!webpackManifest) {\n    try {\n      // eslint-disable-next-line -- Allow JSON type 'any'\n      webpackManifest = JSON.parse(readFileSync(manifestPath, 'utf-8'))\n    } catch {\n      logger.error(`Webpack ${basename(manifestPath)} not found`)\n    }\n  }\n\n  return {\n    config: {\n      cdpEnvironment: config.get('cdpEnvironment'),\n      designerUrl: config.get('designerUrl'),\n      feedbackLink: encodeUrl(config.get('feedbackLink')),\n      phaseTag: config.get('phaseTag'),\n      serviceName: config.get('serviceName'),\n      serviceVersion: config.get('serviceVersion')\n    },\n    assetPath: '/assets',\n    getDxtAssetPath: (asset = '') => {\n      return `/${webpackManifest?.[asset] ?? asset}`\n    }\n  }\n}\n\n/**\n * @import { ViewContext } from '~/src/server/plugins/nunjucks/types.js'\n * @import { FormRequest, FormRequestPayload } from '~/src/server/routes/types.js'\n */\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"context.js","names":["readFileSync","basename","join","Boom","StatusCodes","config","createLogger","checkFormStatus","encodeUrl","safeGenerateCrumb","logger","webpackManifest","context","request","params","response","isPreview","isPreviewMode","state","formState","isResponseOK","isBoom","statusCode","OK","pluginStorage","server","plugins","consumerViewContext","Error","baseLayoutPath","viewContext","ctx","crumb","currentPath","path","url","search","previewMode","undefined","slug","devtoolContext","_request","manifestPath","get","JSON","parse","info","cdpEnvironment","designerUrl","feedbackLink","phaseTag","serviceName","serviceVersion","assetPath","getDxtAssetPath","asset"],"sources":["../../../../src/server/plugins/nunjucks/context.js"],"sourcesContent":["import { readFileSync } from 'node:fs'\nimport { basename, join } from 'node:path'\n\nimport Boom from '@hapi/boom'\nimport { StatusCodes } from 'http-status-codes'\n\nimport { config } from '~/src/config/index.js'\nimport { createLogger } from '~/src/server/common/helpers/logging/logger.js'\nimport {\n  checkFormStatus,\n  encodeUrl,\n  safeGenerateCrumb\n} from '~/src/server/plugins/engine/helpers.js'\n\nconst logger = createLogger()\n\n/** @type {Record<string, string> | undefined} */\nlet webpackManifest\n\n/**\n * @param {FormRequest | FormRequestPayload | null} request\n */\nexport async function context(request) {\n  const { params, response } = request ?? {}\n\n  const { isPreview: isPreviewMode, state: formState } = checkFormStatus(params)\n\n  // Only add the slug in to the context if the response is OK.\n  // Footer meta links are not rendered when the slug is missing.\n  const isResponseOK =\n    !Boom.isBoom(response) && response?.statusCode === StatusCodes.OK\n\n  const pluginStorage = request?.server.plugins['forms-engine-plugin']\n\n  let consumerViewContext = {}\n\n  if (!pluginStorage) {\n    throw Error('context called before plugin registered')\n  }\n\n  if (!pluginStorage.baseLayoutPath) {\n    throw Error('Missing baseLayoutPath in plugin.options.nunjucks')\n  }\n\n  if (typeof pluginStorage.viewContext === 'function') {\n    consumerViewContext = await pluginStorage.viewContext(request)\n  }\n\n  /** @type {ViewContext} */\n  const ctx = {\n    // take consumers props first so we can override it\n    ...consumerViewContext,\n    baseLayoutPath: pluginStorage.baseLayoutPath,\n    crumb: safeGenerateCrumb(request),\n    currentPath: `${request.path}${request.url.search}`,\n    previewMode: isPreviewMode ? formState : undefined,\n    slug: isResponseOK ? params?.slug : undefined\n  }\n\n  return ctx\n}\n\n/**\n * Returns the context for the devtool. Consumers won't have access to this.\n * @param {FormRequest | FormRequestPayload | null} _request\n * @returns {Record<string, unknown> & { assetPath: string, getDxtAssetPath: (asset: string) => string }}\n */\nexport function devtoolContext(_request) {\n  const manifestPath = join(config.get('publicDir'), 'assets-manifest.json')\n\n  if (!webpackManifest) {\n    try {\n      // eslint-disable-next-line -- Allow JSON type 'any'\n      webpackManifest = JSON.parse(readFileSync(manifestPath, 'utf-8'))\n    } catch {\n      logger.info(\n        `[webpackManifestMissing] Webpack ${basename(manifestPath)} not found - running without asset manifest`\n      )\n    }\n  }\n\n  return {\n    config: {\n      cdpEnvironment: config.get('cdpEnvironment'),\n      designerUrl: config.get('designerUrl'),\n      feedbackLink: encodeUrl(config.get('feedbackLink')),\n      phaseTag: config.get('phaseTag'),\n      serviceName: config.get('serviceName'),\n      serviceVersion: config.get('serviceVersion')\n    },\n    assetPath: '/assets',\n    getDxtAssetPath: (asset = '') => {\n      return `/${webpackManifest?.[asset] ?? asset}`\n    }\n  }\n}\n\n/**\n * @import { ViewContext } from '~/src/server/plugins/nunjucks/types.js'\n * @import { FormRequest, FormRequestPayload } from '~/src/server/routes/types.js'\n */\n"],"mappings":"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","ignoreList":[]}

package/.server/server/plugins/nunjucks/environment.d.ts

@@ -13,6 +13,7 @@ export function checkComponentTemplates(this: NunjucksContext, component: Compon
  * @param {string} template
  */
 export function evaluate(this: NunjucksContext, template: string): string;
+export function govukRebrand(): boolean;
 export const paths: string[];
 export const environment: nunjucks.Environment;
 import type { FormSubmissionError } from '~/src/server/plugins/engine/types.js';

package/.server/server/plugins/nunjucks/environment.js

@@ -86,6 +86,10 @@ export function evaluate(template) {
   return context ? evaluateTemplate(template, context) : template;
 }
 environment.addGlobal('evaluate', evaluate);
+export function govukRebrand() {
+  return true;
+}
+environment.addGlobal('govukRebrand', govukRebrand());
 
 /**
  * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'

package/.server/server/plugins/nunjucks/environment.js.map

@@ -1 +1 @@
-{"version":3,"file":"environment.js","names":["dirname","join","ComponentType","nunjucks","resolvePkg","config","evaluateTemplate","filters","govukFrontendPath","sync","paths","get","environment","configure","trimBlocks","lstripBlocks","watch","noCache","name","nunjucksFilter","Object","entries","addFilter","checkErrorTemplates","errors","context","ctx","forEach","error","text","addGlobal","checkComponentTemplates","component","isFormComponent","model","fieldset","legend","label","errorMessage","message","type","Html","content","evaluate","template"],"sources":["../../../../src/server/plugins/nunjucks/environment.js"],"sourcesContent":["import { dirname, join } from 'node:path'\n\nimport { ComponentType } from '@defra/forms-model'\nimport nunjucks from 'nunjucks'\nimport resolvePkg from 'resolve'\n\nimport { config } from '~/src/config/index.js'\nimport { evaluateTemplate } from '~/src/server/plugins/engine/helpers.js'\nimport * as filters from '~/src/server/plugins/nunjucks/filters/index.js'\n\nconst govukFrontendPath = dirname(\n  resolvePkg.sync('govuk-frontend/package.json')\n)\n\nexport const paths = [\n  join(config.get('appDir'), 'plugins/engine/views'),\n  join(config.get('appDir'), 'views')\n]\n\nexport const environment = nunjucks.configure(\n  [...paths, join(govukFrontendPath, 'dist')],\n  {\n    trimBlocks: true,\n    lstripBlocks: true,\n    watch: config.get('isDevelopment'),\n    noCache: config.get('isDevelopment')\n  }\n)\n\nfor (const [name, nunjucksFilter] of Object.entries(filters)) {\n  environment.addFilter(name, nunjucksFilter)\n}\n\n/**\n * @this {NunjucksContext}\n * @param {FormSubmissionError[]} errors\n */\nexport function checkErrorTemplates(errors) {\n  const { context } = this.ctx\n\n  if (!context) {\n    return errors\n  }\n\n  errors.forEach((error) => {\n    error.text = evaluateTemplate(error.text, context)\n  })\n\n  return errors\n}\n\nenvironment.addGlobal('checkErrorTemplates', checkErrorTemplates)\n\n/**\n * @this {NunjucksContext}\n * @param {ComponentViewModel} component\n */\nexport function checkComponentTemplates(component) {\n  const { context } = this.ctx\n\n  if (!context) {\n    return component\n  }\n\n  if (component.isFormComponent) {\n    // Evaluate label/legend text\n    if (component.model.fieldset?.legend?.text) {\n      const legend = component.model.fieldset.legend\n\n      legend.text = evaluateTemplate(legend.text, context)\n    } else if (component.model.label?.text) {\n      const label = component.model.label\n\n      label.text = evaluateTemplate(label.text, context)\n    } else {\n      // No template evaluation needed for other component types\n    }\n\n    // Evaluate error message\n    if (component.model.errorMessage?.text) {\n      const message = component.model.errorMessage\n\n      message.text = evaluateTemplate(message.text, context)\n    }\n  } else if (component.type === ComponentType.Html) {\n    const content = component.model.content\n\n    if (typeof content === 'string') {\n      component.model.content = evaluateTemplate(content, context)\n    }\n  } else {\n    // No template evaluation needed for other component types\n  }\n\n  return component\n}\n\nenvironment.addGlobal('checkComponentTemplates', checkComponentTemplates)\n\n/**\n * @this {NunjucksContext}\n * @param {string} template\n */\nexport function evaluate(template) {\n  const { context } = this.ctx\n\n  return context ? evaluateTemplate(template, context) : template\n}\n\nenvironment.addGlobal('evaluate', evaluate)\n\n/**\n * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'\n * @import { FormSubmissionError } from '~/src/server/plugins/engine/types.js'\n * @import { ComponentViewModel } from '~/src/server/plugins/engine/components/types.js'\n */\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"environment.js","names":["dirname","join","ComponentType","nunjucks","resolvePkg","config","evaluateTemplate","filters","govukFrontendPath","sync","paths","get","environment","configure","trimBlocks","lstripBlocks","watch","noCache","name","nunjucksFilter","Object","entries","addFilter","checkErrorTemplates","errors","context","ctx","forEach","error","text","addGlobal","checkComponentTemplates","component","isFormComponent","model","fieldset","legend","label","errorMessage","message","type","Html","content","evaluate","template","govukRebrand"],"sources":["../../../../src/server/plugins/nunjucks/environment.js"],"sourcesContent":["import { dirname, join } from 'node:path'\n\nimport { ComponentType } from '@defra/forms-model'\nimport nunjucks from 'nunjucks'\nimport resolvePkg from 'resolve'\n\nimport { config } from '~/src/config/index.js'\nimport { evaluateTemplate } from '~/src/server/plugins/engine/helpers.js'\nimport * as filters from '~/src/server/plugins/nunjucks/filters/index.js'\n\nconst govukFrontendPath = dirname(\n  resolvePkg.sync('govuk-frontend/package.json')\n)\n\nexport const paths = [\n  join(config.get('appDir'), 'plugins/engine/views'),\n  join(config.get('appDir'), 'views')\n]\n\nexport const environment = nunjucks.configure(\n  [...paths, join(govukFrontendPath, 'dist')],\n  {\n    trimBlocks: true,\n    lstripBlocks: true,\n    watch: config.get('isDevelopment'),\n    noCache: config.get('isDevelopment')\n  }\n)\n\nfor (const [name, nunjucksFilter] of Object.entries(filters)) {\n  environment.addFilter(name, nunjucksFilter)\n}\n\n/**\n * @this {NunjucksContext}\n * @param {FormSubmissionError[]} errors\n */\nexport function checkErrorTemplates(errors) {\n  const { context } = this.ctx\n\n  if (!context) {\n    return errors\n  }\n\n  errors.forEach((error) => {\n    error.text = evaluateTemplate(error.text, context)\n  })\n\n  return errors\n}\n\nenvironment.addGlobal('checkErrorTemplates', checkErrorTemplates)\n\n/**\n * @this {NunjucksContext}\n * @param {ComponentViewModel} component\n */\nexport function checkComponentTemplates(component) {\n  const { context } = this.ctx\n\n  if (!context) {\n    return component\n  }\n\n  if (component.isFormComponent) {\n    // Evaluate label/legend text\n    if (component.model.fieldset?.legend?.text) {\n      const legend = component.model.fieldset.legend\n\n      legend.text = evaluateTemplate(legend.text, context)\n    } else if (component.model.label?.text) {\n      const label = component.model.label\n\n      label.text = evaluateTemplate(label.text, context)\n    } else {\n      // No template evaluation needed for other component types\n    }\n\n    // Evaluate error message\n    if (component.model.errorMessage?.text) {\n      const message = component.model.errorMessage\n\n      message.text = evaluateTemplate(message.text, context)\n    }\n  } else if (component.type === ComponentType.Html) {\n    const content = component.model.content\n\n    if (typeof content === 'string') {\n      component.model.content = evaluateTemplate(content, context)\n    }\n  } else {\n    // No template evaluation needed for other component types\n  }\n\n  return component\n}\n\nenvironment.addGlobal('checkComponentTemplates', checkComponentTemplates)\n\n/**\n * @this {NunjucksContext}\n * @param {string} template\n */\nexport function evaluate(template) {\n  const { context } = this.ctx\n\n  return context ? evaluateTemplate(template, context) : template\n}\n\nenvironment.addGlobal('evaluate', evaluate)\n\nexport function govukRebrand() {\n  return true\n}\n\nenvironment.addGlobal('govukRebrand', govukRebrand())\n\n/**\n * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'\n * @import { FormSubmissionError } from '~/src/server/plugins/engine/types.js'\n * @import { ComponentViewModel } from '~/src/server/plugins/engine/components/types.js'\n */\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-engine-plugin",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "Defra forms engine",
   "type": "module",
   "files": [
@@ -63,7 +63,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "dependencies": {
-    "@defra/forms-model": "^3.0.441",
+    "@defra/forms-model": "^3.0.497",
     "@defra/hapi-tracing": "^1.0.0",
     "@elastic/ecs-pino-format": "^1.5.0",
     "@hapi/boom": "^10.0.1",
@@ -87,22 +87,22 @@
     "btoa": "^1.2.1",
     "convict": "^6.2.4",
     "date-fns": "^4.1.0",
-    "dotenv": "^16.4.7",
+    "dotenv": "^16.5.0",
     "expr-eval": "^2.0.2",
-    "govuk-frontend": "^5.7.1",
+    "govuk-frontend": "^5.10.2",
     "hapi-pino": "^12.1.0",
     "hapi-pulse": "^3.0.1",
     "highlight.js": "^11.11.1",
     "http-status-codes": "^2.3.0",
-    "humanize-duration": "^3.32.1",
-    "ioredis": "^5.6.0",
+    "humanize-duration": "^3.33.0",
+    "ioredis": "^5.6.1",
     "joi": "^17.13.3",
-    "liquidjs": "^10.21.0",
+    "liquidjs": "^10.21.1",
     "lodash": "^4.17.21",
     "marked": "^15.0.7",
     "nunjucks": "^3.2.3",
     "outdent": "^0.8.0",
-    "pino": "^9.6.0",
+    "pino": "^9.7.0",
     "pino-pretty": "^13.0.0",
     "proxy-agent": "^6.5.0",
     "resolve": "^1.22.10",
@@ -120,18 +120,18 @@
     "@types/btoa": "^1.2.5",
     "@types/convict": "^6.1.6",
     "@types/eslint": "^9.6.1",
-    "@types/govuk-frontend": "^5.7.0",
+    "@types/govuk-frontend": "^5.9.0",
     "@types/hapi": "^18.0.14",
     "@types/hapi__catbox-memory": "^4.1.8",
     "@types/hapi__cookie": "^12.0.5",
     "@types/hapi__crumb": "^7.3.7",
     "@types/hapi__yar": "^10.1.6",
     "@types/hoek": "^4.1.7",
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^30.0.0",
     "@types/jsdom": "^21.1.7",
-    "@types/lodash": "^4.17.13",
-    "@types/mysql": "^2.15.26",
-    "@types/node": "^22.10.2",
+    "@types/lodash": "^4.17.17",
+    "@types/mysql": "^2.15.27",
+    "@types/node": "^24.0.2",
     "@types/nunjucks": "^3.2.6",
     "@types/resolve": "^1.20.6",
     "@types/url-parse": "^1.4.11",
@@ -145,7 +145,7 @@
     "babel-plugin-replace-import-extension": "^1.1.4",
     "babel-plugin-transform-import-meta": "^2.3.2",
     "clean-webpack-plugin": "^4.0.0",
-    "concurrently": "^9.1.2",
+    "concurrently": "^9.2.0",
     "cookie": "^1.0.2",
     "copy-webpack-plugin": "^12.0.2",
     "core-js": "^3.39.0",
@@ -161,11 +161,11 @@
     "eslint-plugin-jsdoc": "^50.6.1",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-promise": "^6.6.0",
-    "global-jsdom": "^25.0.0",
+    "global-jsdom": "^26.0.0",
     "husky": "^9.1.7",
-    "jest": "^29.7.0",
+    "jest": "^30.0.2",
     "jest-extended": "^4.0.2",
-    "jsdom": "^25.0.1",
+    "jsdom": "^26.1.0",
     "lint-staged": "^15.3.0",
     "postcss": "^8.4.49",
     "postcss-load-config": "^6.0.1",
@@ -178,7 +178,7 @@
     "stylelint": "^16.12.0",
     "stylelint-config-gds": "^2.0.0",
     "terser-webpack-plugin": "^5.3.11",
-    "tsx": "^4.19.3",
+    "tsx": "^4.20.3",
     "typescript": "^5.7.2",
     "webpack": "^5.97.1",
     "webpack-assets-manifest": "^6.0.2",

package/src/index.ts

@@ -1,3 +1,5 @@
+import { getErrorMessage } from '@defra/forms-model'
+
 import { config } from '~/src/config/index.js'
 import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
 import { createServer } from '~/src/server/index.js'
@@ -5,8 +7,9 @@ import { createServer } from '~/src/server/index.js'
 const logger = createLogger()
 
 process.on('unhandledRejection', (error) => {
+  const err = getErrorMessage(error)
   logger.info('Unhandled rejection')
-  logger.error(error)
+  logger.error(err, `[unhandledRejection] Unhandled promise rejection: ${err}`)
   throw error
 })
 
@@ -26,6 +29,8 @@ async function startServer() {
 }
 
 startServer().catch((error: unknown) => {
+  const err = getErrorMessage(error)
   logger.info('Server failed to start :(')
-  logger.error(error)
+  logger.error(err, `[serverStartup] Server failed to start: ${err}`)
+  throw error
 })

package/src/server/common/helpers/logging/request-tracing.js

@@ -6,5 +6,5 @@ import { config } from '~/src/config/index.js'
 
 export const requestTracing = {
   plugin: tracing,
-  options: { tracingHeader: config.get('tracing').header }
+  options: { tracingHeader: config.get('tracing.header') }
 }

package/src/server/common/helpers/redis-client.js

@@ -1,3 +1,4 @@
+import { getErrorMessage } from '@defra/forms-model'
 import { Cluster, Redis } from 'ioredis'
 
 import { config } from '~/src/config/index.js'
@@ -53,17 +54,18 @@ export function buildRedisClient() {
   }
 
   redisClient.on('connect', () => {
-    logger.info('Connected to Redis server')
+    logger.info('[redisConnected] Connected to Redis server')
   })
 
   redisClient.on('close', () => {
     logger.warn(
-      'Redis connection closed attempting reconnect with default behavior'
+      '[redisDisconnected] Redis connection closed attempting reconnect with default behavior'
     )
   })
 
   redisClient.on('error', (error) => {
-    logger.error(error, `Redis connection error ${error}.`)
+    const err = getErrorMessage(error)
+    logger.error(err, `[redisConnectionError] Redis connection error - ${err}`)
   })
 
   return redisClient

package/src/server/constants.js

@@ -1,3 +1,2 @@
 export const PREVIEW_PATH_PREFIX = '/preview'
-export const ERROR_PREVIEW_PATH_PREFIX = '/error-preview'
 export const FORM_PREFIX = ''

package/src/server/index.ts

@@ -89,7 +89,6 @@ export async function createServer(routeConfig?: RouteConfig) {
   await server.register(inert)
   await server.register(Scooter)
   await server.register(pluginCrumb)
-
   await server.register(pluginEngine)
 
   server.ext('onPreResponse', (request: Request, h: ResponseToolkit) => {
@@ -126,7 +125,11 @@ export async function createServer(routeConfig?: RouteConfig) {
   })
 
   await server.register(pluginErrorPages)
-  await server.register(blipp)
+
+  if (config.get('cdpEnvironment') === 'local') {
+    await server.register(blipp)
+  }
+
   await server.register(requestTracing)
 
   return server

package/src/server/plugins/engine/components/DatePartsField.test.ts

@@ -242,9 +242,26 @@ describe('DatePartsField', () => {
           })
         )
 
+        // Check a non-4-digit year shows as an error
+        const state4 = getFormState({
+          day: 1,
+          month: 2,
+          year: 20
+        })
+        const result4 = field.getContextValueFromState(state4)
+
+        const state5 = getFormState({
+          day: 1,
+          month: 2,
+          year: 2000
+        })
+        const result5 = field.getContextValueFromState(state5)
+
         expect(result1.errors).toBeTruthy()
         expect(result2.errors).toBeTruthy()
         expect(result3.errors).toBeTruthy()
+        expect(result4).toBeNull()
+        expect(result5).toBe('2000-02-01')
       })
     })
 

package/src/server/plugins/engine/components/DatePartsField.ts

@@ -9,7 +9,11 @@ import {
   isFormValue
 } from '~/src/server/plugins/engine/components/FormComponent.js'
 import { NumberField } from '~/src/server/plugins/engine/components/NumberField.js'
-import { type DateInputItem } from '~/src/server/plugins/engine/components/types.js'
+import {
+  type DateInputItem,
+  type DatePartsState
+} from '~/src/server/plugins/engine/components/types.js'
+import { parseStrictDate } from '~/src/server/plugins/engine/date-helper.js'
 import { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'
 import {
   type ErrorMessageTemplateList,
@@ -121,7 +125,8 @@ export class DatePartsField extends FormComponent {
     if (
       !value ||
       !isValid(
-        parse(
+        parseStrictDate(
+          value,
           `${value.year}-${value.month}-${value.day}`,
           'yyyy-MM-dd',
           new Date()
@@ -232,12 +237,6 @@ export class DatePartsField extends FormComponent {
   }
 }
 
-export interface DatePartsState extends Record<string, number> {
-  day: number
-  month: number
-  year: number
-}
-
 export function getValidatorDate(component: DatePartsField) {
   const validator: CustomValidator = (payload: FormPayload, helpers) => {
     const { collection, name, options } = component

package/src/server/plugins/engine/components/MonthYearField.test.ts

@@ -222,9 +222,24 @@ describe('MonthYearField', () => {
           })
         )
 
+        // Check a non-4-digit year shows as an error
+        const state4 = getFormState({
+          month: 2,
+          year: 20
+        })
+        const result4 = field.getContextValueFromState(state4)
+
+        const state5 = getFormState({
+          month: 5,
+          year: 2000
+        })
+        const result5 = field.getContextValueFromState(state5)
+
         expect(result1.errors).toBeTruthy()
         expect(result2.errors).toBeTruthy()
         expect(result3.errors).toBeTruthy()
+        expect(result4).toBeNull()
+        expect(result5).toBe('2000-05')
       })
     })
 

package/src/server/plugins/engine/components/MonthYearField.ts

@@ -1,5 +1,5 @@
 import { ComponentType, type MonthYearFieldComponent } from '@defra/forms-model'
-import { format, isValid, parse } from 'date-fns'
+import { format, isValid } from 'date-fns'
 import {
   type Context,
   type CustomValidator,
@@ -14,7 +14,11 @@ import {
   isFormValue
 } from '~/src/server/plugins/engine/components/FormComponent.js'
 import { NumberField } from '~/src/server/plugins/engine/components/NumberField.js'
-import { type DateInputItem } from '~/src/server/plugins/engine/components/types.js'
+import {
+  type DateInputItem,
+  type MonthYearState
+} from '~/src/server/plugins/engine/components/types.js'
+import { parseStrictDate } from '~/src/server/plugins/engine/date-helper.js'
 import { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'
 import {
   type ErrorMessageTemplateList,
@@ -119,7 +123,12 @@ export class MonthYearField extends FormComponent {
     if (
       !value ||
       !isValid(
-        parse(`${value.year}-${value.month}-01`, 'yyyy-MM-dd', new Date())
+        parseStrictDate(
+          value,
+          `${value.year}-${value.month}-01`,
+          'yyyy-MM-dd',
+          new Date()
+        )
       )
     ) {
       return null
@@ -223,11 +232,6 @@ export class MonthYearField extends FormComponent {
   }
 }
 
-export interface MonthYearState extends Record<string, number> {
-  month: number
-  year: number
-}
-
 export function getValidatorMonthYear(component: MonthYearField) {
   const validator: CustomValidator = (payload: FormPayload, helpers) => {
     const { collection, name, options } = component

package/src/server/plugins/engine/components/YesNoField.ts

@@ -1,4 +1,9 @@
-import { type YesNoFieldComponent } from '@defra/forms-model'
+import {
+  SchemaVersion,
+  yesNoListId,
+  yesNoListName,
+  type YesNoFieldComponent
+} from '@defra/forms-model'
 
 import { SelectionControlField } from '~/src/server/plugins/engine/components/SelectionControlField.js'
 import { addClassOptionIfNone } from '~/src/server/plugins/engine/components/helpers.js'
@@ -17,7 +22,16 @@ export class YesNoField extends SelectionControlField {
     def: YesNoFieldComponent,
     props: ConstructorParameters<typeof SelectionControlField>[1]
   ) {
-    super({ ...def, list: '__yesNo' }, props)
+    super(
+      {
+        ...def,
+        list:
+          props.model.schemaVersion === SchemaVersion.V1
+            ? yesNoListName
+            : yesNoListId
+      },
+      props
+    )
 
     const { options } = def
     let { formSchema } = this

package/src/server/plugins/engine/components/types.ts

@@ -115,3 +115,14 @@ export interface ComponentViewModel {
   isFormComponent: boolean
   model: ViewModel
 }
+
+export interface DatePartsState extends Record<string, number> {
+  day: number
+  month: number
+  year: number
+}
+
+export interface MonthYearState extends Record<string, number> {
+  month: number
+  year: number
+}

package/src/server/plugins/engine/date-helper.test.ts

@@ -0,0 +1,47 @@
+import { startOfToday } from 'date-fns'
+
+import {
+  parseStrictDate,
+  todayAsDateOnly
+} from '~/src/server/plugins/engine/date-helper.js'
+
+describe('todayAsDateOnly()', () => {
+  test('should return today with no time element', () => {
+    expect(todayAsDateOnly()).toEqual(startOfToday())
+  })
+})
+
+describe('parseStrictDate()', () => {
+  test('should parse valid date', () => {
+    const dateObj = {
+      year: 2025,
+      month: 5,
+      day: 21
+    }
+    expect(
+      parseStrictDate(dateObj, '2025-05-21', 'yyyy-MM-dd', new Date())
+    ).toEqual(new Date(2025, 4, 21))
+  })
+
+  test('should fail to parse invalid date with 4-digit year', () => {
+    const dateObj = {
+      year: 2025,
+      month: 15,
+      day: 21
+    }
+    expect(
+      parseStrictDate(dateObj, '2025-15-21', 'yyyy-MM-dd', new Date())
+    ).toBeNaN()
+  })
+
+  test('should fail to parse valid date that has non-4-digit year', () => {
+    const dateObj = {
+      year: 25,
+      month: 5,
+      day: 21
+    }
+    expect(
+      parseStrictDate(dateObj, '25-15-21', 'yyyy-MM-dd', new Date())
+    ).toBeNaN()
+  })
+})

package/src/server/plugins/engine/date-helper.ts

@@ -0,0 +1,32 @@
+import { parse, startOfToday } from 'date-fns'
+
+import {
+  type DatePartsState,
+  type MonthYearState
+} from '~/src/server/plugins/engine/components/types.js'
+
+/**
+ * This function is just a wrapper for startOfToday() but, since it's in a separate file, allows
+ * the function to be easily mocked for unit testing.
+ * @returns {Date}
+ */
+export function todayAsDateOnly() {
+  return startOfToday()
+}
+
+/**
+ * Wrapper for date-fns parse() method to ensure the year is 4-digits. It seems parse() allows a non-4-digit year
+ * despite the format mask enforcing it.
+ */
+export function parseStrictDate(
+  dateObj: DatePartsState | MonthYearState,
+  dateStr: string,
+  formatStr: string,
+  referenceDate: Date
+) {
+  if (!dateObj.year || dateObj.year < 1000 || dateObj.year > 9999) {
+    return NaN
+  }
+
+  return parse(dateStr, formatStr, referenceDate)
+}

package/src/server/plugins/engine/helpers.ts

@@ -1,6 +1,7 @@
 import {
   ControllerPath,
   Engine,
+  getErrorMessage,
   hasComponents,
   isFormType,
   type ComponentDef,
@@ -148,7 +149,11 @@ export function encodeUrl(link?: string) {
     try {
       return new URL(link).toString() // escape the search params without breaking the ? and & reserved characters in rfc2368
     } catch (err) {
-      logger.error(err, `Failed to encode ${link}`)
+      const errMsg = getErrorMessage(err)
+      logger.error(
+        errMsg,
+        `[urlEncodingFailed] Failed to encode URL: ${link} - ${errMsg}`
+      )
       throw err
     }
   }
@@ -404,7 +409,9 @@ export function setPageTitles(def: FormDefinition) {
       if (!page.title) {
         const formNameMsg = def.name ? ` in form '${def.name}'` : ''
 
-        logger.warn(`Page '${page.path}' has no title${formNameMsg}`)
+        logger.info(
+          `[pageTitleMissing] Page '${page.path}' has no title${formNameMsg}`
+        )
       }
     }
   })

package/src/server/plugins/engine/index.ts

@@ -6,7 +6,8 @@ import { type FilterFunction } from '~/src/server/plugins/engine/types.js'
 import {
   checkComponentTemplates,
   checkErrorTemplates,
-  evaluate
+  evaluate,
+  govukRebrand
 } from '~/src/server/plugins/nunjucks/environment.js'
 import * as filters from '~/src/server/plugins/nunjucks/filters/index.js'
 
@@ -16,7 +17,8 @@ export { context } from '~/src/server/plugins/nunjucks/context.js'
 const globals = {
   checkComponentTemplates,
   checkErrorTemplates,
-  evaluate
+  evaluate,
+  govukRebrand
 }
 
 export const VIEW_PATH = 'src/server/plugins/engine/views'