Skip to content

Commit a1f7d09

Browse files
DF-1105: Interactive map - replace UMD with ESM (#1222)
* Interactive map - replace UMD with ESM * Remove blank line * Bump forms-engine-plugin version to 4.15.0 for ESM maps
1 parent 491103c commit a1f7d09

4 files changed

Lines changed: 6 additions & 74 deletions

File tree

package-lock.json

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"license": "SEE LICENSE IN LICENSE",
4747
"dependencies": {
4848
"@aws-sdk/client-sns": "^3.997.0",
49-
"@defra/forms-engine-plugin": "^4.14.4",
49+
"@defra/forms-engine-plugin": "^4.15.0",
5050
"@defra/forms-model": "^3.0.674",
5151
"@defra/hapi-tracing": "^1.30.0",
5252
"@elastic/ecs-pino-format": "^1.5.0",

src/server/views/layout.html

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,6 @@
3232
<link rel="preload" as="font" href="{{ assetPath }}/fonts/bold-b542beb274-v2.woff2" type="font/woff2" crossorigin="anonymous">
3333
<link rel="preload" as="font" href="{{ assetPath }}/fonts/light-94a07e06a1-v2.woff2" type="font/woff2" crossorigin="anonymous">
3434
<link rel="stylesheet" href="{{ getAssetPath("stylesheets/application.scss") }}">
35-
36-
{% if config.useMapsFeature %}
37-
<link href="{{assetPath}}/interactive-map/css/index.css" rel="stylesheet" type="text/css">
38-
<link href="{{assetPath}}/interactive-map/plugins/map-styles/dist/css/index.css" rel="stylesheet" type="text/css">
39-
<link href="{{assetPath}}/interactive-map/plugins/search/dist/css/index.css" rel="stylesheet" type="text/css">
40-
<link href="{{assetPath}}/interactive-map/plugins/scale-bar/dist/css/index.css" rel="stylesheet" type="text/css">
41-
<link href="{{assetPath}}/interactive-map/plugins/interact/dist/css/index.css" rel="stylesheet" type="text/css">
42-
<link href="{{assetPath}}/interactive-map/plugins/draw-ml/dist/css/index.css" rel="stylesheet" type="text/css">
43-
{% endif %}
4435
{% endblock %}
4536

4637
{% block pageTitle -%}
@@ -174,15 +165,6 @@ <h1 class="govuk-heading-l">Default page template</h1>
174165
<script type="module" nonce="{{ cspNonce }}" src="{{ getAssetPath("application.js") }}"></script>
175166

176167
{% if config.useMapsFeature %}
177-
<script nonce="{{ cspNonce }}" src="{{assetPath}}/interactive-map/umd/index.js"></script>
178-
<script nonce="{{ cspNonce }}" src="{{assetPath}}/interactive-map/providers/maplibre/dist/umd/index.js"></script>
179-
<script nonce="{{ cspNonce }}" src="{{assetPath}}/interactive-map/providers/open-names/dist/umd/index.js"></script>
180-
<script nonce="{{ cspNonce }}" src="{{assetPath}}/interactive-map/plugins/map-styles/dist/umd/index.js"></script>
181-
<script nonce="{{ cspNonce }}" src="{{assetPath}}/interactive-map/plugins/search/dist/umd/index.js"></script>
182-
<script nonce="{{ cspNonce }}" src="{{assetPath}}/interactive-map/plugins/scale-bar/dist/umd/index.js"></script>
183-
<script nonce="{{ cspNonce }}" src="{{assetPath}}/interactive-map/plugins/interact/dist/umd/index.js"></script>
184-
<script nonce="{{ cspNonce }}" src="{{assetPath}}/interactive-map/plugins/draw-ml/dist/umd/index.js"></script>
185-
<script nonce="{{ cspNonce }}" src="{{assetPath}}/interactive-map/plugins/datasets/dist/umd/maplibre/index.js"></script>
186168
<script type="module" nonce="{{ cspNonce }}" src="{{ getAssetPath("maps.js") }}"></script>
187169
{% endif %}
188170

webpack.config.js

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -180,57 +180,6 @@ export default {
180180
new CopyPlugin({
181181
patterns: [
182182
{ from: join(govukFrontendPath, 'dist/govuk/assets'), to: 'assets' },
183-
{
184-
from: join(pluginPath, '../interactive-map/dist'),
185-
to: 'assets/interactive-map'
186-
},
187-
{
188-
from: join(pluginPath, '../interactive-map/providers/maplibre'),
189-
to: 'assets/interactive-map/providers/maplibre'
190-
},
191-
{
192-
from: join(
193-
pluginPath,
194-
'../interactive-map/providers/beta/open-names'
195-
),
196-
to: 'assets/interactive-map/providers/open-names'
197-
},
198-
{
199-
from: join(
200-
pluginPath,
201-
'../interactive-map/plugins/beta/map-styles/dist'
202-
),
203-
to: 'assets/interactive-map/plugins/map-styles/dist'
204-
},
205-
{
206-
from: join(
207-
pluginPath,
208-
'../interactive-map/plugins/beta/scale-bar/dist'
209-
),
210-
to: 'assets/interactive-map/plugins/scale-bar/dist'
211-
},
212-
{
213-
from: join(pluginPath, '../interactive-map/plugins/interact/dist'),
214-
to: 'assets/interactive-map/plugins/interact/dist'
215-
},
216-
{
217-
from: join(pluginPath, '../interactive-map/plugins/search/dist'),
218-
to: 'assets/interactive-map/plugins/search/dist'
219-
},
220-
{
221-
from: join(
222-
pluginPath,
223-
'../interactive-map/plugins/beta/draw-ml/dist'
224-
),
225-
to: 'assets/interactive-map/plugins/draw-ml/dist'
226-
},
227-
{
228-
from: join(
229-
pluginPath,
230-
'../interactive-map/plugins/beta/datasets/dist'
231-
),
232-
to: 'assets/interactive-map/plugins/datasets/dist'
233-
},
234183
{
235184
from: join(pluginPath, '../interactive-map/assets'),
236185
to: 'assets/interactive-map/assets'

0 commit comments

Comments
 (0)