Merge branch 'release-next'

Author: brophdawg11

contributors.yml

@@ -112,6 +112,7 @@
 - jonkoops
 - jrakotoharisoa
 - kachun333
+- juanpprieto
 - kantuni
 - kark
 - KAROTT7

docs/route/should-revalidate.md

@@ -5,6 +5,32 @@ new: true
 
 # `shouldRevalidate`
 
+<details>
+  <summary>Type declaration</summary>
+
+```ts
+interface ShouldRevalidateFunction {
+  (args: ShouldRevalidateFunctionArgs): boolean;
+}
+
+interface ShouldRevalidateFunctionArgs {
+  currentUrl: URL;
+  currentParams: AgnosticDataRouteMatch["params"];
+  nextUrl: URL;
+  nextParams: AgnosticDataRouteMatch["params"];
+  formMethod?: Submission["formMethod"];
+  formAction?: Submission["formAction"];
+  formEncType?: Submission["formEncType"];
+  text?: Submission["text"];
+  formData?: Submission["formData"];
+  json?: Submission["json"];
+  actionResult?: any;
+  defaultShouldRevalidate: boolean;
+}
+```
+
+</details>
+
 This function allows you opt-out of revalidation for a route's loader as an optimization.
 
 <docs-warning>This feature only works if using a data router, see [Picking a Router][pickingarouter]</docs-warning>
@@ -53,27 +79,6 @@ Note that this is only for data that has already been loaded, is currently rende
 
 <docs-warning>Using this API risks your UI getting out of sync with your data, use with caution!</docs-warning>
 
-## Type Declaration
-
-```ts
-interface ShouldRevalidateFunction {
-  (args: {
-    currentUrl: URL;
-    currentParams: AgnosticDataRouteMatch["params"];
-    nextUrl: URL;
-    nextParams: AgnosticDataRouteMatch["params"];
-    formMethod?: Submission["formMethod"];
-    formAction?: Submission["formAction"];
-    formEncType?: Submission["formEncType"];
-    formData?: Submission["formData"];
-    json?: Submission["json"];
-    text?: Submission["text"];
-    actionResult?: DataResult;
-    defaultShouldRevalidate: boolean;
-  }): boolean;
-}
-```
-
 [action]: ./action
 [form]: ../components/form
 [fetcher]: ../hooks/use-fetcher

package.json

@@ -110,7 +110,7 @@
   },
   "filesize": {
     "packages/router/dist/router.umd.min.js": {
-      "none": "47.5 kB"
+      "none": "47.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.16.0
+
+### Minor Changes
+
+- Updated dependencies:
+  - `[email protected]`
+  - `[email protected]`
+
 ## 6.15.0
 
 ### Minor Changes

packages/react-router-dom-v5-compat/index.ts

@@ -47,67 +47,72 @@
  *   deprecate the deep require if we wanted to avoid the duplication here.
  */
 export type {
-  BrowserRouterProps,
-  Hash,
-  HashRouterProps,
-  HistoryRouterProps,
-  LinkProps,
-  Location,
-  Path,
-  To,
-  MemoryRouterProps,
-  NavigateFunction,
-  NavigateOptions,
-  NavigateProps,
-  Navigator,
-  NavLinkProps,
-  OutletProps,
-  Params,
-  ParamParseKey,
-  PathMatch,
-  RouteMatch,
-  RouteObject,
-  RouteProps,
-  PathRouteProps,
-  LayoutRouteProps,
-  IndexRouteProps,
-  RouterProps,
-  Pathname,
-  Search,
-  RoutesProps,
-  ParamKeyValuePair,
-  URLSearchParamsInit,
-  // New stuff from RR 6.4
   ActionFunction,
   ActionFunctionArgs,
   AwaitProps,
-  unstable_Blocker,
-  unstable_BlockerFunction,
+  BrowserRouterProps,
   DataRouteMatch,
   DataRouteObject,
+  ErrorResponse,
   Fetcher,
   FetcherWithComponents,
   FormEncType,
   FormMethod,
   FormProps,
   GetScrollRestorationKeyFunction,
+  Hash,
+  HashRouterProps,
+  HistoryRouterProps,
   IndexRouteObject,
+  IndexRouteProps,
   JsonFunction,
+  LayoutRouteProps,
+  LinkProps,
   LoaderFunction,
   LoaderFunctionArgs,
+  Location,
+  MemoryRouterProps,
+  NavLinkProps,
+  NavigateFunction,
+  NavigateOptions,
+  NavigateProps,
   Navigation,
+  Navigator,
   NonIndexRouteObject,
+  OutletProps,
+  ParamKeyValuePair,
+  ParamParseKey,
+  Params,
+  Path,
+  PathMatch,
   PathPattern,
+  PathRouteProps,
+  Pathname,
   RedirectFunction,
   RelativeRoutingType,
+  RouteMatch,
+  RouteObject,
+  RouteProps,
+  RouterProps,
   RouterProviderProps,
+  RoutesProps,
   ScrollRestorationProps,
+  Search,
   ShouldRevalidateFunction,
+  ShouldRevalidateFunctionArgs,
   SubmitFunction,
   SubmitOptions,
+  To,
+  URLSearchParamsInit,
+  UIMatch,
+  unstable_Blocker,
+  unstable_BlockerFunction,
 } from "./react-router-dom";
 export {
+  AbortedDeferredError,
+  Await,
   BrowserRouter,
+  Form,
   HashRouter,
   Link,
   MemoryRouter,
@@ -117,69 +122,65 @@ export {
   Outlet,
   Route,
   Router,
+  RouterProvider,
   Routes,
+  ScrollRestoration,
+  UNSAFE_DataRouterContext,
+  UNSAFE_DataRouterStateContext,
   UNSAFE_LocationContext,
   UNSAFE_NavigationContext,
   UNSAFE_RouteContext,
+  UNSAFE_useRouteId,
+  UNSAFE_useScrollRestoration,
+  createBrowserRouter,
+  createHashRouter,
+  createMemoryRouter,
   createPath,
   createRoutesFromChildren,
+  createRoutesFromElements,
   createSearchParams,
+  defer,
   generatePath,
+  isRouteErrorResponse,
+  json,
   matchPath,
   matchRoutes,
   parsePath,
+  redirect,
+  redirectDocument,
   renderMatches,
   resolvePath,
   unstable_HistoryRouter,
+  unstable_useBlocker,
+  unstable_usePrompt,
+  useActionData,
+  useAsyncError,
+  useAsyncValue,
+  useBeforeUnload,
+  useFetcher,
+  useFetchers,
+  useFormAction,
   useHref,
   useInRouterContext,
   useLinkClickHandler,
+  useLoaderData,
   useLocation,
   useMatch,
+  useMatches,
   useNavigate,
+  useNavigation,
   useNavigationType,
   useOutlet,
   useOutletContext,
   useParams,
   useResolvedPath,
-  useRoutes,
-  useSearchParams,
-  // New stuff from 6.4
-  AbortedDeferredError,
-  Await,
-  RouterProvider,
-  ScrollRestoration,
-  createBrowserRouter,
-  createHashRouter,
-  createMemoryRouter,
-  createRoutesFromElements,
-  defer,
-  isRouteErrorResponse,
-  Form,
-  json,
-  redirect,
-  redirectDocument,
-  useActionData,
-  useAsyncError,
-  useAsyncValue,
-  useBeforeUnload,
-  unstable_useBlocker,
-  useFetcher,
-  useFetchers,
-  useFormAction,
-  useLoaderData,
-  useMatches,
-  useNavigation,
-  unstable_usePrompt,
   useRevalidator,
   useRouteError,
   useRouteLoaderData,
+  useRoutes,
+  useSearchParams,
   useSubmit,
-  UNSAFE_DataRouterContext,
-  UNSAFE_DataRouterStateContext,
-  UNSAFE_useScrollRestoration,
-  UNSAFE_useRouteId,
 } from "./react-router-dom";
 
 export type { StaticRouterProps } from "./lib/components";
-export { CompatRouter, CompatRoute, StaticRouter } from "./lib/components";
+export { CompatRoute, CompatRouter, StaticRouter } from "./lib/components";

packages/react-router-dom-v5-compat/lib/components.tsx

@@ -66,6 +66,8 @@ export interface StaticRouterProps {
   location: Partial<Location> | string;
 }
 
+const ABSOLUTE_URL_REGEX = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
+
 /**
  * A <Router> that may not navigate to any other location. This is useful
  * on the server where there is no stateful UI.
@@ -93,11 +95,14 @@ export function StaticRouter({
       return typeof to === "string" ? to : createPath(to);
     },
     encodeLocation(to: To) {
-      let path = typeof to === "string" ? parsePath(to) : to;
+      let href = typeof to === "string" ? to : createPath(to);
+      let encoded = ABSOLUTE_URL_REGEX.test(href)
+        ? new URL(href)
+        : new URL(href, "http://localhost");
       return {
-        pathname: path.pathname || "",
-        search: path.search || "",
-        hash: path.hash || "",
+        pathname: encoded.pathname,
+        search: encoded.search,
+        hash: encoded.hash,
       };
     },
     push(to: To) {

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

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

packages/react-router-dom/CHANGELOG.md

@@ -1,5 +1,17 @@
 # `react-router-dom`
 
+## 6.16.0
+
+### Minor Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+  - `[email protected]`
+
+### Patch Changes
+
+- Properly encode rendered URIs in server rendering to avoid hydration errors ([#10769](https://github.com/remix-run/react-router/pull/10769))
+
 ## 6.15.0
 
 ### Minor Changes