From c38cd7382281ecd0141b6660dc076a075e518904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?benjamin=20melan=C3=A7on?= <ben@agaric.com>
Date: Wed, 6 May 2020 22:27:28 -0400
Subject: [PATCH] Update composer.json to be more like Agaric's

---
 composer.json | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 53b3ae3..42a6191 100644
--- a/composer.json
+++ b/composer.json
@@ -2,16 +2,17 @@
     "name": "agaric-sites/geo",
     "description": "Drutopia-based site for the Grassroots Economic Organizing collective.",
     "type": "project",
-    "license": "GPL-2.0+",
+    "license": "GPL-2.0-or-later",
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "config": {
-        "sort-packages": true
-    },
     "require": {
-        "composer/installers": "^1.0",
+        "behat/behat": "^3.4",
+        "behat/mink": "^1.7",
+        "behat/mink-goutte-driver": "^1.2",
+        "composer/installers": "^1.7",
         "cweagans/composer-patches": "^1.0",
         "drupal-composer/drupal-scaffold": "^2.0.0",
+        "drupal/allowed_formats": "^1.1",
         "drupal/antibot": "^1.2",
         "drupal/ckeditorheight": "^1.3",
         "drupal/classitup": "dev-8.x-1.x as 1.x-dev",
@@ -93,10 +94,18 @@
             "web/themes/contrib/{$name}": [
                 "type:drupal-theme"
             ],
+            "web/libraries/{$name}": [
+                "type:drupal-library"
+            ],
             "drush/contrib/{$name}": [
                 "type:drupal-drush"
             ]
         },
+        "merge-plugin": {
+            "include": [
+                "web/modules/contrib/webform/composer.libraries.json"
+            ]
+        },
         "enable-patching": true,
         "patches": {
             "drupal/core": {
@@ -111,6 +120,10 @@
             "drupal/ds": {
                 "Template suggestions does not work": "https://www.drupal.org/files/issues/2018-08-27/2887778-9.patch"
             }
-        }
+	    }
+    },
+    "config": {
+        "sort-packages": true,
+        "process-timeout": 600
     }
 }