Issue #3230933 by paul121: Use composer-merge-plugin to include farmOS-map instead of Asset Packagist

composer.json

@@ -44,14 +44,8 @@
         "drupal/views_geojson": "^1.1",
         "drush/drush": "^10.3",
         "ext-simplexml": "^7.4",
-        "npm-asset/farmos.org--farmos-map": "^2.0.0-alpha.0",
         "phayes/geophp": "^1.2"
     },
-    "config": {
-        "preferred-install": {
-            "npm-asset/farmos.org--farmos-map": "dist"
-        }
-    },
     "extra": {
         "patchLevel": {
             "drupal/core": "-p2"

composer.libraries.json

@@ -0,0 +1,26 @@
+{
+    "name": "farmos/farmos",
+    "description": "A web-based farm record keeping application.",
+    "type": "drupal-profile",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "farmos/farmos-map": "*"
+    },
+    "repositories": {
+        "farmos-map": {
+            "type": "package",
+            "package": {
+                "name": "farmos/farmos-map",
+                "version": "2.0.1",
+                "type": "drupal-library",
+                "dist": {
+                  "url": "https://github.com/farmOS/farmOS-map/releases/download/v2.0.1/v2.0.1-dist.zip",
+                  "type": "zip"
+                },
+                "extra": {
+                  "installer-name": "farmOS-map"
+                }
+            }
+        }
+    }
+}

modules/core/map/farm_map.libraries.yml

@@ -5,14 +5,14 @@ farmOS-map:
     url: https://github.com/farmOS/farmOS-map/blob/master/LICENSE
     gpl-compatible: true
   js:
-    /libraries/farmOS-map/dist/farmOS-map.js:
+    /libraries/farmOS-map/farmOS-map.js:
       # Skip aggregating farmOS-map.js with other JS since that
       # breaks the lazy loading of behavior chunks.
       preprocess: false
       minified: true
   css:
     theme:
-      /libraries/farmOS-map/dist/farmOS-map.css: { }
+      /libraries/farmOS-map/farmOS-map.css: { }
   dependencies:
     - core/drupalSettings