Bring composer file more in line with Drutopia on Elizabeth, CRLA

composer.json

@@ -6,9 +6,9 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "repositories": {
-        "drupal/classitup": {
+        "drupal/octavia_camouflage": {
             "type": "git",
-            "url": "git@git.drupal.org:project/classitup.git"
+            "url": "git@gitlab.com:drutopia/octavia_camouflage.git"
         },
         "drupal/twigsuggest": {
             "type": "git",
@@ -20,7 +20,7 @@
         },
         "drutopia": {
             "type": "vcs",
-            "url": "https://github.com/drutopia/drutopia"
+            "url": "https://gitlab.com/drutopia/drutopia"
         },
         "drupal/drutopia_core": {
             "type": "git",
@@ -37,8 +37,9 @@
         "drupal/allowed_formats": "^1.1",
         "drupal/antibot": "^1.2",
         "drupal/backup_migrate": "^4.1",
+        "drupal/block_field": "^1.0@RC",
         "drupal/ckeditorheight": "^1.3",
-        "drupal/classitup": "dev-8.x-1.x as 1.x-dev",
+        "drupal/classitup": "^1.0@beta",
         "drupal/comment_notify": "dev-1.x",
         "drupal/config_actions": "1.x-dev",
         "drupal/convert_bundles": "^1.0@alpha",
@@ -49,43 +50,60 @@
         "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/drutopia_paragraph_title": "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/geolocation": "^3.2",
         "drupal/google_analytics": "^3.0",
         "drupal/honeypot": "^1.29",
         "drupal/indieweb": "^1.12",
         "drupal/insert": "^1.0",
+        "drupal/key": "^1.14",
         "drupal/link_attributes": "^1.9",
         "drupal/linkit": "^4.3",
         "drupal/mailchimp": "^1.10",
+        "drupal/markdown": "^1.3",
         "drupal/menu_link_config": "^1.0@alpha",
         "drupal/migrate_plus": "^4.2",
         "drupal/migrate_source_csv": "3.1",
         "drupal/migrate_tools": "^4.1",
         "drupal/migrate_upgrade": "^3",
         "drupal/minimalhtml": "^1.1",
+        "drupal/node_view_permissions": "^1.4",
         "drupal/noreferrer": "^1.7",
+        "drupal/notfoundpassthrough": "1.x-dev",
+        "drupal/octavia": "1.x-dev",
+        "drupal/octavia_camouflage": "dev-8.x-1.x as 1.x-dev",
         "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",
+        "drupal/search404": "^1.0",
+        "drupal/seckit": "^2.0",
+        "drupal/shield": "^1.4",
         "drupal/subpathauto": "^1.0@RC",
+        "drupal/taxonomy_manager": "^1.0@alpha",
+        "drupal/trim": "^1.0",
         "drupal/twigsuggest": "dev-8.x-1.x as 1.x-dev",
-        "drupal/webform": "^5.4",
+        "drupal/urllogin": "^1.0",
-        "drush/drush": "^9.0",
+        "drupal/view_unpublished": "^1.0",
+        "drupal/webform": "^6.0",
+        "drupal/weight": "^3.3",
+        "drupal/wysiwyg_linebreaks": "^1.10",
+        "drush/drush": "^10.3",
         "drutopia/drutopia": "dev-8.x-1.x",
-        "wikimedia/composer-merge-plugin": "^2.0"
+        "vlucas/phpdotenv": "^5.1",
+        "webflo/drupal-finder": "^1.2"
     },
     "require-dev": {
         "behat/behat": "^3.4",
         "behat/mink": "^1.7",
-        "behat/mink-goutte-driver": "^1.2",
+        "behat/mink-goutte-driver": "^1.2"
-        "zaporylie/composer-drupal-optimizations": "^1.0"
     },
     "config": {
         "sort-packages": true,
@@ -98,7 +116,10 @@
         "drupal-scaffold": {
             "locations": {
                 "web-root": "web/"
-            }
+            },
+            "allowed-packages": [
+                "drupal/ui_patterns"
+            ]
         },
         "installer-paths": {
             "web/core": ["type:drupal-core"],
@@ -120,7 +141,7 @@
             "drupal/ds": {
                 "Template suggestions does not work": "https://www.drupal.org/files/issues/2018-08-27/2887778-9.patch"
             }
-	      }
+        }
     },
     "scripts": {
         "nuke": "rm -rf vendor web/core web/modules/contrib web/profiles/contrib drush/contrib",