From 3274d753c4ac7200db9a0bc4ef2de2cdbe4d1e98 Mon Sep 17 00:00:00 2001 From: David Stone Date: Thu, 4 Jun 2026 14:00:00 +0100 Subject: [PATCH 1/3] Interactive map - replace UMD with ESM --- src/server/views/layout.html | 17 ------------ webpack.config.js | 51 ------------------------------------ 2 files changed, 68 deletions(-) diff --git a/src/server/views/layout.html b/src/server/views/layout.html index 5962a0475..f3c9ca7a8 100644 --- a/src/server/views/layout.html +++ b/src/server/views/layout.html @@ -33,14 +33,6 @@ - {% if config.useMapsFeature %} - - - - - - - {% endif %} {% endblock %} {% block pageTitle -%} @@ -174,15 +166,6 @@

Default page template

{% if config.useMapsFeature %} - - - - - - - - - {% endif %} diff --git a/webpack.config.js b/webpack.config.js index 19fb0fd18..5babe29af 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -180,57 +180,6 @@ export default { new CopyPlugin({ patterns: [ { from: join(govukFrontendPath, 'dist/govuk/assets'), to: 'assets' }, - { - from: join(pluginPath, '../interactive-map/dist'), - to: 'assets/interactive-map' - }, - { - from: join(pluginPath, '../interactive-map/providers/maplibre'), - to: 'assets/interactive-map/providers/maplibre' - }, - { - from: join( - pluginPath, - '../interactive-map/providers/beta/open-names' - ), - to: 'assets/interactive-map/providers/open-names' - }, - { - from: join( - pluginPath, - '../interactive-map/plugins/beta/map-styles/dist' - ), - to: 'assets/interactive-map/plugins/map-styles/dist' - }, - { - from: join( - pluginPath, - '../interactive-map/plugins/beta/scale-bar/dist' - ), - to: 'assets/interactive-map/plugins/scale-bar/dist' - }, - { - from: join(pluginPath, '../interactive-map/plugins/interact/dist'), - to: 'assets/interactive-map/plugins/interact/dist' - }, - { - from: join(pluginPath, '../interactive-map/plugins/search/dist'), - to: 'assets/interactive-map/plugins/search/dist' - }, - { - from: join( - pluginPath, - '../interactive-map/plugins/beta/draw-ml/dist' - ), - to: 'assets/interactive-map/plugins/draw-ml/dist' - }, - { - from: join( - pluginPath, - '../interactive-map/plugins/beta/datasets/dist' - ), - to: 'assets/interactive-map/plugins/datasets/dist' - }, { from: join(pluginPath, '../interactive-map/assets'), to: 'assets/interactive-map/assets' From 97ae4f4a176a98ebe1ea5d9e4760e01c152113bb Mon Sep 17 00:00:00 2001 From: David Stone Date: Thu, 4 Jun 2026 14:00:16 +0100 Subject: [PATCH 2/3] Remove blank line --- 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 f3c9ca7a8..e6d2be907 100644 --- a/src/server/views/layout.html +++ b/src/server/views/layout.html @@ -32,7 +32,6 @@ - {% endblock %} {% block pageTitle -%} From da31a8e5110bfadd46d1b7f7654178fdd5b4b304 Mon Sep 17 00:00:00 2001 From: David Stone Date: Fri, 5 Jun 2026 10:58:17 +0100 Subject: [PATCH 3/3] Bump forms-engine-plugin version to 4.15.0 for ESM maps --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c2036cd71..1ecc829dd 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.14.4", + "@defra/forms-engine-plugin": "^4.15.0", "@defra/forms-model": "^3.0.674", "@defra/hapi-tracing": "^1.30.0", "@elastic/ecs-pino-format": "^1.5.0", @@ -4044,9 +4044,9 @@ } }, "node_modules/@defra/forms-engine-plugin": { - "version": "4.14.4", - "resolved": "https://registry.npmjs.org/@defra/forms-engine-plugin/-/forms-engine-plugin-4.14.4.tgz", - "integrity": "sha512-n/FlFvQpNhCx20AxdaYJhZzUWApzXjsxaSaktCTX4PP76kBNcqu7LaJmUmNyQb5mcvXjKsMOJccInGABZFMGkg==", + "version": "4.15.0", + "resolved": "https://registry.npmjs.org/@defra/forms-engine-plugin/-/forms-engine-plugin-4.15.0.tgz", + "integrity": "sha512-b/K4Clz9rDOWXcU7H5W13dhvC2Hp7rQprNwvQxgLgczEIqljIlgZv5eYTgDs6PtHm7x6yHuV3j6j6hF467g/kA==", "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "dependencies": { @@ -4093,6 +4093,7 @@ "joi": "^17.13.3", "liquidjs": "^10.24.0", "lodash": "^4.17.21", + "maplibre-gl": "^5.24.0", "marked": "^15.0.12", "nunjucks": "^3.2.4", "obscenity": "^0.4.5", diff --git a/package.json b/package.json index c444b4dfe..9a47e7f2d 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.14.4", + "@defra/forms-engine-plugin": "^4.15.0", "@defra/forms-model": "^3.0.674", "@defra/hapi-tracing": "^1.30.0", "@elastic/ecs-pino-format": "^1.5.0",