Merge branch 'main' into sh-fileInput-3089

Author: brandonlenz

.all-contributorsrc

@@ -378,6 +378,36 @@
         "code",
         "maintenance"
       ]
+    },
+    {
+      "login": "Ivcota",
+      "name": "Iverson Diles",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18635074?v=4",
+      "profile": "https://github.com/Ivcota",
+      "contributions": [
+        "bug",
+        "code"
+      ]
+    },
+    {
+      "login": "doug-s-nava",
+      "name": "doug-s-nava",
+      "avatar_url": "https://avatars.githubusercontent.com/u/92806979?v=4",
+      "profile": "https://github.com/doug-s-nava",
+      "contributions": [
+        "bug",
+        "code"
+      ]
+    },
+    {
+      "login": "TomNUSDS",
+      "name": "TomNUSDS",
+      "avatar_url": "https://avatars.githubusercontent.com/u/74203452?v=4",
+      "profile": "https://github.com/TomNUSDS",
+      "contributions": [
+        "bug",
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/build-and-test.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [ '20', '22' ]
+        node: [ '20', '22', '24' ]
 
     name: Node ${{ matrix.node }} tests
 
@@ -60,15 +60,6 @@ jobs:
       - name: Check format
         run: yarn format:check
 
-      - name: Build Storybook
-        run: yarn build-storybook
-
-      - name: Happo
-        run: yarn happo-ci
-        env:
-          HAPPO_API_KEY: ${{ secrets.HAPPO_API_KEY }}
-          HAPPO_API_SECRET: ${{ secrets.HAPPO_API_SECRET }}
-
       - name: Run Danger JS
         run: yarn danger ci --failOnErrors
         env:

.github/workflows/happo.yml

@@ -0,0 +1,42 @@
+name: Happo CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  happo:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}
+          fetch-depth: 100
+      - name: Fetch main branch
+        if: github.ref != 'refs/heads/main'
+        run: git fetch origin main:main
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.node-version'
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn --immutable
+
+      - name: Build Storybook
+        run: yarn build-storybook
+
+      - name: Happo
+        run: yarn happo-ci
+        env:
+          HAPPO_API_KEY: ${{ secrets.HAPPO_API_KEY }}
+          HAPPO_API_SECRET: ${{ secrets.HAPPO_API_SECRET }}

.node-version

@@ -1 +1 @@
-22.14.0
+24.11.0

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "10.0.1"
+  ".": "10.0.2"
 }

.storybook/USWDS.js .storybook/USWDS.ts.storybook/USWDS.js renamed to .storybook/USWDS.ts

@@ -1,4 +1,4 @@
-import { create } from '@storybook/theming/create';
+import { create } from 'storybook/theming'
 
 export default create({
   brandTitle: 'U.S. Web Design System (USWDS)',
@@ -8,7 +8,8 @@ export default create({
   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,
-});
+})

.storybook/main.ts

@@ -7,16 +7,11 @@ const config: StorybookConfig = {
     // addon-docs is not in package.json, but required for storybook.
     '@storybook/addon-docs',
     '@storybook/addon-links',
-    '@storybook/addon-essentials',
-    '@storybook/addon-interactions',
   ],
   framework: {
     name: '@storybook/react-vite',
     options: {},
   },
-  docs: {
-    autodocs: true,
-  },
   staticDirs: ['public'],
 }
 export default config

.storybook/manager.js

@@ -0,0 +1,6 @@
+import { addons } from 'storybook/manager-api'
+import USWDS from './USWDS.js'
+
+addons.setConfig({
+  theme: USWDS,
+})

.storybook/manager.ts

@@ -4,9 +4,9 @@ import '@uswds/uswds/css/uswds.css'
 import '../src/styles/index.scss'
 import './custom-styles.scss'
 
-import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport'
-import { Preview } from '@storybook/react';
-import USWDS from './USWDS';
+import { INITIAL_VIEWPORTS } from 'storybook/viewport'
+import { Preview } from '@storybook/react-vite'
+import USWDS from './USWDS'
 
 const preview: Preview = {
   parameters: {
@@ -20,9 +20,16 @@ const preview: Preview = {
       showPanel: true,
       storySort: {
         method: 'alphabetical',
-        order: ['Welcome', 'Design tokens', 'Page Templates', 'Components', 'Other'],
+        order: [
+          'Welcome',
+          'Design tokens',
+          'Page Templates',
+          'Components',
+          'Other',
+        ],
       },
     },
   },
+  tags: ['autodocs'],
 }
-export default preview;
+export default preview