diff --git a/composer.json b/composer.json index 8e5bbca..484c1d7 100644 --- a/composer.json +++ b/composer.json @@ -8,17 +8,6 @@ "email": "info@palantir.net" } ], - "minimum-stability": "dev", - "prefer-stable": true, - "config": { - "platform": { - "php": "7.2" - }, - "preferred-install": { - "*": "dist" - }, - "sort-packages": true - }, "repositories": [ { "type": "composer", @@ -26,17 +15,17 @@ } ], "require": { - "composer/installers": "^1.0", - "drupal/core-composer-scaffold": "^8.8", + "composer/installers": "^1.2", "drupal/config_installer": "^1.8", "drupal/config_split": "^1.4", - "drupal/core-recommended": "^8.7.0", + "drupal/core-composer-scaffold": "^8.8", + "drupal/core-recommended": "^8.8", "zaporylie/composer-drupal-optimizations": "^1.1" }, "require-dev": { - "drupal/core-dev": "^8.7.0", + "drupal/core-dev": "^8.8", "drupal/drupal-extension": "^3.1", - "palantirnet/the-build": "^2.0", + "palantirnet/the-build": "^2.2.1", "palantirnet/the-vagrant": "^2.3" }, "suggest": { @@ -49,21 +38,25 @@ "conflict": { "drupal/drupal": "*" }, - "extra": { - "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"] + "minimum-stability": "dev", + "prefer-stable": true, + "config": { + "platform": { + "php": "7.3" + }, + "preferred-install": { + "*": "dist" }, + "sort-packages": true + }, + "extra": { "drupal-scaffold": { - "allowed-packages": [ - "drupal/core" - ], "locations": { "web-root": "web/" }, + "allowed-packages": [ + "drupal/core" + ], "file-mapping": { "[web-root]/.htaccess": { "mode": "replace", @@ -71,6 +64,16 @@ "overwrite": false } } + }, + "installer-paths": { + "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"] } } }