10.0.7

SU-HSDO · Jan 24, 2024 · d617b5d · d617b5d
2 parents 2361a36 + 273ed1e
commit d617b5d
Show file tree

Hide file tree

Showing 201 changed files with 16,579 additions and 2,644 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -36,10 +36,10 @@ defaults: &defaults
 restore_cache: &restore_cache
   # We use the composer.lock as a way to determine if we can cache our build.
   keys:
-    - cache-d10-{{ .Environment.CACHE_VERSION }}-{{ checksum "composer.json" }}-{{ checksum "composer.lock" }}
-    - cache-d10-{{ .Environment.CACHE_VERSION }}-{{ checksum "composer.json" }}-
+    - cache-{{ checksum "composer.json" }}-{{ checksum "composer.lock" }}-{{ .Environment.CACHE_VERSION }}
+    - cache-{{ checksum "composer.json" }}-{{ checksum "composer.lock" }}-
     # fallback to using the latest cache if no exact match is found
-    - cache-d10-{{ .Environment.CACHE_VERSION }}-
+    - cache-{{ checksum "composer.json" }}
 
 ## Defines the cache saving mechanism.
 save_cache: &save_cache
@@ -50,7 +50,7 @@ save_cache: &save_cache
     - ./docroot/modules/contrib
     - ./docroot/modules/custom
     - ./docroot/themes/contrib
-  key: cache-d10-{{ .Environment.CACHE_VERSION }}-{{ checksum "composer.json" }}-{{ checksum "composer.lock" }}
+  key: cache-{{ checksum "composer.json" }}-{{ checksum "composer.lock" }}-{{ .Environment.CACHE_VERSION }}
 
 disable_telemetry: &disable_telemetry
   run:

diff --git a/.tugboat/config.yml b/.tugboat/config.yml
@@ -55,9 +55,11 @@ services:
         - mysql -h mysql -P 3306 -u tugboat -ptugboat -e 'SET GLOBAL max_allowed_packet=67108864;'
 
         - drush @hs_colorful.local cr
+        - drush @hs_colorful.local eval '\Drupal::moduleHandler()->loadInclude("user", "install");user_update_10000();'
         - blt drupal:update --site=hs_colorful
 
         - drush @hs_traditional.local cr
+        - drush @hs_traditional.local eval '\Drupal::moduleHandler()->loadInclude("user", "install");user_update_10000();'
         - blt drupal:update --site=hs_traditional
 
     # Collection of urls to compare visual results.

diff --git a/blt/src/Blt/Plugin/Commands/HsCircleCiCommands.php b/blt/src/Blt/Plugin/Commands/HsCircleCiCommands.php
@@ -192,7 +192,6 @@ protected function syncAcquia($site = 'swshumsci') {
 
     $tasks[] = $this->taskDrush()
       ->alias('')
-      ->drush('cache-clear')->arg('drush')
       ->drush('sql-sync')
       ->arg("@$site.prod")
       ->arg('@self')

diff --git a/blt/src/Blt/Plugin/Commands/HsCommands.php b/blt/src/Blt/Plugin/Commands/HsCommands.php
@@ -222,7 +222,6 @@ public function syncDb() {
 
     $task = $this->taskDrush()
       ->alias('')
-      ->drush('cache-clear drush')
       ->drush('sql-sync')
       ->arg($remote_alias)
       ->arg($local_alias)
@@ -263,9 +262,8 @@ public function launchSite($site, $options = ['not-live' => FALSE]) {
     $this->switchSiteContext($site);
     $this->taskDrush()
       ->alias("$site.prod")
-      ->drush('cset')
-      ->arg('config_split.config_split.not_live')
-      ->arg('status')
+      ->drush('sset')
+      ->arg('nobots')
       ->arg($options['not-live'] ? 1 : 0)
       ->option('yes')
       ->drush('cset')
@@ -278,8 +276,6 @@ public function launchSite($site, $options = ['not-live' => FALSE]) {
       ->arg('enabled')
       ->arg($options['not-live'] ? 0 : 1)
       ->option('yes')
-      ->drush('pmu')
-      ->arg('nobots')
       ->drush('state:set')
       ->arg('xmlsitemap_base_url')
       ->arg($new_domain)

diff --git a/blt/src/Blt/Plugin/Commands/ToggleModulesCommand.php b/blt/src/Blt/Plugin/Commands/ToggleModulesCommand.php
@@ -3,7 +3,6 @@
 namespace Humsci\Blt\Plugin\Commands;
 
 use Acquia\Blt\Robo\BltTasks;
-use Acquia\Blt\Robo\Exceptions\BltException;
 
 /**
  * Defines commands in the "drupal:toggle:modules" namespace.
@@ -61,8 +60,17 @@ protected function doToggleModules($command, $config_key) {
       $result = $this->taskDrush()
         ->drush("$command $modules_list")
         ->run();
+      // Unable to uninstall all modules at the same time, try one at a time.
       if (!$result->wasSuccessful()) {
-        throw new BltException("Could not toggle modules listed in $config_key.");
+        $this->say('Trying each module separately');
+        foreach ($modules as $module) {
+          // If the module is already uninstalled or installed, the drush
+          // command will throw an error. Ignore that.
+          $this->taskDrush()
+            ->drush("$command $module")
+            ->printOutput(FALSE)
+            ->run();
+        }
       }
     }
     else {

diff --git a/composer.json b/composer.json
@@ -7,8 +7,7 @@
     "repositories": [
         {
             "type": "composer",
-            "url": "https://packages.drupal.org/8",
-            "exclude": ["drupal/better_normalizers", "drupal/role_watchdog"]
+            "url": "https://packages.drupal.org/8"
         },
         {
             "type": "package",
@@ -39,39 +38,28 @@
                     "composer/installers": "^1.2.0"
                 }
             }
-        },
-        {
-            "type": "git",
-            "url": "https://git.drupalcode.org/issue/better_normalizers-3286221.git"
-        },
-        {
-            "type": "git",
-            "url": "https://git.drupalcode.org/issue/role_watchdog-3297981.git"
         }
     ],
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.2",
         "acquia/blt": "^13.5",
         "acquia/blt-multisite": "^1.0",
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.7",
         "dinbror/blazy": "^1.8",
         "drupal/acquia_connector": "^4.0",
         "drupal/acquia_purge": "^1.2",
-        "drupal/address": "^1.9",
+        "drupal/address": "^2.0",
         "drupal/addtocal": "^3.0",
         "drupal/admin_login_path": "^2.0",
         "drupal/admin_toolbar": "^3.0",
         "drupal/allowed_formats": "^3.0",
-        "drupal/anchor_link": "^2.4",
         "drupal/asset_injector": "^2.7",
         "drupal/auto_entitylabel": "^3.0@beta",
         "drupal/better_exposed_filters": "^6.0",
-        "drupal/better_normalizers": "dev-3286221-8.x-1.x-automated-drupal-10 as 1.0-beta5",
+        "drupal/better_normalizers": "^2.0",
         "drupal/block_class": "^2.0",
         "drupal/block_content_permissions": "^1.10",
-        "drupal/block_field": "^1.0@RC",
-        "drupal/bricks": "^2.1@alpha",
         "drupal/cancel_button": "^1.1",
         "drupal/chosen": "^4.0",
         "drupal/color": "^1.0",
@@ -87,9 +75,10 @@
         "drupal/config_update": "^2.0@alpha",
         "drupal/confirm_leave": "^1.0@beta",
         "drupal/content_access": "^2.0",
-        "drupal/core": "^10.0",
-        "drupal/core-composer-scaffold": "^10.0",
-        "drupal/core-recommended": "^10.0",
+        "drupal/core": "^10.2",
+        "drupal/core-composer-scaffold": "^10.2",
+        "drupal/core-recommended": "^10.2",
+        "drupal/cshs": "^4.0",
         "drupal/default_content": "^2.0",
         "drupal/diff": "^1.0",
         "drupal/domain_301_redirect": "^2.0",
@@ -99,22 +88,19 @@
         "drupal/eck": "^2.0",
         "drupal/editor_advanced_link": "^2.0",
         "drupal/editoria11y": "^2.0",
-        "drupal/embed": "^1.4",
         "drupal/empty_fields": "^1.0@beta",
         "drupal/encrypt": "^3.0",
-        "drupal/entity_embed": "^1.1",
         "drupal/entity_reference_exposed_filters": "^2.0@alpha",
         "drupal/entity_reference_revisions": "^1.3",
         "drupal/entityqueue": "^1.2",
         "drupal/environment_indicator": "^4.0",
         "drupal/extlink": "^1.5",
-        "drupal/fakeobjects": "^1.1",
         "drupal/fast_404": "^3.2",
         "drupal/fast_404_generator": "^1.0",
         "drupal/field_formatter_class": "^1.4",
         "drupal/field_group": "^3.1",
         "drupal/field_permissions": "^1.1",
-        "drupal/field_validation": "^1.0@beta",
+        "drupal/field_validation": "^1.1",
         "drupal/fontawesome": "^2.22",
         "drupal/gin": "^3.0",
         "drupal/gin_toolbar": "^1.0",
@@ -130,21 +116,18 @@
         "drupal/key": "^1.14",
         "drupal/layout_builder_component_attributes": "^2.0",
         "drupal/layout_builder_modal": "^1.1",
-        "drupal/layout_paragraphs": "^2.0",
         "drupal/linkit": "^6.0@RC",
         "drupal/mail_safety": "^2.0",
         "drupal/markup": "^2.0@beta",
         "drupal/masquerade": "^2.0@beta",
-        "drupal/mass_pwreset": "^2.0@beta",
         "drupal/maxlength": "^2.0@RC",
         "drupal/media_entity_download": "^2.2",
         "drupal/menu_admin_per_menu": "^1.3",
         "drupal/menu_block": "^1.10",
         "drupal/menu_item_extras": "^3.0",
         "drupal/menu_link_attributes": "^1.2",
-        "drupal/menu_link_weight": "^1.0@beta",
+        "drupal/menu_link_weight": "^2.0",
         "drupal/menu_position": "^1.0@beta",
-        "drupal/menu_trail_by_path": "^2.0",
         "drupal/metatag": "^2.0",
         "drupal/migrate_source_csv": "^3.4",
         "drupal/mysql56": "^1.1",
@@ -155,15 +138,14 @@
         "drupal/paragraphs_edit": "^3.0",
         "drupal/path_redirect_import": "^2.0",
         "drupal/pathauto": "^1.8",
-        "drupal/porterstemmer": "^2.0",
         "drupal/publishcontent": "^1.2",
         "drupal/purge": "^3.2",
         "drupal/rabbit_hole": "^1.0-beta4",
         "drupal/readonly_field_widget": "^1.4",
         "drupal/real_aes": "^2.3",
         "drupal/redirect": "^1.6",
         "drupal/role_delegation": "^1.1",
-        "drupal/role_watchdog": "dev-3297981-automated-drupal-10 as 2.0.2",
+        "drupal/role_watchdog": "^2.1",
         "drupal/search_api": "^1.18",
         "drupal/seckit": "^2.0",
         "drupal/selective_better_exposed_filters": "^3.0@beta",
@@ -175,6 +157,8 @@
         "drupal/spamspan": "^3.0@beta",
         "drupal/stage_file_proxy": "^2.0",
         "drupal/term_condition": "^2.0",
+        "drupal/token_or": "^2.2",
+        "drupal/transliterate_filenames": "^2.0",
         "drupal/ui_patterns": "^1.2",
         "drupal/ui_patterns_field_variants": "1.x-dev",
         "drupal/video_embed_field": "^2.4",
@@ -190,18 +174,16 @@
         "drupal/views_infinite_scroll": "^2.0",
         "drupal/views_taxonomy_term_name_depth": "^7.0",
         "drupal/webform": "^6.2@beta",
-        "drupal/webp": "^1.0@beta",
         "drupal/xmlsitemap": "^1.0",
-        "drupal/yearonly": "^9.0",
-        "drush/drush": "^11.1",
+        "drush/drush": "^12",
         "harvesthq/chosen": "^1.8",
         "kenwheeler/slick": "^1.8",
         "onlyextart/colorbox": "dev-master#e58476becbc89dc671093d1bcd9f99b2167fa8f7",
         "sainsburys/guzzle-oauth2-plugin": "^3.0",
         "su-sws/ckeditor5_plugins": "^1.0",
         "su-sws/stanford_basic": "dev-8.x-2.x#9d6391431de1aefa93c4dfe671e309cef1496d81",
         "su-sws/stanford_fields": "^8.1",
-        "su-sws/stanford_media": "^10.1",
+        "su-sws/stanford_media": "^11.0",
         "su-sws/stanford_migrate": "^8.4",
         "su-sws/stanford_samlauth": "^1.0"
     },
@@ -215,8 +197,7 @@
         "drupal/coder": "*"
     },
     "conflict": {
-        "drupal/drupal": "*",
-        "consolidation/site-alias": ">3.1.5"
+        "drupal/drupal": "*"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -233,31 +214,18 @@
     "extra": {
         "enable-patching": true,
         "patches": {
-            "drupal/anchor_link": {
-                "https://www.drupal.org/project/anchor_link/issues/2958532": "https://www.drupal.org/files/issues/2019-01-11/anchor_link-linkit-support_2958532.patch"
-            },
-            "drupal/bricks": {
-                "https://www.drupal.org/project/bricks/issues/3003176": "https://www.drupal.org/files/issues/2018-09-28/bricks-entity_usage-3003176.patch"
-            },
             "drupal/config_ignore": {
                 "https://www.drupal.org/project/config_ignore/issues/2857247": "https://www.drupal.org/files/issues/2020-01-11/support-for-export-2857247-44.patch",
                 "https://www.drupal.org/project/config_ignore/issues/2865419": "https://www.drupal.org/files/issues/2020-07-20/config_ignore-wildcard_force_import.patch"
             },
             "drupal/core": {
                 "https://www.drupal.org/project/drupal/issues/2999491": "https://www.drupal.org/files/issues/2020-10-06/2999491--reusable-title-display--56.patch",
                 "https://www.drupal.org/project/drupal/issues/2981837": "https://www.drupal.org/files/issues/2019-05-22/findMigrationDependencies-null-process-value-2981837-5.patch",
-                "https://www.drupal.org/project/drupal/issues/1349080": "https://www.drupal.org/files/issues/2023-06-15/1349080-521.patch",
-                "https://www.drupal.org/project/drupal/issues/3306916": "https://www.drupal.org/files/issues/2022-08-30/file_validate_size.patch",
+                "https://www.drupal.org/project/drupal/issues/1349080": "https://git.drupalcode.org/project/drupal/-/commit/c271adbb22f28a66ff4321b2fb7f86f20fe0c838.patch",
+                "https://www.drupal.org/project/drupal/issues/3306916": "https://www.drupal.org/files/issues/2023-12-19/3306916-18.patch",
                 "views form null fix": "patches/core-views.patch",
                 "CKEditor 5 headings plugin paragraph label change": "patches/ckeditor5-paragraph-rename.patch"
             },
-            "drupal/ds": {
-                "https://www.drupal.org/project/ds/issues/2939322": "https://www.drupal.org/files/issues/2020-01-07/ds-content_entity-2939322-11.patch",
-                "https://www.drupal.org/project/ds/issues/3311925": "https://www.drupal.org/files/issues/2022-09-26/fix-ds-with-hook-entity-update.patch"
-            },
-            "drupal/fakeobjects": {
-                "https://www.drupal.org/project/fakeobjects/issues/3002953": "https://www.drupal.org/files/issues/2020-06-22/fakeobjects-missing_plugin-3002953-5.patch"
-            },
             "drupal/gin": {
                 "https://www.drupal.org/project/gin/issues/3276752": "https://www.drupal.org/files/issues/2022-12-07/gin-stick-after-ajax-reload-3276752-23.patch"
             },
@@ -277,12 +245,18 @@
             "drupal/menu_block": {
                 "https://www.drupal.org/project/menu_block/issues/3271218": "https://www.drupal.org/files/issues/2022-04-29/menu_block_rendered_empty-3271218-17.patch"
             },
+            "drupal/menu_link": {
+                "https://www.drupal.org/project/menu_link/issues/3145735": "https://www.drupal.org/files/issues/2022-03-22/menu_link-empty-entity-error-3145735-7.patch",
+                "https://www.drupal.org/project/menu_link/issues/3092282": "https://git.drupalcode.org/project/menu_link/-/merge_requests/8.patch",
+                "https://www.drupal.org/project/menu_link/issues/3358081": "https://git.drupalcode.org/project/menu_link/-/merge_requests/9.patch"
+            },
+            "drupal/menu_link_weight": {
+                "https://www.drupal.org/project/menu_link_weight/issues/3410674": "https://www.drupal.org/files/issues/2023-12-23/menu_link_weight-3410674.patch",
+                "https://www.drupal.org/project/menu_link_weight/issues/3099139": "https://www.drupal.org/files/issues/2019-12-05/menu_link_weight-target_blank-3099139.patch"
+            },
             "drupal/menu_position": {
                 "Clean menu tree": "patches/contrib/menu_postion_rule-edit_route.patch"
             },
-            "drupal/menu_trail_by_path": {
-                "https://www.drupal.org/project/menu_trail_by_path/issues/2914746": "https://www.drupal.org/files/issues/2022-04-06/2914746-27.patch"
-            },
             "drupal/migrate_plus": {
                 "https://www.drupal.org/project/migrate_plus/issues/2837684": "https://www.drupal.org/files/issues/2023-01-13/2837684-14-migrate-plus-xml-return-as-xml.patch"
             },