Merge branch 'release-next' into dev

remix-run · May 17, 2023 · 86f7206 · 86f7206
2 parents 0b89da3 + 0815c96
commit 86f7206
Show file tree

Hide file tree

Showing 19 changed files with 57 additions and 36 deletions.
diff --git a/.changeset/fix-basename-duplication.md b/.changeset/fix-basename-duplication.md
diff --git a/.changeset/hmr-error-boundary.md b/.changeset/hmr-error-boundary.md
diff --git a/.changeset/initialize-with-hash.md b/.changeset/initialize-with-hash.md
diff --git a/.changeset/set-search-params-type.md b/.changeset/set-search-params-type.md
diff --git a/.github/workflows/release-comments.yml b/.github/workflows/release-comments.yml
@@ -15,7 +15,7 @@ jobs:
           fetch-depth: 0
 
       - name: 📝 Comment on related issues and pull requests
-        uses: mcansh/release-comment-action@v0.3.1
+        uses: remix-run/release-comment-action@v0.4.1
         with:
           DIRECTORY_TO_CHECK: "./packages"
           PACKAGE_NAME: "react-router"
diff --git a/contributors.yml b/contributors.yml
@@ -20,6 +20,7 @@
 - avipatel97
 - awreese
 - aymanemadidi
+- babafemij-k
 - bavardage
 - bbrowning918
 - BDomzalski
@@ -83,6 +84,7 @@
 - Isammoc
 - ivanjeremic
 - ivanjonas
+- Ivanrenes
 - JackPriceBurns
 - jacob-ebey
 - JaffParker
@@ -143,6 +145,7 @@
 - mfijas
 - MichaelDeBoey
 - michal-antczak
+- mikib0
 - minami-minami
 - minthulim
 - modex98
@@ -212,4 +215,3 @@
 - yionr
 - yuleicul
 - zheng-chuang
-- Ivanrenes
diff --git a/docs/components/nav-link.md b/docs/components/nav-link.md
@@ -82,7 +82,7 @@ You can pass a render prop as children to customize the content of the `<NavLink
 
 ## `end`
 
-The `end` prop changes the matching logic for the `active` and `pending` states to only match to the "end" of the NavLinks's `to` path. If the URL is longer than `to`, it will no longer be considered active.
+The `end` prop changes the matching logic for the `active` and `pending` states to only match to the "end" of the NavLink's `to` path. If the URL is longer than `to`, it will no longer be considered active.
 
 Without the end prop, this link is always active because every URL matches `/`.
 

diff --git a/docs/start/concepts.md b/docs/start/concepts.md
@@ -631,7 +631,7 @@ If all the teams are in a list on the left then an empty outlet means you've got
 
 Another way to think of an index route is that it's the default child route when the parent matches but none of its children do.
 
-Depending on the user interface, you might not need an index route, but if there is any sort of persistent navigation in the parent route you'll most likely want index route to fill the space when the user hasn't clicked one of the items yet.
+Depending on the user interface, you might not need an index route, but if there is any sort of persistent navigation in the parent route you'll most likely want an index route to fill the space when the user hasn't clicked one of the items yet.
 
 ### Layout Routes
 

diff --git a/docs/start/tutorial.md b/docs/start/tutorial.md
@@ -1784,7 +1784,7 @@ Alright, we're ready to click the star next to the user's name!
 
 <img class="tutorial" loading="lazy" src="/_docs/tutorial/24.webp" />
 
-Check that out, both stars automatically update. Our new `<fetcher.Form method="post">` works almost exactly like a the `<Form>` we've been using: it calls the action and then all data is revalidated automatically--even your errors will be caught the same way.
+Check that out, both stars automatically update. Our new `<fetcher.Form method="post">` works almost exactly like the `<Form>` we've been using: it calls the action and then all data is revalidated automatically--even your errors will be caught the same way.
 
 There is one key difference though, it's not a navigation--the URL doesn't change, the history stack is unaffected.
 

diff --git a/packages/react-router-dom-v5-compat/CHANGELOG.md b/packages/react-router-dom-v5-compat/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `react-router-dom-v5-compat`
 
+## 6.11.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@6.11.2`
+  - `react-router-dom@6.11.2`
+
 ## 6.11.1
 
 ### Patch Changes

diff --git a/packages/react-router-dom-v5-compat/package.json b/packages/react-router-dom-v5-compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom-v5-compat",
-  "version": "6.11.1",
+  "version": "6.11.2",
   "description": "Migration path to React Router v6 from v4/5",
   "keywords": [
     "react",
@@ -24,7 +24,7 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "history": "^5.3.0",
-    "react-router": "6.11.1"
+    "react-router": "6.11.2"
   },
   "peerDependencies": {
     "react": ">=16.8",

diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md
@@ -1,5 +1,14 @@
 # `react-router-dom`
 
+## 6.11.2
+
+### Patch Changes
+
+- Export `SetURLSearchParams` type ([#10444](https://github.com/remix-run/react-router/pull/10444))
+- Updated dependencies:
+  - `react-router@6.11.2`
+  - `@remix-run/router@1.6.2`
+
 ## 6.11.1
 
 ### Patch Changes

diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom",
-  "version": "6.11.1",
+  "version": "6.11.2",
   "description": "Declarative routing for React web applications",
   "keywords": [
     "react",
@@ -23,8 +23,8 @@
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@remix-run/router": "1.6.1",
-    "react-router": "6.11.1"
+    "@remix-run/router": "1.6.2",
+    "react-router": "6.11.2"
   },
   "devDependencies": {
     "react": "^18.2.0",

diff --git a/packages/react-router-native/CHANGELOG.md b/packages/react-router-native/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `react-router-native`
 
+## 6.11.2
+
+### Patch Changes
+
+- Export `SetURLSearchParams` type ([#10444](https://github.com/remix-run/react-router/pull/10444))
+- Updated dependencies:
+  - `react-router@6.11.2`
+
 ## 6.11.1
 
 ### Patch Changes

diff --git a/packages/react-router-native/package.json b/packages/react-router-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-native",
-  "version": "6.11.1",
+  "version": "6.11.2",
   "description": "Declarative routing for React Native applications",
   "keywords": [
     "react",
@@ -22,7 +22,7 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "@ungap/url-search-params": "^0.1.4",
-    "react-router": "6.11.1"
+    "react-router": "6.11.2"
   },
   "devDependencies": {
     "react": "^18.2.0",

diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `react-router`
 
+## 6.11.2
+
+### Patch Changes
+
+- Fix `basename` duplication in descendant `<Routes>` inside a `<RouterProvider>` ([#10492](https://github.com/remix-run/react-router/pull/10492))
+- Updated dependencies:
+  - `@remix-run/router@1.6.2`
+
 ## 6.11.1
 
 ### Patch Changes

diff --git a/packages/react-router/package.json b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "6.11.1",
+  "version": "6.11.2",
   "description": "Declarative routing for React",
   "keywords": [
     "react",
@@ -23,7 +23,7 @@
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@remix-run/router": "1.6.1"
+    "@remix-run/router": "1.6.2"
   },
   "devDependencies": {
     "react": "^18.2.0"

diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/router`
 
+## 1.6.2
+
+### Patch Changes
+
+- Fix HMR-driven error boundaries by properly reconstructing new routes and `manifest` in `\_internalSetRoutes` ([#10437](https://github.com/remix-run/react-router/pull/10437))
+- Fix bug where initial data load would not kick off when hash is present ([#10493](https://github.com/remix-run/react-router/pull/10493))
+
 ## 1.6.1
 
 ### Patch Changes

diff --git a/packages/router/package.json b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/router",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "Nested/Data-driven/Framework-agnostic Routing",
   "keywords": [
     "remix",