From 2be6a7c64f17a5b65220361342468786fbeaa805 Mon Sep 17 00:00:00 2001
From: mlncn <ben@agaric.com>
Date: Fri, 9 Apr 2021 11:16:38 -0400
Subject: [PATCH] Reorganize and update composer.json  to be more in line with
 standard Drutopia

---
 composer.json | 66 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/composer.json b/composer.json
index 789b4fe..b0ff513 100644
--- a/composer.json
+++ b/composer.json
@@ -5,9 +5,35 @@
     "license": "GPL-2.0-or-later",
     "minimum-stability": "dev",
     "prefer-stable": true,
+    "repositories": {
+        "drupal/classitup": {
+            "type": "git",
+            "url": "git@git.drupal.org:project/classitup.git"
+        },
+        "drupal/twigsuggest": {
+            "type": "git",
+            "url": "git@gitlab.com:agaric/drupal/twigsuggest.git"
+        },
+        "drupal/drutopia_collection": {
+            "type": "git",
+            "url": "git@gitlab.com:drutopia/drutopia_collection.git"
+        },
+        "drutopia": {
+            "type": "vcs",
+            "url": "https://github.com/drutopia/drutopia"
+        },
+        "drupal/drutopia_core": {
+            "type": "git",
+            "url": "git@gitlab.com:drutopia/drutopia_core.git"
+        },
+        "drupal": {
+            "type": "composer",
+            "url": "https://packages.drupal.org/8"
+        }
+    },
     "require": {
-        "composer/installers": "^1.7",
-        "cweagans/composer-patches": "^1.0",
+        "composer/installers": "^1.9",
+        "cweagans/composer-patches": "^1.7",
         "drupal/allowed_formats": "^1.1",
         "drupal/antibot": "^1.2",
         "drupal/ckeditorheight": "^1.3",
@@ -15,15 +41,22 @@
         "drupal/comment_notify": "dev-1.x",
         "drupal/config_actions": "1.x-dev",
         "drupal/convert_bundles": "^1.0@alpha",
+        "drupal/core-composer-scaffold": "^8.8",
+        "drupal/core-project-message": "^8.8",
         "drupal/cshs": "^1.0@beta",
+        "drupal/csp": "^1.13",
+        "drupal/diff": "^1.0",
         "drupal/drutopia_collection": "dev-8.x-1.x as 1.x-dev",
+        "drupal/drutopia_core": "dev-8.x-1.x as 1.x-dev",
         "drupal/empty_page": "^2.0",
         "drupal/entity_reference_override": "1.x-dev",
+        "drupal/environment_indicator": "^4.0",
         "drupal/field_token_value": "^1.0",
         "drupal/fixed_block_content": "^1.0",
         "drupal/footnotes": "2.x-dev",
         "drupal/google_analytics": "^3.0",
         "drupal/honeypot": "^1.29",
+        "drupal/indieweb": "^1.12",
         "drupal/insert": "^1.0",
         "drupal/link_attributes": "^1.9",
         "drupal/linkit": "^4.3",
@@ -36,6 +69,7 @@
         "drupal/minimalhtml": "^1.1",
         "drupal/noreferrer": "^1.7",
         "drupal/password_policy": "^3.0",
+        "drupal/preview_link": "^1.7",
         "drupal/prod_check": "^1.0@alpha",
         "drupal/role_delegation": "^1.0",
         "drupal/scn": "^1.1",
@@ -44,35 +78,13 @@
         "drupal/webform": "^5.4",
         "drush/drush": "^9.0",
         "drutopia/drutopia": "dev-8.x-1.x",
-        "wikimedia/composer-merge-plugin": "^1.4",
-        "zaporylie/composer-drupal-optimizations": "^1.0"
+        "wikimedia/composer-merge-plugin": "^1.4"
     },
     "require-dev": {
         "behat/behat": "^3.4",
         "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"
-        },
-        "drupal/drutopia_collection": {
-            "type": "git",
-            "url": "git@gitlab.com:drutopia/drutopia_collection.git"
-        },
-        "drupal/classitup": {
-            "type": "git",
-            "url": "git@git.drupal.org:project/classitup.git"
-        },
-        "drupal/twigsuggest": {
-            "type": "git",
-            "url": "git@gitlab.com:agaric/drupal/twigsuggest.git"
-        }
+        "behat/mink-goutte-driver": "^1.2",
+        "zaporylie/composer-drupal-optimizations": "^1.0"
     },
     "config": {
         "sort-packages": true,