Major base update to Drupal 9

Makefile

@@ -165,7 +165,7 @@ export-prod: # Export production tarball
 # Drupal specific commands
 # The following commands are used to strap and control Drupal.
 ##
-init-drupal: drupal-install config-init config-import clear-cache
+init-drupal: drupal-install clear-cache
 
 update: docker-stop composer-install docker-rebuild wait-healthy clear-cache config-import updb clear-cache # Run the 'rebuild' task then import configuration and clear Drupal's cache.
 
@@ -178,6 +178,7 @@ drupal-install: docker-running
 	    --yes \
 	    --account-name=admin \
 	    --account-pass=admin \
+	    --existing-config \
 	    install_configure_form.enable_update_status_module=NULL \
 	    install_configure_form.enable_update_status_emails=NULL
 	$(CURDIR)/bin/tool chmod 777 /var/www/webroot/sites/default/files

README.md

@@ -22,12 +22,16 @@ standalone servers.
 
 ## Requirements
 
-MacOS, Linux, or Windows
+* MacOS, Linux, or Windows
+
+> On systems that don't ship with docker-compose (Linux), it should also be installed.
+
+* GNU Make (https://www.gnu.org/software/make/)
 
 > Windows support can be achieved with WSL or WSL2 natively in this repository.
 > We recommend WSL2 due to the excellent speed and support using `make` commands to manage Docker natively.
 
-### Windows Setup
+#### Windows Setup
 Docker for Windows (https://www.docker.com/products/overview) will detect and use WSL2. Hypervisor is required for WSL **while it is not for WSL2**. For now, Windows 10 version 2004 and above are the only versions that have WSL2 available. Updates for Windows are being rolled out over the coming months, but to get it now, run the Update Assistant (see https://support.microsoft.com/en-us/help/3159635/windows-10-update-assistant)
 
 For native-like speeds, add your code to a folder under the WSL2 OS you have set up. You may experience significant slowdown if you do not set up your project this way due to the fact that filesystem mounts in WSL2 are implemented as NFS. (see https://github.com/microsoft/WSL/issues/4197#issuecomment-650205399)
@@ -56,15 +60,9 @@ You can select WSL to run instead of the default DOS prompt. Open this project a
 
 Attempting to use a drive letter mapping will not work correctly. Open the project in PHPStorm using the path at `\\wsl$\`
 
-##
-
-> On systems that don't ship with docker-compose (Linux), it should also be installed.
-
-GNU Make (https://www.gnu.org/software/make/)
-
 ## Usage
 
-Once docker has been installed, the environment can be brought right up:
+Once Docker is installed, the environment can be brought right up:
 
 ```
 make init
@@ -138,8 +136,8 @@ and XDebug configuration.
 volume is not deleted manually or with the "-v" option on `docker-compose down`.
 * This repository *does* track a composer.lock file meaning that versions of software 
 installed are the ones that match the lock file. Currently this repository tracks 
-the base installation provided by the [drupal-composer/drupal-project](https://github.com/drupal-composer/drupal-project) 
-with Drupal 8.8.1. You can upgrade with `make drupal-upgrade` or wait until this 
+the base installation provided by the [drupal/recommended-project](https://github.com/drupal/recommended-project) 
+with Drupal 9.0.1. You can upgrade with `make drupal-upgrade` or wait until this 
 repository is updated. Certain files such as those provided by the Drupal scaffolding 
 project may be subject to manipulation and may or may not upgrade cleanly. The default
 location for the hosted content in this project was moved from the default of `/web`

composer.json

@@ -1,43 +1,38 @@
 {
-    "name": "drupal-composer/drupal-project",
-    "description": "Project template for Drupal 8 projects with composer",
+    "name": "drupal/recommended-project",
+    "description": "Project template for Drupal 8 projects with a relocated document root",
     "type": "project",
-    "license": "GPL-2.0+",
-    "authors": [
-        {
-            "name": "",
-            "role": ""
-        }
-    ],
+    "license": "GPL-2.0-or-later",
+    "homepage": "https://www.drupal.org/project/drupal",
+    "support": {
+        "docs": "https://www.drupal.org/docs/user_guide/en/index.html",
+        "chat": "https://www.drupal.org/node/314178"
+    },
     "repositories": [
         {
             "type": "composer",
             "url": "https://packages.drupal.org/8"
         }
     ],
     "require": {
-        "composer/installers": "^1.2",
-        "drupal-composer/drupal-scaffold": "^2.5",
+        "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.6.5",
-        "drupal/core": "^8.7.0",
-        "drush/drush": "^9.0.0",
-        "drupal/console": "^1.0.2",
-        "webflo/drupal-finder": "^1.0.0",
-        "webmozart/path-util": "^2.3",
-        "zaporylie/composer-drupal-optimizations": "^1.0",
-        "drupal/admin_toolbar": "^1.0",
-        "vlucas/phpdotenv": "^2.4"
+        "drupal/admin_toolbar": "^2.3",
+        "drupal/core-composer-scaffold": "^9",
+        "drupal/core-project-message": "^9",
+        "drupal/core-recommended": "^9",
+        "drush/drush": "^10.3",
+        "vlucas/phpdotenv": "^5.0"
     },
     "require-dev": {
-        "webflo/drupal-core-require-dev": "^8.7.0",
-        "behat/behat": "^3.5.0",
-        "emuse/behat-html-formatter": "^0.1.0",
-        "bex/behat-screenshot": "^1.2",
-        "drupal/drupal-extension": "~3.2",
-        "jarnaiz/behat-junit-formatter": "^1.3.2",
-        "drupal/devel": "^2.1",
-        "jakub-onderka/php-parallel-lint": "^0.9.2",
-        "jakub-onderka/php-console-highlighter": "^0.3.2"
+        "behat/behat": "^3.7",
+        "bex/behat-screenshot": "^2.1",
+        "drupal/core-dev": "^9",
+        "drupal/devel": "^4.0",
+        "emuse/behat-html-formatter": "^0.2.0",
+        "jakub-onderka/php-console-highlighter": "^0.4.0",
+        "jakub-onderka/php-parallel-lint": "^1.0",
+        "jarnaiz/behat-junit-formatter": "^1.3"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -49,35 +44,28 @@
             "scripts/composer/ScriptHandler.php"
         ]
     },
-    "scripts": {
-        "drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
-        "pre-install-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
-        ],
-        "pre-update-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
-        ],
-        "post-install-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
-        ],
-        "post-update-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
-        ]
-    },
     "extra": {
+        "drupal-scaffold": {
+            "locations": {
+                "web-root": "webroot/"
+            }
+        },	    
         "installer-paths": {
             "webroot/core": ["type:drupal-core"],
             "webroot/libraries/{$name}": ["type:drupal-library"],
             "webroot/modules/contrib/{$name}": ["type:drupal-module"],
             "webroot/profiles/contrib/{$name}": ["type:drupal-profile"],
             "webroot/themes/contrib/{$name}": ["type:drupal-theme"],
-            "webroot/sites/all/drush/contrib/{$name}": ["type:drupal-drush"]
+            "drush/Commands/contrib/{$name}": ["type:drupal-drush"],
+	    "webroot/modules/custom/{$name}": ["type:drupal-custom-module"],
+            "webroot/themes/custom/{$name}": ["type:drupal-custom-theme"]
         }
     },
     "config": {
         "platform": {
             "php": "7.3",
             "ext-gd": "1"
-        }
+        },
+	"sort-packages": true
     }
 }