react-router-dom-v5-compat 6.26.2-pre.0 → 6.27.0-pre.0

package/dist/main.js

@@ -1,5 +1,5 @@
 /**
- * React Router DOM v5 Compat v6.26.2-pre.0
+ * React Router DOM v5 Compat v6.27.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/react-router-dom/dom.d.ts

@@ -73,7 +73,7 @@ interface SharedSubmitOptions {
     /**
      * Enable flushSync for this submission's state updates
      */
-    unstable_flushSync?: boolean;
+    flushSync?: boolean;
 }
 /**
  * Submit options available to fetchers
@@ -105,7 +105,7 @@ export interface SubmitOptions extends FetcherSubmitOptions {
     /**
      * Enable view transitions on this submission navigation
      */
-    unstable_viewTransition?: boolean;
+    viewTransition?: boolean;
 }
 export declare function getFormSubmissionInfo(target: SubmitTarget, basename: string): {
     action: string | null;

package/dist/react-router-dom/index.d.ts

@@ -3,14 +3,14 @@
  * you'll need to update the rollup config for react-router-dom-v5-compat.
  */
 import * as React from "react";
-import type { FutureConfig, Location, NavigateOptions, RelativeRoutingType, RouteObject, RouterProviderProps, To, unstable_DataStrategyFunction, unstable_PatchRoutesOnNavigationFunction } from "react-router";
+import type { FutureConfig, Location, NavigateOptions, RelativeRoutingType, RouteObject, RouterProviderProps, To, DataStrategyFunction, PatchRoutesOnNavigationFunction } from "react-router";
 import type { Fetcher, FormEncType, FormMethod, FutureConfig as RouterFutureConfig, GetScrollRestorationKeyFunction, History, HTMLFormMethod, HydrationState, Router as RemixRouter, V7_FormMethod, BlockerFunction } from "@remix-run/router";
 import { UNSAFE_ErrorResponseImpl as ErrorResponseImpl } from "@remix-run/router";
 import type { SubmitOptions, ParamKeyValuePair, URLSearchParamsInit, SubmitTarget, FetcherSubmitOptions } from "./dom";
 import { createSearchParams } from "./dom";
 export type { FormEncType, FormMethod, GetScrollRestorationKeyFunction, ParamKeyValuePair, SubmitOptions, URLSearchParamsInit, V7_FormMethod, };
 export { createSearchParams, ErrorResponseImpl as UNSAFE_ErrorResponseImpl };
-export type { ActionFunction, ActionFunctionArgs, AwaitProps, Blocker, BlockerFunction, DataRouteMatch, DataRouteObject, unstable_DataStrategyFunction, unstable_DataStrategyFunctionArgs, unstable_DataStrategyMatch, unstable_DataStrategyResult, ErrorResponse, Fetcher, FutureConfig, Hash, IndexRouteObject, IndexRouteProps, JsonFunction, LazyRouteFunction, LayoutRouteProps, LoaderFunction, LoaderFunctionArgs, Location, MemoryRouterProps, NavigateFunction, NavigateOptions, NavigateProps, Navigation, Navigator, NonIndexRouteObject, OutletProps, Params, ParamParseKey, Path, PathMatch, Pathname, PathParam, PathPattern, PathRouteProps, RedirectFunction, RelativeRoutingType, RouteMatch, RouteObject, RouteProps, RouterProps, RouterProviderProps, RoutesProps, Search, ShouldRevalidateFunction, ShouldRevalidateFunctionArgs, To, UIMatch, unstable_PatchRoutesOnNavigationFunction, } from "react-router";
+export type { ActionFunction, ActionFunctionArgs, AwaitProps, Blocker, BlockerFunction, DataRouteMatch, DataRouteObject, DataStrategyFunction, DataStrategyFunctionArgs, DataStrategyMatch, DataStrategyResult, ErrorResponse, Fetcher, FutureConfig, Hash, IndexRouteObject, IndexRouteProps, JsonFunction, LazyRouteFunction, LayoutRouteProps, LoaderFunction, LoaderFunctionArgs, Location, MemoryRouterProps, NavigateFunction, NavigateOptions, NavigateProps, Navigation, Navigator, NonIndexRouteObject, OutletProps, Params, ParamParseKey, PatchRoutesOnNavigationFunction, PatchRoutesOnNavigationFunctionArgs, Path, PathMatch, Pathname, PathParam, PathPattern, PathRouteProps, RedirectFunction, RelativeRoutingType, RouteMatch, RouteObject, RouteProps, RouterProps, RouterProviderProps, RoutesProps, Search, ShouldRevalidateFunction, ShouldRevalidateFunctionArgs, To, UIMatch, } from "react-router";
 export { AbortedDeferredError, Await, MemoryRouter, Navigate, NavigationType, Outlet, Route, Router, Routes, createMemoryRouter, createPath, createRoutesFromChildren, createRoutesFromElements, defer, isRouteErrorResponse, generatePath, json, matchPath, matchRoutes, parsePath, redirect, redirectDocument, replace, renderMatches, resolvePath, useActionData, useAsyncError, useAsyncValue, useBlocker, useHref, useInRouterContext, useLoaderData, useLocation, useMatch, useMatches, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useRoutes, } from "react-router";
 /** @internal */
 export { UNSAFE_DataRouterContext, UNSAFE_DataRouterStateContext, UNSAFE_NavigationContext, UNSAFE_LocationContext, UNSAFE_RouteContext, UNSAFE_useRouteId, } from "react-router";
@@ -25,8 +25,8 @@ interface DOMRouterOpts {
     basename?: string;
     future?: Partial<Omit<RouterFutureConfig, "v7_prependBasename">>;
     hydrationData?: HydrationState;
-    unstable_dataStrategy?: unstable_DataStrategyFunction;
-    unstable_patchRoutesOnNavigation?: unstable_PatchRoutesOnNavigationFunction;
+    dataStrategy?: DataStrategyFunction;
+    patchRoutesOnNavigation?: PatchRoutesOnNavigationFunction;
     window?: Window;
 }
 export declare function createBrowserRouter(routes: RouteObject[], opts?: DOMRouterOpts): RemixRouter;
@@ -99,7 +99,7 @@ export interface LinkProps extends Omit<React.AnchorHTMLAttributes<HTMLAnchorEle
     preventScrollReset?: boolean;
     relative?: RelativeRoutingType;
     to: To;
-    unstable_viewTransition?: boolean;
+    viewTransition?: boolean;
 }
 /**
  * The public API for rendering a history-aware `<a>`.
@@ -190,7 +190,7 @@ export interface FormProps extends SharedFormProps {
     /**
      * Enable view transitions on this Form navigation
      */
-    unstable_viewTransition?: boolean;
+    viewTransition?: boolean;
 }
 /**
  * A `@remix-run/router`-aware `<form>`. It behaves like a normal form except
@@ -216,13 +216,13 @@ export declare namespace ScrollRestoration {
  * you need to create custom `<Link>` components with the same click behavior we
  * use in our exported `<Link>`.
  */
-export declare function useLinkClickHandler<E extends Element = HTMLAnchorElement>(to: To, { target, replace: replaceProp, state, preventScrollReset, relative, unstable_viewTransition, }?: {
+export declare function useLinkClickHandler<E extends Element = HTMLAnchorElement>(to: To, { target, replace: replaceProp, state, preventScrollReset, relative, viewTransition, }?: {
     target?: React.HTMLAttributeAnchorTarget;
     replace?: boolean;
     state?: any;
     preventScrollReset?: boolean;
     relative?: RelativeRoutingType;
-    unstable_viewTransition?: boolean;
+    viewTransition?: boolean;
 }): (event: React.MouseEvent<E, MouseEvent>) => void;
 /**
  * A convenient wrapper for reading and writing search parameters via the
@@ -268,7 +268,7 @@ export type FetcherWithComponents<TData> = Fetcher<TData> & {
     Form: React.ForwardRefExoticComponent<FetcherFormProps & React.RefAttributes<HTMLFormElement>>;
     submit: FetcherSubmitFunction;
     load: (href: string, opts?: {
-        unstable_flushSync?: boolean;
+        flushSync?: boolean;
     }) => void;
 };
 /**
@@ -328,4 +328,4 @@ export { usePrompt as unstable_usePrompt };
 declare function useViewTransitionState(to: To, opts?: {
     relative?: RelativeRoutingType;
 }): boolean;
-export { useViewTransitionState as unstable_useViewTransitionState };
+export { useViewTransitionState as useViewTransitionState };

package/dist/umd/react-router-dom-v5-compat.development.js

@@ -1,5 +1,5 @@
 /**
- * React Router DOM v5 Compat v6.26.2-pre.0
+ * React Router DOM v5 Compat v6.27.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -250,9 +250,9 @@
     };
   }
 
-  const _excluded = ["onClick", "relative", "reloadDocument", "replace", "state", "target", "to", "preventScrollReset", "unstable_viewTransition"],
-    _excluded2 = ["aria-current", "caseSensitive", "className", "end", "style", "to", "unstable_viewTransition", "children"],
-    _excluded3 = ["fetcherKey", "navigate", "reloadDocument", "replace", "state", "method", "action", "onSubmit", "relative", "preventScrollReset", "unstable_viewTransition"];
+  const _excluded = ["onClick", "relative", "reloadDocument", "replace", "state", "target", "to", "preventScrollReset", "viewTransition"],
+    _excluded2 = ["aria-current", "caseSensitive", "className", "end", "style", "to", "viewTransition", "children"],
+    _excluded3 = ["fetcherKey", "navigate", "reloadDocument", "replace", "state", "method", "action", "onSubmit", "relative", "preventScrollReset", "viewTransition"];
   //#endregion
   // HEY YOU! DON'T TOUCH THIS VARIABLE!
   //
@@ -285,8 +285,8 @@
       hydrationData: (opts == null ? void 0 : opts.hydrationData) || parseHydrationData(),
       routes,
       mapRouteProperties: reactRouter.UNSAFE_mapRouteProperties,
-      unstable_dataStrategy: opts == null ? void 0 : opts.unstable_dataStrategy,
-      unstable_patchRoutesOnNavigation: opts == null ? void 0 : opts.unstable_patchRoutesOnNavigation,
+      dataStrategy: opts == null ? void 0 : opts.dataStrategy,
+      patchRoutesOnNavigation: opts == null ? void 0 : opts.patchRoutesOnNavigation,
       window: opts == null ? void 0 : opts.window
     }).initialize();
   }
@@ -302,8 +302,8 @@
       hydrationData: (opts == null ? void 0 : opts.hydrationData) || parseHydrationData(),
       routes,
       mapRouteProperties: reactRouter.UNSAFE_mapRouteProperties,
-      unstable_dataStrategy: opts == null ? void 0 : opts.unstable_dataStrategy,
-      unstable_patchRoutesOnNavigation: opts == null ? void 0 : opts.unstable_patchRoutesOnNavigation,
+      dataStrategy: opts == null ? void 0 : opts.dataStrategy,
+      patchRoutesOnNavigation: opts == null ? void 0 : opts.patchRoutesOnNavigation,
       window: opts == null ? void 0 : opts.window
     }).initialize();
   }
@@ -478,8 +478,8 @@
     let setState = React__namespace.useCallback((newState, _ref2) => {
       let {
         deletedFetchers,
-        unstable_flushSync: flushSync,
-        unstable_viewTransitionOpts: viewTransitionOpts
+        flushSync: flushSync,
+        viewTransitionOpts: viewTransitionOpts
       } = _ref2;
       deletedFetchers.forEach(key => fetcherData.current.delete(key));
       newState.fetchers.forEach((fetcher, key) => {
@@ -815,7 +815,7 @@
         target,
         to,
         preventScrollReset,
-        unstable_viewTransition
+        viewTransition
       } = _ref7,
       rest = _objectWithoutPropertiesLoose(_ref7, _excluded);
     let {
@@ -858,7 +858,7 @@
       target,
       preventScrollReset,
       relative,
-      unstable_viewTransition
+      viewTransition
     });
     function handleClick(event) {
       if (onClick) onClick(event);
@@ -891,7 +891,7 @@
         end = false,
         style: styleProp,
         to,
-        unstable_viewTransition,
+        viewTransition,
         children
       } = _ref8,
       rest = _objectWithoutPropertiesLoose(_ref8, _excluded2);
@@ -907,7 +907,7 @@
     let isTransitioning = routerState != null &&
     // Conditional usage is OK here because the usage of a data router is static
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    useViewTransitionState(path) && unstable_viewTransition === true;
+    useViewTransitionState(path) && viewTransition === true;
     let toPathname = navigator.encodeLocation ? navigator.encodeLocation(path).pathname : path.pathname;
     let locationPathname = location.pathname;
     let nextLocationPathname = routerState && routerState.navigation && routerState.navigation.location ? routerState.navigation.location.pathname : null;
@@ -952,7 +952,7 @@
       ref: ref,
       style: style,
       to: to,
-      unstable_viewTransition: unstable_viewTransition
+      viewTransition: viewTransition
     }), typeof children === "function" ? children(renderProps) : children);
   });
   {
@@ -989,7 +989,7 @@
         onSubmit,
         relative,
         preventScrollReset,
-        unstable_viewTransition
+        viewTransition
       } = _ref9,
       props = _objectWithoutPropertiesLoose(_ref9, _excluded3);
     let submit = useSubmit();
@@ -1011,7 +1011,7 @@
         state,
         relative,
         preventScrollReset,
-        unstable_viewTransition
+        viewTransition
       });
     };
     return /*#__PURE__*/React__namespace.createElement("form", _extends({
@@ -1089,7 +1089,7 @@
       state,
       preventScrollReset,
       relative,
-      unstable_viewTransition
+      viewTransition
     } = _temp === void 0 ? {} : _temp;
     let navigate = reactRouter.useNavigate();
     let location = reactRouter.useLocation();
@@ -1108,10 +1108,10 @@
           state,
           preventScrollReset,
           relative,
-          unstable_viewTransition
+          viewTransition
         });
       }
-    }, [location, navigate, path, replaceProp, state, target, to, preventScrollReset, relative, unstable_viewTransition]);
+    }, [location, navigate, path, replaceProp, state, target, to, preventScrollReset, relative, viewTransition]);
   }
 
   /**
@@ -1185,7 +1185,7 @@
           body,
           formMethod: options.method || method,
           formEncType: options.encType || encType,
-          unstable_flushSync: options.unstable_flushSync
+          flushSync: options.flushSync
         });
       } else {
         router.navigate(options.action || action, {
@@ -1197,8 +1197,8 @@
           replace: options.replace,
           state: options.state,
           fromRouteId: currentRouteId,
-          unstable_flushSync: options.unstable_flushSync,
-          unstable_viewTransition: options.unstable_viewTransition
+          flushSync: options.flushSync,
+          viewTransition: options.viewTransition
         });
       }
     }, [router, basename, currentRouteId]);
@@ -1235,9 +1235,13 @@
       // since it might not apply to our contextual route.  We add it back based
       // on match.route.index below
       let params = new URLSearchParams(path.search);
-      if (params.has("index") && params.get("index") === "") {
+      let indexValues = params.getAll("index");
+      let hasNakedIndexParam = indexValues.some(v => v === "");
+      if (hasNakedIndexParam) {
         params.delete("index");
-        path.search = params.toString() ? "?" + params.toString() : "";
+        indexValues.filter(v => v).forEach(v => params.append("index", v));
+        let qs = params.toString();
+        path.search = qs ? "?" + qs : "";
       }
     }
     if ((!action || action === ".") && match.route.index) {
@@ -1548,7 +1552,7 @@
       opts = {};
     }
     let vtContext = React__namespace.useContext(ViewTransitionContext);
-    !(vtContext != null) ? router.UNSAFE_invariant(false, "`unstable_useViewTransitionState` must be used within `react-router-dom`'s `RouterProvider`.  " + "Did you accidentally import `RouterProvider` from `react-router`?")  : void 0;
+    !(vtContext != null) ? router.UNSAFE_invariant(false, "`useViewTransitionState` must be used within `react-router-dom`'s `RouterProvider`.  " + "Did you accidentally import `RouterProvider` from `react-router`?")  : void 0;
     let {
       basename
     } = useDataRouterContext(DataRouterHook.useViewTransitionState);
@@ -1565,11 +1569,11 @@
     // destination.  This ensures that other PUSH navigations that reverse
     // an indicated transition apply.  I.e., on the list view you have:
     //
-    //   <NavLink to="/details/1" unstable_viewTransition>
+    //   <NavLink to="/details/1" viewTransition>
     //
     // If you click the breadcrumb back to the list view:
     //
-    //   <NavLink to="/list" unstable_viewTransition>
+    //   <NavLink to="/list" viewTransition>
     //
     // We should apply the transition because it's indicated as active going
     // from /list -> /details/1 and therefore should be active on the reverse