Compare commits
26 commits
main
...
D9-upgrade
Author | SHA1 | Date | |
---|---|---|---|
|
82509ba323 | ||
|
8fd49b27f7 | ||
|
10ea0431f6 | ||
|
32f8e7373f | ||
|
e350adbafe | ||
|
a6caeba30a | ||
|
483138ae5e | ||
|
5079621e13 | ||
|
c219eebb28 | ||
|
c3061fede2 | ||
|
654f5793b4 | ||
|
d632dd7aa3 | ||
|
a5087a1d31 | ||
|
c99ee499ea | ||
|
2a08038d1a | ||
|
01a8ffd05d | ||
|
f6791135ae | ||
|
7df2c30770 | ||
|
0459c98cdd | ||
|
1ee678f81f | ||
|
89ae9979ed | ||
|
c900bf8f92 | ||
|
f116820568 | ||
|
cd7ff4df46 | ||
|
b431d07447 | ||
|
30b49372f5 |
8 changed files with 3672 additions and 1264 deletions
1
.ddev/.gitignore
vendored
1
.ddev/.gitignore
vendored
|
@ -1,7 +1,6 @@
|
||||||
#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
|
/.gitignore
|
||||||
|
|
||||||
/**/*.example
|
/**/*.example
|
||||||
/.dbimageBuild
|
/.dbimageBuild
|
||||||
/.dbimageExtra
|
/.dbimageExtra
|
||||||
|
|
|
@ -2,18 +2,19 @@ APIVersion: v1.13.1
|
||||||
name: agaric-coop
|
name: agaric-coop
|
||||||
type: drupal8
|
type: drupal8
|
||||||
docroot: web
|
docroot: web
|
||||||
php_version: "7.4"
|
php_version: "7.3"
|
||||||
webserver_type: nginx-fpm
|
webserver_type: nginx-fpm
|
||||||
router_http_port: "80"
|
router_http_port: "80"
|
||||||
router_https_port: "443"
|
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: ""
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -11,30 +11,33 @@
|
||||||
"drupal/admin_links_access_filter": "^1.0@alpha",
|
"drupal/admin_links_access_filter": "^1.0@alpha",
|
||||||
"drupal/allowed_formats": "^1.1",
|
"drupal/allowed_formats": "^1.1",
|
||||||
"drupal/antibot": "^1.2",
|
"drupal/antibot": "^1.2",
|
||||||
"drupal/block_theme_sync": "^1.0@alpha",
|
"drupal/block_theme_sync": "1.x-dev",
|
||||||
"drupal/ckeditor_markdown": "^1.1",
|
"drupal/ckeditor_markdown": "^1.1",
|
||||||
"drupal/coffee": "1.x-dev",
|
"drupal/coffee": "1.x-dev",
|
||||||
"drupal/comment_notify": "dev-1.x",
|
"drupal/comment_notify": "dev-1.x",
|
||||||
"drupal/core-recommended": "^8.8",
|
"drupal/core-composer-scaffold": "^9.0.0",
|
||||||
|
"drupal/core-project-message": "^9.0.0",
|
||||||
|
"drupal/core-recommended": "^9.0.0",
|
||||||
"drupal/customerror": "1.x-dev",
|
"drupal/customerror": "1.x-dev",
|
||||||
"drupal/diff": "^1.0@RC",
|
"drupal/diff": "^1.0@RC",
|
||||||
"drupal/dropdown_language": "^2.2",
|
"drupal/dropdown_language": "^2.2",
|
||||||
"drupal/drutopia_core": "1.x-dev",
|
"drupal/drutopia_core": "dev-update-to-drupal9 as 1.x-dev",
|
||||||
"drupal/drutopia_site": "dev-1.x",
|
"drupal/drutopia_site": "dev-1.x",
|
||||||
"drupal/google_analytics": "^2.3",
|
"drupal/google_analytics": "^2.3",
|
||||||
"drupal/honeypot": "^1.29",
|
"drupal/honeypot": "^2.0",
|
||||||
"drupal/hotjar": "^1.2",
|
"drupal/hotjar": "^1.2",
|
||||||
"drupal/http_cache_control": "^1.0",
|
"drupal/http_cache_control": "^1.0",
|
||||||
"drupal/http_client_error_status": "^1.0",
|
"drupal/http_client_error_status": "^2.0",
|
||||||
"drupal/indieweb": "1.x-dev",
|
"drupal/indieweb": "1.x-dev",
|
||||||
|
"drupal/mailchimp": "1.x-dev",
|
||||||
"drupal/mailsystem": "^4.3",
|
"drupal/mailsystem": "^4.3",
|
||||||
"drupal/markdown": "^1.2",
|
"drupal/markdown": "dev-2.x",
|
||||||
"drupal/menu_trail_by_path": "^1.1",
|
"drupal/menu_trail_by_path": "^1.1",
|
||||||
"drupal/migrate_plus": "^4.0",
|
"drupal/migrate_plus": "^4.0",
|
||||||
"drupal/migrate_tools": "^4.0",
|
"drupal/migrate_tools": "^4.0",
|
||||||
"drupal/mimemail": "^1.0@alpha",
|
"drupal/mimemail": "^1.0@alpha",
|
||||||
"drupal/minimalhtml": "^1.0",
|
"drupal/minimalhtml": "1.x-dev",
|
||||||
"drupal/multiline_config": "^1.0",
|
"drupal/multiline_config": "dev-1.x",
|
||||||
"drupal/paragraphs_features": "^1.4",
|
"drupal/paragraphs_features": "^1.4",
|
||||||
"drupal/preview_link": "^1.1",
|
"drupal/preview_link": "^1.1",
|
||||||
"drupal/redirect": "^1.2",
|
"drupal/redirect": "^1.2",
|
||||||
|
@ -42,24 +45,27 @@
|
||||||
"drupal/scheduler": "^1.0",
|
"drupal/scheduler": "^1.0",
|
||||||
"drupal/scn": "^1.1",
|
"drupal/scn": "^1.1",
|
||||||
"drupal/search404": "^1.0",
|
"drupal/search404": "^1.0",
|
||||||
"drupal/stripe_webform": "^1.1",
|
"drupal/stripe_webform": "1.x-dev",
|
||||||
"drupal/swiftmailer": "^1.0@beta",
|
"drupal/swiftmailer": "^2.0",
|
||||||
"drupal/textarea_widget_for_text": "^1.1",
|
"drupal/textarea_widget_for_text": "1.x-dev",
|
||||||
"drupal/twigsuggest": "1.x-dev",
|
"drupal/twigsuggest": "1.x-dev",
|
||||||
"drupal/ui_patterns": "^1.0@RC",
|
"drupal/ui_patterns": "1.x-dev",
|
||||||
"drupal/viewsreference": "^1.2",
|
"drupal/upgrade_status": "^2.0",
|
||||||
"drupal/webform": "^5.0@RC",
|
"drupal/viewsreference": "^2.0",
|
||||||
|
"drupal/webform": "^6.0",
|
||||||
"drupal/webform_mailchimp": "^5.4",
|
"drupal/webform_mailchimp": "^5.4",
|
||||||
"drupal/wysiwyg_linebreaks": "^1.9",
|
"drupal/wysiwyg_linebreaks": "1.x-dev",
|
||||||
"drush/drush": "^9.0",
|
"drush/drush": "^10.0",
|
||||||
"drutopia/drutopia": "^1.0-beta1",
|
"drutopia/drutopia": "dev-update-to-drupal9",
|
||||||
|
"league/commonmark": "^1.5",
|
||||||
"wikimedia/composer-merge-plugin": "^1.4",
|
"wikimedia/composer-merge-plugin": "^1.4",
|
||||||
"zaporylie/composer-drupal-optimizations": "^1.0"
|
"zaporylie/composer-drupal-optimizations": "^1.0"
|
||||||
},
|
},
|
||||||
"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": {
|
||||||
|
@ -68,7 +74,11 @@
|
||||||
},
|
},
|
||||||
"drutopia": {
|
"drutopia": {
|
||||||
"type": "vcs",
|
"type": "vcs",
|
||||||
"url": "https://github.com/drutopia/drutopia"
|
"url": "https://gitlab.com/drutopia/drutopia"
|
||||||
|
},
|
||||||
|
"drutopia_core": {
|
||||||
|
"type": "vcs",
|
||||||
|
"url": "https://gitlab.com/drutopia/drutopia_core"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
|
@ -108,7 +118,35 @@
|
||||||
"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"
|
"Drupal 9 readiness and code standars": "https://www.drupal.org/files/issues/2020-04-21/drupal_9_readiness_and_code_standarts_3129608-7.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/textarea_widget_for_text": {
|
||||||
|
"Automated Drupal Rector fixes":"https://www.drupal.org/files/issues/2020-05-23/textarea_widget_for_text.1.1.rector.patch"
|
||||||
|
},
|
||||||
|
"drupal/block_theme_sync": {
|
||||||
|
"Automated Drupal 9 compatibility fixes": "https://www.drupal.org/files/issues/2020-09-07/3146266-3.patch"
|
||||||
|
},
|
||||||
|
"drupal/config_actions_provider": {
|
||||||
|
"Automated Drupal Rector fixes": "https://www.drupal.org/files/issues/2020-05-23/config_actions_provider.1.x-dev.rector.patch"
|
||||||
|
},
|
||||||
|
"drupal/multiline_config": {
|
||||||
|
"Drupal 9 readiness for Multiline Config": "https://www.drupal.org/files/issues/2020-07-22/3109713-Drupal-support-13.patch"
|
||||||
|
},
|
||||||
|
"drupal/mailchimp": {
|
||||||
|
"Drupal 9 compatibility": "https://www.drupal.org/files/issues/2020-07-16/mailchimp-d9-3138909-9.patch"
|
||||||
|
},
|
||||||
|
"drupal/minimalhtml": {
|
||||||
|
"Automated Drupal Rector fixes": "https://www.drupal.org/files/issues/2020-09-09/3141144-4.txt"
|
||||||
|
},
|
||||||
|
"drupal/regionincontent": {
|
||||||
|
"Region In Content Template": "https://www.drupal.org/files/issues/2020-06-06/regionincontent.1.x-dev.rector.patch"
|
||||||
|
},
|
||||||
|
"drupal/stripe_webform": {
|
||||||
|
"Automated Drupal 9 compatibility fixes": "https://www.drupal.org/files/issues/2020-09-09/stripe_webform.1.x-dev.rector.patch"
|
||||||
|
},
|
||||||
|
"drupal/markdown": {
|
||||||
|
"[markdown] Drupal 9 Support": "https://www.drupal.org/files/issues/2020-05-14/3103679-18.patch"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
4843
composer.lock
generated
4843
composer.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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'
|
||||||
|
|
Loading…
Reference in a new issue