Skip to content

Commit 3d86376

Browse files
committed
Merge branch 'main' of github.com:primer/react into mp/rm-box-and-sx-from-listy-components
2 parents 38b3e93 + 4196e0e commit 3d86376

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+548
-400
lines changed

.changeset/gold-geckos-send.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/react': major
3+
---
4+
5+
Removes sx prop from PageLayout and subcomponents

.changeset/light-schools-wish.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/react': major
3+
---
4+
5+
Removes `Box` component usage and `sx` prop from the `Link` component, Storybook stories, and a .figma.tsx file

.changeset/lucky-wasps-nail.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@primer/react": major
3+
"@primer/styled-react": patch
4+
---
5+
6+
Remove support for `sx` from the `TabNav` component

.changeset/pre.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@
1212
"@primer/styled-react": "0.1.0"
1313
},
1414
"changesets": [
15+
"beige-plums-obey",
16+
"beige-shrimps-sleep",
17+
"better-coins-dream",
1518
"big-oranges-marry",
1619
"bright-dolls-dance",
1720
"bright-parents-flow",
1821
"busy-bananas-smash",
22+
"chilly-dingos-build",
1923
"chubby-colts-nail",
2024
"cold-teams-buy",
2125
"cruel-papers-film",
@@ -24,46 +28,74 @@
2428
"deprecate-textinputwithtokens",
2529
"dirty-chairs-invent",
2630
"eighty-queens-tap",
31+
"fair-views-laugh",
2732
"few-mails-sing",
33+
"fifty-walls-yawn",
2834
"five-squids-sin",
35+
"fresh-points-cover",
2936
"gentle-rockets-go",
37+
"gentle-sheep-feel",
38+
"giant-impalas-occur",
3039
"gold-dingos-sneeze",
3140
"great-hats-serve",
3241
"hot-bears-cry",
3342
"hot-melons-jump",
43+
"hot-mirrors-feel",
3444
"icy-pianos-say",
3545
"lemon-jokes-camp",
46+
"light-colts-burn",
3647
"little-peas-mix",
3748
"lovely-vans-burn",
3849
"metal-badgers-joke",
3950
"metal-cups-peel",
51+
"metal-deer-refuse",
4052
"metal-lamps-appear",
53+
"mighty-lizards-lick",
54+
"nasty-seals-carry",
4155
"new-dragons-melt",
4256
"new-shrimps-appear",
4357
"nine-cobras-talk",
4458
"orange-taxis-rhyme",
4559
"pretty-women-sing",
4660
"proud-chairs-study",
4761
"rich-walls-fold",
62+
"rotten-carpets-raise",
63+
"rude-cycles-scream",
4864
"salty-geese-own",
4965
"seven-coats-hang",
5066
"seven-forks-join",
67+
"sharp-beans-run",
68+
"sharp-papayas-destroy",
69+
"shiny-deer-lose",
70+
"short-cloths-deny",
71+
"shy-flies-marry",
72+
"silent-wasps-warn",
5173
"silly-parks-give",
5274
"slick-months-cry",
75+
"smooth-singers-thank",
5376
"soft-islands-warn",
5477
"spotty-colts-hear",
78+
"stale-avocados-enjoy",
5579
"stale-wasps-smell",
5680
"strange-knives-study",
5781
"strange-peas-kiss",
5882
"strong-falcons-design",
5983
"strong-lions-tan",
84+
"tame-ducks-ring",
85+
"tasty-cheetahs-pay",
86+
"ten-jobs-attack",
6087
"thin-oranges-lick",
6188
"three-hounds-refuse",
89+
"three-vans-join",
6290
"tricky-eggs-cross",
91+
"twelve-sloths-flow",
6392
"twenty-baboons-pull",
6493
"unlucky-hotels-shake",
94+
"upset-flowers-yawn",
6595
"wet-crews-drum",
96+
"wet-mammals-feel",
6697
"wet-terms-argue",
98+
"wicked-starfishes-shout",
6799
"witty-chicken-leave",
68100
"young-dots-heal",
69101
"young-timers-accept"

.changeset/pretty-emus-cover.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+
update FormControl ValidationIcon position

.changeset/sweet-islands-sleep.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+
Replace StateLabel color with new draft token

.changeset/sweet-results-smell.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/react': major
3+
---
4+
5+
Remove support for `sx` from the Dialog component and sub-components

.github/workflows/lock-release.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: Toggle Release Lock
22

33
on:
44
release:
5-
types: [released]
5+
types:
6+
- released
7+
- prereleased
68
workflow_dispatch:
79
inputs:
810
action:
@@ -78,7 +80,7 @@ jobs:
7880
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
7981
- name: Update all PRs that are toggled merge when ready
8082
run: |
81-
PR_NUMBERS=$(gh pr list -L 100 -R primer/react --state open --json number,baseRefName,autoMergeRequest,mergeStateStatus,reviewDecision -q '.[] | select(.autoMergeRequest != null) | select(.baseRefName == "main") | select(.mergeStateStatus == "BEHIND") | select(.reviewDecision == "APPROVED") | .number')
83+
PR_NUMBERS=$(gh pr list -L 100 -R primer/react --state open --json number,baseRefName,autoMergeRequest,reviewDecision -q '.[] | select(.autoMergeRequest != null) | select(.baseRefName == "main") | select(.reviewDecision == "APPROVED") | .number')
8284
if [ -n "$PR_NUMBERS" ]; then
8385
echo "Updating $PR_NUMBERS"
8486
echo "$PR_NUMBERS" | xargs -I {} gh pr update-branch -R primer/react {}

e2e/components/Dialog.test.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,6 @@ const stories = [
2727
title: 'Position sidesheet',
2828
id: 'components-dialog-features--side-sheet',
2929
},
30-
{
31-
title: 'Dev: With Css',
32-
id: 'components-dialog-dev--with-css',
33-
},
34-
{
35-
title: 'Dev: With Sx',
36-
id: 'components-dialog-dev--with-sx',
37-
},
38-
{
39-
title: 'Dev: With Sx And Css',
40-
id: 'components-dialog-dev--with-sx-and-css',
41-
},
4230
] as const
4331

4432
test.describe('Dialog', () => {

examples/codesandbox/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@types/react": "^18.3.11",
1818
"@types/react-dom": "^18.3.0",
1919
"@vitejs/plugin-react": "^4.3.3",
20-
"@primer/react": "38.0.0-rc.3",
20+
"@primer/react": "38.0.0-rc.4",
2121
"styled-components": "5.x",
2222
"typescript": "^5.9.2",
2323
"vite": "^7.1.5"

0 commit comments

Comments
 (0)