Merge pull request #250 from digital-land/maplibre_rollup

Maplibre rollup hotfix

Author: GeorgeGoodall

Makefile

@@ -110,6 +110,7 @@ govukAssets::
 	npx nps copy.govukAssets
 
 javascripts:
+	npm run build
 	rsync -r assets/javascripts static/
 
 robots:
@@ -122,6 +123,7 @@ frontend:
 	make stylesheets
 	make govukAssets
 	rsync -r assets/images static/
+	cp node_modules/maplibre-gl/dist/maplibre-gl.css static/stylesheets/maplibre-gl.css
 
 frontend-all: clean frontend
 

application/templates/entity.html

@@ -29,8 +29,8 @@
 {% endblock %}
 
 {%- block mapAssets %}
-  <script src='https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.js'></script>
-  <link href='https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.css' rel='stylesheet' />
+  <script src='/static/javascripts/maplibre-gl.js'></script>
+  <link href='/static/stylesheets/maplibre-gl.css' rel='stylesheet' />
   <script src='https://api.mapbox.com/mapbox.js/plugins/turf/v2.0.2/turf.min.js'></script>
   {{ super() }}
 {% endblock -%}

application/templates/national-map.html

@@ -14,8 +14,8 @@
 %}
 
 {%- block mapAssets %}
-  <script src='https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.js'></script>
-  <link href='https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.css' rel='stylesheet' />
+  <script src='/static/javascripts/maplibre-gl.js'></script>
+  <link href='/static/stylesheets/maplibre-gl.css' rel='stylesheet' />
   {{ super() }}
 {% endblock -%}
 

application/templates/search.html

@@ -12,8 +12,8 @@
 {% from 'components/pagination/macro.jinja' import appPagination %}
 
 {%- block mapAssets %}
-  <script src='https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.js'></script>
-  <link href='https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.css' rel='stylesheet' />
+  <script src='/static/javascripts/maplibre-gl.js'></script>
+  <link href='/static/stylesheets/maplibre-gl.css' rel='stylesheet' />
   <script src='https://api.mapbox.com/mapbox.js/plugins/turf/v2.0.2/turf.min.js'></script>
   {{ super() }}
 {% endblock -%}

package.json

@@ -31,13 +31,14 @@
     "test": "vitest run",
     "coverage": "vitest run --coverage",
     "test-unit": "vitest run --dir tests/unit/javascript",
-    "test-integration": "vitest run --dir tests/integration/javascript"
+    "test-integration": "vitest run --dir tests/integration/javascript",
+    "build": "rollup -c"
   },
   "dependencies": {
     "copyfiles": "^2.4.1",
     "govuk-frontend": "4.2.0",
-    "node-sass": "^9.0.0",
-    "nps": "^5.10.0"
+    "maplibre-gl": "^4.1.2",
+    "node-sass": "^9.0.0"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^0.34.1",

rollup.config.js

@@ -0,0 +1,10 @@
+// get the config object from the package file
+module.exports = [
+  {
+    input: `./node_modules/maplibre-gl/dist/maplibre-gl.js`,
+    output: {
+      file: `static/javascripts/maplibre-gl.js`,
+      format: "iife",
+    }
+  },
+];