From 443a1e199c96ecef706efdc9725044bcafcc5766 Mon Sep 17 00:00:00 2001 From: David Stone Date: Mon, 27 Apr 2026 12:21:01 +0100 Subject: [PATCH 1/4] Update webpack to copy ESRI logo --- src/server/views/layout.html | 1 + webpack.config.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/server/views/layout.html b/src/server/views/layout.html index d47d54744..c9b5dd76d 100644 --- a/src/server/views/layout.html +++ b/src/server/views/layout.html @@ -182,6 +182,7 @@

Default page template

+ {% endif %} diff --git a/webpack.config.js b/webpack.config.js index 1c7e16a9c..dcb471691 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -227,6 +227,10 @@ export default { { from: join(pluginPath, '../interactive-map/assets'), to: 'assets/interactive-map/assets' + }, + { + from: join(pluginPath, './.server/images/esri-logo.png'), + to: 'assets/interactive-map/assets/images' } ] }) From c5825ebce3fefb3ab27656082c8fa3b3aacac99b Mon Sep 17 00:00:00 2001 From: David Stone Date: Mon, 27 Apr 2026 12:24:51 +0100 Subject: [PATCH 2/4] Revert dataset UMD link --- src/server/views/layout.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/server/views/layout.html b/src/server/views/layout.html index c9b5dd76d..d47d54744 100644 --- a/src/server/views/layout.html +++ b/src/server/views/layout.html @@ -182,7 +182,6 @@

Default page template

- {% endif %} From e7f85a990fcdd33295b0d38fa5f8475b14bba95e Mon Sep 17 00:00:00 2001 From: David Stone Date: Mon, 27 Apr 2026 12:44:48 +0100 Subject: [PATCH 3/4] Bump forms-engine-plugin to v4.9.1 --- package-lock.json | 16 ++++++++-------- package.json | 2 +- webpack.config.js | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index ba51b8e15..943a0af4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "SEE LICENSE IN LICENSE", "dependencies": { "@aws-sdk/client-sns": "^3.997.0", - "@defra/forms-engine-plugin": "^4.8.0", + "@defra/forms-engine-plugin": "^4.9.1", "@defra/forms-model": "^3.0.647", "@defra/hapi-tracing": "^1.30.0", "@elastic/ecs-pino-format": "^1.5.0", @@ -4043,13 +4043,13 @@ } }, "node_modules/@defra/forms-engine-plugin": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@defra/forms-engine-plugin/-/forms-engine-plugin-4.8.0.tgz", - "integrity": "sha512-iY9sTw8YwWsLT+RHFJDydy1tyLUjjD/oh+nlG6W1KDfjHzNOhz2lv2kU1of1F5KnRke0RNAMH/ij1dReSmObTw==", + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/@defra/forms-engine-plugin/-/forms-engine-plugin-4.9.1.tgz", + "integrity": "sha512-VC063tb40/PA8mapU2FxRVw8zYi65UG/aXbAQYsRKt1q1YDT+ZaNprZGszN1yibd0HT5ZUIrsnLszJNfZ8O/0A==", "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "dependencies": { - "@defra/forms-model": "^3.0.647", + "@defra/forms-model": "^3.0.648", "@defra/hapi-tracing": "^1.29.0", "@defra/interactive-map": "^0.0.17-alpha", "@elastic/ecs-pino-format": "^1.5.0", @@ -4158,9 +4158,9 @@ } }, "node_modules/@defra/forms-model": { - "version": "3.0.647", - "resolved": "https://registry.npmjs.org/@defra/forms-model/-/forms-model-3.0.647.tgz", - "integrity": "sha512-H0zlUy51ownjQE6QnhJtm7anjcnVZrktI7yMloWUuDVhK4hN4c2Obnj5iB7QbqFEAeRxAXDjn2gjBm1JzZlx5A==", + "version": "3.0.649", + "resolved": "https://registry.npmjs.org/@defra/forms-model/-/forms-model-3.0.649.tgz", + "integrity": "sha512-zmJlDrPeBFjNaF26Zv1Gxm79J4Kgqu90mns3N59LCNQnEYFwb0zgmSEam9xbMltHDjbAtbdm5R7/RnxMbzPZMg==", "license": "OGL-UK-3.0", "dependencies": { "@joi/date": "^2.1.1", diff --git a/package.json b/package.json index 1fea1216a..96a038222 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "license": "SEE LICENSE IN LICENSE", "dependencies": { "@aws-sdk/client-sns": "^3.997.0", - "@defra/forms-engine-plugin": "^4.8.0", + "@defra/forms-engine-plugin": "^4.9.1", "@defra/forms-model": "^3.0.647", "@defra/hapi-tracing": "^1.30.0", "@elastic/ecs-pino-format": "^1.5.0", diff --git a/webpack.config.js b/webpack.config.js index dcb471691..a6e74d4e8 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -229,7 +229,7 @@ export default { to: 'assets/interactive-map/assets' }, { - from: join(pluginPath, './.server/images/esri-logo.png'), + from: join(pluginPath, './.server/client/images/esri-logo.png'), to: 'assets/interactive-map/assets/images' } ] From 3b0e4b9fb542c6ce4a1a9ec0c414e56ec71657d0 Mon Sep 17 00:00:00 2001 From: Mohammed Khalid Date: Mon, 27 Apr 2026 13:10:45 +0100 Subject: [PATCH 4/4] fix(test): bump fixture amount to match payment state in CYA tests DF-832 added an amount-equality gate in the engine before paymentState is exposed on the view model. The basic-with-payment fixture had amount: 125 but the SummaryPageWithConfirmationEmailController tests construct payment state with amount: 150, so the gate fails and the payerEmail prepop never runs. --- test/form/definitions/basic-with-payment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/form/definitions/basic-with-payment.js b/test/form/definitions/basic-with-payment.js index c7924ca7a..f1d9f8664 100644 --- a/test/form/definitions/basic-with-payment.js +++ b/test/form/definitions/basic-with-payment.js @@ -61,7 +61,7 @@ export default /** @satisfies {FormDefinition} */ ({ components: [ { options: { - amount: 125, + amount: 150, description: 'Pay for your licence' }, type: ComponentType.PaymentField,