From 9723afa6364f83690a7af1b6ab3d51a2dd476578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Fri, 21 Feb 2025 18:23:55 -0500 Subject: [PATCH] Align composer.json more closely (but not perfectly) with Drutopia build source --- composer.json | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index 38f1124..e5166f6 100644 --- a/composer.json +++ b/composer.json @@ -1,11 +1,11 @@ { "name": "agaric-sites/geo", "description": "Drutopia-based site for the Grassroots Economic Organizing collective and potentially other news sites.", + "homepage": "https://geo.coop", "type": "project", "license": "GPL-2.0-or-later", "minimum-stability": "dev", "prefer-stable": true, - "homepage": "https://drutopia.org", "support": { "docs": "http://docs.drutopia.org/en/latest", "issues": "https://gitlab.com/drutopia/drutopia/-/issues" @@ -15,10 +15,6 @@ "type": "git", "url": "git@git.drupal.org:issue/empty_page-3287186.git" }, - "drupal/google_analytics": { - "type": "git", - "url": "git@git.drupal.org:issue/google_analytics-3357831.git" - }, "drupal": { "type": "composer", "url": "https://packages.drupal.org/8" @@ -28,12 +24,14 @@ "composer/installers": "^2", "cweagans/composer-patches": "^1.7", "drupal/admin_toolbar": "^3", - "drupal/allowed_formats": "^2", "drupal/antibot": "^2", "drupal/asset_injector": "^2", - "drupal/auto_entitylabel": "^3.0@beta", + "drupal/auto_entitylabel": "^3", "drupal/backup_migrate": "^5", - "drupal/block_class": "^2", + "drupal/better_exposed_filters": "^6", + "drupal/block_class": "^4", + "drupal/bpmn_io": "^1", + "drupal/cancel_button": "^1", "drupal/ckeditorheight": "^1", "drupal/classitup": "^1", "drupal/comment_notify": "^1", @@ -51,6 +49,7 @@ "drupal/drd_agent": "^4", "drupal/drutopia_collection": "2.0.x-dev@dev", "drupal/drutopia_core": "2.0.x-dev@dev", + "drupal/drutopia_organization": "2.0.x-dev@dev", "drupal/drutopia_paragraph_title": "^1", "drupal/drutopia_site": "2.0.x-dev@dev", "drupal/easy_breadcrumb": "^2", @@ -73,18 +72,14 @@ "drupal/fixed_block_content": "^1", "drupal/footnotes": "^3", "drupal/geolocation": "^3", - "drupal/gin": "^3", "drupal/gin_gutenberg": "^1", "drupal/gin_login": "^2", - "drupal/gin_toolbar": "^1", - "drupal/google_analytics": "dev-3357831-php-8.2-compatibility", + "drupal/google_analytics": "^4", "drupal/gutenberg": "^2", "drupal/http_cache_control": "^2", "drupal/http_client_error_status": "^3", - "drupal/honeypot": "~2.1.0", "drupal/ief_complex_open": "^1", "drupal/indieweb": "^1", - "drupal/inline_entity_form": "^1.0@RC", "drupal/inotherwords": "^3", "drupal/insert": "^3", "drupal/key": "^1.14", @@ -111,19 +106,25 @@ "drupal/plausible": "^2.0@beta", "drupal/prepopulate": "^2", "drupal/preview_link": "^2", + "drupal/printable": "^3", "drupal/r4032login": "^2", "drupal/rabbit_hole": "^1.0@beta", + "drupal/regionincontent": "^1", + "drupal/registration_role": "^2", + "drupal/require_on_publish": "^1", "drupal/role_delegation": "^1", - "drupal/schema_metatag": "^2", + "drupal/scheduler": "^1", + "drupal/schema_metatag": "^3", "drupal/scn": "^2", "drupal/search404": "^2", "drupal/search_api_autocomplete": "^1.6", "drupal/search_api_saved_searches": "^1", - "drupal/seckit": "^2.0", + "drupal/seckit": "^2", "drupal/select_or_other": "^4.0", "drupal/shield": "^1.4", - "drupal/smart_date": "^4.0", - "drupal/sms": "^2.0", + "drupal/simple_sitemap": "^4.1", + "drupal/smart_date": "^4", + "drupal/sms": "^2", "drupal/social_post_facebook": "3.0.x-dev@dev", "drupal/social_post_twitter": "3.x-dev@dev", "drupal/stable": "^2.0", @@ -134,16 +135,18 @@ "drupal/textarea_widget_for_text": "^1.1", "drupal/tomselect": "1.0.x-dev@dev", "drupal/trim": "^2", - "drupal/twig_tweak": "^3.2", - "drupal/twigsuggest": "^1", + "drupal/twig_tweak": "^3", + "drupal/ui_patterns": "^1", + "drupal/unique_content_field_validation": "^1.1", "drupal/view_password": "^6", "drupal/view_unpublished": "^1.0", "drupal/viewsreference": "^1", "drupal/visitors": "^2.17", "drupal/webform": "^6.0", "drupal/weight": "^3.3", + "drupal/workflow_buttons": "1.x-dev", "drupal/wysiwyg_linebreaks": "^2", - "drush/drush": "^12", + "drush/drush": "*", "drutopia/drutopia": "2.0.x-dev", "league/commonmark": "^1.0", "vlucas/phpdotenv": "^5.1", @@ -196,8 +199,7 @@ "drupal/core": { "Adding attributes to views-view-list.html.twig doesn't work if Views List class Style option is empty": "https://www.drupal.org/files/issues/2023-03-16/2845400-24.patch", "Use form element of type date instead textfield when selecting a date in an exposed filter": "https://www.drupal.org/files/issues/2024-08-21/2648950-284.patch", - "Views Date Filter Datetime Granularity Option": "https://www.drupal.org/files/issues/2021-04-27/2868014-110-after-2648950-247-applied.patch", - "Entity reference filter for all entity reference fields 3347343": "https://git.drupalcode.org/project/drupal/-/merge_requests/9226.diff" + "Views Date Filter Datetime Granularity Option": "https://www.drupal.org/files/issues/2021-04-27/2868014-110-after-2648950-247-applied.patch" }, "drupal/ds": { "Parent theme template inheritance bug": "https://www.drupal.org/files/issues/2021-02-22/2895316-12.patch" @@ -213,6 +215,7 @@ "quick-start": [ "composer install", "php docroot/core/scripts/drupal quick-start drutopia --no-interaction" - ] + ], + "post-drupal-scaffold-cmd": "scripts/retain-custom-htaccess.sh" } }