From 72d3428ded3b0ca5976072f0cd4ad89c6292433b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?benjamin=20melan=C3=A7on?= <ben@agaric.com>
Date: Wed, 21 Apr 2021 21:59:19 -0400
Subject: [PATCH] Update/reorg composer file to be a bit more like Drutopia

---
 composer.json | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index a48c88a..bf6e830 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,22 @@
 {
     "name": "agaric-sites/agaric_coop",
-    "description": "Agaric site modified from template for composer-based Drutopia projects.",
+    "description": "Agaric site modified from template for composer-based Drupal 8 Drutopia projects.",
     "type": "project",
     "license": "GPL-2.0-or-later",
-    "minimum-stability": "dev",
-    "prefer-stable": true,
+    "homepage": "https://agaric.coop",
+    "repositories": {
+        "drupal": {
+            "type": "composer",
+            "url": "https://packages.drupal.org/8"
+        },
+        "drutopia": {
+            "type": "vcs",
+            "url": "https://github.com/drutopia/drutopia"
+        }
+    },
     "require": {
-        "composer/installers": "^1.7",
-        "cweagans/composer-patches": "^1.0",
+        "composer/installers": "^1.9",
+        "cweagans/composer-patches": "^1.6",
         "drupal/admin_links_access_filter": "^1.0@alpha",
         "drupal/allowed_formats": "^1.1",
         "drupal/antibot": "^1.2",
@@ -15,6 +24,7 @@
         "drupal/ckeditor_markdown": "^1.1",
         "drupal/coffee": "1.x-dev",
         "drupal/comment_notify": "dev-1.x",
+        "drupal/core-composer-scaffold": "^8.9",
         "drupal/core-recommended": "^8.8",
         "drupal/customerror": "1.x-dev",
         "drupal/diff": "^1.0@RC",
@@ -61,23 +71,15 @@
         "behat/mink": "^1.7",
         "behat/mink-goutte-driver": "^1.2"
     },
-    "repositories": {
-        "drupal": {
-            "type": "composer",
-            "url": "https://packages.drupal.org/8"
-        },
-        "drutopia": {
-            "type": "vcs",
-            "url": "https://github.com/drutopia/drutopia"
-        }
+    "conflict": {
+        "drupal/drupal": "*"
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "config": {
         "sort-packages": true,
         "process-timeout": 600
     },
-    "conflict": {
-        "drupal/drupal": "*"
-    },
     "extra": {
         "drupal-scaffold": {
             "locations": {