Merge branch 'release-6.4.4'

remix-run · Nov 30, 2022 · 12aa08a · 12aa08a
2 parents cf00c03 + 12e7c28
commit 12aa08a
Show file tree

Hide file tree

Showing 30 changed files with 1,671 additions and 384 deletions.
diff --git a/contributors.yml b/contributors.yml
@@ -75,8 +75,10 @@
 - jonkoops
 - jrakotoharisoa
 - kantuni
+- KAROTT7
 - kddnewton
 - kentcdodds
+- kiliman
 - kkirsche
 - koojaa
 - KostiantynPopovych
@@ -141,9 +143,11 @@
 - tyankatsu0105
 - underager
 - vijaypushkin
-- vikingviolinist
 - vishwast03
+- vikingviolinist
+- willemarcel
 - williamsdyyz
 - xavier-lc
 - xcsnowcity
 - yuleicul
+- m-shojaei
diff --git a/docs/routers/picking-a-router.md b/docs/routers/picking-a-router.md
@@ -31,6 +31,8 @@ The easiest way to quickly update to a v6.4 is to get the help from [`createRout
 ```jsx
 import {
   createBrowserRouter,
+  createRoutesFromElements,
+  Route,
   RouterProvider,
 } from "react-router-dom";
 

diff --git a/examples/notes/README.md b/examples/notes/README.md
@@ -16,4 +16,4 @@ This example demonstrates some of the basic features of Data Router, including:
 
 Open this example on [StackBlitz](https://stackblitz.com):
 
-[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/remix-run/react-router/tree/remixing/examples/notes?file=src/main.tsx)
+[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/remix-run/react-router/tree/dev/examples/notes?file=src/main.tsx)
diff --git a/package.json b/package.json
@@ -107,7 +107,7 @@
   },
   "filesize": {
     "packages/router/dist/router.umd.min.js": {
-      "none": "34 kB"
+      "none": "35 kB"
     },
     "packages/react-router/dist/react-router.production.min.js": {
       "none": "12.5 kB"
@@ -116,10 +116,10 @@
       "none": "14.5 kB"
     },
     "packages/react-router-dom/dist/react-router-dom.production.min.js": {
-      "none": "10 kB"
+      "none": "10.5 kB"
     },
     "packages/react-router-dom/dist/umd/react-router-dom.production.min.js": {
-      "none": "16 kB"
+      "none": "16.5 kB"
     }
   }
 }
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.4.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router-dom@6.4.4`
+  - `react-router@6.4.4`
+
 ## 6.4.3
 
 ### Patch Changes

diff --git a/packages/react-router-dom-v5-compat/lib/components.tsx b/packages/react-router-dom-v5-compat/lib/components.tsx
@@ -81,6 +81,14 @@ export function StaticRouter({
     createHref(to: To) {
       return typeof to === "string" ? to : createPath(to);
     },
+    encodeLocation(to: To) {
+      let path = typeof to === "string" ? parsePath(to) : to;
+      return {
+        pathname: path.pathname || "",
+        search: path.search || "",
+        hash: path.hash || "",
+      };
+    },
     push(to: To) {
       throw new Error(
         `You cannot use navigator.push() on the server because it is a stateless ` +

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.4.3",
+  "version": "6.4.4",
   "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.4.3"
+    "react-router": "6.4.4"
   },
   "peerDependencies": {
     "react": ">=16.8",

diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md
@@ -1,5 +1,16 @@
 # `react-router-dom`
 
+## 6.4.4
+
+### Patch Changes
+
+- Fix issues with encoded characters in `NavLink` and descendant `<Routes>` ([#9589](https://github.com/remix-run/react-router/pull/9589), [#9647](https://github.com/remix-run/react-router/pull/9647))
+- Properly serialize/deserialize `ErrorResponse` instances when using built-in hydration ([#9593](https://github.com/remix-run/react-router/pull/9593))
+- Support `basename` in static data routers ([#9591](https://github.com/remix-run/react-router/pull/9591))
+- Updated dependencies:
+  - `@remix-run/router@1.0.4`
+  - `react-router@6.4.4`
+
 ## 6.4.3
 
 ### Patch Changes

diff --git a/packages/react-router-dom/__tests__/data-browser-router-test.tsx b/packages/react-router-dom/__tests__/data-browser-router-test.tsx
@@ -23,6 +23,7 @@ import {
   Outlet,
   createBrowserRouter,
   createHashRouter,
+  isRouteErrorResponse,
   useLoaderData,
   useActionData,
   useRouteError,
@@ -264,6 +265,40 @@ function testDomRouter(
       `);
     });
 
+    it("deserializes ErrorResponse instances from the window", async () => {
+      window.__staticRouterHydrationData = {
+        loaderData: {},
+        actionData: null,
+        errors: {
+          "0": {
+            status: 404,
+            statusText: "Not Found",
+            internal: false,
+            data: { not: "found" },
+            __type: "RouteErrorResponse",
+          },
+        },
+      };
+      let { container } = render(
+        <TestDataRouter window={getWindow("/")}>
+          <Route path="/" element={<h1>Nope</h1>} errorElement={<Boundary />} />
+        </TestDataRouter>
+      );
+
+      function Boundary() {
+        let error = useRouteError();
+        return isRouteErrorResponse(error) ? <h1>Yes!</h1> : <h2>No :(</h2>;
+      }
+
+      expect(getHtml(container)).toMatchInlineSnapshot(`
+        "<div>
+          <h1>
+            Yes!
+          </h1>
+        </div>"
+      `);
+    });
+
     it("renders fallbackElement while first data fetch happens", async () => {
       let fooDefer = createDeferred();
       let { container } = render(