Merge branch 'dev' into user/auastorg-ms/scoped-memory-router

Author: auaustorg-ms

.changeset/proud-timers-tickle.md

@@ -0,0 +1,6 @@
+---
+"@remix-run/router": patch
+---
+
+- Throw an error if an `action`/`loader` function returns `undefined` as revalidations need to know whether the loader has previously been executed. `undefined` also causes issues during SSR stringification for hydration. You should always ensure you loader/acton return a value, and you may return `null` if you don't wish to return anything.
+- Enhanced `ErrorResponse` bodies to contain more descriptive text in internal 403/404/405 scenarios

contributors.yml

@@ -137,6 +137,7 @@
 - vijaypushkin
 - vikingviolinist
 - vishwast03
+- willemarcel
 - williamsdyyz
 - xavier-lc
 - xcsnowcity

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";
 

package.json

@@ -107,7 +107,7 @@
   },
   "filesize": {
     "packages/router/dist/router.umd.min.js": {
-      "none": "34 kB"
+      "none": "34.5 kB"
     },
     "packages/react-router/dist/react-router.production.min.js": {
       "none": "12.5 kB"

packages/react-router-dom/__tests__/nav-link-active-test.tsx

@@ -509,7 +509,7 @@ describe("NavLink using a data router", () => {
     fireEvent.click(screen.getByText("Link to Bar"));
     expect(screen.getByText("Link to Bar").className).toBe("pending");
 
-    dfd.resolve();
+    dfd.resolve(null);
     await waitFor(() => screen.getByText("Bar page"));
     expect(screen.getByText("Link to Bar").className).toBe("active");
   });
@@ -562,7 +562,7 @@ describe("NavLink using a data router", () => {
       "some-pending-classname"
     );
 
-    dfd.resolve();
+    dfd.resolve(null);
     await waitFor(() => screen.getByText("Bar page"));
     expect(screen.getByText("Link to Bar").className).toBe(
       "some-active-classname"
@@ -617,7 +617,7 @@ describe("NavLink using a data router", () => {
       "lowercase"
     );
 
-    dfd.resolve();
+    dfd.resolve(null);
     await waitFor(() => screen.getByText("Bar page"));
     expect(screen.getByText("Link to Bar").style.textTransform).toBe(
       "uppercase"
@@ -667,7 +667,7 @@ describe("NavLink using a data router", () => {
     fireEvent.click(screen.getByText("Link to Bar (idle)"));
     expect(screen.getByText("Link to Bar (loading...)")).toBeDefined();
 
-    dfd.resolve();
+    dfd.resolve(null);
     await waitFor(() => screen.getByText("Bar page"));
     expect(screen.getByText("Link to Bar (current)")).toBeDefined();
   });
@@ -708,7 +708,7 @@ describe("NavLink using a data router", () => {
     fireEvent.click(screen.getByText("Link to Baz"));
     expect(screen.getByText("Link to Bar").className).toBe("");
 
-    dfd.resolve();
+    dfd.resolve(null);
     await waitFor(() => screen.getByText("Baz page"));
     expect(screen.getByText("Link to Bar").className).toBe("");
   });

packages/react-router/__tests__/data-memory-router-test.tsx

@@ -2713,7 +2713,7 @@ describe("<DataMemoryRouter>", () => {
       expect(getAwaitRenderCount()).toBe(3);
 
       // complete /baz navigation
-      bazDefer.resolve();
+      bazDefer.resolve(null);
       await waitFor(() => screen.getByText("Baz"));
       expect(getHtml(container)).toMatchInlineSnapshot(`
         "<div