Skip to content

Commit e4ad72f

Browse files
authored
Merge branch 'main' into heading-component-style-props
2 parents 772d7cb + c0425ff commit e4ad72f

40 files changed

+415
-39
lines changed

.changeset/beige-schools-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 `link` variant to Button

.changeset/pre.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,17 @@
88
"example-consumer-test": "0.0.0",
99
"example-nextjs": "0.0.0",
1010
"@primer/react": "36.27.0",
11-
"rollup-plugin-import-css": "0.0.0"
11+
"rollup-plugin-import-css": "0.0.0",
12+
"postcss-preset-primer": "0.0.0"
1213
},
13-
"changesets": []
14+
"changesets": [
15+
"beige-schools-kneel",
16+
"dry-trainers-protect",
17+
"fluffy-ravens-thank",
18+
"four-shoes-yell",
19+
"four-tables-glow",
20+
"lovely-days-march",
21+
"moody-rivers-impress",
22+
"young-meals-worry"
23+
]
1424
}

.changeset/tough-pans-punch.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+
Update Blankslate component to use CSS Modules behind a feature flag

.github/workflows/release_candidate.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,19 @@ jobs:
4242

4343
- name: Publish release candidate
4444
run: |
45+
# Remove existing pre.json if one exists. Snapshots are not allowed
46+
# in pre-release mode.
47+
# TODO: remove in v37
48+
rm .changeset/pre.json
49+
4550
pkg_json_path=packages/react/package.json
4651
version=$(jq -r .version $pkg_json_path)
47-
echo "$( jq ".version = \"$(echo $version)-rc.$(git rev-parse --short HEAD)\"" $pkg_json_path )" > $pkg_json_path
52+
53+
# Update how the version is generated in these prereleases. By
54+
# default, -rc. is included in versions when `pre.json` is present.
55+
# Add this back in when we exit the v37 release
56+
# TODO: remove in v37
57+
echo "$( jq ".version = \"$(echo $version).$(git rev-parse --short HEAD)\"" $pkg_json_path )" > $pkg_json_path
4858
npx changeset publish --tag next
4959
env:
5060
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8.04 KB
Loading
7.97 KB
Loading
8.09 KB
Loading
8.04 KB
Loading
8.04 KB
Loading
7.99 KB
Loading

0 commit comments

Comments
 (0)