Issue #2050: Update example.drupal.composer.json for Drupal 9.

geerlingguy · Jul 6, 2020 · 396c6ba · 396c6ba
1 parent fcc7832
commit 396c6ba
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 52 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@
 vagrant_ansible_inventory_default
 
 # Drupal VM specific files.
+drupal.composer.json
 local.config.yml
 Vagrantfile.local
 /config.yml

diff --git a/drupal.composer.json b/drupal.composer.json
diff --git a/example.drupal.composer.json b/example.drupal.composer.json
@@ -16,24 +16,48 @@
         }
     ],
     "require": {
-        "composer/installers": "^1.0.20",
-        "drupal-composer/drupal-scaffold": "^2.0.1",
-        "drupal/core": "^8.6",
-        "drupal/devel": "^1.2"
+        "composer/installers": "^1.9",
+        "drupal/core-composer-scaffold": "^9",
+        "drupal/core-project-message": "^9",
+        "drupal/core-recommended": "^9"
     },
-    "replace": {
+    "conflict": {
         "drupal/drupal": "*"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "extra": {
+        "drupal-scaffold": {
+            "locations": {
+                "web-root": "web/"
+            }
+        },
         "installer-paths": {
-            "web/core": ["type:drupal-core"],
-            "web/modules/contrib/{$name}": ["type:drupal-module"],
-            "web/profiles/contrib/{$name}": ["type:drupal-profile"],
-            "web/themes/contrib/{$name}": ["type:drupal-theme"],
-            "drush/contrib/{$name}": ["type:drupal-drush"]
-        }
+            "web/core": [
+                "type:drupal-core"
+            ],
+            "web/libraries/{$name}": [
+                "type:drupal-library"
+            ],
+            "web/modules/contrib/{$name}": [
+                "type:drupal-module"
+            ],
+            "web/profiles/contrib/{$name}": [
+                "type:drupal-profile"
+            ],
+            "web/themes/contrib/{$name}": [
+                "type:drupal-theme"
+            ],
+            "drush/Commands/contrib/{$name}": [
+                "type:drupal-drush"
+            ],
+            "web/modules/custom/{$name}": [
+                "type:drupal-custom-module"
+            ],
+            "web/themes/custom/{$name}": [
+                "type:drupal-custom-theme"
+            ]
+        },
     },
     "config": {
         "process-timeout": 1200