Skip to content

Commit 9d2fa50

Browse files
authored
Merge branch 'main' into llastflowers/5796/no-sx-PageLayout
2 parents daa48e4 + 9acebe1 commit 9d2fa50

Some content is hidden

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

50 files changed

+706
-1069
lines changed

.changeset/bright-parents-flow.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': minor
4+
---
5+
6+
Update ToggleSwitch component to no longer support sx, add sx wrapper to @primer/styled-react.

.changeset/little-peas-mix.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+
---
4+
5+
BREAKING CHANGE: remove AvatarToken
6+
BREAKING CHANGE: make Caret component internal only

.changeset/tricky-eggs-cross.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+
Update StateLabel component to no longer support sx.
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: 'Upload Versions'
2+
description: 'Upload version information for public packages'
3+
runs:
4+
using: 'composite'
5+
steps:
6+
- name: Set up Node.js
7+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
8+
with:
9+
node-version: 22
10+
- name: Install glob package
11+
shell: bash
12+
run: npm install glob --no-package-lock
13+
- name: Write workspace versions as JSON file
14+
uses: actions/github-script@a3e7071a34d7e1f219a8a4de9a5e0a34d1ee1293
15+
with:
16+
script: |
17+
const fs = require('node:fs');
18+
const {globSync} = require('glob')
19+
20+
const packageJsonPaths = globSync('packages/**/package.json', { ignore: ['**/node_modules/**'] })
21+
const output = {
22+
packages: [],
23+
};
24+
25+
for (const packageJsonPath of packageJsonPaths) {
26+
const contents = fs.readFileSync(packageJsonPath, 'utf8');
27+
const packageJson = JSON.parse(contents);
28+
if (packageJson.private) {
29+
continue;
30+
}
31+
32+
const pkg = {
33+
name: packageJson.name,
34+
version: packageJson.version,
35+
};
36+
output.packages.push(pkg);
37+
}
38+
39+
fs.writeFileSync('versions.json', JSON.stringify(output, null, 2));
40+
- name: Upload version file
41+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
42+
with:
43+
name: versions
44+
path: versions.json

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
env:
4848
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
4949
NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN_SHARED }}
50+
- uses: ./.github/actions/upload-versions
5051

5152
release-next-major:
5253
if: github.ref_name == 'next-major'

.github/workflows/release_canary.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,4 @@ jobs:
6464
description: package.version,
6565
target_url: `https://unpkg.com/${package.name}@${package.version}/`
6666
})
67+
- uses: ./.github/actions/upload-versions

contributor-docs/adrs/adr-007-experimental-components.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
## Status
44

5-
| Stage | Status |
6-
| -------- | ------ |
7-
| Approved ||
8-
| Adopted | 🚧 |
5+
| Stage | Status |
6+
| -------- | ------------------------------------------------------------------------------------ |
7+
| Approved | |
8+
| Adopted | [Abandoned](https://github.com/github/primer/issues/2534#issuecomment-3227363552) |
99

1010
 
1111

e2e/components/SelectPanel.test.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@ const scenarios = matrix({
4040
id: 'components-selectpanel-dev--with-css',
4141
name: 'With Css',
4242
},
43-
{
44-
id: 'components-selectpanel-dev--with-sx',
45-
name: 'With Sx',
46-
},
47-
{
48-
id: 'components-selectpanel-dev--with-sx-and-css',
49-
name: 'With Sx and Css',
50-
},
5143
],
5244
})
5345

e2e/components/Token.test.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,6 @@ const stories = [
3939
title: 'IssueLabelToken with onRemove fn',
4040
id: 'components-token-features--issue-label-token-with-on-remove-fn',
4141
},
42-
{
43-
title: 'AvatarToken Default',
44-
id: 'components-avatartoken--default-token',
45-
},
46-
{
47-
title: 'AvatarToken Interactive',
48-
id: 'components-avatartoken--interactive',
49-
},
50-
{
51-
title: 'AvatarToken On Remove Fn',
52-
id: 'components-avatartoken--with-on-remove-fn',
53-
},
5442
]
5543

5644
test.describe('Token', () => {

0 commit comments

Comments
 (0)