From 43398d56205ff2ad56b0f94629c200152c5ea0e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Dec 2023 10:50:40 -0800
Subject: [PATCH 01/17] Bump va-gov/content-build from 0.0.3409 to 0.0.3410
 (#16549)

Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3409 to 0.0.3410.
- [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases)
- [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3409...v0.0.3410)

---
updated-dependencies:
- dependency-name: va-gov/content-build
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json |  2 +-
 composer.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 2f1b57cd95..1552d34947 100644
--- a/composer.json
+++ b/composer.json
@@ -221,7 +221,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3409",
+        "va-gov/content-build": "^0.0.3410",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",
diff --git a/composer.lock b/composer.lock
index a4c66367b3..858fc8daba 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": "5387248818223379c16643f10fb25e74",
+    "content-hash": "d54aa0ea5471b9b838b72d1f32007a61",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -25942,16 +25942,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3409",
+            "version": "v0.0.3410",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "613e754f2d3154e14247121d627d77b5f4f71314"
+                "reference": "054f0e4d0f1ea69f3421955e9c7bc5823a1d71a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/613e754f2d3154e14247121d627d77b5f4f71314",
-                "reference": "613e754f2d3154e14247121d627d77b5f4f71314",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/054f0e4d0f1ea69f3421955e9c7bc5823a1d71a8",
+                "reference": "054f0e4d0f1ea69f3421955e9c7bc5823a1d71a8",
                 "shasum": ""
             },
             "type": "node-project",
@@ -25978,9 +25978,9 @@
             "description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
             "support": {
                 "issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
-                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3409"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3410"
             },
-            "time": "2023-12-20T16:08:44+00:00"
+            "time": "2023-12-21T22:26:26+00:00"
         },
         {
             "name": "vlucas/phpdotenv",

From e2a600f26108720486f5f0fe8a84b1456a0564fa Mon Sep 17 00:00:00 2001
From: Jill Adams <85581471+jilladams@users.noreply.github.com>
Date: Fri, 22 Dec 2023 15:06:19 -0800
Subject: [PATCH 02/17] [docs] Update
 cms-team-and-sitewide-crew-member-onboarding.md

---
 .../cms-team-and-sitewide-crew-member-onboarding.md          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/cms-team-and-sitewide-crew-member-onboarding.md b/.github/ISSUE_TEMPLATE/cms-team-and-sitewide-crew-member-onboarding.md
index 6e5b3e489e..7f20dc71ee 100644
--- a/.github/ISSUE_TEMPLATE/cms-team-and-sitewide-crew-member-onboarding.md
+++ b/.github/ISSUE_TEMPLATE/cms-team-and-sitewide-crew-member-onboarding.md
@@ -121,7 +121,6 @@ You can view team sprint boards using either the Github view with Zenhub browser
 
 ### Context & History
 - [ ] How does the team fit into the larger OCTO ecosystem? [View this Mural diagram](https://app.mural.co/t/departmentofveteransaffairs9999/m/departmentofveteransaffairs9999/1686789362540/fb8f73b8d536f088e56bd3e38f0e37141560f62a?sender=u0b235d03cbd64f7f93673243)
-- [ ] Why is VA.gov using a Drupal CMS and how is our success measured? Read the [objectives and key results](https://va-gov.atlassian.net/wiki/spaces/VAGOV/pages/96698383/Product+CMS).
 - [ ] [Watch the Drupal GovCon presentation about the project](https://www.youtube.com/watch?v=WN4bGjEuQdM).
 - [ ] Why are VA Medical Centers changing their websites? Watch the [2-minute YouTube video](https://youtu.be/Xrv5wCv6cKY).
 - [ ] Why are Vet Centers important to Veterans? Watch the [2-minute YouTube video](https://www.youtube.com/watch?v=VMzkZNbKk1I).
@@ -183,7 +182,7 @@ Drupal is the VA's content management system of choice. For anyone on our team,
   - [ ] **Drupal production access**: (SOCKS or VA network required) - in DSVA #cms-support channel, use the Slack workflow to file a helpdesk support request. Ask the helpdesk to create a Drupal user for you in [prod.cms.va.gov](prod.cms.va.gov).
      * DevOps team members require an administrator account. (SOCKS or VA access with PIV card required)
      * Standard practice for other roles is to have minimal access in prod (content editor or even a blocked account) and full admin access in lower environments.
-  - [ ] [View short presentations on specific topics](https://va-gov.atlassian.net/wiki/spaces/VAGOV/pages/1714094110/CMS+Topic+Dives). Topics include site alerts, release and deploy, Facility API, etc.
+  - [ ] [View Topic Dives](https://github.com/department-of-veterans-affairs/va.gov-team/tree/master/teams/sitewide/topic-dives) (short presentations on specific topics). Topics include site alerts, release and deploy, Facility API, etc.
   - [ ] [Browse the VA Drupal CMS Knowledge Base articles](https://prod.cms.va.gov/help/).
   - [ ] What is Drupal? [Link list for Drupal context and community](https://docs.google.com/spreadsheets/d/11ppWiIggKJh-YAWia28utZXW48tJZGCEg-sFJ6eIl9c)
   - [ ] If you have a Drupal.org account, add your Agency & VA. Drupal.org > Login > My Account > Edit profile > Work tab > Add your agency, and "Department of Veterans Affairs" & save. This will help our team track Drupal open source contributions.
@@ -325,7 +324,7 @@ Each repository includes READMEs to help with setup.
  - [ ] [Platform Collab Cycle calendar](https://calendar.google.com/calendar/u/0/embed?src=c_7iurst2mk3hdhfuto5u7lemgbk@group.calendar.google.com&ctz=America/New_York)
 
 **CMS Collab Cycle**
-- [ ] [CMS Collab Cycle documentation](https://va-gov.atlassian.net/wiki/spaces/VAGOV/pages/1791459333/CMS+Collaboration+Flow#like-section)
+- [ ] [CMS Collab Cycle documentation](LINK TBD on CMS provision of Plat Confluence access or migration of docs to DEPO website)
 - [ ] [CMS Collab Cycle kanban board](https://github.com/department-of-veterans-affairs/va.gov-cms#workspaces/cms-collaboration-cycle-reviews-62f50368ef32b60022d76d64/board?repos=154174777)
 
 **Tracking features**

From 48de27e4b43c79826053fb63c09bf2986fc87b8c Mon Sep 17 00:00:00 2001
From: John Luo <john.luo@agile6.com>
Date: Fri, 22 Dec 2023 18:45:20 -0500
Subject: [PATCH 03/17] Refresh Tugboat Preview ID cache from PR cache scope
 (#16562)

---
 ...yml => tugboat-refresh-cache-dispatch.yml} | 38 +++++--------------
 .../tugboat-refresh-cache-responder.yml       | 29 ++++++++++++++
 2 files changed, 38 insertions(+), 29 deletions(-)
 rename .github/workflows/{tugboat-refresh-cache.yml => tugboat-refresh-cache-dispatch.yml} (58%)
 create mode 100644 .github/workflows/tugboat-refresh-cache-responder.yml

diff --git a/.github/workflows/tugboat-refresh-cache.yml b/.github/workflows/tugboat-refresh-cache-dispatch.yml
similarity index 58%
rename from .github/workflows/tugboat-refresh-cache.yml
rename to .github/workflows/tugboat-refresh-cache-dispatch.yml
index bd1167fa11..efba64d672 100644
--- a/.github/workflows/tugboat-refresh-cache.yml
+++ b/.github/workflows/tugboat-refresh-cache-dispatch.yml
@@ -5,16 +5,14 @@ on:
     - cron: '0 */6 * * *'
 jobs:
   # Collects the cache keys that need to be refreshed
-  collect_cache_keys:
-    name: Collect Tugboat Preview ID cache keys that need to be refreshed
-    outputs:
-      matrix: ${{ steps.cache-keys.outputs.result }}
+  dispatch_cache_keys:
+    name: Dispatch Tugboat Preview ID cache keys that need to be refreshed
     runs-on: ubuntu-latest
     steps:
       - name: Cross reference open PRs against cache keys in repo
-        id: cache-keys
         uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         with:
+          github-token: ${{ secrets.LABEL_API_TOKEN }}
           script: |
             const prs = await github.paginate(
               github.rest.pulls.list,
@@ -43,32 +41,14 @@ jobs:
               console.log(`Key: ${key}`)
             }
 
-            const toRefresh = []
             for (const pr of prs) {
               if (cacheKeys.includes(`${{ runner.os }}-tugboat-preview-id-pr-${pr}`)) {
                 console.log(`Need to refresh: ${pr}`)
-                toRefresh.push(pr)
+                await github.rest.issues.addLabels({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: `${pr}`,
+                  labels: ['refresh-tugboat-cache'],
+                });
               }
             }
-
-            const result = JSON.stringify(toRefresh)
-            console.log(`Refresh Keys: ${result}`)
-            return result
-          result-encoding: string
-
-  # Refresh cache for given keys
-  refresh_cache:
-    name: Refresh cache for given keys
-    needs: [ collect_cache_keys ]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        value: ${{fromJSON(needs.collect_cache_keys.outputs.matrix)}}
-    steps:
-      - name: Refresh Preview ID
-        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: .tugboat_preview.txt
-          key: ${{ runner.os }}-tugboat-preview-id-pr-${{ matrix.value }}
-      - name: Cleanup temporary file
-        run: rm .tugboat_preview.txt
diff --git a/.github/workflows/tugboat-refresh-cache-responder.yml b/.github/workflows/tugboat-refresh-cache-responder.yml
new file mode 100644
index 0000000000..fce9d5f14a
--- /dev/null
+++ b/.github/workflows/tugboat-refresh-cache-responder.yml
@@ -0,0 +1,29 @@
+
+
+name: Refresh Tugboat Preview ID Cache
+on:
+  pull_request:
+    types: [ labeled ]
+jobs:
+  refresh_cache:
+    name: Refresh Tugboat Preview ID Cache
+    runs-on: ubuntu-latest
+    if: ${{ github.event.label.name == 'refresh-tugboat-cache' }}
+    steps:
+      - name: Refresh Preview ID
+        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        with:
+          path: .tugboat_preview.txt
+          key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}
+      - name: Cleanup temporary file
+        run: rm .tugboat_preview.txt
+      - name: Remove refresh label
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
+        with:
+          script: |
+            await github.rest.issues.removeLabel({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: ${{ github.event.pull_request.number }},
+              name: 'refresh-tugboat-cache',
+            });

From 338091844ca9d11a0c0da37412f919dc8220db9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Dec 2023 10:05:25 -0600
Subject: [PATCH 04/17] Bump va-gov/content-build from 0.0.3410 to 0.0.3411
 (#16564)

Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3410 to 0.0.3411.
- [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases)
- [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3410...v0.0.3411)

---
updated-dependencies:
- dependency-name: va-gov/content-build
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 composer.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 1552d34947..a5bdb118eb 100644
--- a/composer.json
+++ b/composer.json
@@ -221,7 +221,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3410",
+        "va-gov/content-build": "^0.0.3411",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",
diff --git a/composer.lock b/composer.lock
index 858fc8daba..ac3393d280 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": "d54aa0ea5471b9b838b72d1f32007a61",
+    "content-hash": "782dffad1efba3404fec837d052c36f3",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -25942,7 +25942,7 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3410",
+            "version": "v0.0.3411",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
@@ -25978,7 +25978,7 @@
             "description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
             "support": {
                 "issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
-                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3410"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3411"
             },
             "time": "2023-12-21T22:26:26+00:00"
         },

From 58d904362308d4097870cf1b10e06ddae15ed13e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Dec 2023 09:15:11 -0500
Subject: [PATCH 05/17] Bump drupal/raven from 4.0.22 to 5.0.6 (#16569)

Bumps drupal/raven from 4.0.22 to 5.0.6.

---
updated-dependencies:
- dependency-name: drupal/raven
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json |   2 +-
 composer.lock | 336 +++++++-------------------------------------------
 2 files changed, 48 insertions(+), 290 deletions(-)

diff --git a/composer.json b/composer.json
index a5bdb118eb..d5f2cd2b32 100644
--- a/composer.json
+++ b/composer.json
@@ -157,7 +157,7 @@
         "drupal/pfm": "^2.0",
         "drupal/post_api": "^2.0.3",
         "drupal/prometheus_exporter": "^2.0@beta",
-        "drupal/raven": "^4.0",
+        "drupal/raven": "^5.0",
         "drupal/rdf": "^2.1",
         "drupal/redirect": "^1.3",
         "drupal/redirect_options": "^2.1",
diff --git a/composer.lock b/composer.lock
index ac3393d280..50798dea43 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": "782dffad1efba3404fec837d052c36f3",
+    "content-hash": "8cb3ea52d534b97bbecc08dbfd26eadf",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -11322,41 +11322,37 @@
         },
         {
             "name": "drupal/raven",
-            "version": "4.0.22",
+            "version": "5.0.6",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/raven.git",
-                "reference": "4.0.22"
+                "reference": "5.0.6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/raven-4.0.22.zip",
-                "reference": "4.0.22",
-                "shasum": "94a5d8bf3d9951b951b2c8a03976e0631ff0c362"
+                "url": "https://ftp.drupal.org/files/projects/raven-5.0.6.zip",
+                "reference": "5.0.6",
+                "shasum": "be7ae010e66a7046ea85aa2118188618439b135e"
             },
             "require": {
-                "drupal/core": "^8 || ^9 || ^10",
-                "sentry/sdk": "^3.3"
+                "drupal/core": "^10.1",
+                "sentry/sentry": "^4.0"
             },
             "require-dev": {
                 "drupal/csp": "^1.17",
+                "drupal/monitoring": "^1.13",
                 "drupal/seckit": "^2.0",
-                "drush/drush": "^10.6 || ^11.0 || ^12.0"
+                "drush/drush": "^11.0 || ^12.0"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "4.0.22",
-                    "datestamp": "1694761425",
+                    "version": "5.0.6",
+                    "datestamp": "1703326112",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
                     }
-                },
-                "drush": {
-                    "services": {
-                        "drush.services.yml": "^9 || ^10 || ^11 || ^12"
-                    }
                 }
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
@@ -17801,16 +17797,16 @@
         },
         {
             "name": "php-http/client-common",
-            "version": "2.7.0",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/client-common.git",
-                "reference": "880509727a447474d2a71b7d7fa5d268ddd3db4b"
+                "reference": "1e19c059b0e4d5f717bf5d524d616165aeab0612"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/client-common/zipball/880509727a447474d2a71b7d7fa5d268ddd3db4b",
-                "reference": "880509727a447474d2a71b7d7fa5d268ddd3db4b",
+                "url": "https://api.github.com/repos/php-http/client-common/zipball/1e19c059b0e4d5f717bf5d524d616165aeab0612",
+                "reference": "1e19c059b0e4d5f717bf5d524d616165aeab0612",
                 "shasum": ""
             },
             "require": {
@@ -17820,7 +17816,7 @@
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0",
                 "psr/http-message": "^1.0 || ^2.0",
-                "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0",
+                "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0 || ^7.0",
                 "symfony/polyfill-php80": "^1.17"
             },
             "require-dev": {
@@ -17864,22 +17860,22 @@
             ],
             "support": {
                 "issues": "https://github.com/php-http/client-common/issues",
-                "source": "https://github.com/php-http/client-common/tree/2.7.0"
+                "source": "https://github.com/php-http/client-common/tree/2.7.1"
             },
-            "time": "2023-05-17T06:46:59+00:00"
+            "time": "2023-11-30T10:31:25+00:00"
         },
         {
             "name": "php-http/discovery",
-            "version": "1.19.1",
+            "version": "1.19.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/discovery.git",
-                "reference": "57f3de01d32085fea20865f9b16fb0e69347c39e"
+                "reference": "61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/discovery/zipball/57f3de01d32085fea20865f9b16fb0e69347c39e",
-                "reference": "57f3de01d32085fea20865f9b16fb0e69347c39e",
+                "url": "https://api.github.com/repos/php-http/discovery/zipball/61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb",
+                "reference": "61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb",
                 "shasum": ""
             },
             "require": {
@@ -17942,9 +17938,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-http/discovery/issues",
-                "source": "https://github.com/php-http/discovery/tree/1.19.1"
+                "source": "https://github.com/php-http/discovery/tree/1.19.2"
             },
-            "time": "2023-07-11T07:02:26+00:00"
+            "time": "2023-11-30T16:49:05+00:00"
         },
         {
             "name": "php-http/guzzle7-adapter",
@@ -21045,112 +21041,42 @@
             ],
             "time": "2020-09-28T06:39:44+00:00"
         },
-        {
-            "name": "sentry/sdk",
-            "version": "3.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/getsentry/sentry-php-sdk.git",
-                "reference": "cd91b752f07c4bab9fb3b173f81af68a78a78d6d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/getsentry/sentry-php-sdk/zipball/cd91b752f07c4bab9fb3b173f81af68a78a78d6d",
-                "reference": "cd91b752f07c4bab9fb3b173f81af68a78a78d6d",
-                "shasum": ""
-            },
-            "require": {
-                "http-interop/http-factory-guzzle": "^1.0",
-                "sentry/sentry": "^3.19",
-                "symfony/http-client": "^4.3|^5.0|^6.0"
-            },
-            "type": "metapackage",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Sentry",
-                    "email": "accounts@sentry.io"
-                }
-            ],
-            "description": "This is a metapackage shipping sentry/sentry with a recommended HTTP client.",
-            "homepage": "http://sentry.io",
-            "keywords": [
-                "crash-reporting",
-                "crash-reports",
-                "error-handler",
-                "error-monitoring",
-                "log",
-                "logging",
-                "sentry"
-            ],
-            "support": {
-                "issues": "https://github.com/getsentry/sentry-php-sdk/issues",
-                "source": "https://github.com/getsentry/sentry-php-sdk/tree/3.5.0"
-            },
-            "funding": [
-                {
-                    "url": "https://sentry.io/",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://sentry.io/pricing/",
-                    "type": "custom"
-                }
-            ],
-            "time": "2023-06-12T17:50:36+00:00"
-        },
         {
             "name": "sentry/sentry",
-            "version": "3.22.0",
+            "version": "4.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/getsentry/sentry-php.git",
-                "reference": "c0e3df5a5c1d133cd9461e7672568ff07042c19d"
+                "reference": "cd89f230bda0833cb9992ebe9a1b7d24d6ee245b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/c0e3df5a5c1d133cd9461e7672568ff07042c19d",
-                "reference": "c0e3df5a5c1d133cd9461e7672568ff07042c19d",
+                "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/cd89f230bda0833cb9992ebe9a1b7d24d6ee245b",
+                "reference": "cd89f230bda0833cb9992ebe9a1b7d24d6ee245b",
                 "shasum": ""
             },
             "require": {
+                "ext-curl": "*",
                 "ext-json": "*",
                 "ext-mbstring": "*",
-                "guzzlehttp/promises": "^1.5.3|^2.0",
+                "guzzlehttp/psr7": "^1.8.4|^2.1.1",
                 "jean85/pretty-package-versions": "^1.5|^2.0.4",
                 "php": "^7.2|^8.0",
-                "php-http/async-client-implementation": "^1.0",
-                "php-http/client-common": "^1.5|^2.0",
-                "php-http/discovery": "^1.15",
-                "php-http/httplug": "^1.1|^2.0",
-                "php-http/message": "^1.5",
-                "php-http/message-factory": "^1.1",
-                "psr/http-factory": "^1.0",
-                "psr/http-factory-implementation": "^1.0",
                 "psr/log": "^1.0|^2.0|^3.0",
-                "symfony/options-resolver": "^3.4.43|^4.4.30|^5.0.11|^6.0|^7.0",
-                "symfony/polyfill-php80": "^1.17"
+                "symfony/options-resolver": "^4.4.30|^5.0.11|^6.0|^7.0"
             },
             "conflict": {
-                "php-http/client-common": "1.8.0",
                 "raven/raven": "*"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.19|3.4.*",
+                "friendsofphp/php-cs-fixer": "^3.4",
+                "guzzlehttp/promises": "^1.0|^2.0",
                 "guzzlehttp/psr7": "^1.8.4|^2.1.1",
-                "http-interop/http-factory-guzzle": "^1.0",
                 "monolog/monolog": "^1.6|^2.0|^3.0",
-                "nikic/php-parser": "^4.10.3",
-                "php-http/mock-client": "^1.3",
                 "phpbench/phpbench": "^1.0",
-                "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "^1.3",
-                "phpstan/phpstan-phpunit": "^1.0",
                 "phpunit/phpunit": "^8.5.14|^9.4",
-                "symfony/phpunit-bridge": "^5.2|^6.0",
+                "symfony/phpunit-bridge": "^5.2|^6.0|^7.0",
                 "vimeo/psalm": "^4.17"
             },
             "suggest": {
@@ -21175,7 +21101,7 @@
                     "email": "accounts@sentry.io"
                 }
             ],
-            "description": "A PHP SDK for Sentry (http://sentry.io)",
+            "description": "PHP SDK for Sentry (http://sentry.io)",
             "homepage": "http://sentry.io",
             "keywords": [
                 "crash-reporting",
@@ -21184,11 +21110,13 @@
                 "error-monitoring",
                 "log",
                 "logging",
-                "sentry"
+                "profiling",
+                "sentry",
+                "tracing"
             ],
             "support": {
                 "issues": "https://github.com/getsentry/sentry-php/issues",
-                "source": "https://github.com/getsentry/sentry-php/tree/3.22.0"
+                "source": "https://github.com/getsentry/sentry-php/tree/4.3.1"
             },
             "funding": [
                 {
@@ -21200,7 +21128,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2023-10-23T20:34:53+00:00"
+            "time": "2023-12-22T18:46:49+00:00"
         },
         {
             "name": "simplesamlphp/assert",
@@ -23013,176 +22941,6 @@
             ],
             "time": "2023-11-24T10:25:33+00:00"
         },
-        {
-            "name": "symfony/http-client",
-            "version": "v6.3.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/http-client.git",
-                "reference": "cd67fcaf4524ec6ae5d9b2d9497682d7ad3ce57d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/cd67fcaf4524ec6ae5d9b2d9497682d7ad3ce57d",
-                "reference": "cd67fcaf4524ec6ae5d9b2d9497682d7ad3ce57d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "psr/log": "^1|^2|^3",
-                "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/http-client-contracts": "^3",
-                "symfony/service-contracts": "^2.5|^3"
-            },
-            "conflict": {
-                "php-http/discovery": "<1.15",
-                "symfony/http-foundation": "<6.3"
-            },
-            "provide": {
-                "php-http/async-client-implementation": "*",
-                "php-http/client-implementation": "*",
-                "psr/http-client-implementation": "1.0",
-                "symfony/http-client-implementation": "3.0"
-            },
-            "require-dev": {
-                "amphp/amp": "^2.5",
-                "amphp/http-client": "^4.2.1",
-                "amphp/http-tunnel": "^1.0",
-                "amphp/socket": "^1.1",
-                "guzzlehttp/promises": "^1.4",
-                "nyholm/psr7": "^1.0",
-                "php-http/httplug": "^1.0|^2.0",
-                "psr/http-client": "^1.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/http-kernel": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/stopwatch": "^5.4|^6.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\HttpClient\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "http"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/http-client/tree/v6.3.7"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-10-29T12:41:36+00:00"
-        },
-        {
-            "name": "symfony/http-client-contracts",
-            "version": "v3.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "1ee70e699b41909c209a0c930f11034b93578654"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1ee70e699b41909c209a0c930f11034b93578654",
-                "reference": "1ee70e699b41909c209a0c930f11034b93578654",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.4-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\HttpClient\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Test/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to HTTP clients",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-07-30T20:28:31+00:00"
-        },
         {
             "name": "symfony/http-foundation",
             "version": "v6.3.9",
@@ -23541,16 +23299,16 @@
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v6.3.0",
+            "version": "v6.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd"
+                "reference": "22301f0e7fdeaacc14318928612dee79be99860e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a10f19f5198d589d5c33333cffe98dc9820332dd",
-                "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/22301f0e7fdeaacc14318928612dee79be99860e",
+                "reference": "22301f0e7fdeaacc14318928612dee79be99860e",
                 "shasum": ""
             },
             "require": {
@@ -23588,7 +23346,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v6.3.0"
+                "source": "https://github.com/symfony/options-resolver/tree/v6.4.0"
             },
             "funding": [
                 {
@@ -23604,7 +23362,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-12T14:21:09+00:00"
+            "time": "2023-08-08T10:16:24+00:00"
         },
         {
             "name": "symfony/phpunit-bridge",

From 1cef82935339069c797ec40deca4ddf4efe4b1c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Dec 2023 09:35:36 -0500
Subject: [PATCH 06/17] Bump actions/setup-node from 4.0.0 to 4.0.1 (#16568)

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/8f152de45cc393bb48ce5d89d36b731f54556e65...b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cypress.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index a6a582f085..a4fa015041 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -37,7 +37,7 @@ jobs:
           ref: ${{ inputs.commit_sha }}
 
       - name: Setup the Node environment
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
         with:
           node-version: '18.13'
 

From ac7b8ce2b9b00b2614dfaf282e30763baf7f9feb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 08:35:25 -0500
Subject: [PATCH 07/17] Bump palantirnet/drupal-rector from 0.15.1 to 0.18.6
 (#16582)

Bumps [palantirnet/drupal-rector](https://github.com/palantirnet/drupal-rector) from 0.15.1 to 0.18.6.
- [Release notes](https://github.com/palantirnet/drupal-rector/releases)
- [Commits](https://github.com/palantirnet/drupal-rector/compare/0.15.1...0.18.6)

---
updated-dependencies:
- dependency-name: palantirnet/drupal-rector
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json |  2 +-
 composer.lock | 38 +++++++++++++++++---------------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/composer.json b/composer.json
index d5f2cd2b32..0bf7c6741a 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "drupal/devel": "^5.0",
         "drupal/html_tag_usage": "^1.0@beta",
         "drupal/media_entity_generic": "^1.0",
-        "palantirnet/drupal-rector": "^0.15.0"
+        "palantirnet/drupal-rector": "^0.18.6"
     },
     "require": {
         "bower-asset/cropper": "^4.1",
diff --git a/composer.lock b/composer.lock
index 50798dea43..f5d422992e 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": "8cb3ea52d534b97bbecc08dbfd26eadf",
+    "content-hash": "e76a6326527792acdb37d4cd44c8fda8",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -26497,20 +26497,20 @@
         },
         {
             "name": "palantirnet/drupal-rector",
-            "version": "0.15.1",
+            "version": "0.18.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/palantirnet/drupal-rector.git",
-                "reference": "85382a67a07b928f5a963d94fbca11d7be33d6ca"
+                "reference": "94650bc58a9b99b9616115fa3a9e89dfc1135928"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/palantirnet/drupal-rector/zipball/85382a67a07b928f5a963d94fbca11d7be33d6ca",
-                "reference": "85382a67a07b928f5a963d94fbca11d7be33d6ca",
+                "url": "https://api.github.com/repos/palantirnet/drupal-rector/zipball/94650bc58a9b99b9616115fa3a9e89dfc1135928",
+                "reference": "94650bc58a9b99b9616115fa3a9e89dfc1135928",
                 "shasum": ""
             },
             "require": {
-                "rector/rector": "~0.15.2",
+                "rector/rector": "~0.18.0",
                 "webflo/drupal-finder": "^1.2"
             },
             "replace": {
@@ -26519,13 +26519,14 @@
             },
             "require-dev": {
                 "cweagans/composer-patches": "^1.7.2",
+                "friendsofphp/php-cs-fixer": "^3.38",
                 "php": "^8.1",
                 "phpstan/extension-installer": "^1.1",
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-deprecation-rules": "^1.0",
                 "phpunit/phpunit": "^10.0",
-                "rector/rector-src": "dev-main",
                 "symfony/yaml": "^5 || ^6",
+                "symplify/rule-doc-generator": "^12.0",
                 "symplify/vendor-patches": "^11.0"
             },
             "type": "library",
@@ -26568,27 +26569,27 @@
                 "rector"
             ],
             "support": {
-                "source": "https://github.com/palantirnet/drupal-rector/tree/0.15.1"
+                "source": "https://github.com/palantirnet/drupal-rector/tree/0.18.6"
             },
-            "time": "2023-03-23T20:57:43+00:00"
+            "time": "2023-12-28T16:38:54+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.15.25",
+            "version": "0.18.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "015935c7ed9e48a4f5895ba974f337e20a263841"
+                "reference": "f8011a76d36aa4f839f60f3b4f97707d97176618"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/015935c7ed9e48a4f5895ba974f337e20a263841",
-                "reference": "015935c7ed9e48a4f5895ba974f337e20a263841",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/f8011a76d36aa4f839f60f3b4f97707d97176618",
+                "reference": "f8011a76d36aa4f839f60f3b4f97707d97176618",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.10.14"
+                "phpstan/phpstan": "^1.10.35"
             },
             "conflict": {
                 "rector/rector-doctrine": "*",
@@ -26600,11 +26601,6 @@
                 "bin/rector"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "0.15-dev"
-                }
-            },
             "autoload": {
                 "files": [
                     "bootstrap.php"
@@ -26623,7 +26619,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.15.25"
+                "source": "https://github.com/rectorphp/rector/tree/0.18.13"
             },
             "funding": [
                 {
@@ -26631,7 +26627,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-04-20T16:07:39+00:00"
+            "time": "2023-12-20T16:08:01+00:00"
         },
         {
             "name": "symfony/css-selector",

From 7e401f1194c70d2ba15249425f36bfc79ef75327 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 08:36:27 -0500
Subject: [PATCH 08/17] Bump actions/cache from 3.3.1 to 3.3.2 (#16566)

Bumps [actions/cache](https://github.com/actions/cache) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8...704facf57e6136b1bc63b828d79edcd491f0ee84)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/tugboat-pr-closed.yml               | 2 +-
 .github/workflows/tugboat-pr-opened.yml               | 2 +-
 .github/workflows/tugboat-pr-updated.yml              | 2 +-
 .github/workflows/tugboat-refresh-cache-responder.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tugboat-pr-closed.yml b/.github/workflows/tugboat-pr-closed.yml
index 469afce94e..26501bbe2a 100644
--- a/.github/workflows/tugboat-pr-closed.yml
+++ b/.github/workflows/tugboat-pr-closed.yml
@@ -14,7 +14,7 @@ jobs:
     name: Delete Tugboat Preview
     steps:
     - name: Restore Preview ID
-      uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
       with:
         path: .tugboat_preview.txt
         key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}
diff --git a/.github/workflows/tugboat-pr-opened.yml b/.github/workflows/tugboat-pr-opened.yml
index acb07e992b..1bc92b7620 100644
--- a/.github/workflows/tugboat-pr-opened.yml
+++ b/.github/workflows/tugboat-pr-opened.yml
@@ -39,7 +39,7 @@ jobs:
             key: `${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}`,
           });
     - name: Save Preview ID
-      uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      uses: actions/cache/save@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
       with:
         path: .tugboat_preview.txt
         key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}
diff --git a/.github/workflows/tugboat-pr-updated.yml b/.github/workflows/tugboat-pr-updated.yml
index 43b735445f..1e0adb4461 100644
--- a/.github/workflows/tugboat-pr-updated.yml
+++ b/.github/workflows/tugboat-pr-updated.yml
@@ -14,7 +14,7 @@ jobs:
     name: Rebuild Tugboat Preview
     steps:
     - name: Restore Preview ID
-      uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
       with:
         path: .tugboat_preview.txt
         key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}
diff --git a/.github/workflows/tugboat-refresh-cache-responder.yml b/.github/workflows/tugboat-refresh-cache-responder.yml
index fce9d5f14a..9186df928a 100644
--- a/.github/workflows/tugboat-refresh-cache-responder.yml
+++ b/.github/workflows/tugboat-refresh-cache-responder.yml
@@ -11,7 +11,7 @@ jobs:
     if: ${{ github.event.label.name == 'refresh-tugboat-cache' }}
     steps:
       - name: Refresh Preview ID
-        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: .tugboat_preview.txt
           key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}

From ea93a3522a23eaa91ec7b2347c4b0bdac92719e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 08:37:49 -0500
Subject: [PATCH 09/17] Bump reviewdog/action-eslint from 1.20.0 to 1.21.0
 (#16565)

Bumps [reviewdog/action-eslint](https://github.com/reviewdog/action-eslint) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/reviewdog/action-eslint/releases)
- [Commits](https://github.com/reviewdog/action-eslint/compare/10ca150f51dbbb963467c37a03c873ba1fa75f91...279acb08336462ec76183a2d9ef1dd43e4c6b391)

---
updated-dependencies:
- dependency-name: reviewdog/action-eslint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/continuous_integration.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
index 74d8836a00..f727c16d16 100644
--- a/.github/workflows/continuous_integration.yml
+++ b/.github/workflows/continuous_integration.yml
@@ -46,7 +46,7 @@ jobs:
         uses: ./.github/actions/post-checkout
       - name: ReviewDog
         # See also `composer va:test:eslint` in composer.json
-        uses: reviewdog/action-eslint@10ca150f51dbbb963467c37a03c873ba1fa75f91 # v1.20.0
+        uses: reviewdog/action-eslint@279acb08336462ec76183a2d9ef1dd43e4c6b391 # v1.21.0
         with:
           reporter: github-pr-review
           eslint_flags: '--max-warnings 0 -c .eslintrc.json --no-eslintrc docroot/modules/custom/**/*.es6.js docroot/themes/custom/**/*.es6.js tests/cypress/**/*.js'

From 0b96812b29deb29fa10d8cb1c6dd23ab1379d34f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 08:12:26 -0500
Subject: [PATCH 10/17] Bump symfony/process from 6.3.4 to 6.3.11 (#16589)

Bumps [symfony/process](https://github.com/symfony/process) from 6.3.4 to 6.3.11.
- [Release notes](https://github.com/symfony/process/releases)
- [Changelog](https://github.com/symfony/process/blob/7.0/CHANGELOG.md)
- [Commits](https://github.com/symfony/process/compare/v6.3.4...v6.3.11)

---
updated-dependencies:
- dependency-name: symfony/process
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index f5d422992e..86e2559729 100644
--- a/composer.lock
+++ b/composer.lock
@@ -24351,16 +24351,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v6.3.4",
+            "version": "v6.3.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54"
+                "reference": "0a4e8fac947b0f1720b0f634a13a2273cc4cc1ad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/0b5c29118f2e980d455d2e34a5659f4579847c54",
-                "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54",
+                "url": "https://api.github.com/repos/symfony/process/zipball/0a4e8fac947b0f1720b0f634a13a2273cc4cc1ad",
+                "reference": "0a4e8fac947b0f1720b0f634a13a2273cc4cc1ad",
                 "shasum": ""
             },
             "require": {
@@ -24392,7 +24392,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.3.4"
+                "source": "https://github.com/symfony/process/tree/v6.3.11"
             },
             "funding": [
                 {
@@ -24408,7 +24408,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-08-07T10:39:22+00:00"
+            "time": "2023-12-02T12:48:42+00:00"
         },
         {
             "name": "symfony/property-access",

From 1c9bfbd0de96a294cbd8fffda5362042d44125f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 08:12:49 -0500
Subject: [PATCH 11/17] Bump symfony/console from 6.3.9 to 6.3.11 (#16588)

Bumps [symfony/console](https://github.com/symfony/console) from 6.3.9 to 6.3.11.
- [Release notes](https://github.com/symfony/console/releases)
- [Changelog](https://github.com/symfony/console/blob/7.0/CHANGELOG.md)
- [Commits](https://github.com/symfony/console/compare/v6.3.9...v6.3.11)

---
updated-dependencies:
- dependency-name: symfony/console
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/composer.lock b/composer.lock
index 86e2559729..26cc6ae2bb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -22137,16 +22137,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.3.9",
+            "version": "v6.3.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0566dbd051f8648d980592c7849f5d90d2c7c60c"
+                "reference": "ca73e92b0ab86d3c5347f58ec6d822cce6ded1b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0566dbd051f8648d980592c7849f5d90d2c7c60c",
-                "reference": "0566dbd051f8648d980592c7849f5d90d2c7c60c",
+                "url": "https://api.github.com/repos/symfony/console/zipball/ca73e92b0ab86d3c5347f58ec6d822cce6ded1b0",
+                "reference": "ca73e92b0ab86d3c5347f58ec6d822cce6ded1b0",
                 "shasum": ""
             },
             "require": {
@@ -22207,7 +22207,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.3.9"
+                "source": "https://github.com/symfony/console/tree/v6.3.11"
             },
             "funding": [
                 {
@@ -22223,7 +22223,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-20T16:36:29+00:00"
+            "time": "2023-12-10T14:03:40+00:00"
         },
         {
             "name": "symfony/dependency-injection",
@@ -24919,16 +24919,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.3.9",
+            "version": "v6.3.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "56427887aeaf540e9bbd121ad6c43f14ad3ce136"
+                "reference": "6a4b1e7b315cf420c814c8e29d8af1e96ae4b674"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/56427887aeaf540e9bbd121ad6c43f14ad3ce136",
-                "reference": "56427887aeaf540e9bbd121ad6c43f14ad3ce136",
+                "url": "https://api.github.com/repos/symfony/string/zipball/6a4b1e7b315cf420c814c8e29d8af1e96ae4b674",
+                "reference": "6a4b1e7b315cf420c814c8e29d8af1e96ae4b674",
                 "shasum": ""
             },
             "require": {
@@ -24985,7 +24985,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.3.9"
+                "source": "https://github.com/symfony/string/tree/v6.3.11"
             },
             "funding": [
                 {
@@ -25001,7 +25001,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-28T20:40:29+00:00"
+            "time": "2023-12-10T14:03:40+00:00"
         },
         {
             "name": "symfony/translation-contracts",

From a932555ce23c9b056a0af07b03b8f50a77e33074 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 08:13:38 -0500
Subject: [PATCH 12/17] Bump symfony/routing from 6.3.10 to 6.3.11 (#16587)

Bumps [symfony/routing](https://github.com/symfony/routing) from 6.3.10 to 6.3.11.
- [Release notes](https://github.com/symfony/routing/releases)
- [Changelog](https://github.com/symfony/routing/blob/7.0/CHANGELOG.md)
- [Commits](https://github.com/symfony/routing/compare/v6.3.10...v6.3.11)

---
updated-dependencies:
- dependency-name: symfony/routing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index 26cc6ae2bb..e465a36426 100644
--- a/composer.lock
+++ b/composer.lock
@@ -24660,16 +24660,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v6.3.10",
+            "version": "v6.3.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "cb7404232d49dd11cc971b832fcbd49e7c22b049"
+                "reference": "5f1b4eb8e7b7d8487389bd774fb76f51dba57452"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/cb7404232d49dd11cc971b832fcbd49e7c22b049",
-                "reference": "cb7404232d49dd11cc971b832fcbd49e7c22b049",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/5f1b4eb8e7b7d8487389bd774fb76f51dba57452",
+                "reference": "5f1b4eb8e7b7d8487389bd774fb76f51dba57452",
                 "shasum": ""
             },
             "require": {
@@ -24723,7 +24723,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.3.10"
+                "source": "https://github.com/symfony/routing/tree/v6.3.11"
             },
             "funding": [
                 {
@@ -24739,7 +24739,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-01T14:25:58+00:00"
+            "time": "2023-12-29T15:20:22+00:00"
         },
         {
             "name": "symfony/serializer",

From db68b1f0e7f633a61b2a54b07392c3acfed2f77c Mon Sep 17 00:00:00 2001
From: Steve Wirt <swirtSJW@users.noreply.github.com>
Date: Tue, 2 Jan 2024 11:00:20 -0500
Subject: [PATCH 13/17] VACMS-14238 Improve parsing of Facility phone numbers
 in facility migrations (#16500)

* VACMS-14238 Improve parsing of VBA phone numbers in migration.

* VACMS-14238 Update phone processing in all facility migrations.

* VACMS-14238 Add removal of , e xt. specifically.
---
 ...te_plus.migration.va_node_facility_nca.yml | 72 +++++++++++--------
 ...te_plus.migration.va_node_facility_vba.yml | 36 ++++++----
 ...migration.va_node_facility_vet_centers.yml | 36 ++++++----
 ...ation.va_node_facility_vet_centers_mvc.yml | 36 ++++++----
 ...ration.va_node_facility_vet_centers_os.yml | 36 ++++++----
 ...ion.va_node_health_care_local_facility.yml | 72 +++++++++++--------
 ...te_plus.migration.va_node_facility_nca.yml | 38 +++-------
 ...te_plus.migration.va_node_facility_vba.yml | 19 ++---
 ...migration.va_node_facility_vet_centers.yml | 19 ++---
 ...ation.va_node_facility_vet_centers_mvc.yml | 19 ++---
 ...ration.va_node_facility_vet_centers_os.yml | 19 ++---
 ...ion.va_node_health_care_local_facility.yml | 38 +++-------
 12 files changed, 216 insertions(+), 224 deletions(-)

diff --git a/config/sync/migrate_plus.migration.va_node_facility_nca.yml b/config/sync/migrate_plus.migration.va_node_facility_nca.yml
index c2d88e34a7..239edde565 100644
--- a/config/sync/migrate_plus.migration.va_node_facility_nca.yml
+++ b/config/sync/migrate_plus.migration.va_node_facility_nca.yml
@@ -241,35 +241,51 @@ process:
       plugin: get
       source: constants/country_code
   field_fax_number:
-    -
-      plugin: str_replace
-      source: fax
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    plugin: str_replace
+    search:
+      - (
+      - )
+      - X
+      - ' '
+      - ext
+      - Ext
+      - .
+      - ','
+      - x
+    replace:
+      - ''
+      - '-'
+      - x
+      - ''
+      - x
+      - x
+      - ''
+      - ''
+      - ', ext. '
+    source: fax
   field_phone_number:
-    -
-      plugin: str_replace
-      source: phone
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    plugin: str_replace
+    search:
+      - (
+      - )
+      - X
+      - ' '
+      - ext
+      - Ext
+      - .
+      - ','
+      - x
+    replace:
+      - ''
+      - '-'
+      - x
+      - ''
+      - x
+      - x
+      - ''
+      - ''
+      - ', ext. '
+    source: phone
   field_office_hours:
     plugin: va_field_office_hours
     source: hours
diff --git a/config/sync/migrate_plus.migration.va_node_facility_vba.yml b/config/sync/migrate_plus.migration.va_node_facility_vba.yml
index 3c42410434..855584247e 100644
--- a/config/sync/migrate_plus.migration.va_node_facility_vba.yml
+++ b/config/sync/migrate_plus.migration.va_node_facility_vba.yml
@@ -175,20 +175,28 @@ process:
         'Veteran Readiness and Employment Office': 6
         'VetSuccess On Campus': 7
   field_phone_number:
-    -
-      plugin: str_replace
-      source: phone-main
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    plugin: str_replace
+    search:
+      - (
+      - )
+      - X
+      - ' '
+      - ext
+      - Ext
+      - .
+      - ','
+      - x
+    replace:
+      - ''
+      - '-'
+      - x
+      - ''
+      - x
+      - x
+      - ''
+      - ''
+      - ', ext. '
+    source: phone-main
   status:
     plugin: default_value
     default_value: 0
diff --git a/config/sync/migrate_plus.migration.va_node_facility_vet_centers.yml b/config/sync/migrate_plus.migration.va_node_facility_vet_centers.yml
index 73f4db7725..24951be047 100644
--- a/config/sync/migrate_plus.migration.va_node_facility_vet_centers.yml
+++ b/config/sync/migrate_plus.migration.va_node_facility_vet_centers.yml
@@ -162,20 +162,28 @@ process:
       - '@latitude'
       - '@longitude'
   field_phone_number:
-    -
-      plugin: str_replace
-      source: phone-main
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    plugin: str_replace
+    search:
+      - (
+      - )
+      - X
+      - ' '
+      - ext
+      - Ext
+      - .
+      - ','
+      - x
+    replace:
+      - ''
+      - '-'
+      - x
+      - ''
+      - x
+      - x
+      - ''
+      - ''
+      - ', ext. '
+    source: phone-main
   field_office_hours:
     plugin: va_field_office_hours
     source: hours
diff --git a/config/sync/migrate_plus.migration.va_node_facility_vet_centers_mvc.yml b/config/sync/migrate_plus.migration.va_node_facility_vet_centers_mvc.yml
index 9a7618075d..b728b7aeb5 100644
--- a/config/sync/migrate_plus.migration.va_node_facility_vet_centers_mvc.yml
+++ b/config/sync/migrate_plus.migration.va_node_facility_vet_centers_mvc.yml
@@ -159,20 +159,28 @@ process:
   field_address/administrative_area: state
   field_address/postal_code: zip
   field_phone_number:
-    -
-      plugin: str_replace
-      source: phone-main
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    plugin: str_replace
+    search:
+      - (
+      - )
+      - X
+      - ' '
+      - ext
+      - Ext
+      - .
+      - ','
+      - x
+    replace:
+      - ''
+      - '-'
+      - x
+      - ''
+      - x
+      - x
+      - ''
+      - ''
+      - ', ext. '
+    source: phone-main
   field_office_hours:
     plugin: va_field_office_hours
     source: hours
diff --git a/config/sync/migrate_plus.migration.va_node_facility_vet_centers_os.yml b/config/sync/migrate_plus.migration.va_node_facility_vet_centers_os.yml
index 5f49e070b0..bfdee432a3 100644
--- a/config/sync/migrate_plus.migration.va_node_facility_vet_centers_os.yml
+++ b/config/sync/migrate_plus.migration.va_node_facility_vet_centers_os.yml
@@ -156,20 +156,28 @@ process:
       - '@latitude'
       - '@longitude'
   field_phone_number:
-    -
-      plugin: str_replace
-      source: phone-main
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    plugin: str_replace
+    search:
+      - (
+      - )
+      - X
+      - ' '
+      - ext
+      - Ext
+      - .
+      - ','
+      - x
+    replace:
+      - ''
+      - '-'
+      - x
+      - ''
+      - x
+      - x
+      - ''
+      - ''
+      - ', ext. '
+    source: phone-main
   field_office_hours:
     plugin: va_field_office_hours
     source: hours
diff --git a/config/sync/migrate_plus.migration.va_node_health_care_local_facility.yml b/config/sync/migrate_plus.migration.va_node_health_care_local_facility.yml
index 5b0b4f6e75..37047c74c8 100644
--- a/config/sync/migrate_plus.migration.va_node_health_care_local_facility.yml
+++ b/config/sync/migrate_plus.migration.va_node_health_care_local_facility.yml
@@ -180,35 +180,51 @@ process:
         'Extended Care Site (Community Living Center) (Stand-Alone)': 7
         'Residential Care Site (MH RRTP/DRRTP) (Stand-Alone)': 8
   field_mental_health_phone:
-    -
-      plugin: str_replace
-      source: phone-mental-health
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    plugin: str_replace
+    search:
+      - (
+      - )
+      - X
+      - ' '
+      - ext
+      - Ext
+      - .
+      - ','
+      - x
+    replace:
+      - ''
+      - '-'
+      - x
+      - ''
+      - x
+      - x
+      - ''
+      - ''
+      - ', ext. '
+    source: phone-mental-health
   field_phone_number:
-    -
-      plugin: str_replace
-      source: phone-main
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    plugin: str_replace
+    search:
+      - (
+      - )
+      - X
+      - ' '
+      - ext
+      - Ext
+      - .
+      - ','
+      - x
+    replace:
+      - ''
+      - '-'
+      - x
+      - ''
+      - x
+      - x
+      - ''
+      - ''
+      - ', ext. '
+    source: phone-main
   field_mobile:
     plugin: convert_boolean
     source: mobile
diff --git a/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_nca.yml b/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_nca.yml
index a7cfe4eb8e..29ce21a6ca 100644
--- a/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_nca.yml
+++ b/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_nca.yml
@@ -254,35 +254,17 @@ process:
       plugin: get
       source: 'constants/country_code'
   field_fax_number:
-    -
-      plugin: str_replace
-      source: fax
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    # Covert all ext variants to x and then replace it with, ', ext. ' last.
+    plugin: str_replace
+    search: ['(', ')', 'X', ' ', 'ext', 'Ext', '.', ',', 'x']
+    replace: ['', '-', 'x', '', 'x', 'x', '', '', ', ext. ']
+    source: fax
   field_phone_number:
-    -
-      plugin: str_replace
-      source: phone
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    # Covert all ext variants to x and then replace it with, ', ext. ' last.
+    plugin: str_replace
+    search: ['(', ')', 'X', ' ', 'ext', 'Ext', '.', ',', 'x']
+    replace: ['', '-', 'x', '', 'x', 'x', '', '', ', ext. ']
+    source: phone
   field_office_hours:
     plugin: va_field_office_hours
     source: hours
diff --git a/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vba.yml b/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vba.yml
index 63a962141f..0a87b4ef55 100644
--- a/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vba.yml
+++ b/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vba.yml
@@ -187,20 +187,11 @@ process:
         'Veteran Readiness and Employment Office': 6
         'VetSuccess On Campus': 7
   field_phone_number:
-    -
-      plugin: str_replace
-      source: phone-main
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    # Covert all ext variants to x and then replace it with, ', ext. ' last.
+    plugin: str_replace
+    search: ['(', ')', 'X', ' ', 'ext', 'Ext', '.', ',', 'x']
+    replace: ['', '-', 'x', '', 'x', 'x', '', '', ', ext. ']
+    source: phone-main
   # Bring these in as unpublished.
   status:
     plugin: default_value
diff --git a/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vet_centers.yml b/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vet_centers.yml
index 820269a055..d4649573ae 100644
--- a/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vet_centers.yml
+++ b/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vet_centers.yml
@@ -174,20 +174,11 @@ process:
       - '@latitude'
       - '@longitude'
   field_phone_number:
-    -
-      plugin: str_replace
-      source: phone-main
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    # Covert all ext variants to x and then replace it with, ', ext. ' last.
+    plugin: str_replace
+    search: ['(', ')', 'X', ' ', 'ext', 'Ext', '.', ',', 'x']
+    replace: ['', '-', 'x', '', 'x', 'x', '', '', ', ext. ']
+    source: phone-main
   field_office_hours:
     plugin: va_field_office_hours
     source: hours
diff --git a/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vet_centers_mvc.yml b/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vet_centers_mvc.yml
index 1d9dd3e137..7404dedaa5 100644
--- a/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vet_centers_mvc.yml
+++ b/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vet_centers_mvc.yml
@@ -170,20 +170,11 @@ process:
   field_address/administrative_area: state
   field_address/postal_code: zip
   field_phone_number:
-    -
-      plugin: str_replace
-      source: phone-main
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    # Covert all ext variants to x and then replace it with, ', ext. ' last.
+    plugin: str_replace
+    search: ['(', ')', 'X', ' ', 'ext', 'Ext', '.', ',', 'x']
+    replace: ['', '-', 'x', '', 'x', 'x', '', '', ', ext. ']
+    source: phone-main
   field_office_hours:
     plugin: va_field_office_hours
     source: hours
diff --git a/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vet_centers_os.yml b/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vet_centers_os.yml
index ecfe799e33..09757ea808 100644
--- a/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vet_centers_os.yml
+++ b/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_facility_vet_centers_os.yml
@@ -166,20 +166,11 @@ process:
       - '@latitude'
       - '@longitude'
   field_phone_number:
-    -
-      plugin: str_replace
-      source: phone-main
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    # Covert all ext variants to x and then replace it with, ', ext. ' last.
+    plugin: str_replace
+    search: ['(', ')', 'X', ' ', 'ext', 'Ext', '.', ',', 'x']
+    replace: ['', '-', 'x', '', 'x', 'x', '', '', ', ext. ']
+    source: phone-main
   field_office_hours:
     plugin: va_field_office_hours
     source: hours
diff --git a/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_health_care_local_facility.yml b/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_health_care_local_facility.yml
index 86706167ab..084789f101 100644
--- a/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_health_care_local_facility.yml
+++ b/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_health_care_local_facility.yml
@@ -192,35 +192,17 @@ process:
         'Extended Care Site (Community Living Center) (Stand-Alone)': 7
         'Residential Care Site (MH RRTP/DRRTP) (Stand-Alone)': 8
   field_mental_health_phone:
-    -
-      plugin: str_replace
-      source: phone-mental-health
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    # Covert all ext variants to x and then replace it with, ', ext. ' last.
+    plugin: str_replace
+    search: ['(', ')', 'X', ' ', 'ext', 'Ext', '.', ',', 'x']
+    replace: ['', '-', 'x', '', 'x', 'x', '', '', ', ext. ']
+    source: phone-mental-health
   field_phone_number:
-    -
-      plugin: str_replace
-      source: phone-main
-      search: Ext.
-      replace: x
-    -
-      plugin: explode
-      delimiter: x
-    -
-      plugin: callback
-      callable: trim
-    -
-      plugin: concat
-      delimiter: ' x'
+    # Covert all ext variants to x and then replace it with, ', ext. ' last.
+    plugin: str_replace
+    search: ['(', ')', 'X', ' ', 'ext', 'Ext', '.', ',', 'x']
+    replace: ['', '-', 'x', '', 'x', 'x', '', '', ', ext. ']
+    source: phone-main
   field_mobile:
     plugin: convert_boolean
     source: mobile

From f0b0711e64c08d34c0bca2f940521cc5579234a6 Mon Sep 17 00:00:00 2001
From: Tanner Heffner <tanner.heffner@agile6.com>
Date: Tue, 2 Jan 2024 15:12:47 -0800
Subject: [PATCH 14/17] VACMS-16288 use generated assets for next preview
 server (#16340)

* add symlink to generated files for next build preview server

* test a theory

* quiet storybook logs

* dont pre-build next now that we are running dev. in theory

* make directory before symlink

* test a different theory

* adjust perms

* use right node version, create dir for symlink

* move symlink creation after next install

* adjust symlink logic

* one symlink please

* one symlink please

* try a different directory

* clone into correct new dir
---
 .tugboat/config.yml                | 12 +++++++++++-
 docroot/design-system/package.json |  2 +-
 scripts/next-start.sh              |  4 ++++
 scripts/vets-web-setup.sh          | 29 +++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100755 scripts/vets-web-setup.sh

diff --git a/.tugboat/config.yml b/.tugboat/config.yml
index accffe4cea..6e7a318ed1 100644
--- a/.tugboat/config.yml
+++ b/.tugboat/config.yml
@@ -156,6 +156,10 @@ services:
         # Install GitHub Status Updater, which updates the status of GitHub check runs.
         - ./scripts/install_github_status_updater.sh
 
+        # Install & build vets-website early for next-build preview
+        # Build vets-website so assets are available (various widgets, fonts, etc)
+        - ./scripts/vets-web-setup.sh
+
       # Commands that import files, databases,  or other assets. When an
       # existing preview is refreshed, the build workflow starts here,
       # skipping the init step, because the results of that step will
@@ -203,6 +207,12 @@ services:
         - bash -lc 'composer va:theme:compile'
         - bash -lc 'composer va:web:install'
         - bash -lc 'composer va:next:install'
+
+        # Create symlink between vets-website assets and next-build
+#        - ln -snf "${DOCROOT}/vendor/va-gov/vets-website/build/localhost/generated" "${TUGBOAT_ROOT}/next/public/generated"
+        - ln -snf "${TUGBOAT_ROOT}/vets-website/build/localhost/generated" "${TUGBOAT_ROOT}/next/public/generated"
+
+
         # https://www.drush.org/latest/deploycommand/ (updatedb, cache:rebuild, config:import, deploy:hook)
         - drush deploy
 
@@ -250,7 +260,7 @@ services:
         # Build storybook and the frontends (web, next) in parallel
         - bash -lc 'time task --taskfile=tugboat.yml'
 
-        # Start the next build server
+        # Start the next build preview server
         - bash -lc 'composer va:next:start'
 
   memcache:
diff --git a/docroot/design-system/package.json b/docroot/design-system/package.json
index 63d4e827d3..f1b8a9af53 100644
--- a/docroot/design-system/package.json
+++ b/docroot/design-system/package.json
@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "css": "node ./.storybook/cssVariables.js",
     "storybook": "npm run css && storybook dev -p 6006",
-    "build:storybook": "npm run css && storybook build",
+    "build:storybook": "npm run css && storybook build --quiet",
     "build:drupal": "webpack --node-env=production --progress",
     "build:dev": "webpack --mode=development",
     "watch": "webpack --watch"
diff --git a/scripts/next-start.sh b/scripts/next-start.sh
index 65544641da..99f1e59994 100755
--- a/scripts/next-start.sh
+++ b/scripts/next-start.sh
@@ -7,4 +7,8 @@ source ~/.bashrc
 
 cd next
 
+# Start the dev server. Vets-website assets will be available to the preview server after content-build builds them.
+# APP_ENV=tugboat yarn dev
+
+# Start the dev server. Vets-website assets need to be in place prior to this build.
 APP_ENV=tugboat yarn start
diff --git a/scripts/vets-web-setup.sh b/scripts/vets-web-setup.sh
new file mode 100755
index 0000000000..97234edab9
--- /dev/null
+++ b/scripts/vets-web-setup.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+source ~/.bashrc
+
+# Installs & builds vets-website dependencies for next-build preview.
+#if [ ! -d docroot/vendor/va-gov/vets-website ]; then
+if [ ! -d vets-website ]; then
+  git clone --single-branch --depth 1 https://github.com/department-of-veterans-affairs/vets-website.git vets-website
+else
+  echo "Repo vets-website already cloned."
+fi
+
+#cd docroot/vendor/va-gov/vets-website
+cd vets-website
+
+nvm install 14.15.1
+nvm use 14.15.1
+npm install -g yarn
+
+echo "Node $(node -v)"
+echo "NPM $(npm -v)"
+echo "Yarn $(yarn -v)"
+
+export NODE_EXTRA_CA_CERTS=/etc/ssl/certs/ca-certificates.crt
+yarn install
+yarn build

From d2d398298225b6a1884e0b901ae2775d3355da0d Mon Sep 17 00:00:00 2001
From: Tim Cosgrove <timcosgrove@users.noreply.github.com>
Date: Tue, 2 Jan 2024 15:35:19 -0800
Subject: [PATCH 15/17] Remove implementation checklist

---
 .github/ISSUE_TEMPLATE/ap-task.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/ap-task.md b/.github/ISSUE_TEMPLATE/ap-task.md
index 46140ee1ac..567dc08385 100644
--- a/.github/ISSUE_TEMPLATE/ap-task.md
+++ b/.github/ISSUE_TEMPLATE/ap-task.md
@@ -18,7 +18,3 @@ labels: Needs refining, Accelerated Publishing
 <!-- any suppporting information, links etc. -->
 <!-- solution-specific discussion is great here. -->
 
-```[tasklist]
-### Implementation tasks
-- [ ] Use this if it helps you or feel free to delete.
-```

From 73a8a631b8c30ec6b26d64ba53c27b23a38dd64c Mon Sep 17 00:00:00 2001
From: Alex Finnarn <alex.finnarn@gmail.com>
Date: Tue, 2 Jan 2024 18:44:44 -0500
Subject: [PATCH 16/17] OpenAPI UI Hook to Event Subscriber  (#16552)

* convert hook to event subscriber

* correct doc block

* remove libraries definition

* convert one event subscriber to another

* remove composer requirements no longer needed

---------

Co-authored-by: Tanner Heffner <tanner.heffner@agile6.com>
---
 .../js/json-schemas-table-filter.js           |  5 +-
 .../EventSubscriber/AddJsEventSubscriber.php  | 46 +++++++++++++++++++
 .../custom/va_gov_api/va_gov_api.module       | 18 --------
 .../custom/va_gov_api/va_gov_api.services.yml |  6 +++
 4 files changed, 55 insertions(+), 20 deletions(-)
 create mode 100644 docroot/modules/custom/va_gov_api/src/EventSubscriber/AddJsEventSubscriber.php
 delete mode 100644 docroot/modules/custom/va_gov_api/va_gov_api.module

diff --git a/docroot/modules/custom/va_gov_api/js/json-schemas-table-filter.js b/docroot/modules/custom/va_gov_api/js/json-schemas-table-filter.js
index 8086755b3b..c07b77a22f 100644
--- a/docroot/modules/custom/va_gov_api/js/json-schemas-table-filter.js
+++ b/docroot/modules/custom/va_gov_api/js/json-schemas-table-filter.js
@@ -9,13 +9,14 @@
 
       rows.forEach(function(row) {
         // Get the first cell (td) of the row, which contains the schema label.
-        const firstCell = row.cells[0];
+        const schemaLabel = row.cells[0];
 
         // Remove all but 'VA.gov JSON:API'.
-        if (firstCell.textContent.trim() !== 'VA.gov JSON:API') {
+        if (schemaLabel.textContent.trim() !== 'VA.gov JSON:API') {
           row.remove();
         }
       });
     }
   }
 })(jQuery, Drupal, drupalSettings);
+
diff --git a/docroot/modules/custom/va_gov_api/src/EventSubscriber/AddJsEventSubscriber.php b/docroot/modules/custom/va_gov_api/src/EventSubscriber/AddJsEventSubscriber.php
new file mode 100644
index 0000000000..c19705d593
--- /dev/null
+++ b/docroot/modules/custom/va_gov_api/src/EventSubscriber/AddJsEventSubscriber.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Drupal\va_gov_api\EventSubscriber;
+
+use Drupal\core_event_dispatcher\Event\Theme\PageAttachmentsEvent;
+use Drupal\core_event_dispatcher\PageHookEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Add JS to the OpenAPI UI selector page so only one schema is displayed.
+ */
+class AddJsEventSubscriber implements EventSubscriberInterface {
+
+  /**
+   * The request.
+   */
+  protected RequestStack $requestStack;
+
+  /**
+   * Constructor.
+   */
+  public function __construct(RequestStack $requestStack) {
+    $this->requestStack = $requestStack;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents(): array {
+    return [
+      PageHookEvents::PAGE_ATTACHMENTS => ['onPageAttachments'],
+    ];
+  }
+
+  /**
+   * Modify response to add JS script to a route.
+   */
+  public function onPageAttachments(PageAttachmentsEvent $event): void {
+    if ($this->requestStack->getCurrentRequest()->get('_route') === 'openapi.downloads') {
+      $attachments = &$event->getAttachments();
+      $attachments['#attached']['library'][] = 'va_gov_api/json_schemas_table_filter';
+    }
+  }
+
+}
diff --git a/docroot/modules/custom/va_gov_api/va_gov_api.module b/docroot/modules/custom/va_gov_api/va_gov_api.module
deleted file mode 100644
index 3251458992..0000000000
--- a/docroot/modules/custom/va_gov_api/va_gov_api.module
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * @file
- * Hooks used by the va_gov_api module.
- */
-
-/**
- * Implements hook_page_attachments().
- *
- * Limit the UI options for OpenAPI documentation.
- */
-function va_gov_api_page_attachments(array &$attachments): void {
-  $current_path = \Drupal::service('path.current')->getPath();
-  if ($current_path == '/admin/config/services/openapi') {
-    $attachments['#attached']['library'][] = 'va_gov_api/json_schemas_table_filter';
-  }
-}
diff --git a/docroot/modules/custom/va_gov_api/va_gov_api.services.yml b/docroot/modules/custom/va_gov_api/va_gov_api.services.yml
index bbdadb0350..5637378076 100644
--- a/docroot/modules/custom/va_gov_api/va_gov_api.services.yml
+++ b/docroot/modules/custom/va_gov_api/va_gov_api.services.yml
@@ -1,3 +1,9 @@
 # Increases the # of items in the response for any given jsonapi request.
 parameters:
   next_jsonapi.size_max: 2000
+services:
+  va_gov_api.add_js_to_ui:
+      class: Drupal\va_gov_api\EventSubscriber\AddJsEventSubscriber
+      arguments: ['@request_stack']
+      tags:
+      - { name: event_subscriber }

From 8f2576b00f9b9688a5db85363fb79716209f47c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 20:20:56 -0600
Subject: [PATCH 17/17] Bump va-gov/content-build from 0.0.3411 to 0.0.3412
 (#16635)

Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3411 to 0.0.3412.
- [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases)
- [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3411...v0.0.3412)

---
updated-dependencies:
- dependency-name: va-gov/content-build
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json |  2 +-
 composer.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 0bf7c6741a..53a8f71a02 100644
--- a/composer.json
+++ b/composer.json
@@ -221,7 +221,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3411",
+        "va-gov/content-build": "^0.0.3412",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",
diff --git a/composer.lock b/composer.lock
index e465a36426..79b00e3f54 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": "e76a6326527792acdb37d4cd44c8fda8",
+    "content-hash": "86b64711dabe170d98620dd29d6984e3",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -25700,16 +25700,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3411",
+            "version": "v0.0.3412",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "054f0e4d0f1ea69f3421955e9c7bc5823a1d71a8"
+                "reference": "e2938debc1e4e57305cd23d87ba31b32c399fbe1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/054f0e4d0f1ea69f3421955e9c7bc5823a1d71a8",
-                "reference": "054f0e4d0f1ea69f3421955e9c7bc5823a1d71a8",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/e2938debc1e4e57305cd23d87ba31b32c399fbe1",
+                "reference": "e2938debc1e4e57305cd23d87ba31b32c399fbe1",
                 "shasum": ""
             },
             "type": "node-project",
@@ -25736,9 +25736,9 @@
             "description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
             "support": {
                 "issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
-                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3411"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3412"
             },
-            "time": "2023-12-21T22:26:26+00:00"
+            "time": "2024-01-02T19:30:09+00:00"
         },
         {
             "name": "vlucas/phpdotenv",