Merge pull request #46 from Patternslib/upgrade-dependencies

thet · web-flow · commit dae16bbece53 · 2025-08-25T12:11:47.000+02:00
Upgrade dependencies
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: '18'
+        node-version: '22'
         cache: 'yarn'
     - run: |
         make install
diff --git a/.husky/.gitignore b/.husky/.gitignore
diff --git a/.husky/commit-msg b/.husky/commit-msg
diff --git a/Makefile b/Makefile
@@ -18,13 +18,10 @@
 -include .env
 export
 
+YARN		?= npx yarn
 
-.PHONY: install
-stamp-yarn install:
-	npx yarn install
-	# Install pre commit hook
-	npx yarn husky install
-	touch stamp-yarn
+yarn.lock install:
+	$(YARN) install
 
 
 # Unlink any linked dependencies before building a bundle.
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1 @@
+module.exports = require("@patternslib/dev/eslint.config.js");
diff --git a/index.html b/index.html
@@ -1,6 +1,6 @@
-<!DOCTYPE HTML>
+<!DOCTYPE html>
 <html>
-<head>
-  <meta http-equiv="refresh" content="0; url=./src" />
-</head>
+    <head>
+        <meta http-equiv="refresh" content="0; url=./src" />
+    </head>
 </html>
diff --git a/package.json b/package.json
@@ -5,22 +5,22 @@
     "license": "MIT",
     "main": "./src/leaflet.js",
     "dependencies": {
-        "@patternslib/patternslib": ">=9.9.16",
+        "@patternslib/patternslib": ">=9.10.3",
         "fontawesome-free": "^1.0.4",
         "jquery": "^3.7.1",
         "leaflet": "^1.9.4",
-        "leaflet-geosearch": "^4.0.0",
+        "leaflet-geosearch": "^4.2.0",
         "leaflet-minimap": "^3.6.1",
         "leaflet-providers": "^2.0.0",
         "leaflet-sleep": "^0.5.2",
         "leaflet.awesome-markers": "^2.0.5",
-        "leaflet.fullscreen": "^3.0.2",
-        "leaflet.locatecontrol": "^0.81.1",
+        "leaflet.fullscreen": "^4.0.0",
+        "leaflet.locatecontrol": "^0.84.2",
         "leaflet.markercluster": "^1.5.3",
         "leaflet.simplemarkers": "git+https://github.com/jdomingu/Leaflet.SimpleMarkers.git"
     },
     "devDependencies": {
-        "@patternslib/dev": "^3.6.1"
+        "@patternslib/dev": "^3.8.1"
     },
     "scripts": {
         "start": "NODE_ENV=development webpack serve --config webpack.config.js",
diff --git a/src/index.html b/src/index.html
@@ -1,30 +1,37 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
-  <head>
-    <meta charset="utf-8">
-    <title>leaflet demo</title>
-    <script src="https://cdn.jsdelivr.net/npm/@patternslib/patternslib@9.8.2/dist/bundle.min.js"></script>
-    <script src="/remote.min.js"></script>
-  </head>
-  <body>
-
-    <h2>pat-leaflet demo - minimal</h2>
-    <section class="pat-clone-code">
-      <div id="map1" style="height:400px" class="pat-leaflet" data-pat-leaflet='
+    <head>
+        <meta charset="utf-8" />
+        <title>leaflet demo</title>
+        <script src="https://cdn.jsdelivr.net/npm/@patternslib/patternslib@9.8.2/dist/bundle.min.js"></script>
+        <script src="/remote.min.js"></script>
+    </head>
+    <body>
+        <h2>pat-leaflet demo - minimal</h2>
+        <section class="pat-clone-code">
+            <div
+                id="map1"
+                style="height: 400px"
+                class="pat-leaflet"
+                data-pat-leaflet='
       {
         "fullscreencontrol": false,
         "locatecontrol": false,
         "zoomcontrol": true,
         "geosearch": true,
         "latitude": 47.33325135,
         "longitude": 9.645877746692685
-      }'></div>
-    </section>
+      }'
+            ></div>
+        </section>
 
-    <h2>pat-leaflet demo - full</h2>
-    <section class="pat-clone-code">
-      <div id="map2" style="height:400px" class="pat-leaflet"
-          data-pat-leaflet='{
+        <h2>pat-leaflet demo - full</h2>
+        <section class="pat-clone-code">
+            <div
+                id="map2"
+                style="height: 400px"
+                class="pat-leaflet"
+                data-pat-leaflet='{
 "fullscreencontrol": true,
 "locatecontrol": true,
 "zoomcontrol": true,
@@ -35,7 +42,7 @@ <h2>pat-leaflet demo - full</h2>
 "maxClusterRadius": 80,
 "useCluster": true
 }'
-        data-geojson='{
+                data-geojson='{
 "type": "FeatureCollection",
 "features": [
     {
@@ -85,10 +92,10 @@ <h2>pat-leaflet demo - full</h2>
             ]
         }
     }
-]}'></div>
-      <input type="text" name="latitude" value="55.69078" id="latinput"/>
-      <input type="text" name="longitude" value="12.55568" id="lnginput"/>
-    </section>
-
-  </body>
+]}'
+            ></div>
+            <input type="text" name="latitude" value="55.69078" id="latinput" />
+            <input type="text" name="longitude" value="12.55568" id="lnginput" />
+        </section>
+    </body>
 </html>
diff --git a/src/leaflet.js b/src/leaflet.js
@@ -123,7 +123,7 @@ class Pattern extends BasePattern {
                 // build layers object with tileLayer instances
                 baseLayers[layer.title] = this.L.tileLayer.provider(
                     layer.id,
-                    layer.options
+                    layer.options,
                 );
             }
             if (options.map_layers.length > 1) {
@@ -150,17 +150,17 @@ class Pattern extends BasePattern {
                 response = await fetch(options.geojson_ajaxurl);
                 const data = await response.json();
                 this.init_geojson(map, data);
-            } catch (e) {
+            } catch {
                 log.info(
-                    `Could not load geojson data from url ${options.geojson_ajaxurl}`
+                    `Could not load geojson data from url ${options.geojson_ajaxurl}`,
                 );
                 return;
             }
         } else if (this.el.dataset.geojson) {
             try {
                 // inject inline geoJSON data object
                 this.init_geojson(map, JSON.parse(this.el.dataset.geojson));
-            } catch (e) {
+            } catch {
                 log.info("Could not parse geojson data.");
                 return;
             }
@@ -198,7 +198,7 @@ class Pattern extends BasePattern {
                     e.marker.setIcon(this.create_marker("red"));
                     this.bind_popup(
                         { properties: { editable: true, popup: e.location.label } },
-                        e.marker
+                        e.marker,
                     );
                     this.marker_cluster.addLayer(e.marker);
                 }
@@ -229,9 +229,9 @@ class Pattern extends BasePattern {
             const minimap = new this.L.Control.MiniMap(
                 this.L.tileLayer.provider(
                     options.default_map_layer.id,
-                    options.default_map_layer.options
+                    options.default_map_layer.options,
                 ),
-                { toggleDisplay: true, mapOptions: { sleep: false } }
+                { toggleDisplay: true, mapOptions: { sleep: false } },
             );
             map.addControl(minimap);
         }
@@ -290,7 +290,7 @@ class Pattern extends BasePattern {
                             // fit bounds
                             bounds = this.marker_cluster.getBounds();
                             map.fitBounds(bounds, this.fitBoundsOptions);
-                        }
+                        },
                     );
                 }
                 if (input_lng) {
@@ -309,7 +309,7 @@ class Pattern extends BasePattern {
                             // fit bounds
                             bounds = this.marker_cluster.getBounds();
                             map.fitBounds(bounds, this.fitBoundsOptions);
-                        }
+                        },
                     );
                 }
                 return marker;
diff --git a/src/leaflet.test.js b/src/leaflet.test.js
@@ -73,7 +73,7 @@ describe("pat-leaflet", () => {
                             },
                         ],
                     }),
-            })
+            }),
         );
 
         document.body.innerHTML = `<div class="pat-leaflet" data-pat-leaflet='{
diff --git a/webpack.config.js b/webpack.config.js
@@ -33,7 +33,7 @@ module.exports = () => {
                 ...package_json_patternslib.dependencies,
                 ...package_json.dependencies,
             },
-        })
+        }),
     );
 
     if (process.env.NODE_ENV === "development") {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+module.exports = require("@patternslib/dev/eslint.config.js");`