From e427a1c1b6ed9fb89d0f554f5292c6fe62854af7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jan 2024 11:09:46 -0500
Subject: [PATCH 1/2] Bump drupal/entity_field_fetch from 1.0.4 to 1.0.6
 (#16776)

Bumps drupal/entity_field_fetch from 1.0.4 to 1.0.6.

---
updated-dependencies:
- dependency-name: drupal/entity_field_fetch
  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>
Co-authored-by: Tim Cosgrove <timcosgrove@users.noreply.github.com>
Co-authored-by: Alex Finnarn <alex.finnarn@gmail.com>
---
 composer.lock | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/composer.lock b/composer.lock
index 9ab33a09d8..566767364a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5400,17 +5400,17 @@
         },
         {
             "name": "drupal/entity_field_fetch",
-            "version": "1.0.4",
+            "version": "1.0.6",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/entity_field_fetch.git",
-                "reference": "1.0.4"
+                "reference": "1.0.6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/entity_field_fetch-1.0.4.zip",
-                "reference": "1.0.4",
-                "shasum": "a48fabc970c460d032e7ac017285d5b9e2f434d1"
+                "url": "https://ftp.drupal.org/files/projects/entity_field_fetch-1.0.6.zip",
+                "reference": "1.0.6",
+                "shasum": "615ec840043ef03e28ec727bd2809c3c0de630f8"
             },
             "require": {
                 "drupal/core": "^8 || ^9 || ^10"
@@ -5418,8 +5418,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "1.0.4",
-                    "datestamp": "1691158258",
+                    "version": "1.0.6",
+                    "datestamp": "1704772049",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -18793,16 +18793,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.24.5",
+            "version": "1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc"
+                "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fedf211ff14ec8381c9bf5714e33a7a552dd1acc",
-                "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240",
+                "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240",
                 "shasum": ""
             },
             "require": {
@@ -18834,9 +18834,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.5"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.25.0"
             },
-            "time": "2023-12-16T09:33:33+00:00"
+            "time": "2024-01-04T17:06:16+00:00"
         },
         {
             "name": "phpstan/phpstan",
@@ -26734,7 +26734,6 @@
         "drupal/entity_block": 10,
         "drupal/entity_clone": 15,
         "drupal/entity_diff_ui": 15,
-        "drupal/entity_field_fetch": 10,
         "drupal/entity_reference_hierarchy": 10,
         "drupal/entity_reference_validators": 15,
         "drupal/entity_route_context": 5,

From 8a1209888a4ce602b12bc314478eb8d3fe443e3d Mon Sep 17 00:00:00 2001
From: Nate Douglas <ndouglas@users.noreply.github.com>
Date: Wed, 10 Jan 2024 12:49:36 -0500
Subject: [PATCH 2/2] VACMS-16237: Replace s3 address for assets. (#16777)

* VACMS-16237: Replace s3 address for assets.

* Subtract a line.

* Try a local build.

* So much for KISS.
---
 scripts/web-build.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/web-build.sh b/scripts/web-build.sh
index ebdc8e0cb5..bdc714984b 100755
--- a/scripts/web-build.sh
+++ b/scripts/web-build.sh
@@ -17,7 +17,6 @@ touch ./.buildlock
 build_type="vagovdev"
 web_path="./web"
 build_path="${web_path}/build/${build_type}"
-assets_base_url="https://dev-va-gov-assets\.s3-us-gov-west-1\.amazonaws\.com"
 rm -rf "${build_path}"
 
 pushd "${web_path}"
@@ -35,11 +34,19 @@ yarn build \
 popd
 
 echo "Replacing s3 address with local in generated files."
+assets_base_url="https://dev-va-gov-assets\.s3-us-gov-west-1\.amazonaws\.com"
 find \
   "${build_path}/generated" \
   -type f \
   -exec sed -i "s#${assets_base_url}##g" {} \+;
 
+echo "Replacing s3 address with local in built content."
+dev_base_url="https://s3-us-gov-west-1\.amazonaws\.com/content\.dev\.va\.gov"
+find \
+  "${build_path}" \
+  -type f \
+  -exec sed -i -e "s#${dev_base_url}##g" {} \+;
+
 rm ./.buildlock
 
 popd > /dev/null