First step to move the site to Drupal 9

This commit is contained in:
David Valdez 2020-07-06 23:20:43 +00:00 committed by benjamin melançon
parent c900bf8f92
commit 89ae9979ed
7 changed files with 29 additions and 30 deletions

38
.ddev/.gitignore vendored
View file

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

View file

@ -9,11 +9,12 @@ router_https_port: "443"
xdebug_enabled: true xdebug_enabled: true
additional_hostnames: [] additional_hostnames: []
additional_fqdns: [] additional_fqdns: []
mariadb_version: "10.2" mariadb_version: "10.3"
nfs_mount_enabled: false nfs_mount_enabled: false
provider: default provider: default
webimage_extra_packages: [rake, sassc] webimage_extra_packages: [rake, sassc]
use_dns_when_possible: false use_dns_when_possible: false
php_version: "7.3"
timezone: "" timezone: ""

View file

@ -47,11 +47,12 @@
"drupal/textarea_widget_for_text": "^1.1", "drupal/textarea_widget_for_text": "^1.1",
"drupal/twigsuggest": "1.x-dev", "drupal/twigsuggest": "1.x-dev",
"drupal/ui_patterns": "^1.0@RC", "drupal/ui_patterns": "^1.0@RC",
"drupal/upgrade_status": "^2.0",
"drupal/viewsreference": "^1.2", "drupal/viewsreference": "^1.2",
"drupal/webform": "^5.0@RC", "drupal/webform": "^5.0@RC",
"drupal/webform_mailchimp": "^5.4", "drupal/webform_mailchimp": "^5.4",
"drupal/wysiwyg_linebreaks": "^1.9", "drupal/wysiwyg_linebreaks": "^1.9",
"drush/drush": "^9.0", "drush/drush": "^10.0",
"drutopia/drutopia": "^1.0-beta1", "drutopia/drutopia": "^1.0-beta1",
"wikimedia/composer-merge-plugin": "^1.4", "wikimedia/composer-merge-plugin": "^1.4",
"zaporylie/composer-drupal-optimizations": "^1.0" "zaporylie/composer-drupal-optimizations": "^1.0"
@ -59,7 +60,8 @@
"require-dev": { "require-dev": {
"behat/behat": "^3.4", "behat/behat": "^3.4",
"behat/mink": "^1.7", "behat/mink": "^1.7",
"behat/mink-goutte-driver": "^1.2" "behat/mink-goutte-driver": "^1.2",
"phpunit/phpunit": "^7"
}, },
"repositories": { "repositories": {
"drupal": { "drupal": {
@ -108,7 +110,8 @@
"Allow user to specify keyboard shortcut.": "https://www.drupal.org/files/issues/2018-11-11/1734898-14.coffee-hotkeys-plus-g.patch" "Allow user to specify keyboard shortcut.": "https://www.drupal.org/files/issues/2018-11-11/1734898-14.coffee-hotkeys-plus-g.patch"
}, },
"drupal/wysiwyg_linebreaks": { "drupal/wysiwyg_linebreaks": {
"Excess line breaks keep getting added": "https://www.drupal.org/files/issues/2018-11-18/excess-line-breaks-keep-getting-added-3013853-5.patch" "Excess line breaks keep getting added": "https://www.drupal.org/files/issues/2018-11-18/excess-line-breaks-keep-getting-added-3013853-5.patch",
"Drupal 9 readiness and code standars": "https://www.drupal.org/files/issues/2020-04-21/drupal_9_readiness_and_code_standarts_3129608-7.patch"
} }
} }
}, },

View file

@ -2,7 +2,7 @@ name: Agaric Migration
description: Migrate the content from the D7 version of the site. description: Migrate the content from the D7 version of the site.
package: Custom package: Custom
type: module type: module
core: 8.x core_version_requirement: ^8 || ^9
dependencies: dependencies:
- drupal:migrate - drupal:migrate
- drupal:migrate_drupal - drupal:migrate_drupal

View file

@ -1,7 +1,7 @@
name: 'Drutopia Case Study' name: 'Drutopia Case Study'
description: 'A Case Study highlights work done on a project.' description: 'A Case Study highlights work done on a project.'
type: module type: module
core: 8.x core_version_requirement: ^8 || ^9
dependencies: dependencies:
- config_snapshot - config_snapshot
- drutopia_case_study - drutopia_case_study

View file

@ -1,7 +1,7 @@
name: 'Creative License' name: 'Creative License'
type: module type: module
core: 8.x
package: Drutopia package: Drutopia
core_version_requirement: ^8 || ^9
dependencies: dependencies:
- config_actions - config_actions
- config_snapshot - config_snapshot

View file

@ -3,8 +3,7 @@ description: An Octavia-based subtheme.
type: theme type: theme
base theme: octavia base theme: octavia
package: Custom package: Custom
core: 8.x core_version_requirement: ^8 || ^9
regions: regions:
header: 'Header' header: 'Header'
navbar_branding: 'Branding' navbar_branding: 'Branding'