Skip to content

Commit 8e30feb

Browse files
committed
Merge branch 'main' of github.com:primer/react into llastflowers/6757/rm-sx-ActionList2
2 parents c173eda + 985ba9a commit 8e30feb

Some content is hidden

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

51 files changed

+2304
-123
lines changed

.changeset/fruity-monkeys-cover.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 DataTable.Container

.changeset/pre.json

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"@primer/styled-react": "0.1.0"
1313
},
1414
"changesets": [
15+
"afraid-eyes-serve",
1516
"beige-plums-obey",
1617
"beige-shrimps-sleep",
1718
"better-coins-dream",
@@ -20,15 +21,20 @@
2021
"bright-parents-flow",
2122
"busy-bananas-smash",
2223
"chilly-dingos-build",
24+
"chilly-lemons-promise",
25+
"chubby-buses-greet",
2326
"chubby-colts-nail",
2427
"cold-teams-buy",
28+
"cool-apricots-sneeze",
29+
"cool-clubs-think",
2530
"cruel-papers-film",
2631
"cuddly-ads-behave",
2732
"cuddly-cows-trade",
2833
"deprecate-textinputwithtokens",
2934
"dirty-chairs-invent",
3035
"eighty-queens-tap",
3136
"fair-views-laugh",
37+
"famous-jobs-applaud",
3238
"few-mails-sing",
3339
"fifty-walls-yawn",
3440
"five-squids-sin",
@@ -37,31 +43,43 @@
3743
"gentle-sheep-feel",
3844
"giant-impalas-occur",
3945
"gold-dingos-sneeze",
46+
"good-snakes-fix",
4047
"great-hats-serve",
4148
"hot-bears-cry",
4249
"hot-melons-jump",
4350
"hot-mirrors-feel",
4451
"icy-pianos-say",
52+
"itchy-readers-yell",
53+
"lazy-elephants-shave",
54+
"lazy-gifts-join",
4555
"lemon-jokes-camp",
4656
"light-colts-burn",
57+
"light-schools-wish",
4758
"little-peas-mix",
4859
"lovely-vans-burn",
60+
"lucky-wasps-nail",
4961
"metal-badgers-joke",
5062
"metal-cups-peel",
5163
"metal-deer-refuse",
5264
"metal-lamps-appear",
5365
"mighty-lizards-lick",
66+
"modern-chicken-happen",
5467
"nasty-seals-carry",
5568
"new-dragons-melt",
5669
"new-shrimps-appear",
5770
"nine-cobras-talk",
71+
"olive-rats-serve",
5872
"orange-taxis-rhyme",
73+
"pink-rockets-win",
74+
"pretty-emus-cover",
5975
"pretty-women-sing",
6076
"proud-chairs-study",
6177
"rich-walls-fold",
6278
"rotten-carpets-raise",
6379
"rude-cycles-scream",
80+
"rude-windows-bathe",
6481
"salty-geese-own",
82+
"seven-cameras-act",
6583
"seven-coats-hang",
6684
"seven-forks-join",
6785
"sharp-beans-run",
@@ -72,6 +90,7 @@
7290
"silent-wasps-warn",
7391
"silly-parks-give",
7492
"slick-months-cry",
93+
"slimy-parrots-love",
7594
"smooth-singers-thank",
7695
"soft-islands-warn",
7796
"spotty-colts-hear",
@@ -81,23 +100,30 @@
81100
"strange-peas-kiss",
82101
"strong-falcons-design",
83102
"strong-lions-tan",
103+
"sweet-islands-sleep",
104+
"sweet-owls-do",
105+
"sweet-results-smell",
84106
"tame-ducks-ring",
85107
"tasty-cheetahs-pay",
86108
"ten-jobs-attack",
109+
"tender-dodos-create",
87110
"thin-oranges-lick",
88111
"three-hounds-refuse",
89112
"three-vans-join",
113+
"tricky-boats-visit",
90114
"tricky-eggs-cross",
91115
"twelve-sloths-flow",
92116
"twenty-baboons-pull",
93117
"unlucky-hotels-shake",
94118
"upset-flowers-yawn",
119+
"weak-papers-drive",
95120
"wet-crews-drum",
96121
"wet-mammals-feel",
97122
"wet-terms-argue",
98123
"wicked-starfishes-shout",
99124
"witty-chicken-leave",
100125
"young-dots-heal",
101-
"young-timers-accept"
126+
"young-timers-accept",
127+
"yummy-years-greet"
102128
]
103129
}
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+
Replaces `useTheme` usage with `theme`. If an application uses a custom theme that modifies one of the following 5 tokens, they will be reset to the default theme values. (`space.2, colors.success.fg, colors.border.default, colors.border.muted, animation.easeOutCubic`)

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ jobs:
144144
${{ runner.os }}-turbo-
145145
- name: Install dependencies
146146
run: npm ci
147+
- name: Build doc-gen
148+
run: npm run build --workspace @primer/doc-gen
147149
- name: Build storybook to generate story IDs
148150
run: npm run build:storybook
149151
working-directory: packages/react

.github/workflows/lock-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
5151

5252
unlock:
53-
if: ${{ github.event.inputs.action == 'unlock' || github.event.action == 'released' }}
53+
if: ${{ github.event.inputs.action == 'unlock' || github.event.action == 'released' || github.event.action == 'prereleased' }}
5454
name: Unlock the release
5555
runs-on: ubuntu-latest
5656
steps:

.github/workflows/migration-status.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,18 @@ jobs:
3434
- name: Run migration script
3535
run: |
3636
node --experimental-strip-types script/styled-components-migration-status.mts >> $GITHUB_STEP_SUMMARY
37+
38+
ts-docgen:
39+
runs-on: ubuntu-latest
40+
steps:
41+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
42+
- name: Set up Node.js
43+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
44+
with:
45+
node-version-file: '.nvmrc'
46+
cache: 'npm'
47+
- name: Install dependencies
48+
run: npm ci
49+
- name: Run migration script
50+
run: |
51+
node --experimental-strip-types script/ts-docs-status.mts >> $GITHUB_STEP_SUMMARY

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.4",
20+
"@primer/react": "38.0.0-rc.5",
2121
"styled-components": "5.x",
2222
"typescript": "^5.9.2",
2323
"vite": "^7.1.5"

examples/nextjs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"type-check": "tsc --noEmit"
1111
},
1212
"dependencies": {
13-
"@primer/react": "38.0.0-rc.4",
13+
"@primer/react": "38.0.0-rc.5",
1414
"next": "^15.2.3",
1515
"react": "18.3.1",
1616
"react-dom": "18.3.1",

examples/theming/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"dependencies": {
1313
"@primer/octicons-react": "^19.14.0",
14-
"@primer/react": "38.0.0-rc.4",
14+
"@primer/react": "38.0.0-rc.5",
1515
"clsx": "^2.1.1",
1616
"next": "^15.2.3",
1717
"react": "18.3.1",

0 commit comments

Comments
 (0)