Merge branch 'dev' into brophdawg11/opt-out-serialization

Author: brophdawg11

docs/guides/api-development-strategy.md

@@ -51,7 +51,8 @@ The lifecycle is thus either:
 
 Here's the current future flags in React Router v6 today:
 
-| Flag | Description |
+| Flag                     | Description                                                           |
+| ------------------------ | --------------------------------------------------------------------- |
 | `v7_normalizeFormMethod` | Normalize `useNavigation().formMethod` to be an uppercase HTTP Method |
 
 [future-flags-blog-post]: https://remix.run/blog/future-flags

examples/data-router/src/app.tsx

@@ -3,12 +3,10 @@ import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router-dom";
 import {
   Await,
   createBrowserRouter,
-  createRoutesFromElements,
   defer,
   Form,
   Link,
   Outlet,
-  Route,
   RouterProvider,
   useAsyncError,
   useAsyncValue,

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

@@ -5663,14 +5663,3 @@ function getHtml(container: HTMLElement) {
     },
   });
 }
-
-async function waitForRouterInitialize(router) {
-  return await new Promise((resolve) => {
-    let unsubscribe = router.subscribe((updatedState) => {
-      if (updatedState.initialized) {
-        unsubscribe();
-        resolve(router);
-      }
-    });
-  });
-}

packages/react-router-dom/server.tsx

@@ -6,7 +6,6 @@ import type {
   StaticHandlerContext,
   CreateStaticHandlerOptions as RouterCreateStaticHandlerOptions,
   UNSAFE_RouteManifest as RouteManifest,
-  FutureConfig,
 } from "@remix-run/router";
 import {
   IDLE_BLOCKER,

packages/router/README.md

@@ -122,9 +122,10 @@ By default, active loaders will revalidate after any navigation or fetcher mutat
 
 We use _Future Flags_ in the router to help us introduce breaking changes in an opt-in fashion ahead of major releases. Please check out the [blog post][future-flags-post] and [React Router Docs][api-development-strategy] for more information on this process. The currently available future flags in `@remix-run/router` are:
 
-| Flag | Description |
-| `v7_normalizeFormMethod` | Normalize `useNavigation().formMethod` to be an uppercase HTTP Method |
-| `v7_prependBasename` | Prepend the `basename` to incoming `router.navigate`/`router.fetch` paths |
+| Flag                     | Description                                                               |
+| ------------------------ | ------------------------------------------------------------------------- |
+| `v7_normalizeFormMethod` | Normalize `useNavigation().formMethod` to be an uppercase HTTP Method     |
+| `v7_prependBasename`     | Prepend the `basename` to incoming `router.navigate`/`router.fetch` paths |
 
 [react-router]: https://reactrouter.com
 [remix]: https://remix.run