Skip to content

Commit

Permalink
Merge branch 'main' into 3688-remove-wildcard-exports
Browse files Browse the repository at this point in the history
  • Loading branch information
joshblack authored Oct 9, 2024
2 parents 336ba3d + 6cd3960 commit 022f702
Show file tree
Hide file tree
Showing 56 changed files with 2,418 additions and 2,534 deletions.
5 changes: 5 additions & 0 deletions .changeset/dull-beans-dance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Set the `min-width` of `IconButton` to `unset` to resolve layout issues.
5 changes: 5 additions & 0 deletions .changeset/eight-avocados-lick.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": minor
---

Tooltip: Do not export all types publicly in the experimental bundle
5 changes: 5 additions & 0 deletions .changeset/five-seas-scream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Move CSS modules feature flag from staff to ga for Avatar component
5 changes: 5 additions & 0 deletions .changeset/itchy-paws-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

fix(SegmentedControl): set global focus styles
5 changes: 5 additions & 0 deletions .changeset/khaki-dolls-reflect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@primer/react': minor
---

Promote Dialog, Tooltip, and Stack from `@primer/react/experimental` to `@primer/react`
5 changes: 5 additions & 0 deletions .changeset/large-glasses-provide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Add focus styles to Pagination component
5 changes: 5 additions & 0 deletions .changeset/large-plants-unite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Bug fix(Avatar): Changed rounded border calculation for the "square" Avatar to better align with existing border styles
5 changes: 5 additions & 0 deletions .changeset/modern-cooks-invite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

fix(Banner): rewrite PrimaryAction & SecondaryAction types
14 changes: 14 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,19 @@
"cool-lobsters-nail",
"curvy-goats-sell",
"dirty-pianos-wash",
"dry-pens-pay",
"dry-trainers-protect",
"dull-beans-dance",
"dull-dolphins-bake",
"dull-mirrors-dream",
"dull-turkeys-cheer",
"early-lions-vanish",
"eight-avocados-lick",
"eighty-houses-beg",
"eleven-drinks-kiss",
"fifty-foxes-drop",
"fifty-rockets-joke",
"five-seas-scream",
"flat-avocados-cheer",
"flat-weeks-battle",
"fluffy-ravens-thank",
Expand All @@ -48,13 +52,17 @@
"happy-fireants-mate",
"honest-ligers-fly",
"hot-baboons-allow",
"khaki-dolls-reflect",
"large-glasses-provide",
"large-plants-unite",
"lemon-candles-deny",
"light-chefs-bow",
"little-bats-approve",
"long-pans-travel",
"lovely-days-march",
"lucky-oranges-camp",
"mighty-parrots-carry",
"modern-cooks-invite",
"moody-rivers-impress",
"nervous-llamas-ring",
"new-shirts-beam",
Expand All @@ -63,6 +71,7 @@
"olive-donkeys-exercise",
"orange-steaks-do",
"pink-actors-cross",
"plenty-books-agree",
"purple-apricots-relax",
"quick-adults-buy",
"quick-feet-sip",
Expand All @@ -73,8 +82,10 @@
"serious-terms-sniff",
"seven-scissors-explain",
"short-boats-cover",
"silent-fireants-kneel",
"silent-planes-grab",
"silly-weeks-clap",
"silver-cheetahs-compare",
"six-owls-walk",
"sixty-olives-glow",
"slow-walls-drum",
Expand All @@ -87,6 +98,7 @@
"stale-lizards-report",
"stale-pets-tan",
"strong-tables-rest",
"stupid-monkeys-beg",
"tall-wasps-end",
"tame-boats-hide",
"ten-gifts-own",
Expand All @@ -98,11 +110,13 @@
"three-scissors-hide",
"tidy-bats-warn",
"tidy-clocks-marry",
"tidy-impalas-remain",
"tough-pans-punch",
"twelve-tables-leave",
"twenty-spoons-give",
"weak-hats-type",
"weak-ravens-greet",
"wet-apples-hide",
"wet-otters-pull",
"wicked-books-occur",
"yellow-tools-call",
Expand Down
5 changes: 5 additions & 0 deletions .changeset/silent-fireants-kneel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@primer/react': minor
---

Add the `useFeatureFlag` hook to `@primer/react/experimental`
5 changes: 5 additions & 0 deletions .changeset/silver-cheetahs-compare.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Bug fix for `IconButton` to respect the `style` prop width when the feature flag is on.
5 changes: 5 additions & 0 deletions .changeset/stupid-monkeys-beg.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

SelectPanel: Fix items not being selected when defined within scope (track selection by item.id)
5 changes: 5 additions & 0 deletions .changeset/wet-apples-hide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Correctly pass styled system typography and common props to the `Box` component in the `Text` component when the CSS modules feature flag is enabled.
11 changes: 1 addition & 10 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,7 @@ updates:
directory: '/'
schedule:
interval: 'weekly'
labels:
- 'dependencies'
- 'skip changeset'

- package-ecosystem: 'npm'
directory: '/docs'
schedule:
interval: 'weekly'
allow:
- dependency-name: '@primer/gatsby-theme-doctocat'
versioning-strategy: increase
labels:
- 'dependencies'
- 'skip changeset'
Expand Down
170 changes: 163 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
run: npm run build -ws --if-present

vrt-runner:
runs-on: ubuntu-latest-8-cores
runs-on: ubuntu-latest-16-cores
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: vrt-${{ matrix.shard }}
name: vrt-no-flag-${{ matrix.shard }}
path: blob-report
retention-days: 1

Expand All @@ -166,21 +166,99 @@ jobs:
uses: actions/download-artifact@v4
with:
path: all-blob-reports
pattern: vrt-*
pattern: vrt-no-flag-*
merge-multiple: true
- name: merge all reports
run: npx playwright merge-reports --reporter html ./all-blob-reports
- name: Upload report
uses: actions/upload-artifact@v4
with:
name: vrt
name: vrt-no-flag
path: playwright-report
- name: check vrt-runner job status
if: ${{ needs.vrt-runner.result == 'failure' }}
run: exit 1

vrt-runner-all-flags:
runs-on: ubuntu-latest-16-cores
strategy:
fail-fast: false
matrix:
shard: [1, 2, 3, 4]
env:
VITE_PRIMER_REACT_CSS_MODULES_TEAM: 1
VITE_PRIMER_REACT_CSS_MODULES_STAFF: 1
VITE_PRIMER_REACT_CSS_MODULES_GA: 1
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 22
cache: 'npm'
- run: npm i -g npm@^10.5.1
- name: Install dependencies
run: npm ci
- name: Build storybook
run: npx storybook build
working-directory: packages/react
- name: Run storybook
id: storybook
working-directory: packages/react
run: |
npx serve -l 6006 storybook-static &
pid=$!
echo "pid=$pid" >> $GITHUB_OUTPUT
sleep 5
- name: Run VRT
uses: docker://mcr.microsoft.com/playwright:v1.43.0-jammy
env:
STORYBOOK_URL: 'http://172.17.0.1:6006'
with:
args: npx playwright test --grep @vrt --shard="${{ matrix.shard }}/${{ strategy.job-total }}"
- name: Stop storybook
run: kill ${{ steps.storybook.outputs.pid }}
- name: Upload report
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: vrt-all-flags-${{ matrix.shard }}
path: blob-report
retention-days: 1

vrt-all-flags:
if: ${{ always() }}
runs-on: ubuntu-latest
needs: vrt-runner-all-flags
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 22
cache: 'npm'
- run: npm i -g npm@^10.5.1
- name: install dependencies
run: npm ci
- name: download all reports
uses: actions/download-artifact@v4
with:
path: all-blob-reports
pattern: vrt-all-flags-*
merge-multiple: true
- name: merge all reports
run: npx playwright merge-reports --reporter html ./all-blob-reports
- name: Upload report
uses: actions/upload-artifact@v4
with:
name: vrt-all-flags
path: playwright-report
- name: check vrt-runner job status
if: ${{ needs.vrt-runner.result == 'failure' }}
run: exit 1

aat-runner:
runs-on: ubuntu-latest-8-cores
runs-on: ubuntu-latest-16-cores
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -218,7 +296,7 @@ jobs:
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: axe-${{ matrix.shard }}
name: axe-no-flag-${{ matrix.shard }}
path: blob-report
retention-days: 1

Expand All @@ -240,7 +318,7 @@ jobs:
uses: actions/download-artifact@v4
with:
path: all-blob-reports
pattern: axe-*
pattern: axe-no-flag-*
merge-multiple: true
- name: merge all reports
run: npx playwright merge-reports --reporter html ./all-blob-reports
Expand All @@ -253,6 +331,84 @@ jobs:
if: ${{ needs.aat-runner.result == 'failure' }}
run: exit 1

aat-runner-all-flags:
runs-on: ubuntu-latest-16-cores
strategy:
fail-fast: false
matrix:
shard: [1, 2, 3, 4]
env:
VITE_PRIMER_REACT_CSS_MODULES_TEAM: 1
VITE_PRIMER_REACT_CSS_MODULES_STAFF: 1
VITE_PRIMER_REACT_CSS_MODULES_GA: 1
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 22
cache: 'npm'
- run: npm i -g npm@^10.5.1
- name: Install dependencies
run: npm ci
- name: Build storybook
run: npx storybook build
working-directory: packages/react
- name: Run storybook
id: storybook
working-directory: packages/react
run: |
npx serve -l 6006 storybook-static &
pid=$!
echo "pid=$pid" >> $GITHUB_OUTPUT
sleep 5
- name: Run AAT
uses: docker://mcr.microsoft.com/playwright:v1.43.0-jammy
env:
STORYBOOK_URL: 'http://172.17.0.1:6006'
with:
args: npx playwright test --grep @aat --shard="${{ matrix.shard }}/${{ strategy.job-total }}"
- name: Stop storybook
run: kill ${{ steps.storybook.outputs.pid }}
- name: Upload report
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: axe-all-flags-${{ matrix.shard }}
path: blob-report
retention-days: 1

aat-all-flags:
if: ${{ always() }}
runs-on: ubuntu-latest
needs: aat-runner-all-flags
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 22
cache: 'npm'
- run: npm i -g npm@^10.5.1
- name: install dependencies
run: npm ci
- name: download all reports
uses: actions/download-artifact@v4
with:
path: all-blob-reports
pattern: axe-all-flags-*
merge-multiple: true
- name: merge all reports
run: npx playwright merge-reports --reporter html ./all-blob-reports
- name: Upload report
uses: actions/upload-artifact@v4
with:
name: axe-all-flags
path: playwright-report
- name: Check aat-runner job status
if: ${{ needs.aat-runner.result == 'failure' }}
run: exit 1

build-components-json:
runs-on: ubuntu-latest
steps:
Expand Down
Loading

0 comments on commit 022f702

Please sign in to comment.