Merge branch 'main' into v-team-trailing-action-action-list

primer · May 31, 2024 · 5bc72d6 · 5bc72d6
2 parents f4156d1 + afe8d7a
commit 5bc72d6
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 16 deletions.
diff --git a/.changeset/clever-schools-shave.md b/.changeset/clever-schools-shave.md
diff --git a/.changeset/hungry-rockets-smell.md b/.changeset/hungry-rockets-smell.md
diff --git a/examples/app-router/package.json b/examples/app-router/package.json
@@ -9,7 +9,7 @@
     "type-check": "tsc --noEmit"
   },
   "dependencies": {
-    "@primer/react": "36.19.1",
+    "@primer/react": "36.20.0",
     "next": "^14.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/examples/codesandbox/package.json b/examples/codesandbox/package.json
@@ -20,7 +20,7 @@
     "@typescript-eslint/eslint-plugin": "^7.3.1",
     "@typescript-eslint/parser": "^7.3.1",
     "@vitejs/plugin-react": "^4.2.1",
-    "@primer/react": "36.19.1",
+    "@primer/react": "36.20.0",
     "eslint": "^8.56.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.5",

diff --git a/examples/nextjs/package.json b/examples/nextjs/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@primer/octicons-react": "19.x",
-    "@primer/react": "36.19.1",
+    "@primer/react": "36.20.0",
     "next": "^14.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @primer/react
 
+## 36.20.0
+
+### Minor Changes
+
+- [#4358](https://github.com/primer/react/pull/4358) [`e34e4b265f7584c344a4b6b7145da1a5eec1ffb5`](https://github.com/primer/react/commit/e34e4b265f7584c344a4b6b7145da1a5eec1ffb5) Thanks [@broccolinisoup](https://github.com/broccolinisoup)! - PageHeader: Update the layout styles so that all interactive content comes after the title (while keeping the component visually the same).
+  This is a breaking change however PageHeader is still a draft component so we are releasing the changes as minor but please upgrade with caution.
+
+- [#4617](https://github.com/primer/react/pull/4617) [`42ba5dc5e722c2341761bf4c6e1e993aac9f2ca8`](https://github.com/primer/react/commit/42ba5dc5e722c2341761bf4c6e1e993aac9f2ca8) Thanks [@JelloBagel](https://github.com/JelloBagel)! - Add an ability to provide custom `aria-label` and `aria-labelledby` to `TreeView.Item`
+
 ## 36.19.1
 
 ### Patch Changes

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/react",
-  "version": "36.19.1",
+  "version": "36.20.0",
   "description": "An implementation of GitHub's Primer Design System using React",
   "main": "lib/index.js",
   "module": "lib-esm/index.js",