From f7a18b95684d6ba05e94800bcf2740f7dd7ff5c0 Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Tue, 1 Oct 2024 12:45:28 +0100 Subject: [PATCH 1/7] Mental Health Champion - turn on caching for publications search --- .../config/views.view.publications_search.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/project/config/mentalhealthchampionni/config/views.view.publications_search.yml b/project/config/mentalhealthchampionni/config/views.view.publications_search.yml index 8efc7e7be8..c9f9f36b3e 100644 --- a/project/config/mentalhealthchampionni/config/views.view.publications_search.yml +++ b/project/config/mentalhealthchampionni/config/views.view.publications_search.yml @@ -82,6 +82,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 20 total_pages: null id: 0 @@ -211,19 +212,20 @@ display: - 'user.node_grants:view' tags: - 'config:search_api.index.publications' + - 'search_api_list:publications' publication_search_page: id: publication_search_page display_title: Page display_plugin: page position: 1 display_options: - cache: - type: none defaults: - cache: false + cache: true exposed_block: true display_extenders: - metatag_display_extender: { } + metatag_display_extender: + metatags: { } + tokenize: false path: publications menu: type: normal @@ -235,11 +237,14 @@ display: parent: '' context: '0' cache_metadata: - max-age: -1 + max-age: 0 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' tags: + - 'config:facets.facet.publication_type' + - 'config:facets.facet.published_date_publications' - 'config:search_api.index.publications' + - 'search_api_list:publications' From 006b5ecb03b2549f874bd55789d13df4c1d00d1f Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Tue, 1 Oct 2024 12:52:01 +0100 Subject: [PATCH 2/7] Turn on caching for CPAN publications search --- .../config/views.view.publications_search.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/project/config/publicappointmentsni/config/views.view.publications_search.yml b/project/config/publicappointmentsni/config/views.view.publications_search.yml index 527cd11a5c..1c7df8f6be 100644 --- a/project/config/publicappointmentsni/config/views.view.publications_search.yml +++ b/project/config/publicappointmentsni/config/views.view.publications_search.yml @@ -82,6 +82,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 20 total_pages: null id: 0 @@ -211,19 +212,20 @@ display: - 'user.node_grants:view' tags: - 'config:search_api.index.publications' + - 'search_api_list:publications' publication_search_page: id: publication_search_page display_title: Page display_plugin: page position: 1 display_options: - cache: - type: none defaults: - cache: false + cache: true exposed_block: true display_extenders: - metatag_display_extender: { } + metatag_display_extender: + metatags: { } + tokenize: false path: publications menu: type: normal @@ -235,11 +237,14 @@ display: parent: '' context: '0' cache_metadata: - max-age: -1 + max-age: 0 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' tags: + - 'config:facets.facet.publication_type' + - 'config:facets.facet.published_date_publications' - 'config:search_api.index.publications' + - 'search_api_list:publications' From 249cd88bc7e65cd6e4e7a3fd26ae99531e403d7f Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Tue, 1 Oct 2024 12:59:29 +0100 Subject: [PATCH 3/7] Add caching to NICertOffice document search and decisions search --- .../config/views.view.decision_search.yml | 15 ++++++++++----- .../config/views.view.documents_search.yml | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/project/config/nicertoffice/config/views.view.decision_search.yml b/project/config/nicertoffice/config/views.view.decision_search.yml index 649239b26a..1c9e3545a1 100644 --- a/project/config/nicertoffice/config/views.view.decision_search.yml +++ b/project/config/nicertoffice/config/views.view.decision_search.yml @@ -103,6 +103,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 20 total_pages: null id: 0 @@ -247,19 +248,20 @@ display: - 'user.node_grants:view' tags: - 'config:search_api.index.decision' + - 'search_api_list:decision' decision_search_page: id: decision_search_page display_title: Page display_plugin: page position: 1 display_options: - cache: - type: none defaults: - cache: false + cache: true exposed_block: true display_extenders: - metatag_display_extender: { } + metatag_display_extender: + metatags: { } + tokenize: false path: decision menu: type: normal @@ -271,7 +273,7 @@ display: parent: '' context: '0' cache_metadata: - max-age: -1 + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -279,4 +281,7 @@ display: - url.query_args - 'user.node_grants:view' tags: + - 'config:facets.facet.decision_date' + - 'config:facets.facet.respondent_id' - 'config:search_api.index.decision' + - 'search_api_list:decision' diff --git a/project/config/nicertoffice/config/views.view.documents_search.yml b/project/config/nicertoffice/config/views.view.documents_search.yml index badbf60d84..66b184cc10 100644 --- a/project/config/nicertoffice/config/views.view.documents_search.yml +++ b/project/config/nicertoffice/config/views.view.documents_search.yml @@ -27,6 +27,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 20 total_pages: null id: 0 @@ -169,19 +170,20 @@ display: - 'user.node_grants:view' tags: - 'config:search_api.index.documents' + - 'search_api_list:documents' documents_search_page: id: documents_search_page display_title: Page display_plugin: page position: 1 display_options: - cache: - type: none defaults: - cache: false + cache: true exposed_block: true display_extenders: - metatag_display_extender: { } + metatag_display_extender: + metatags: { } + tokenize: false path: documents menu: type: normal @@ -194,11 +196,14 @@ display: parent: '' context: '0' cache_metadata: - max-age: -1 + max-age: 0 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' tags: + - 'config:facets.facet.documents_date' + - 'config:facets.facet.type_id' - 'config:search_api.index.documents' + - 'search_api_list:documents' From 94558da8bdc3846e2e4f86228df1c878ff02f751 Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Wed, 2 Oct 2024 14:11:17 +0100 Subject: [PATCH 4/7] Upgrade Lando PHP to 8.3 --- .lando.base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.lando.base.yml b/.lando.base.yml index d59ed400b4..0652b181a9 100644 --- a/.lando.base.yml +++ b/.lando.base.yml @@ -3,7 +3,7 @@ recipe: drupal9 config: webroot: web database: mariadb - php: '8.2' + php: '8.3' composer_version: '2.5.8' config: php: .lando/config/php.ini From 9f3db36937facc957d99c18306b1ab518cb3e414 Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Thu, 3 Oct 2024 16:00:41 +0100 Subject: [PATCH 5/7] Composer updates related to PHP 8.3 --- composer.json | 2 ++ composer.lock | 31 ++++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index f649a4b3d6..fa54381eaf 100644 --- a/composer.json +++ b/composer.json @@ -44,6 +44,7 @@ ], "require": { "composer-runtime-api": "*", + "caxy/php-htmldiff": "^0.1.15", "composer/installers": "^2.0", "cweagans/composer-patches": "^1.7", "dof-dss/nicsdru_origins_modules": "^10.4", @@ -156,6 +157,7 @@ "drupal/webform": "^6.2", "drupal/whatlinkshere": "^2.1", "drush/drush": "^12.5", + "ezyang/htmlpurifier": "^4.17", "geocoder-php/google-maps-provider": "^4.7", "harvesthq/chosen": "^1.8", "kenwheeler/slick": "^1.8", diff --git a/composer.lock b/composer.lock index 812078d641..ed6aefd4d0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "70bdbad9f2a90644ddfaa45f614095d7", + "content-hash": "aa63793008a3b784ee84bb92c392a579", "packages": [ { "name": "asm89/stack-cors", @@ -213,16 +213,16 @@ }, { "name": "caxy/php-htmldiff", - "version": "v0.1.14", + "version": "v0.1.15", "source": { "type": "git", "url": "https://github.com/caxy/php-htmldiff.git", - "reference": "3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5" + "reference": "6342b02ddb86fd36093ad7e2db2efc21f01ab7cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5", - "reference": "3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5", + "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/6342b02ddb86fd36093ad7e2db2efc21f01ab7cd", + "reference": "6342b02ddb86fd36093ad7e2db2efc21f01ab7cd", "shasum": "" }, "require": { @@ -268,9 +268,9 @@ ], "support": { "issues": "https://github.com/caxy/php-htmldiff/issues", - "source": "https://github.com/caxy/php-htmldiff/tree/v0.1.14" + "source": "https://github.com/caxy/php-htmldiff/tree/v0.1.15" }, - "time": "2022-01-19T11:09:59+00:00" + "time": "2023-11-05T23:49:04+00:00" }, { "name": "chi-teck/drupal-code-generator", @@ -9406,20 +9406,20 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.16.0", + "version": "v4.17.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" + "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", - "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c", + "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c", "shasum": "" }, "require": { - "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { "cerdic/css-tidy": "^1.7 || ^2.0", @@ -9461,9 +9461,9 @@ ], "support": { "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0" }, - "time": "2022-09-18T07:06:19+00:00" + "time": "2023-11-17T15:01:25+00:00" }, { "name": "firebase/php-jwt", @@ -22237,6 +22237,7 @@ "drupal/inline_entity_form": 5, "drupal/media_entity_browser": 15, "drupal/menu_breadcrumb": 15, + "drupal/migrate_absolute_links": 20, "drupal/scheduler_content_moderation_integration": 10, "drupal/search_api_location": 15, "drupal/shs": 5, @@ -22250,5 +22251,5 @@ "composer-runtime-api": "*" }, "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } From d344142527a2b32692f9b91a744b1952c3cb4b70 Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Thu, 3 Oct 2024 16:11:55 +0100 Subject: [PATCH 6/7] Update facets patches --- composer.json | 14 +++---- composer.lock | 107 +++++++++++++++++++++++++------------------------- 2 files changed, 59 insertions(+), 62 deletions(-) diff --git a/composer.json b/composer.json index fa54381eaf..8dcf432800 100644 --- a/composer.json +++ b/composer.json @@ -88,7 +88,7 @@ "drupal/entityqueue": "^1.6", "drupal/eu_cookie_compliance": "^1.24", "drupal/facets": "^2.0", - "drupal/facets_pretty_paths": "^1.4", + "drupal/facets_pretty_paths": "2.0.2", "drupal/fastly": "^4.0", "drupal/field_group": "^3.4", "drupal/file_delete_ui": "^1.0@beta", @@ -129,11 +129,11 @@ "drupal/scheduler": "^2.0", "drupal/scheduler_content_moderation_integration": "^2.0@beta", "drupal/schema_metatag": "^3.0", - "drupal/search_api": "^1.26", + "drupal/search_api": "1.35.0", "drupal/search_api_autocomplete": "^1.4", "drupal/search_api_glossary": "^4.2", "drupal/search_api_location": "^1.0@alpha", - "drupal/search_api_solr": "4.3.0", + "drupal/search_api_solr": "4.3.5", "drupal/search_api_spellcheck": "^4.0", "drupal/seven": "^1.0", "drupal/shs": "^2.0@RC", @@ -164,6 +164,7 @@ "oomphinc/composer-installers-extender": "^2.0", "php-http/message-factory": "^1.1", "platformsh/config-reader": "^2.4", + "solarium/solarium": "^6.3", "symfony/http-client": "^5.4", "vlucas/phpdotenv": "^5.5" }, @@ -223,12 +224,7 @@ "Allow unique records only": "https://www.drupal.org/files/issues/2021-02-07/entity_queue_unique_records-1240856-3197148.patch" }, "drupal/facets": { - "Pass facet object onto child items": "https://www.drupal.org/files/issues/2019-11-13/child_item-3094143-2.patch", - "Fix to deprecated function $transliterateDisplayValue": "https://www.drupal.org/files/issues/2024-02-21/facets-php82-3406085-18.patch", - "Fatal errors on config import": "https://www.drupal.org/files/issues/2023-10-20/3395567.patch" - }, - "drupal/facets_pretty_paths": { - "facet pretty paths doubling up": "https://www.drupal.org/files/issues/2023-01-12/url_duplication-3254600-45.patch" + "Incompatibilities between facets_pretty_paths and facets 2.0": "https://www.drupal.org/files/issues/2022-03-09/facet_summary_reset-3268360-3.patch" }, "drupal/fastly": { "Allow disabling of logging": "https://git.drupalcode.org/project/fastly/-/merge_requests/6.patch" diff --git a/composer.lock b/composer.lock index ed6aefd4d0..666134bcdf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "aa63793008a3b784ee84bb92c392a579", + "content-hash": "837e9be584b5676a7a0d4cc0e4bee36d", "packages": [ { "name": "asm89/stack-cors", @@ -4425,28 +4425,28 @@ }, { "name": "drupal/facets", - "version": "2.0.6", + "version": "2.0.8", "source": { "type": "git", "url": "https://git.drupalcode.org/project/facets.git", - "reference": "2.0.6" + "reference": "2.0.8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/facets-2.0.6.zip", - "reference": "2.0.6", - "shasum": "e984e6ce69026c20d2049d4ec53748e67c5e70de" + "url": "https://ftp.drupal.org/files/projects/facets-2.0.8.zip", + "reference": "2.0.8", + "shasum": "ab46542fe36e05697a5562fe504d1f61986eb268" }, "require": { - "drupal/core": "^9.3 || ^10.0" + "drupal/core": "^10 || ^11" }, "conflict": { - "drupal/search_api": "<1.14" + "drupal/search_api": "<1.30" }, "require-dev": { - "drupal/jquery_ui_slider": "~2.0", - "drupal/jquery_ui_touch_punch": "~1.1", - "drupal/search_api": "^1.28||1.x-dev" + "drupal/jquery_ui_slider": "^2.1", + "drupal/jquery_ui_touch_punch": "^1.1", + "drupal/search_api": "1.x-dev" }, "suggest": { "drupal/jquery_ui_slider": "Required for the 'Facets Range Widget' module to work", @@ -4455,8 +4455,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.6", - "datestamp": "1671207897", + "version": "2.0.8", + "datestamp": "1723040927", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4481,11 +4481,11 @@ "homepage": "https://www.drupal.org/user/124705" }, { - "name": "Nick_vh", + "name": "nick_vh", "homepage": "https://www.drupal.org/user/122682" }, { - "name": "StryKaizer", + "name": "strykaizer", "homepage": "https://www.drupal.org/user/462700" } ], @@ -4499,31 +4499,31 @@ }, { "name": "drupal/facets_pretty_paths", - "version": "1.4.0", + "version": "2.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/facets_pretty_paths.git", - "reference": "8.x-1.4" + "reference": "2.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/facets_pretty_paths-8.x-1.4.zip", - "reference": "8.x-1.4", - "shasum": "a0ae64ef6c22adb75a4ef0e9b2e23ac58caf6dd3" + "url": "https://ftp.drupal.org/files/projects/facets_pretty_paths-2.0.2.zip", + "reference": "2.0.2", + "shasum": "d4b777c022e1f040dd022398979a104ffcc84241" }, "require": { - "drupal/core": "^9.1 || ^10", - "drupal/facets": "^1 || ^2", + "drupal/core": "^10 || ^11", + "drupal/facets": "^2 || ^3", "drupal/pathauto": "^1" }, "require-dev": { - "drupal/search_api": "^1.5" + "drupal/search_api": "^1.29" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.4", - "datestamp": "1671178925", + "version": "2.0.2", + "datestamp": "1723043303", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4554,11 +4554,11 @@ "homepage": "https://www.drupal.org/user/205645" }, { - "name": "StryKaizer", + "name": "strykaizer", "homepage": "https://www.drupal.org/user/462700" }, { - "name": "Upchuk", + "name": "upchuk", "homepage": "https://www.drupal.org/user/1885838" } ], @@ -7441,20 +7441,20 @@ }, { "name": "drupal/search_api", - "version": "1.30.0", + "version": "1.35.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.30" + "reference": "8.x-1.35" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.30.zip", - "reference": "8.x-1.30", - "shasum": "25bd2cfab6a6332c595fbc8be1c4cfff33a85ce8" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.35.zip", + "reference": "8.x-1.35", + "shasum": "d119726e870f793c6470d2a4fa9286662c5eb45d" }, "require": { - "drupal/core": "^9.3 || ^10.0" + "drupal/core": "^10.1 || ^11" }, "conflict": { "drupal/search_api_solr": "2.* || 3.0 || 3.1" @@ -7472,8 +7472,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.30", - "datestamp": "1700925904", + "version": "8.x-1.35", + "datestamp": "1718551025", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7695,30 +7695,30 @@ }, { "name": "drupal/search_api_solr", - "version": "4.3.0", + "version": "4.3.5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api_solr.git", - "reference": "4.3.0" + "reference": "4.3.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api_solr-4.3.0.zip", - "reference": "4.3.0", - "shasum": "222e14f9ab49efb519e3a78674606880a2b07416" + "url": "https://ftp.drupal.org/files/projects/search_api_solr-4.3.5.zip", + "reference": "4.3.5", + "shasum": "c784ebc822c95f54bbfbf7b6cb1c369142f13311" }, "require": { "composer-runtime-api": ">=2.0", "composer/semver": "^1.0|^3.0", "consolidation/annotated-command": "^2.12|^4.1", - "drupal/core": "^9.3 || ^10.0", - "drupal/search_api": "~1.29", + "drupal/core": "^10.2 || ^11.0", + "drupal/search_api": "~1.34", "ext-dom": "*", "ext-json": "*", "ext-simplexml": "*", "laminas/laminas-stdlib": "^3.2", "maennchen/zipstream-php": "^2.2.1|^3.0.2", - "solarium/solarium": "^6.3.0" + "solarium/solarium": "^6.3.5" }, "conflict": { "drupal/acquia_search_solr": "<1.0.0-beta8", @@ -7744,8 +7744,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.3.0", - "datestamp": "1696589367", + "version": "4.3.5", + "datestamp": "1722332547", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7783,7 +7783,7 @@ "homepage": "https://www.drupal.org/user/124705" }, { - "name": "Nick_vh", + "name": "nick_vh", "homepage": "https://www.drupal.org/user/122682" } ], @@ -12636,16 +12636,16 @@ }, { "name": "solarium/solarium", - "version": "6.3.3", + "version": "6.3.5", "source": { "type": "git", "url": "https://github.com/solariumphp/solarium.git", - "reference": "90e42bf322217cc1f26439e61b0c7d17fedb3a9c" + "reference": "ae4ea592dc92d2be4dfd0a329f1ffbe3cbd01cf3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/solariumphp/solarium/zipball/90e42bf322217cc1f26439e61b0c7d17fedb3a9c", - "reference": "90e42bf322217cc1f26439e61b0c7d17fedb3a9c", + "url": "https://api.github.com/repos/solariumphp/solarium/zipball/ae4ea592dc92d2be4dfd0a329f1ffbe3cbd01cf3", + "reference": "ae4ea592dc92d2be4dfd0a329f1ffbe3cbd01cf3", "shasum": "" }, "require": { @@ -12669,6 +12669,7 @@ "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^9.6", + "rawr/phpunit-data-provider": "^3.3", "roave/security-advisories": "dev-master", "symfony/event-dispatcher": "^5.0 || ^6.0" }, @@ -12697,9 +12698,9 @@ ], "support": { "issues": "https://github.com/solariumphp/solarium/issues", - "source": "https://github.com/solariumphp/solarium/tree/6.3.3" + "source": "https://github.com/solariumphp/solarium/tree/6.3.5" }, - "time": "2023-10-14T14:46:33+00:00" + "time": "2024-01-10T08:36:53+00:00" }, { "name": "symfony/console", @@ -22251,5 +22252,5 @@ "composer-runtime-api": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 6301d805fd77ff20e09d1c97010d4bdfba97078f Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Fri, 4 Oct 2024 11:59:01 +0100 Subject: [PATCH 7/7] Update date_facet_drilldown module --- composer.json | 2 +- composer.lock | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 8dcf432800..55dd66c6f7 100644 --- a/composer.json +++ b/composer.json @@ -78,7 +78,7 @@ "drupal/core-recommended": "^10.3", "drupal/csp": "^1.20", "drupal/ctools": "^4.1", - "drupal/date_facet_drilldown": "^5.0@dev", + "drupal/date_facet_drilldown": "^7.0@dev", "drupal/diff": "^1.1", "drupal/draggableviews": "^2.1", "drupal/dynamic_entity_reference": "^3.2", diff --git a/composer.lock b/composer.lock index 666134bcdf..def9223af5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "837e9be584b5676a7a0d4cc0e4bee36d", + "content-hash": "11091081f8e26b35c596807006df9989", "packages": [ { "name": "asm89/stack-cors", @@ -3656,11 +3656,11 @@ }, { "name": "drupal/date_facet_drilldown", - "version": "dev-5.x", + "version": "dev-7.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/date_facet_drilldown.git", - "reference": "727320bcc53239dbe615b4a86d13d25ed0585125" + "reference": "b4cef2dada7cb6d81a84a654c7f84193dbd3afc9" }, "require": { "drupal/core": "^8 || ^9 || ^10" @@ -3668,11 +3668,11 @@ "type": "drupal-module", "extra": { "branch-alias": { - "dev-5.x": "5.x-dev" + "dev-7.x": "7.x-dev" }, "drupal": { - "version": "8.x-5.x-dev", - "datestamp": "1688987471", + "version": "8.x-7.x-dev", + "datestamp": "1728039386", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -3685,7 +3685,7 @@ ], "authors": [ { - "name": "DuttonMa", + "name": "duttonma", "homepage": "https://www.drupal.org/user/2250396" }, { @@ -22232,7 +22232,6 @@ "drupal/clone_nodes": 20, "drupal/config_readonly": 10, "drupal/config_update": 15, - "drupal/date_facet_drilldown": 20, "drupal/file_delete_ui": 10, "drupal/flag": 10, "drupal/inline_entity_form": 5,