Skip to content

Commit faf8056

Browse files
jonrohanjonrohan
authored
Merge branch 'main' into selectpanel-track-by-id
2 parents fc23f0d + b91a5e5 commit faf8056

36 files changed

+2195
-2993
lines changed

‎.changeset/breezy-windows-speak.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": patch
3+
---
4+
5+
Remove the CSS modules feature flag from Link component

‎.changeset/dull-beans-dance.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": patch
3+
---
4+
5+
Set the `min-width` of `IconButton` to `unset` to resolve layout issues.

‎.changeset/large-plants-unite.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": patch
3+
---
4+
5+
Bug fix(Avatar): Changed rounded border calculation for the "square" Avatar to better align with existing border styles

‎.changeset/silent-fireants-kneel.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/react': minor
3+
---
4+
5+
Add the `useFeatureFlag` hook to `@primer/react/experimental`

‎.changeset/wet-apples-hide.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": patch
3+
---
4+
5+
Correctly pass styled system typography and common props to the `Box` component in the `Text` component when the CSS modules feature flag is enabled.

‎.github/workflows/ci.yml‎

Lines changed: 161 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
if: ${{ always() }}
145145
uses: actions/upload-artifact@v4
146146
with:
147-
name: vrt-${{ matrix.shard }}
147+
name: vrt-no-flag-${{ matrix.shard }}
148148
path: blob-report
149149
retention-days: 1
150150

@@ -166,14 +166,92 @@ jobs:
166166
uses: actions/download-artifact@v4
167167
with:
168168
path: all-blob-reports
169-
pattern: vrt-*
169+
pattern: vrt-no-flag-*
170170
merge-multiple: true
171171
- name: merge all reports
172172
run: npx playwright merge-reports --reporter html ./all-blob-reports
173173
- name: Upload report
174174
uses: actions/upload-artifact@v4
175175
with:
176-
name: vrt
176+
name: vrt-no-flag
177+
path: playwright-report
178+
- name: check vrt-runner job status
179+
if: ${{ needs.vrt-runner.result == 'failure' }}
180+
run: exit 1
181+
182+
vrt-runner-all-flags:
183+
runs-on: ubuntu-latest-8-cores
184+
strategy:
185+
fail-fast: false
186+
matrix:
187+
shard: [1, 2, 3, 4]
188+
env:
189+
VITE_PRIMER_REACT_CSS_MODULES_TEAM: 1
190+
VITE_PRIMER_REACT_CSS_MODULES_STAFF: 1
191+
VITE_PRIMER_REACT_CSS_MODULES_GA: 1
192+
steps:
193+
- uses: actions/checkout@v4
194+
- name: Use Node.js 20.x
195+
uses: actions/setup-node@v4
196+
with:
197+
node-version: 22
198+
cache: 'npm'
199+
- run: npm i -g npm@^10.5.1
200+
- name: Install dependencies
201+
run: npm ci
202+
- name: Build storybook
203+
run: npx storybook build
204+
working-directory: packages/react
205+
- name: Run storybook
206+
id: storybook
207+
working-directory: packages/react
208+
run: |
209+
npx serve -l 6006 storybook-static &
210+
pid=$!
211+
echo "pid=$pid" >> $GITHUB_OUTPUT
212+
sleep 5
213+
- name: Run VRT
214+
uses: docker://mcr.microsoft.com/playwright:v1.43.0-jammy
215+
env:
216+
STORYBOOK_URL: 'http://172.17.0.1:6006'
217+
with:
218+
args: npx playwright test --grep @vrt --shard="${{ matrix.shard }}/${{ strategy.job-total }}"
219+
- name: Stop storybook
220+
run: kill ${{ steps.storybook.outputs.pid }}
221+
- name: Upload report
222+
if: ${{ always() }}
223+
uses: actions/upload-artifact@v4
224+
with:
225+
name: vrt-all-flags-${{ matrix.shard }}
226+
path: blob-report
227+
retention-days: 1
228+
229+
vrt-all-flags:
230+
if: ${{ always() }}
231+
runs-on: ubuntu-latest
232+
needs: vrt-runner-all-flags
233+
steps:
234+
- uses: actions/checkout@v4
235+
- name: Use Node.js 20.x
236+
uses: actions/setup-node@v4
237+
with:
238+
node-version: 22
239+
cache: 'npm'
240+
- run: npm i -g npm@^10.5.1
241+
- name: install dependencies
242+
run: npm ci
243+
- name: download all reports
244+
uses: actions/download-artifact@v4
245+
with:
246+
path: all-blob-reports
247+
pattern: vrt-all-flags-*
248+
merge-multiple: true
249+
- name: merge all reports
250+
run: npx playwright merge-reports --reporter html ./all-blob-reports
251+
- name: Upload report
252+
uses: actions/upload-artifact@v4
253+
with:
254+
name: vrt-all-flags
177255
path: playwright-report
178256
- name: check vrt-runner job status
179257
if: ${{ needs.vrt-runner.result == 'failure' }}
@@ -218,7 +296,7 @@ jobs:
218296
if: ${{ always() }}
219297
uses: actions/upload-artifact@v4
220298
with:
221-
name: axe-${{ matrix.shard }}
299+
name: axe-no-flag-${{ matrix.shard }}
222300
path: blob-report
223301
retention-days: 1
224302

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

334+
aat-runner-all-flags:
335+
runs-on: ubuntu-latest-8-cores
336+
strategy:
337+
fail-fast: false
338+
matrix:
339+
shard: [1, 2, 3, 4]
340+
env:
341+
VITE_PRIMER_REACT_CSS_MODULES_TEAM: 1
342+
VITE_PRIMER_REACT_CSS_MODULES_STAFF: 1
343+
VITE_PRIMER_REACT_CSS_MODULES_GA: 1
344+
steps:
345+
- uses: actions/checkout@v4
346+
- name: Use Node.js 20.x
347+
uses: actions/setup-node@v4
348+
with:
349+
node-version: 22
350+
cache: 'npm'
351+
- run: npm i -g npm@^10.5.1
352+
- name: Install dependencies
353+
run: npm ci
354+
- name: Build storybook
355+
run: npx storybook build
356+
working-directory: packages/react
357+
- name: Run storybook
358+
id: storybook
359+
working-directory: packages/react
360+
run: |
361+
npx serve -l 6006 storybook-static &
362+
pid=$!
363+
echo "pid=$pid" >> $GITHUB_OUTPUT
364+
sleep 5
365+
- name: Run AAT
366+
uses: docker://mcr.microsoft.com/playwright:v1.43.0-jammy
367+
env:
368+
STORYBOOK_URL: 'http://172.17.0.1:6006'
369+
with:
370+
args: npx playwright test --grep @aat --shard="${{ matrix.shard }}/${{ strategy.job-total }}"
371+
- name: Stop storybook
372+
run: kill ${{ steps.storybook.outputs.pid }}
373+
- name: Upload report
374+
if: ${{ always() }}
375+
uses: actions/upload-artifact@v4
376+
with:
377+
name: axe-all-flags-${{ matrix.shard }}
378+
path: blob-report
379+
retention-days: 1
380+
381+
aat-all-flags:
382+
if: ${{ always() }}
383+
runs-on: ubuntu-latest
384+
needs: aat-runner-all-flags
385+
steps:
386+
- uses: actions/checkout@v4
387+
- name: Use Node.js 20.x
388+
uses: actions/setup-node@v4
389+
with:
390+
node-version: 22
391+
cache: 'npm'
392+
- run: npm i -g npm@^10.5.1
393+
- name: install dependencies
394+
run: npm ci
395+
- name: download all reports
396+
uses: actions/download-artifact@v4
397+
with:
398+
path: all-blob-reports
399+
pattern: axe-all-flags-*
400+
merge-multiple: true
401+
- name: merge all reports
402+
run: npx playwright merge-reports --reporter html ./all-blob-reports
403+
- name: Upload report
404+
uses: actions/upload-artifact@v4
405+
with:
406+
name: axe-all-flags
407+
path: playwright-report
408+
- name: Check aat-runner job status
409+
if: ${{ needs.aat-runner.result == 'failure' }}
410+
run: exit 1
411+
256412
build-components-json:
257413
runs-on: ubuntu-latest
258414
steps:

‎.playwright/snapshots/components/Timeline.test.ts-snapshots/Timeline-With-Inline-Links-dark-colorblind-linux.png‎

-44 Bytes
Loading

‎.playwright/snapshots/components/Timeline.test.ts-snapshots/Timeline-With-Inline-Links-dark-dimmed-linux.png‎

-120 Bytes
Loading

‎.playwright/snapshots/components/Timeline.test.ts-snapshots/Timeline-With-Inline-Links-dark-high-contrast-linux.png‎

-54 Bytes
Loading

‎.playwright/snapshots/components/Timeline.test.ts-snapshots/Timeline-With-Inline-Links-dark-linux.png‎

-44 Bytes
Loading

0 commit comments

Comments
 (0)