Merge branch 'main' into al-desc-classname

primer · Oct 15, 2024 · 7b1de08 · 7b1de08
2 parents 4e5b314 + a78ed77
commit 7b1de08
Show file tree

Hide file tree

Showing 66 changed files with 1,921 additions and 1,783 deletions.
diff --git a/.changeset/angry-pants-brush.md b/.changeset/angry-pants-brush.md
@@ -0,0 +1,5 @@
+---
+'@primer/react': minor
+---
+
+Add `className` prop to `FormControl.Label` component
diff --git a/.changeset/itchy-paws-bake.md b/.changeset/itchy-paws-bake.md
diff --git a/.changeset/real-seahorses-grab.md b/.changeset/real-seahorses-grab.md
@@ -0,0 +1,5 @@
+---
+'@primer/react': minor
+---
+
+Add ButtonBase to `@primer/react/experimental` to help with wildcard import interop
diff --git a/.changeset/selfish-garlics-approve.md b/.changeset/selfish-garlics-approve.md
@@ -0,0 +1,5 @@
+---
+'@primer/react': minor
+---
+
+[SelectPanel] Implement loading states
diff --git a/.changeset/spicy-pants-breathe.md b/.changeset/spicy-pants-breathe.md
@@ -0,0 +1,5 @@
+---
+'@primer/react': patch
+---
+
+Update CSS styles for CounterLabel to allow overrides for color, background color
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -133,7 +133,7 @@ jobs:
           echo "pid=$pid" >> $GITHUB_OUTPUT
           sleep 5
       - name: Run VRT
-        uses: docker://mcr.microsoft.com/playwright:v1.43.0-jammy
+        uses: docker://mcr.microsoft.com/playwright:v1.47.2-jammy
         env:
           STORYBOOK_URL: 'http://172.17.0.1:6006'
         with:
@@ -211,7 +211,7 @@ jobs:
           echo "pid=$pid" >> $GITHUB_OUTPUT
           sleep 5
       - name: Run VRT
-        uses: docker://mcr.microsoft.com/playwright:v1.43.0-jammy
+        uses: docker://mcr.microsoft.com/playwright:v1.47.2-jammy
         env:
           STORYBOOK_URL: 'http://172.17.0.1:6006'
         with:
@@ -253,8 +253,8 @@ jobs:
         with:
           name: vrt-all-flags
           path: playwright-report
-      - name: check vrt-runner job status
-        if: ${{ needs.vrt-runner.result == 'failure' }}
+      - name: check vrt-runner-all-flags job status
+        if: ${{ needs.vrt-runner-all-flags.result == 'failure' }}
         run: exit 1
 
   aat-runner:
@@ -285,7 +285,7 @@ jobs:
           echo "pid=$pid" >> $GITHUB_OUTPUT
           sleep 5
       - name: Run AAT
-        uses: docker://mcr.microsoft.com/playwright:v1.43.0-jammy
+        uses: docker://mcr.microsoft.com/playwright:v1.47.2-jammy
         env:
           STORYBOOK_URL: 'http://172.17.0.1:6006'
         with:
@@ -363,7 +363,7 @@ jobs:
           echo "pid=$pid" >> $GITHUB_OUTPUT
           sleep 5
       - name: Run AAT
-        uses: docker://mcr.microsoft.com/playwright:v1.43.0-jammy
+        uses: docker://mcr.microsoft.com/playwright:v1.47.2-jammy
         env:
           STORYBOOK_URL: 'http://172.17.0.1:6006'
         with:
@@ -405,8 +405,8 @@ jobs:
         with:
           name: axe-all-flags
           path: playwright-report
-      - name: Check aat-runner job status
-        if: ${{ needs.aat-runner.result == 'failure' }}
+      - name: Check aat-runner-all-flags job status
+        if: ${{ needs.aat-runner-all-flags.result == 'failure' }}
         run: exit 1
 
   build-components-json:

diff --git a/.github/workflows/vrt.yml b/.github/workflows/vrt.yml
@@ -53,7 +53,7 @@ jobs:
           echo "pid=$pid" >> $GITHUB_OUTPUT
           sleep 5
       - name: Run VRT
-        uses: docker://mcr.microsoft.com/playwright:v1.43.0-jammy
+        uses: docker://mcr.microsoft.com/playwright:v1.47.2-jammy
         env:
           STORYBOOK_URL: 'http://172.17.0.1:6006'
         with:

diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,6 @@ blob-report
 
 # TypeScript
 *.tsbuildinfo
+
+# ESLint
+.eslintcache
diff --git a/.husky/install.mjs b/.husky/install.mjs
@@ -0,0 +1,7 @@
+// Skip Husky install in production and CI
+// @see https://typicode.github.io/husky/how-to.html#ci-server-and-docker
+if (process.env.NODE_ENV === 'production' || process.env.CI === 'true') {
+  process.exit(0)
+}
+const husky = (await import('husky')).default
+console.log(husky())
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,6 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-[ -z "$HUSKY_ENABLED" ] && exit 0 
-
-npx lint-staged
+lint-staged
diff --git a/...shots/SelectPanel-Default-forced-colors-dark-modern-action-list--true-linux.png b/...shots/SelectPanel-Default-forced-colors-dark-modern-action-list--true-linux.png
diff --git a/...el-Height-Initial-with-Underflowing-Items-After-Fetch-dark-colorblind-linux.png b/...el-Height-Initial-with-Underflowing-Items-After-Fetch-dark-colorblind-linux.png
diff --git a/...derflowing-Items-After-Fetch-dark-colorblind-modern-action-list--true-linux.png b/...derflowing-Items-After-Fetch-dark-colorblind-modern-action-list--true-linux.png
diff --git a/...tPanel-Height-Initial-with-Underflowing-Items-After-Fetch-dark-dimmed-linux.png b/...tPanel-Height-Initial-with-Underflowing-Items-After-Fetch-dark-dimmed-linux.png
diff --git a/...h-Underflowing-Items-After-Fetch-dark-dimmed-modern-action-list--true-linux.png b/...h-Underflowing-Items-After-Fetch-dark-dimmed-modern-action-list--true-linux.png
diff --git a/...Height-Initial-with-Underflowing-Items-After-Fetch-dark-high-contrast-linux.png b/...Height-Initial-with-Underflowing-Items-After-Fetch-dark-high-contrast-linux.png
diff --git a/...flowing-Items-After-Fetch-dark-high-contrast-modern-action-list--true-linux.png b/...flowing-Items-After-Fetch-dark-high-contrast-modern-action-list--true-linux.png
diff --git a/...s/SelectPanel-Height-Initial-with-Underflowing-Items-After-Fetch-dark-linux.png b/...s/SelectPanel-Height-Initial-with-Underflowing-Items-After-Fetch-dark-linux.png
diff --git a/...ial-with-Underflowing-Items-After-Fetch-dark-modern-action-list--true-linux.png b/...ial-with-Underflowing-Items-After-Fetch-dark-modern-action-list--true-linux.png
diff --git a/...el-Height-Initial-with-Underflowing-Items-After-Fetch-dark-tritanopia-linux.png b/...el-Height-Initial-with-Underflowing-Items-After-Fetch-dark-tritanopia-linux.png
diff --git a/...derflowing-Items-After-Fetch-dark-tritanopia-modern-action-list--true-linux.png b/...derflowing-Items-After-Fetch-dark-tritanopia-modern-action-list--true-linux.png
diff --git a/...l-Height-Initial-with-Underflowing-Items-After-Fetch-light-colorblind-linux.png b/...l-Height-Initial-with-Underflowing-Items-After-Fetch-light-colorblind-linux.png
diff --git a/...erflowing-Items-After-Fetch-light-colorblind-modern-action-list--true-linux.png b/...erflowing-Items-After-Fetch-light-colorblind-modern-action-list--true-linux.png
diff --git a/...eight-Initial-with-Underflowing-Items-After-Fetch-light-high-contrast-linux.png b/...eight-Initial-with-Underflowing-Items-After-Fetch-light-high-contrast-linux.png
diff --git a/...lowing-Items-After-Fetch-light-high-contrast-modern-action-list--true-linux.png b/...lowing-Items-After-Fetch-light-high-contrast-modern-action-list--true-linux.png
diff --git a/.../SelectPanel-Height-Initial-with-Underflowing-Items-After-Fetch-light-linux.png b/.../SelectPanel-Height-Initial-with-Underflowing-Items-After-Fetch-light-linux.png
diff --git a/...al-with-Underflowing-Items-After-Fetch-light-modern-action-list--true-linux.png b/...al-with-Underflowing-Items-After-Fetch-light-modern-action-list--true-linux.png
diff --git a/...l-Height-Initial-with-Underflowing-Items-After-Fetch-light-tritanopia-linux.png b/...l-Height-Initial-with-Underflowing-Items-After-Fetch-light-tritanopia-linux.png
diff --git a/...erflowing-Items-After-Fetch-light-tritanopia-modern-action-list--true-linux.png b/...erflowing-Items-After-Fetch-light-tritanopia-modern-action-list--true-linux.png
diff --git a/examples/codesandbox/package.json b/examples/codesandbox/package.json
@@ -15,7 +15,7 @@
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@types/react": "^18.3.3",
+    "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.0",
     "@typescript-eslint/eslint-plugin": "^7.11.0",
     "@typescript-eslint/parser": "^7.3.1",

diff --git a/examples/consumer-test/package.json b/examples/consumer-test/package.json
@@ -6,7 +6,7 @@
     "check": "tsc --noEmit"
   },
   "dependencies": {
-    "@types/react": "^18.2.14",
+    "@types/react": "^18.3.11",
     "@types/react-dom": "^18.2.19",
     "@types/styled-components": "^5.1.11",
     "@primer/react": "37.0.0-rc.10",