From 29b18a4d9751fd533c1e5d93ebb86cd6b4def179 Mon Sep 17 00:00:00 2001
From: Joseph Andersen <12385932+jpandersen87@users.noreply.github.com>
Date: Fri, 22 Mar 2024 14:34:13 -0500
Subject: [PATCH 1/3] ci: dangerfile fix - shouldRun flag updated to properly
 verify PR exists in addition to bot check

---
 dangerfile.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dangerfile.ts b/dangerfile.ts
index a6031f8644..6effe16df4 100644
--- a/dangerfile.ts
+++ b/dangerfile.ts
@@ -2,8 +2,8 @@ import * as child from 'child_process'
 
 import { danger, fail, schedule, warn } from 'danger'
 
-const shouldRun =
-  !danger.github || (danger.github && danger.github.pr?.user.type !== 'Bot')
+// Only run on PRs from non-bots
+const shouldRun = !!danger.github?.pr && danger.github.pr.user.type !== 'Bot'
 
 // Load all modified and new files
 const allFiles = (danger.git.modified_files ?? []).concat(

From 99517ec7dbf18937cf8efea6e1fa71c173307a5f Mon Sep 17 00:00:00 2001
From: Joseph Andersen <12385932+jpandersen87@users.noreply.github.com>
Date: Fri, 22 Mar 2024 15:13:09 -0500
Subject: [PATCH 2/3] bump node 18.x version, update build-and-test - use
 latest 18.x node version - add node 20 to build-and-test matrix - update
 action versions in build-and-test

---
 .github/workflows/build-and-test.yml | 15 +++++++--------
 .node-version                        |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index a074061c2c..e4c28ae533 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -2,28 +2,27 @@ name: Build and Test
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
   workflow_dispatch:
 
-
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node: [ '18' ]
+        node: ['18', '20']
 
     name: Node ${{ matrix.node }} tests
 
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: 'yarn'
@@ -42,10 +41,10 @@ jobs:
 
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.node-version'
           cache: 'yarn'
diff --git a/.node-version b/.node-version
index 55bffd620b..3c5535cf60 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-18.15.0
+18.19.1

From 02037ca2da727da7cdee7c90464ee6de6c4e62a0 Mon Sep 17 00:00:00 2001
From: Joseph Andersen <12385932+jpandersen87@users.noreply.github.com>
Date: Fri, 22 Mar 2024 15:23:23 -0500
Subject: [PATCH 3/3] fix sb brandImage url

---
 .storybook/USWDS.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.storybook/USWDS.js b/.storybook/USWDS.js
index 66d99f33a5..fad91d03b5 100644
--- a/.storybook/USWDS.js
+++ b/.storybook/USWDS.js
@@ -1,14 +1,15 @@
-import { create } from '@storybook/theming/create';
+import { create } from '@storybook/theming/create'
 
 export default create({
   brandTitle: 'U.S. Web Design System (USWDS)',
   brandUrl: 'https://github.com/trussworks/react-uswds',
-  brandImage: '/uswds.svg',
+  brandImage: 'uswds.svg',
   brandTarget: '_self',
   base: 'light',
 
   // Text
-  fontBase: "'Public Sans Web', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'",
+  fontBase:
+    "'Public Sans Web', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'",
   textColor: '#1b1b1b',
   inputTextColor: '#1b1b1b',
   textInverseColor: '#ffffff',
@@ -22,4 +23,4 @@ export default create({
   appBorderRadius: 4,
   inputBorder: '#5c5c5c',
   inputBorderRadius: 4,
-});
+})