Merge branch 'release-next'

Author: brophdawg11

CHANGELOG.md

@@ -13,120 +13,122 @@ We manage release notes in this file instead of the paginated Github Releases Pa
   <summary>Table of Contents</summary>
 
 - [React Router Releases](#react-router-releases)
+  - [v6.20.1](#v6201)
+    - [Patch Changes](#patch-changes)
   - [v6.20.0](#v6200)
     - [Minor Changes](#minor-changes)
-    - [Patch Changes](#patch-changes)
+    - [Patch Changes](#patch-changes-1)
   - [v6.19.0](#v6190)
     - [What's Changed](#whats-changed)
       - [`unstable_flushSync` API](#unstable_flushsync-api)
     - [Minor Changes](#minor-changes-1)
-    - [Patch Changes](#patch-changes-1)
+    - [Patch Changes](#patch-changes-2)
   - [v6.18.0](#v6180)
     - [What's Changed](#whats-changed-1)
       - [New Fetcher APIs](#new-fetcher-apis)
       - [Persistence Future Flag (`future.v7_fetcherPersist`)](#persistence-future-flag-futurev7_fetcherpersist)
     - [Minor Changes](#minor-changes-2)
-    - [Patch Changes](#patch-changes-2)
+    - [Patch Changes](#patch-changes-3)
   - [v6.17.0](#v6170)
     - [What's Changed](#whats-changed-2)
       - [View Transitions 🚀](#view-transitions-)
     - [Minor Changes](#minor-changes-3)
-    - [Patch Changes](#patch-changes-3)
+    - [Patch Changes](#patch-changes-4)
   - [v6.16.0](#v6160)
     - [Minor Changes](#minor-changes-4)
-    - [Patch Changes](#patch-changes-4)
+    - [Patch Changes](#patch-changes-5)
   - [v6.15.0](#v6150)
     - [Minor Changes](#minor-changes-5)
-    - [Patch Changes](#patch-changes-5)
-  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-6)
-  - [v6.14.1](#v6141)
+  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-7)
+  - [v6.14.1](#v6141)
+    - [Patch Changes](#patch-changes-8)
   - [v6.14.0](#v6140)
     - [What's Changed](#whats-changed-3)
       - [JSON/Text Submissions](#jsontext-submissions)
     - [Minor Changes](#minor-changes-6)
-    - [Patch Changes](#patch-changes-8)
+    - [Patch Changes](#patch-changes-9)
   - [v6.13.0](#v6130)
     - [What's Changed](#whats-changed-4)
     - [Minor Changes](#minor-changes-7)
-    - [Patch Changes](#patch-changes-9)
-  - [v6.12.1](#v6121)
     - [Patch Changes](#patch-changes-10)
+  - [v6.12.1](#v6121)
+    - [Patch Changes](#patch-changes-11)
   - [v6.12.0](#v6120)
     - [What's Changed](#whats-changed-5)
       - [`React.startTransition` support](#reactstarttransition-support)
     - [Minor Changes](#minor-changes-8)
-    - [Patch Changes](#patch-changes-11)
-  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-12)
-  - [v6.11.1](#v6111)
+  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-13)
+  - [v6.11.1](#v6111)
+    - [Patch Changes](#patch-changes-14)
   - [v6.11.0](#v6110)
     - [Minor Changes](#minor-changes-9)
-    - [Patch Changes](#patch-changes-14)
+    - [Patch Changes](#patch-changes-15)
   - [v6.10.0](#v6100)
     - [What's Changed](#whats-changed-6)
     - [Minor Changes](#minor-changes-10)
-    - [Patch Changes](#patch-changes-15)
+    - [Patch Changes](#patch-changes-16)
   - [v6.9.0](#v690)
     - [What's Changed](#whats-changed-7)
       - [`Component`/`ErrorBoundary` route properties](#componenterrorboundary-route-properties)
       - [Introducing Lazy Route Modules](#introducing-lazy-route-modules)
     - [Minor Changes](#minor-changes-11)
-    - [Patch Changes](#patch-changes-16)
-  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-17)
-  - [v6.8.1](#v681)
+  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-18)
+  - [v6.8.1](#v681)
+    - [Patch Changes](#patch-changes-19)
   - [v6.8.0](#v680)
     - [Minor Changes](#minor-changes-12)
-    - [Patch Changes](#patch-changes-19)
+    - [Patch Changes](#patch-changes-20)
   - [v6.7.0](#v670)
     - [Minor Changes](#minor-changes-13)
-    - [Patch Changes](#patch-changes-20)
-  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-21)
-  - [v6.6.1](#v661)
+  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-22)
+  - [v6.6.1](#v661)
+    - [Patch Changes](#patch-changes-23)
   - [v6.6.0](#v660)
     - [What's Changed](#whats-changed-8)
     - [Minor Changes](#minor-changes-14)
-    - [Patch Changes](#patch-changes-23)
+    - [Patch Changes](#patch-changes-24)
   - [v6.5.0](#v650)
     - [What's Changed](#whats-changed-9)
     - [Minor Changes](#minor-changes-15)
-    - [Patch Changes](#patch-changes-24)
-  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-25)
-  - [v6.4.4](#v644)
+  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-26)
-  - [v6.4.3](#v643)
+  - [v6.4.4](#v644)
     - [Patch Changes](#patch-changes-27)
-  - [v6.4.2](#v642)
+  - [v6.4.3](#v643)
     - [Patch Changes](#patch-changes-28)
-  - [v6.4.1](#v641)
+  - [v6.4.2](#v642)
     - [Patch Changes](#patch-changes-29)
+  - [v6.4.1](#v641)
+    - [Patch Changes](#patch-changes-30)
   - [v6.4.0](#v640)
     - [What's Changed](#whats-changed-10)
       - [Remix Data APIs](#remix-data-apis)
-    - [Patch Changes](#patch-changes-30)
+    - [Patch Changes](#patch-changes-31)
   - [v6.3.0](#v630)
     - [Minor Changes](#minor-changes-16)
   - [v6.2.2](#v622)
-    - [Patch Changes](#patch-changes-31)
-  - [v6.2.1](#v621)
     - [Patch Changes](#patch-changes-32)
+  - [v6.2.1](#v621)
+    - [Patch Changes](#patch-changes-33)
   - [v6.2.0](#v620)
     - [Minor Changes](#minor-changes-17)
-    - [Patch Changes](#patch-changes-33)
-  - [v6.1.1](#v611)
     - [Patch Changes](#patch-changes-34)
+  - [v6.1.1](#v611)
+    - [Patch Changes](#patch-changes-35)
   - [v6.1.0](#v610)
     - [Minor Changes](#minor-changes-18)
-    - [Patch Changes](#patch-changes-35)
-  - [v6.0.1](#v601)
     - [Patch Changes](#patch-changes-36)
+  - [v6.0.1](#v601)
+    - [Patch Changes](#patch-changes-37)
   - [v6.0.0](#v600)
 
 </details>
@@ -150,8 +152,21 @@ To add a new release, copy from this template:
 
 -->
 
+## v6.20.1
+
+### Patch Changes
+
+- Revert the `useResolvedPath` fix for splat routes due to a large number of applications that were relying on the buggy behavior (see [#11052](https://github.com/remix-run/react-router/issues/11052#issuecomment-1836589329)) ([#11078](https://github.com/remix-run/react-router/pull/11078))
+  - We plan to re-introduce this fix behind a future flag in the next minor version (see [this comment](https://github.com/remix-run/react-router/issues/11052#issuecomment-1836589329))
+  - This fix was included in versions `6.19.0` and `6.20.0`. If you are upgrading from `6.18.0` or earlier, you would not have been impacted by this fix.
+
+**Full Changelog**: [`v6.20.0...v6.20.1`](https://github.com/remix-run/react-router/compare/[email protected]@6.20.1)
+
 ## v6.20.0
 
+> [!WARNING]
+> Please use version `6.20.1` or later instead of `6.20.0`. We discovered that a large number of apps were relying on buggy behavior that was fixed in this release ([#11045](https://github.com/remix-run/react-router/pull/11045)). We reverted the fix in `6.20.1` and will be re-introducing it behind a future flag in a subsequent release. See [#11052](https://github.com/remix-run/react-router/issues/11052#issuecomment-1836589329) for more details.
+
 ### Minor Changes
 
 - Export the `PathParam` type from the public API ([#10719](https://github.com/remix-run/react-router/pull/10719))
@@ -167,6 +182,9 @@ To add a new release, copy from this template:
 
 ## v6.19.0
 
+> [!WARNING]
+> Please use version `6.20.1` or later instead of `6.19.0`. We discovered that a large number of apps were relying on buggy behavior that was fixed in this release ([#10983](https://github.com/remix-run/react-router/pull/10983)). We reverted the fix in `6.20.1` and will be re-introducing it behind a future flag in a subsequent release. See [#11052](https://github.com/remix-run/react-router/issues/11052#issuecomment-1836589329) for more details.
+
 ### What's Changed
 
 #### `unstable_flushSync` API
@@ -509,7 +527,7 @@ We recommend folks adopt this flag sooner rather than later to be better compati
 
 ## v6.12.1
 
-> **Warning**
+> [!WARNING]
 > Please use version `6.13.0` or later instead of `6.12.0`/`6.12.1`. These versions suffered from some Webpack build/minification issues resulting failed builds or invalid minified code in your production bundles. See [#10569](https://github.com/remix-run/react-router/pull/10569) and [#10579](https://github.com/remix-run/react-router/issues/10579) for more details.
 
 ### Patch Changes
@@ -520,7 +538,7 @@ We recommend folks adopt this flag sooner rather than later to be better compati
 
 ## v6.12.0
 
-> **Warning**
+> [!WARNING]
 > Please use version `6.13.0` or later instead of `6.12.0`/`6.12.1`. These versions suffered from some Webpack build/minification issues resulting failed builds or invalid minified code in your production bundles. See [#10569](https://github.com/remix-run/react-router/pull/10569) and [#10579](https://github.com/remix-run/react-router/issues/10579) for more details.
 
 ### What's Changed

package.json

@@ -110,7 +110,7 @@
   },
   "filesize": {
     "packages/router/dist/router.umd.min.js": {
-      "none": "49.4 kB"
+      "none": "49.3 kB"
     },
     "packages/react-router/dist/react-router.production.min.js": {
       "none": "13.9 kB"

packages/react-router-dom-v5-compat/CHANGELOG.md

@@ -1,5 +1,13 @@
 # `react-router-dom-v5-compat`
 
+## 6.20.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `[email protected]`
+  - `[email protected]`
+
 ## 6.20.0
 
 ### Minor Changes

packages/react-router-dom-v5-compat/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom-v5-compat",
-  "version": "6.20.0",
+  "version": "6.20.1",
   "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.20.0"
+    "react-router": "6.20.1"
   },
   "peerDependencies": {
     "react": ">=16.8",

packages/react-router-dom/CHANGELOG.md

@@ -1,5 +1,14 @@
 # `react-router-dom`
 
+## 6.20.1
+
+### Patch Changes
+
+- Revert the `useResolvedPath` fix for splat routes due to a large number of applications that were relying on the buggy behavior (see https://github.com/remix-run/react-router/issues/11052#issuecomment-1836589329). We plan to re-introduce this fix behind a future flag in the next minor version. ([#11078](https://github.com/remix-run/react-router/pull/11078))
+- Updated dependencies:
+  - `[email protected]`
+  - `@remix-run/[email protected]`
+
 ## 6.20.0
 
 ### Minor Changes
@@ -250,7 +259,7 @@
 
 ## 6.12.1
 
-> **Warning**
+> [!WARNING]
 > Please use version `6.13.0` or later instead of `6.12.1`. This version suffers from a `webpack`/`terser` minification issue resulting in invalid minified code in your resulting production bundles which can cause issues in your application. See [#10579](https://github.com/remix-run/react-router/issues/10579) for more details.
 
 ### Patch Changes

packages/react-router-dom/__tests__/data-browser-router-test.tsx

@@ -2942,44 +2942,6 @@ function testDomRouter(
             "/foo/bar"
           );
         });
-
-        it("includes param portion of path when no action is specified (inline splat)", async () => {
-          let router = createTestRouter(
-            createRoutesFromElements(
-              <Route path="/">
-                <Route path="foo">
-                  <Route path=":param" element={<NoActionComponent />} />
-                </Route>
-              </Route>
-            ),
-            {
-              window: getWindow("/foo/bar"),
-            }
-          );
-          let { container } = render(<RouterProvider router={router} />);
-
-          expect(container.querySelector("form")?.getAttribute("action")).toBe(
-            "/foo/bar"
-          );
-        });
-
-        it("includes splat portion of path when no action is specified (nested splat)", async () => {
-          let router = createTestRouter(
-            createRoutesFromElements(
-              <Route path="/">
-                <Route path="foo/:param" element={<NoActionComponent />} />
-              </Route>
-            ),
-            {
-              window: getWindow("/foo/bar"),
-            }
-          );
-          let { container } = render(<RouterProvider router={router} />);
-
-          expect(container.querySelector("form")?.getAttribute("action")).toBe(
-            "/foo/bar"
-          );
-        });
       });
 
       describe("splat routes", () => {
@@ -2999,7 +2961,7 @@ function testDomRouter(
           let { container } = render(<RouterProvider router={router} />);
 
           expect(container.querySelector("form")?.getAttribute("action")).toBe(
-            "/foo/bar?a=1"
+            "/foo?a=1"
           );
         });
 
@@ -3019,7 +2981,7 @@ function testDomRouter(
           let { container } = render(<RouterProvider router={router} />);
 
           expect(container.querySelector("form")?.getAttribute("action")).toBe(
-            "/foo/bar"
+            "/foo"
           );
         });
 
@@ -3039,25 +3001,7 @@ function testDomRouter(
           let { container } = render(<RouterProvider router={router} />);
 
           expect(container.querySelector("form")?.getAttribute("action")).toBe(
-            "/foo/bar"
-          );
-        });
-
-        it("includes splat portion of path when no action is specified (inline splat)", async () => {
-          let router = createTestRouter(
-            createRoutesFromElements(
-              <Route path="/">
-                <Route path="foo/*" element={<NoActionComponent />} />
-              </Route>
-            ),
-            {
-              window: getWindow("/foo/bar/baz"),
-            }
-          );
-          let { container } = render(<RouterProvider router={router} />);
-
-          expect(container.querySelector("form")?.getAttribute("action")).toBe(
-            "/foo/bar/baz"
+            "/foo"
           );
         });
       });
@@ -3179,13 +3123,10 @@ function testDomRouter(
       it("navigates relative to the URL for splat routes", async () => {
         let router = createTestRouter(
           createRoutesFromElements(
-            <Route path="inbox">
-              <Route path="messages" />
-              <Route
-                path="messages/*"
-                element={<Form action=".." relative="path" />}
-              />
-            </Route>
+            <Route
+              path="inbox/messages/*"
+              element={<Form action=".." relative="path" />}
+            />
           ),
           {
             window: getWindow("/inbox/messages/1/2/3"),
@@ -3194,7 +3135,7 @@ function testDomRouter(
         let { container } = render(<RouterProvider router={router} />);
 
         expect(container.querySelector("form")?.getAttribute("action")).toBe(
-          "/inbox/messages/1/2"
+          "/inbox"
         );
       });
     });

packages/react-router-dom/__tests__/link-href-test.tsx

@@ -530,7 +530,7 @@ describe("<Link> href", () => {
       });
 
       expect(renderer.root.findByType("a").props.href).toEqual(
-        "/inbox/messages/abc"
+        "/inbox/messages"
       );
     });