PE-638 Drupal 10.3.6 update and various module updates (#614)

* PE-638 Update npm and yarn packages * PE-638 Drupal 10.3.5 update * PE-638 Update Drupal modules * PE-638 Incorporate recent changes into services.yml and settings.php * PE-638 Use strict samesite cookies * PE-638 Refactor Github action when rebasing sandbox branch * PE-638 Drupal 10.3.6 update
eGovPDX · Oct 8, 2024 · bbcf573 · bbcf573
1 parent f25f8ff
commit bbcf573
Show file tree

Hide file tree

Showing 17 changed files with 6,390 additions and 6,116 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -68,7 +68,7 @@ commands:
             cd /home/circleci/app/tests/percy
             export PERCY_POSTINSTALL_BROWSER=true
             yarn install --frozen-lockfile
-            node node_modules/puppeteer/install.js
+            node node_modules/puppeteer/install.mjs
       - save_cache:
           name: Save Jest and Percy dependencies cache
           key: jest-{{ checksum "tests/percy/yarn.lock" }}-v2
@@ -338,7 +338,7 @@ tests: &tests
           cd /home/circleci/app/tests/percy
 
           # Start Percy tests
-          echo 'export SUPERADMIN_LOGIN=$(terminus drush ${CIRCLE_PROJECT_REPONAME}.${SITE_NAME} -- uli --name superAdmin)' > $BASH_ENV && source $BASH_ENV
+          echo 'export SUPERADMIN_LOGIN=$(terminus drush ${CIRCLE_PROJECT_REPONAME}.${SITE_NAME} -- uli --name superAdmin | sed 's/^http:/https:/')' > $BASH_ENV && source $BASH_ENV
           npm run single-test -- admin
     - store_artifacts:
         path: /home/circleci/artifacts
@@ -388,7 +388,7 @@ clone_live_database: &clone_live_database
             for TESTFILE in $TESTFILES
             do
               # Generate one time login link for tests
-              echo 'export SUPERADMIN_LOGIN=$(terminus drush ${CIRCLE_PROJECT_REPONAME}.${SITE_NAME} -- uli --name superAdmin)' > $BASH_ENV && source $BASH_ENV
+              echo 'export SUPERADMIN_LOGIN=$(terminus drush ${CIRCLE_PROJECT_REPONAME}.${SITE_NAME} -- uli --name superAdmin | sed 's/^http:/https:/')' > $BASH_ENV && source $BASH_ENV
               npm run jest-sandbox -- ${TESTFILE}
             done
           fi

diff --git a/.github/workflows/rebase-sandbox-with-master.yml b/.github/workflows/rebase-sandbox-with-master.yml
@@ -23,9 +23,8 @@ jobs:
       - name: Rebase the Sandbox branch on Github
         run: |
           git fetch --all --quiet
-          git switch master
           git checkout sandbox
           git config --global user.name "BTS eGov"
           git config --global user.email [email protected]
-          git rebase -X ours origin/master
+          git rebase origin/master
           git push -f
diff --git a/.lando.yml b/.lando.yml
@@ -146,7 +146,7 @@ tooling:
     description: Custom Composer update, database update, and config export to get a clean module or theme update
     cmd:
       - appserver: echo "Updating Composer dependencies..."
-      - appserver: composer update
+      - appserver: composer update -W
       - appserver: echo "Run database updates..."
       - appserver: drush updb -y
       - appserver: echo "Exporting Drupal config..."

diff --git a/composer.json b/composer.json
@@ -86,7 +86,7 @@
         "drupal/remove_http_headers": "^1.0 || ^2.0",
         "drupal/samlauth": "^3.8",
         "drupal/scheduler": "^2.0.0-rc8",
-        "drupal/scheduler_content_moderation_integration": "^2.0.0-beta1",
+        "drupal/scheduler_content_moderation_integration": "^3.0",
         "drupal/search_api_autocomplete": "^1.6",
         "drupal/search_api_page": "^1.0@beta",
         "drupal/search_api_pantheon": "^8",
@@ -106,7 +106,7 @@
         "drupal/toolbar_menu": "^3.0",
         "drupal/twig_tools": "^2.0",
         "drupal/twig_tweak": "^3.1",
-        "drupal/views_bulk_edit": "^2.4",
+        "drupal/views_bulk_edit": "^3.0",
         "drupal/views_bulk_operations": "^4.1",
         "drupal/views_data_export": "^1.1",
         "drupal/webform": "^6.2@beta",
@@ -121,9 +121,6 @@
         "wikimedia/composer-merge-plugin": "^2.0",
         "zendesk/zendesk_api_client_php": "^2.2"
     },
-    "require-dev": {
-        "roave/security-advisories": "dev-latest"
-    },
     "repositories": [
         {
             "type": "composer",
@@ -240,9 +237,7 @@
                 "3401916 - Redirect loop wrong detection (service unavailable: RedirectLoopException)": "https://www.drupal.org/files/issues/2024-04-25/3401916-8.x-1.9.patch"
             },
             "drupal/scheduler_content_moderation_integration": {
-                "3270462 - Set a default value in the publish / unpublish state dropdowns (PE-477)": "https://www.drupal.org/files/issues/2023-04-19/3270462-25.patch",
-                "3442694 - TypeError: Drupal\\scheduler_content_moderation_integration\\EventSubscriber\\SchedulerEventSubscriber::publishImmediately()": "https://www.drupal.org/files/issues/2024-04-23/scheduler_content_moderation_integration-3442694.patch",
-                "3447266 - 10.3 makes terms moderatable so makes this module need to provide an update path": "https://git.drupalcode.org/project/scheduler_content_moderation_integration/-/merge_requests/63.patch"
+                "3270462 - Set a default value in the publish / unpublish state dropdowns (PE-477)": "https://www.drupal.org/files/issues/2023-04-19/3270462-25.patch"
             },
             "drupal/search_api_group_filtering": {
                 "3029582 - Fix handling of Views filter groups": "https://www.drupal.org/files/issues/2022-07-30/3029582-13--fix_views_filter_groups_handling.patch"
@@ -254,5 +249,8 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "scripts": {}
+    "scripts": {},
+    "require-dev": {
+        "roave/security-advisories": "dev-latest"
+    }
 }