From 8d029c4939c2f98feb927444adc51a19acdcce86 Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Mon, 30 Sep 2019 10:51:38 +1000
Subject: [PATCH] Issue #3084298 by greg.1.anderson: Make composer installer
paths consistent between drupal/drupal and the project templates
---
composer.json | 3 ++-
composer.lock | 2 +-
composer/Template/LegacyProject/composer.json | 4 +++-
composer/Template/RecommendedProject/composer.json | 4 +++-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/composer.json b/composer.json
index 18fa5270b204..2a4ba65b33f1 100644
--- a/composer.json
+++ b/composer.json
@@ -45,10 +45,11 @@
},
"installer-paths": {
"core": ["type:drupal-core"],
+ "libraries/{$name}": ["type:drupal-library"],
"modules/contrib/{$name}": ["type:drupal-module"],
"profiles/contrib/{$name}": ["type:drupal-profile"],
"themes/contrib/{$name}": ["type:drupal-theme"],
- "drush/contrib/{$name}": ["type:drupal-drush"],
+ "drush/Commands/contrib/{$name}": ["type:drupal-drush"],
"modules/custom/{$name}": ["type:drupal-custom-module"],
"themes/custom/{$name}": ["type:drupal-custom-theme"]
}
diff --git a/composer.lock b/composer.lock
index 6df5b6acf944..eeabdab4591e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "36ce6886f9438a31a1d93784286214df",
+ "content-hash": "38c8384dea91c895efa0d3119c037f84",
"packages": [
{
"name": "asm89/stack-cors",
diff --git a/composer/Template/LegacyProject/composer.json b/composer/Template/LegacyProject/composer.json
index e9f1cbbcb84e..19afd31ac4c0 100644
--- a/composer/Template/LegacyProject/composer.json
+++ b/composer/Template/LegacyProject/composer.json
@@ -38,7 +38,9 @@
"modules/contrib/{$name}": ["type:drupal-module"],
"profiles/contrib/{$name}": ["type:drupal-profile"],
"themes/contrib/{$name}": ["type:drupal-theme"],
- "drush/Commands/contrib/{$name}": ["type:drupal-drush"]
+ "drush/Commands/contrib/{$name}": ["type:drupal-drush"],
+ "modules/custom/{$name}": ["type:drupal-custom-module"],
+ "themes/custom/{$name}": ["type:drupal-custom-theme"]
}
}
}
diff --git a/composer/Template/RecommendedProject/composer.json b/composer/Template/RecommendedProject/composer.json
index 8b10fdf16ff7..e57c2521c1dd 100644
--- a/composer/Template/RecommendedProject/composer.json
+++ b/composer/Template/RecommendedProject/composer.json
@@ -37,7 +37,9 @@
"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"]
+ "drush/Commands/contrib/{$name}": ["type:drupal-drush"],
+ "web/modules/custom/{$name}": ["type:drupal-custom-module"],
+ "web/themes/custom/{$name}": ["type:drupal-custom-theme"]
}
}
}
--
GitLab