Update for WxT 6.1.x

Author: smulvih2

.env

@@ -1,6 +1,17 @@
 BASE_IMAGE=drupalwxt/site-wxt
 DOCKER_NAME=sitewxt
+# This must match the name of your folder
+DOCKER_IMAGE=site-wxt
+# The database name
 DB_NAME=wxt
+# The database type mysql or pgsql
+# DB_TYPE=mysql
+# DB_PORT=3306
+# DB_VERSION=8.0
+# The installation profile
 PROFILE_NAME=wxt
-DOCKER_IMAGE=site-wxt
+# The relative location of the Behat tests
 BEHAT_PATH=profiles/wxt/tests
+# This must match the name of your mutagen volume
+# MUTAGEN_VOLUME=site-wxt-mutagen-cache
+# COMPOSER_VERSION=2.7.9

Makefile

@@ -5,5 +5,5 @@ PLATFORM := $(shell uname -s)
 $(eval GIT_USERNAME := $(if $(GIT_USERNAME),$(GIT_USERNAME),gitlab-ci-token))
 $(eval GIT_PASSWORD := $(if $(GIT_PASSWORD),$(GIT_PASSWORD),$(CI_JOB_TOKEN)))
 DOCKER_REPO := https://github.com/drupalwxt/docker-scaffold.git
-GET_DOCKER := $(shell [ -d docker ] || git clone --branch 9.2.x $(DOCKER_REPO) docker)
+GET_DOCKER := $(shell [ -d docker ] || git clone --branch 11.1.x $(DOCKER_REPO) docker)
 include docker/Makefile

README.md

@@ -26,10 +26,10 @@ This distribution is open source software and free for use by departments and ex
 The following command is all you need to get started:
 
 ```sh
-composer create-project drupalwxt/wxt-project:5.4.2 <site-name>
+composer create-project drupalwxt/wxt-project:11.1.0 <site-name>
 ```
 
-> **Note**: For development you may also specify a branch using `drupalwxt/wxt-project:5.4.x-dev`.
+> **Note**: For development you may also specify a branch using `drupalwxt/wxt-project:11.1.x-dev`.
 
 You can see a working example of a fully generated Composer Project Template over at:
 
@@ -38,7 +38,7 @@ You can see a working example of a fully generated Composer Project Template ove
 Where the following is the command that was used for the initial generation:
 
 ```sh
-composer create-project drupalwxt/wxt-project:5.4.2 site-wxt
+composer create-project drupalwxt/wxt-project:11.1.0 site-wxt
 ```
 
 > **Note**: Remember to keep the `composer.json` and `composer.lock` files that exist above `docroot` in source control as they are controlling your dependencies.
@@ -87,7 +87,7 @@ Please **don't add `drupal/core` to your project's composer.json** since WxT man
 
 WxT's minor versions will always correspond to Drupal Core's. For example, `drupalwxt/wxt:~4.2.0` will require Drupal Core 9.2.x and `drupalwxt/wxt:~4.1.0` will require Drupal Core 9.1.x.
 
-When you need to update Drupal Core as an example from 9.1.x to 9.2.x, all you would do is change your requirement for `drupalwxt/wxt` in your `composer.json` file:
+When you need to update Drupal Core as an example from 10.4.x to 11.1.x, all you would do is change your requirement for `drupalwxt/wxt` in your `composer.json` file:
 
 ```
 composer require --no-update drupalwxt/wxt:~4.2.0

composer.json

@@ -8,16 +8,19 @@
     "require": {
         "composer/installers": "^2.1",
         "cweagans/composer-patches": "^1.7",
-        "drupal/core-composer-scaffold": "10.4.x",
-        "drupalwxt/wxt": "5.4.x-dev"
+        "drupal/core-composer-scaffold": "11.1.*",
+        "drupalwxt/wxt": "6.1.x-dev"
     },
     "require-dev": {
-        "drupal/core-dev": "10.4.x",
+        "drupal/core-dev": "11.1.*",
+        "drupal/drupal": "^11.1",
         "drupal/drupal-extension": "5.0.0-alpha1",
-        "drush/drush": "^12.4.3",
+        "drush/drush": "^13.3.3",
         "oomphinc/composer-installers-extender": "^1.1 || ^2",
+        "phpspec/prophecy-phpunit": "^2",
         "squizlabs/php_codesniffer": "3.*",
-        "phpspec/prophecy-phpunit": "^2"
+        "vlucas/phpdotenv": "^5.1",
+        "webflo/drupal-finder": "^1.2"
     },
     "config": {
         "discard-changes": true,
@@ -27,9 +30,12 @@
             "cweagans/composer-patches": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "drupal/core-composer-scaffold": true,
+            "drupal/core-project-message": true,
+            "drupal/core-vendor-hardening": true,
             "oomphinc/composer-installers-extender": true,
             "php-http/discovery": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "tbachert/spi": true
         }
     },
     "repositories": [
@@ -44,12 +50,34 @@
         {
             "type": "composer",
             "url": "https://drupalwxt.github.io/composer-extdeps/"
+        },
+        {
+            "type": "package",
+            "package": {
+                "name": "fontawesome/fontawesome",
+                "version": "6.4.2",
+                "type": "drupal-library",
+                "extra": {
+                    "installer-name": "fontawesome"
+                },
+                "dist": {
+                    "url": "https://use.fontawesome.com/releases/v6.4.2/fontawesome-free-6.4.2-web.zip",
+                    "type": "zip"
+                }
+            }
         }
     ],
     "scripts": {
-        "post-root-package-install": [
-            "DrupalWxT\\WxT\\ScriptHandler::postCreateProject"
+        "post-install-cmd": [
+            "@copy-composer-directory"
+        ],
+        "post-update-cmd": [
+            "@copy-composer-directory"
+        ],
+        "copy-composer-directory": [
+            "[ -d vendor/drupal/drupal/composer ] && mkdir -p html/composer && cp -R vendor/drupal/drupal/composer/* html/composer/ || echo 'composer directory not found; skipping copy'"
         ],
+        "post-create-project-cmd": "rm -r -f behat.yml",
         "quick-start": [
             "composer install"
         ]