Merge branch 'D9-upgrade' of gitlab.com:agaric/sites/agaric-com into D9-upgrade

.ddev/.gitignore

@@ -1,24 +1,27 @@
 #ddev-generated: Automatically generated ddev .gitignore.
 # You can remove the above line if you want to edit and maintain this file yourself.
-
-/commands/*/*.example
-/commands/*/README.txt
-/commands/host/launch
-/commands/web/xdebug
-/commands/db/mysql
-/homeadditions/*.example
-/homeadditions/README.txt
 /.gitignore
-/import.yaml
+/**/*.example
+/.dbimageBuild
+/.dbimageExtra
 /.ddev-docker-compose-base.yaml
 /.ddev-docker-compose-full.yaml
-/db_snapshots
+/.ddevlive-downloads
-/sequelpro.spf
+/.global_commands
-/import-db
+/.homeadditions
-/config.*.y*ml
-/.webimageBuild
-/.dbimageBuild
 /.sshimageBuild
+/.webimageBuild
 /.webimageExtra
-/.dbimageExtra
+/apache/apache-site.conf
-/*-build/Dockerfile.example
+/commands/.gitattributes
+/commands/db/mysql
+/commands/host/launch
+/commands/web/live
+/commands/web/xdebug
+/config.*.y*ml
+/db_snapshots
+/import-db
+/import.yaml
+/nginx_full/nginx-site.conf
+/sequelpro.spf
+/**/README.*

.ddev/config.yaml

@@ -2,7 +2,7 @@ APIVersion: v1.13.1
 name: agaric-coop
 type: drupal8
 docroot: web
-php_version: "7.2"
+php_version: "7.3"
 webserver_type: nginx-fpm
 router_http_port: "80"
 router_https_port: "443"

composer.json

@@ -15,7 +15,7 @@
         "drupal/ckeditor_markdown": "^1.1",
         "drupal/coffee": "1.x-dev",
         "drupal/comment_notify": "dev-1.x",
-        "drupal/core-recommended": "^8.8",
+        "drupal/core-recommended": "^9",
         "drupal/customerror": "1.x-dev",
         "drupal/diff": "^1.0@RC",
         "drupal/dropdown_language": "^2.2",
@@ -53,7 +53,7 @@
         "drupal/webform_mailchimp": "^5.4",
         "drupal/wysiwyg_linebreaks": "1.x-dev",
         "drush/drush": "^10.0",
-        "drutopia/drutopia": "^1.0-beta1",
+        "drutopia/drutopia": "^1.x-dev",
         "wikimedia/composer-merge-plugin": "^1.4",
         "zaporylie/composer-drupal-optimizations": "^1.0"
     },