From 0608c46a18f02c44fe108ab87864ffd1f9ffdfc4 Mon Sep 17 00:00:00 2001 From: Stephan Zeidler Date: Thu, 9 Jan 2025 12:25:43 +0100 Subject: [PATCH 1/3] Add support for Drupal recipes --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 966bd1889..522b2dcb5 100644 --- a/composer.json +++ b/composer.json @@ -138,7 +138,11 @@ "patchLevel": { "drupal/core": "-p2" }, - "patches-file": "composer.patches.json" + "patches-file": "composer.patches.json", + "drupal-recipe": { + "unpack-remove-recipe": true, + "auto-unpack": true + } }, "scripts": { "pre-install-cmd": [ From 01878604ca885ca9d8cb24c84656e1ffc9b7fe85 Mon Sep 17 00:00:00 2001 From: Stephan Zeidler Date: Thu, 9 Jan 2025 12:42:27 +0100 Subject: [PATCH 2/3] Fix place of the drupal-recipe configuration --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 522b2dcb5..de67d533f 100644 --- a/composer.json +++ b/composer.json @@ -71,6 +71,10 @@ }, "extra": { "composer-exit-on-patch-failure": true, + "drupal-recipe": { + "unpack-remove-recipe": true, + "auto-unpack": true + }, "drupal-scaffold": { "allowed-packages": [ "ramsalt/drupal-scaffold", @@ -138,11 +142,7 @@ "patchLevel": { "drupal/core": "-p2" }, - "patches-file": "composer.patches.json", - "drupal-recipe": { - "unpack-remove-recipe": true, - "auto-unpack": true - } + "patches-file": "composer.patches.json" }, "scripts": { "pre-install-cmd": [ From dabd96d7629774013a1cbdbe69d53dbd73be1958 Mon Sep 17 00:00:00 2001 From: Stephan Zeidler Date: Thu, 9 Jan 2025 18:29:56 +0100 Subject: [PATCH 3/3] Normalize composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index de67d533f..43609722a 100644 --- a/composer.json +++ b/composer.json @@ -72,8 +72,8 @@ "extra": { "composer-exit-on-patch-failure": true, "drupal-recipe": { - "unpack-remove-recipe": true, - "auto-unpack": true + "auto-unpack": true, + "unpack-remove-recipe": true }, "drupal-scaffold": { "allowed-packages": [