From 44cb10e8e7746792769717a89c15ad8248bf51f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Tue, 1 Mar 2022 23:42:01 -0500 Subject: [PATCH] Upgrade composer info to Drupal 9 & bring more in line w/ Drutopia --- composer.json | 127 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 96 insertions(+), 31 deletions(-) diff --git a/composer.json b/composer.json index cffdb6a..ef2cee0 100644 --- a/composer.json +++ b/composer.json @@ -3,94 +3,155 @@ "description": "Agaric site modified from template for composer-based Drupal 8 Drutopia projects.", "type": "project", "license": "GPL-2.0-or-later", + "minimum-stability": "dev", + "prefer-stable": true, "homepage": "https://agaric.coop", + "support": { + "docs": "http://docs.drutopia.org/en/latest" + }, "repositories": { - "drupal": { - "type": "composer", - "url": "https://packages.drupal.org/8" + "drupal/octavia_camouflage": { + "type": "git", + "url": "git@gitlab.com:drutopia/octavia_camouflage.git" + }, + "drupal/drutopia_collection": { + "type": "git", + "url": "git@gitlab.com:drutopia/drutopia_collection.git" }, "drutopia": { "type": "vcs", - "url": "https://github.com/drutopia/drutopia" + "url": "https://gitlab.com/drutopia/drutopia" + }, + "drupal/drutopia_core": { + "type": "git", + "url": "git@gitlab.com:drutopia/drutopia_core.git" + }, + "drupal": { + "type": "composer", + "url": "https://packages.drupal.org/8" } }, "require": { "composer/installers": "^1.9", - "cweagans/composer-patches": "^1.6", + "cweagans/composer-patches": "^1.7", "drupal/admin_links_access_filter": "^1.0@alpha", "drupal/allowed_formats": "^1.1", "drupal/antibot": "^1.2", - "drupal/block_theme_sync": "^1.0@alpha", - "drupal/ckeditor_markdown": "^1.1", + "drupal/backup_migrate": "^5", + "drupal/block_class": "^1.3", + "drupal/ckeditorheight": "^1.3", + "drupal/ckeditor_markdown": "^1.3", + "drupal/classitup": "^1", + "drupal/convert_bundles": "^1.0@alpha", "drupal/coffee": "1.x-dev", "drupal/comment_notify": "dev-1.x", - "drupal/core-composer-scaffold": "^8.9", - "drupal/core-recommended": "^8.8", + "drupal/core-composer-scaffold": "^9", + "drupal/core-recommended": "^9", + "drupal/csp": "^1.13", "drupal/customerror": "1.x-dev", - "drupal/diff": "^1.0@RC", + "drupal/diff": "^1.0", "drupal/drd": "^4.0", + "drupal/drd_agent": "^4", "drupal/dropdown_language": "^2.2", - "drupal/drutopia_core": "1.x-dev", + "drupal/drutopia_collection": "dev-8.x-1.x as 1.x-dev", + "drupal/drutopia_core": "dev-8.x-1.x as 1.x-dev", + "drupal/drutopia_paragraph_title": "1.x-dev", "drupal/drutopia_site": "dev-1.x", + "drupal/editor_advanced_link": "^2.0", + "drupal/empty_page": "^3", + "drupal/entity_reference_override": "^2", + "drupal/environment_indicator": "^4.0", + "drupal/field_token_value": "^2", + "drupal/fitvids": "^1.1", + "drupal/fixed_block_content": "^1.0", + "drupal/footnotes": "2.x-dev", + "drupal/geolocation": "^3.2", "drupal/google_analytics": "^2.3", "drupal/honeypot": "^1.29", "drupal/hotjar": "^1.5", "drupal/http_cache_control": "^1.0", "drupal/http_client_error_status": "^1.0", - "drupal/indieweb": "1.x-dev", + "drupal/indieweb": "^1.12", + "drupal/insert": "^1.0", + "drupal/key": "^1.14", + "drupal/link_attributes": "^1.9", + "drupal/linkit": "^6", "drupal/mailsystem": "^4.3", - "drupal/markdown": "^1.2", + "drupal/markdown": "^3", + "drupal/menu_link_config": "^1.0@alpha", "drupal/menu_trail_by_path": "^1.1", - "drupal/migrate_plus": "^4.0", - "drupal/migrate_tools": "^4.0", + "drupal/microformats": "^2", + "drupal/migrate_plus": "^5", + "drupal/migrate_source_csv": "^3", + "drupal/migrate_tools": "^4.1", + "drupal/migrate_upgrade": "^3", "drupal/mimemail": "^1.0@alpha", - "drupal/minimalhtml": "^1.0", + "drupal/minimalhtml": "^1.1", + "drupal/node_view_permissions": "^1.4", + "drupal/noreferrer": "^1.7", "drupal/multiline_config": "^1.0", + "drupal/notfoundpassthrough": "1.x-dev", + "drupal/octavia": "1.x-dev", + "drupal/octavia_camouflage": "dev-8.x-1.x as 1.x-dev", "drupal/paragraphs_features": "^1.4", - "drupal/preview_link": "^1.1", + "drupal/password_policy": "^3.0", + "drupal/preview_link": "^1.7", "drupal/redirect": "^1.2", "drupal/regionincontent": "1.x-dev", + "drupal/role_delegation": "^1.0", "drupal/scheduler": "^1.0", "drupal/scn": "^1.1", "drupal/search404": "^1.0", + "drupal/search_api_saved_searches": "^1.0@alpha", + "drupal/seckit": "^2.0", + "drupal/shield": "^1.4", "drupal/stripe_webform": "^1.1", + "drupal/subpathauto": "^1.0@RC", "drupal/swiftmailer": "^1.0@beta", + "drupal/taxonomy_manager": "^2", "drupal/textarea_widget_for_text": "^1.1", - "drupal/twigsuggest": "1.x-dev", + "drupal/trim": "^1.0", + "drupal/twigsuggest": "^1", + "drupal/urllogin": "^2", + "drupal/view_unpublished": "^1.0", "drupal/ui_patterns": "^1.0@RC", "drupal/viewsreference": "^1.2", "drupal/webform": "^6.0", "drupal/webform_mailchimp": "^5.4", - "drupal/wysiwyg_linebreaks": "^1.9", - "drush/drush": "^10.0", - "drutopia/drutopia": "^1.0-beta1", - "wikimedia/composer-merge-plugin": "^2.0" + "drupal/weight": "^3.3", + "drupal/wysiwyg_linebreaks": "^1.10", + "drush/drush": "^10", + "drutopia/drutopia": "dev-8.x-1.x", + "vlucas/phpdotenv": "^5.1", + "webflo/drupal-finder": "^1.2" }, "require-dev": { "behat/behat": "^3.4", "behat/mink": "^1.7", - "behat/mink-goutte-driver": "^1.2" + "behat/mink-goutte-driver": "^1.2", + "drupal/upgrade_status": "^3" }, - "conflict": { - "drupal/drupal": "*" - }, - "minimum-stability": "dev", - "prefer-stable": true, "config": { "sort-packages": true, "process-timeout": 600, "allow-plugins": { - "composer/installers": true, "cweagans/composer-patches": true, "drupal/core-composer-scaffold": true, - "wikimedia/composer-merge-plugin": true + "composer/installers": true, + "drupal/core-project-message": false } }, + "conflict": { + "drupal/drupal": "*" + }, "extra": { "drupal-scaffold": { "locations": { "web-root": "web/" - } + }, + "allowed-packages": [ + "drupal/ui_patterns" + ] }, "installer-paths": { "web/core": ["type:drupal-core"], @@ -125,5 +186,9 @@ "pull": "scripts/pull.sh", "pull-files": "drush -y rsync @live:%files @self:%files", "css": "scripts/css.sh" + "quick-start": [ + "composer install", + "php docroot/core/scripts/drupal quick-start drutopia --no-interaction" + ] } }