react-router 6.4.0-pre.4 → 6.4.0-pre.7

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # react-router
 
+## 6.4.0-pre.7
+
+### Minor Changes
+
+- Add support for functional updates in `useSearchParams` (similar to the `useState` callback signature) (#8955)
+
+### Patch Changes
+
+- Properly handle relative navigation from index/pathless routes (#8954)
+- Fix issues building with webpack + React 17 (#8938)
+- Updated dependencies
+  - `@remix-run/router@0.2.0-pre.2`
+
+## 6.4.0-pre.6
+
+## 6.4.0-pre.5
+
+### Patch Changes
+
+- Fix broken require for CJS builds
+
 ## 6.4.0-pre.4
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import type { ActionFunction, DataRouteMatch, Fetcher, JsonFunction, LoaderFunction, Location, Navigation, Params, Path, PathMatch, PathPattern, RedirectFunction, RouteMatch, RouteObject, ShouldRevalidateFunction, To } from "@remix-run/router";
+import type { ActionFunction, DataRouteMatch, Fetcher, JsonFunction, LoaderFunction, Location, Navigation, Params, ParamParseKey, Path, PathMatch, PathPattern, RedirectFunction, RouteMatch, RouteObject, ShouldRevalidateFunction, To } from "@remix-run/router";
 import { Action as NavigationType, createPath, generatePath, isRouteErrorResponse, json, matchPath, matchRoutes, parsePath, redirect, resolvePath } from "@remix-run/router";
 import type { DataMemoryRouterProps, MemoryRouterProps, NavigateProps, OutletProps, RouteProps, PathRouteProps, LayoutRouteProps, IndexRouteProps, RouterProps, RoutesProps } from "./lib/components";
 import { createRoutesFromChildren, renderMatches, MemoryRouter, DataMemoryRouter, Navigate, Outlet, Route, Router, Routes, useRenderDataRouter } from "./lib/components";
@@ -9,7 +9,7 @@ import { useHref, useInRouterContext, useLocation, useMatch, useNavigationType,
 declare type Hash = string;
 declare type Pathname = string;
 declare type Search = string;
-export type { ActionFunction, DataMemoryRouterProps, DataRouteMatch, Fetcher, Hash, IndexRouteProps, JsonFunction, LayoutRouteProps, LoaderFunction, Location, MemoryRouterProps, NavigateFunction, NavigateOptions, NavigateProps, Navigation, Navigator, OutletProps, Params, Path, PathMatch, Pathname, PathPattern, PathRouteProps, RedirectFunction, RouteMatch, RouteObject, RouteProps, RouterProps, RoutesProps, Search, ShouldRevalidateFunction, To, };
+export type { ActionFunction, DataMemoryRouterProps, DataRouteMatch, Fetcher, Hash, IndexRouteProps, JsonFunction, LayoutRouteProps, LoaderFunction, Location, MemoryRouterProps, NavigateFunction, NavigateOptions, NavigateProps, Navigation, Navigator, OutletProps, Params, ParamParseKey, Path, PathMatch, Pathname, PathPattern, PathRouteProps, RedirectFunction, RouteMatch, RouteObject, RouteProps, RouterProps, RoutesProps, Search, ShouldRevalidateFunction, To, };
 export { DataMemoryRouter, MemoryRouter, Navigate, NavigationType, Outlet, Route, Router, Routes, createPath, createRoutesFromChildren, isRouteErrorResponse, generatePath, json, matchPath, matchRoutes, parsePath, redirect, renderMatches, resolvePath, useActionData, useHref, useInRouterContext, useLoaderData, useLocation, useMatch, useMatches, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useRoutes, };
 /** @internal */
 export { NavigationContext as UNSAFE_NavigationContext, LocationContext as UNSAFE_LocationContext, RouteContext as UNSAFE_RouteContext, DataRouterContext as UNSAFE_DataRouterContext, DataRouterStateContext as UNSAFE_DataRouterStateContext, useRenderDataRouter, };

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * React Router v6.4.0-pre.4
+ * React Router v6.4.0-pre.7
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -191,6 +191,7 @@ const shim = isServerEnvironment ? useSyncExternalStore$1 : useSyncExternalStore
 const useSyncExternalStore = "useSyncExternalStore" in React ? // @ts-expect-error
 (module => module.useSyncExternalStore)(React) : shim;
 
+// Contexts for data routers
 const DataRouterContext = /*#__PURE__*/React.createContext(null);
 
 if (process.env.NODE_ENV !== "production") {
@@ -317,13 +318,16 @@ function useMatch(pattern) {
   } = useLocation();
   return React.useMemo(() => matchPath(pattern, pathname), [pathname, pattern]);
 }
+/**
+ * The interface for the navigate() function returned from useNavigate().
+ */
+
 /**
  * Returns an imperative method for changing the location. Used by <Link>s, but
  * may also be used by other elements to change the location.
  *
  * @see https://reactrouter.com/docs/en/v6/hooks/use-navigate
  */
-
 function useNavigate() {
   !useInRouterContext() ? process.env.NODE_ENV !== "production" ? invariant(false, // TODO: This error is probably because they somehow have 2 versions of the
   // router loaded. We can help them understand how to avoid that.
@@ -337,8 +341,10 @@ function useNavigate() {
   } = React.useContext(RouteContext);
   let {
     pathname: locationPathname
-  } = useLocation();
-  let routePathnamesJson = JSON.stringify(matches.map(match => match.pathnameBase));
+  } = useLocation(); // Ignore index + pathless matches
+
+  let pathContributingMatches = matches.filter((match, index) => index === 0 || !match.route.index && match.pathnameBase !== matches[index - 1].pathnameBase);
+  let routePathnamesJson = JSON.stringify(pathContributingMatches.map(match => match.pathnameBase));
   let activeRef = React.useRef(false);
   React.useEffect(() => {
     activeRef.current = true;
@@ -521,9 +527,9 @@ function DefaultErrorElement() {
     }
   }, message), error != null && error.stack ? /*#__PURE__*/React.createElement("pre", {
     style: preStyles
-  }, error == null ? void 0 : error.stack) : null, /*#__PURE__*/React.createElement("p", null, "\uD83D\uDCBF Hey developer \uD83D\uDC4B"), /*#__PURE__*/React.createElement("p", null, "You can provide a way better UX than this when your app throws errors by providing your own\u00A0", /*#__PURE__*/React.createElement("code", {
+  }, error == null ? void 0 : error.stack) : null, /*#__PURE__*/React.createElement("p", null, "\uD83D\uDCBF Hey developer \uD83D\uDC4B"), /*#__PURE__*/React.createElement("p", null, "You can provide a way better UX than this when your app throws errors by providing your own\xA0", /*#__PURE__*/React.createElement("code", {
     style: codeStyles
-  }, "errorElement"), " props on\u00A0", /*#__PURE__*/React.createElement("code", {
+  }, "errorElement"), " props on\xA0", /*#__PURE__*/React.createElement("code", {
     style: codeStyles
   }, "<Route>")));
 }
@@ -700,24 +706,20 @@ function useMatches() {
  */
 
 function useLoaderData() {
-  var _state$loaderData;
-
   let state = useDataRouterState(DataRouterHook.UseLoaderData);
   let route = React.useContext(RouteContext);
   !route ? process.env.NODE_ENV !== "production" ? invariant(false, "useLoaderData must be used inside a RouteContext") : invariant(false) : void 0;
   let thisRoute = route.matches[route.matches.length - 1];
   !thisRoute.route.id ? process.env.NODE_ENV !== "production" ? invariant(false, "useLoaderData can only be used on routes that contain a unique \"id\"") : invariant(false) : void 0;
-  return (_state$loaderData = state.loaderData) == null ? void 0 : _state$loaderData[thisRoute.route.id];
+  return state.loaderData[thisRoute.route.id];
 }
 /**
  * Returns the loaderData for the given routeId
  */
 
 function useRouteLoaderData(routeId) {
-  var _state$loaderData2;
-
   let state = useDataRouterState(DataRouterHook.UseRouteLoaderData);
-  return (_state$loaderData2 = state.loaderData) == null ? void 0 : _state$loaderData2[routeId];
+  return state.loaderData[routeId];
 }
 /**
  * Returns the action data for the nearest ancestor Route action
@@ -840,12 +842,12 @@ function DataMemoryRouter(_ref2) {
     })
   });
 }
+
 /**
  * A <Router> that stores all entries in memory.
  *
  * @see https://reactrouter.com/docs/en/v6/routers/memory-router
  */
-
 function MemoryRouter(_ref3) {
   let {
     basename,
@@ -877,6 +879,7 @@ function MemoryRouter(_ref3) {
     navigator: history
   });
 }
+
 /**
  * Changes the current location.
  *
@@ -886,7 +889,6 @@ function MemoryRouter(_ref3) {
  *
  * @see https://reactrouter.com/docs/en/v6/components/navigate
  */
-
 function Navigate(_ref4) {
   let {
     to,
@@ -906,24 +908,25 @@ function Navigate(_ref4) {
   });
   return null;
 }
+
 /**
  * Renders the child route's element, if there is one.
  *
  * @see https://reactrouter.com/docs/en/v6/components/outlet
  */
-
 function Outlet(props) {
   return useOutlet(props.context);
 }
+
 /**
  * Declares an element that should be rendered at a certain URL path.
  *
  * @see https://reactrouter.com/docs/en/v6/components/route
  */
-
 function Route(_props) {
   process.env.NODE_ENV !== "production" ? invariant(false, "A <Route> is only ever to be used as the child of <Routes> element, " + "never rendered directly. Please wrap your <Route> in a <Routes>.") : invariant(false) ;
 }
+
 /**
  * Provides location context for the rest of the app.
  *
@@ -933,7 +936,6 @@ function Route(_props) {
  *
  * @see https://reactrouter.com/docs/en/v6/routers/router
  */
-
 function Router(_ref5) {
   let {
     basename: basenameProp = "/",
@@ -993,13 +995,13 @@ function Router(_ref5) {
     }
   }));
 }
+
 /**
  * A container for a nested tree of <Route> elements that renders the branch
  * that best matches the current location.
  *
  * @see https://reactrouter.com/docs/en/v6/components/routes
  */
-
 function Routes(_ref6) {
   let {
     children,
@@ -1007,13 +1009,13 @@ function Routes(_ref6) {
   } = _ref6;
   return useRoutes(createRoutesFromChildren(children), location);
 }
+
 /**
  * @private
  * Used as an extension to <Routes> and accepts a manual `routes` array to be
  * instead of using JSX children.  Extracted to it's own component to avoid
  * conditional usage of `useRoutes` if we have to render a `fallbackElement`
  */
-
 function DataRoutes(_ref7) {
   let {
     children,