From b4d54677d61076b0a2399750c99809f48f38bd4d Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 9 Jan 2023 12:34:31 -0500 Subject: [PATCH 1/6] Test removing contrib modules from composer.json (They are installed by `the-build`.) --- composer.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/composer.json b/composer.json index 6e0a1bd..c9c8026 100644 --- a/composer.json +++ b/composer.json @@ -16,13 +16,7 @@ ], "require": { "composer/installers": "^1.9", - "drupal/admin_toolbar": "^3.0", - "drupal/config_split": "^1.7", "drupal/core-composer-scaffold": "^9", - "drupal/core-recommended": "^9", - "drupal/devel": ">=4.1", - "drupal/workbench": "^1.3", - "drupal/workbench_tabs": "^1.5", "drush/drush": "^11" }, "require-dev": { From 71123c37c8db368b6cf5aa99b3cfff4712bf9062 Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 9 Jan 2023 12:36:29 -0500 Subject: [PATCH 2/6] shaka when the walls fell --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index c9c8026..5148074 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,7 @@ "require": { "composer/installers": "^1.9", "drupal/core-composer-scaffold": "^9", + "drupal/core-recommended": "^9", "drush/drush": "^11" }, "require-dev": { From 686360e04925f9898ad06e45bd98d9beca2bebe9 Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 9 Jan 2023 12:39:40 -0500 Subject: [PATCH 3/6] update to the-build 4 beta --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5148074..90cbdc1 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "require-dev": { "drupal/core-dev": "^9", "drupal/drupal-extension": "^4.1.0", - "palantirnet/the-build": "^4@alpha" + "palantirnet/the-build": "^4@beta" }, "suggest": { "cweagans/composer-patches": "Try ^1.7. Apply patches to packages, especially Drupal.org contrib.", From 0eac3fe25ee9792eb1b10d1838638d74ec3f6a08 Mon Sep 17 00:00:00 2001 From: byrond Date: Tue, 10 Jan 2023 09:17:12 -0500 Subject: [PATCH 4/6] add gitkeep so modules/contrib is available for testing This change should be undone, and a step should be added to the-build to create the directory during first Drupal install. --- docroot/modules/contrib/.gitkeep | 1 + 1 file changed, 1 insertion(+) create mode 100644 docroot/modules/contrib/.gitkeep diff --git a/docroot/modules/contrib/.gitkeep b/docroot/modules/contrib/.gitkeep new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/docroot/modules/contrib/.gitkeep @@ -0,0 +1 @@ + From a29429b3e874d3e24ae42b16cd9228faba5de423 Mon Sep 17 00:00:00 2001 From: byrond Date: Fri, 23 Jun 2023 14:18:04 -0400 Subject: [PATCH 5/6] remove modules added by merge --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index 459785a..7e7fcde 100644 --- a/composer.json +++ b/composer.json @@ -19,9 +19,6 @@ "composer/installers": "^2.0", "drupal/core-composer-scaffold": "^10", "drupal/core-recommended": "^10", - "drupal/devel": "^5", - "drupal/workbench": "^1", - "drupal/workbench_tabs": "^1", "drush/drush": "^11" }, "require-dev": { From 3373494ad2a3c6570504e4a3c7d6958776d8ba6f Mon Sep 17 00:00:00 2001 From: byrond Date: Fri, 23 Jun 2023 14:28:56 -0400 Subject: [PATCH 6/6] temporarily use the-build feature branch --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7e7fcde..d3df924 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "dmore/behat-chrome-extension": "^1.4", "drupal/core-dev": "^10", "drupal/drupal-extension": "^5@alpha", - "palantirnet/the-build": "^4" + "palantirnet/the-build": "dev-drupal-first-install-config-ignore" }, "suggest": { "cweagans/composer-patches": "Try ^1.7. Apply patches to packages, especially Drupal.org contrib.",