react-router 0.0.0-experimental-7ed11be → 0.0.0-experimental-795b50c5b

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # `react-router`
 
+## 7.8.2
+
+### Patch Changes
+
+- \[UNSTABLE] Remove Data Mode `future.unstable_middleware` flag from `createBrowserRouter` ([#14213](https://github.com/remix-run/react-router/pull/14213))
+  - This is only needed as a Framework Mode flag because of the route modules and the `getLoadContext` type behavior change
+  - In Data Mode, it's an opt-in feature because it's just a new property on a route object, so there's no behavior changes that necessitate a flag
+
+- \[UNSTABLE] Add `<RouterProvider unstable_onError>`/`<HydratedRouter unstable_onError>` prop for client side error reporting ([#14162](https://github.com/remix-run/react-router/pull/14162))
+
+- server action revalidation opt out via $SKIP_REVALIDATION field ([#14154](https://github.com/remix-run/react-router/pull/14154))
+
+- Properly escape interpolated param values in `generatePath()` ([#13530](https://github.com/remix-run/react-router/pull/13530))
+
+- Maintain `ReadonlyMap` and `ReadonlySet` types in server response data. ([#13092](https://github.com/remix-run/react-router/pull/13092))
+
+- \[UNSTABLE] Delay serialization of `.data` redirects to 202 responses until after middleware chain ([#14205](https://github.com/remix-run/react-router/pull/14205))
+
+- Fix `TypeError` if you throw from `patchRoutesOnNavigation` when no partial matches exist ([#14198](https://github.com/remix-run/react-router/pull/14198))
+
+- Fix `basename` usage without a leading slash in data routers ([#11671](https://github.com/remix-run/react-router/pull/11671))
+
+- \[UNSTABLE] Update client middleware so it returns the data strategy results allowing for more advanced post-processing middleware ([#14151](https://github.com/remix-run/react-router/pull/14151))
+
 ## 7.8.1
 
 ### Patch Changes

package/dist/development/{chunk-MUVPFEOF.mjs → chunk-7T5JZQAV.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7ed11be
+ * react-router v0.0.0-experimental-795b50c5b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -362,13 +362,13 @@ function createBrowserURLImpl(to, isAbsolute = false) {
 }
 
 // lib/router/utils.ts
-function unstable_createContext(defaultValue) {
+function createContext(defaultValue) {
   return { defaultValue };
 }
 var _map;
-var unstable_RouterContextProvider = class {
+var RouterContextProvider = class {
   /**
-   * Create a new `unstable_RouterContextProvider` instance
+   * Create a new `RouterContextProvider` instance
    * @param init An optional initial context map to populate the provider with
    */
   constructor(init) {
@@ -428,7 +428,7 @@ var unsupportedLazyRouteFunctionKeys = /* @__PURE__ */ new Set([
   "path",
   "id",
   "index",
-  "unstable_middleware",
+  "middleware",
   "children"
 ]);
 function isUnsupportedLazyRouteFunctionKey(key) {
@@ -1009,7 +1009,6 @@ function createRouter(init) {
   }
   let dataStrategyImpl = init.dataStrategy || defaultDataStrategyWithMiddleware;
   let future = {
-    unstable_middleware: false,
     ...init.future
   };
   let unlistenHistory = null;
@@ -1467,7 +1466,7 @@ function createRouter(init) {
       pendingNavigationController.signal,
       opts && opts.submission
     );
-    let scopedContext = init.unstable_getContext ? await init.unstable_getContext() : new unstable_RouterContextProvider();
+    let scopedContext = init.getContext ? await init.getContext() : new RouterContextProvider();
     let pendingActionResult;
     if (opts && opts.pendingError) {
       pendingActionResult = [
@@ -1757,7 +1756,7 @@ function createRouter(init) {
       pendingActionResult
     );
     pendingNavigationLoadId = ++incrementingLoadId;
-    if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && !dsMatches.some((m) => m.route.unstable_middleware) && revalidatingFetchers.length === 0) {
+    if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && !dsMatches.some((m) => m.route.middleware) && revalidatingFetchers.length === 0) {
       let updatedFetchers2 = markFetchRedirectsDone();
       completeNavigation(
         location,
@@ -1911,7 +1910,7 @@ function createRouter(init) {
       setFetcherError(key, routeId, error, { flushSync });
       return;
     }
-    let scopedContext = init.unstable_getContext ? await init.unstable_getContext() : new unstable_RouterContextProvider();
+    let scopedContext = init.getContext ? await init.getContext() : new RouterContextProvider();
     let preventScrollReset = (opts && opts.preventScrollReset) === true;
     if (submission && isMutationMethod(submission.formMethod)) {
       await handleFetcherAction(
@@ -2438,10 +2437,6 @@ function createRouter(init) {
     }
     return state.fetchers.get(key) || IDLE_FETCHER;
   }
-  function resetFetcher(key, opts) {
-    abortFetcher(key, opts?.reason);
-    updateFetcherState(key, getDoneFetcher(null));
-  }
   function deleteFetcher(key) {
     let fetcher = state.fetchers.get(key);
     if (fetchControllers.has(key) && !(fetcher && fetcher.state === "loading" && fetchReloadIds.has(key))) {
@@ -2464,10 +2459,10 @@ function createRouter(init) {
     }
     updateState({ fetchers: new Map(state.fetchers) });
   }
-  function abortFetcher(key, reason) {
+  function abortFetcher(key) {
     let controller = fetchControllers.get(key);
     if (controller) {
-      controller.abort(reason);
+      controller.abort();
       fetchControllers.delete(key);
     }
   }
@@ -2731,7 +2726,6 @@ function createRouter(init) {
     createHref: (to) => init.history.createHref(to),
     encodeLocation: (to) => init.history.encodeLocation(to),
     getFetcher,
-    resetFetcher,
     deleteFetcher: queueFetcherForDeletion,
     dispose,
     getBlocker,
@@ -2767,13 +2761,13 @@ function createStaticHandler(routes, opts) {
     skipLoaderErrorBubbling,
     skipRevalidation,
     dataStrategy,
-    unstable_generateMiddlewareResponse: generateMiddlewareResponse
+    generateMiddlewareResponse
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
     let location = createLocation("", createPath(url), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
-    requestContext = requestContext != null ? requestContext : new unstable_RouterContextProvider();
+    requestContext = requestContext != null ? requestContext : new RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD") {
       let error = getInternalRouterError(405, { method });
       let { matches: methodNotAllowedMatches, route } = getShortCircuitMatches(dataRoutes);
@@ -2811,8 +2805,8 @@ function createStaticHandler(routes, opts) {
     }
     if (generateMiddlewareResponse) {
       invariant(
-        requestContext instanceof unstable_RouterContextProvider,
-        "When using middleware in `staticHandler.query()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
+        requestContext instanceof RouterContextProvider,
+        "When using middleware in `staticHandler.query()`, any provided `requestContext` must be an instance of `RouterContextProvider`"
       );
       try {
         await loadLazyMiddlewareForMatches(
@@ -2832,7 +2826,7 @@ function createStaticHandler(routes, opts) {
           },
           async () => {
             let res = await generateMiddlewareResponse(
-              async (revalidationRequest) => {
+              async (revalidationRequest, opts2 = {}) => {
                 let result2 = await queryImpl(
                   revalidationRequest,
                   location,
@@ -2841,7 +2835,7 @@ function createStaticHandler(routes, opts) {
                   dataStrategy || null,
                   skipLoaderErrorBubbling === true,
                   null,
-                  filterMatchesToLoad || null,
+                  "filterMatchesToLoad" in opts2 ? opts2.filterMatchesToLoad ?? null : null,
                   skipRevalidation === true
                 );
                 if (isResponse(result2)) {
@@ -2939,13 +2933,13 @@ function createStaticHandler(routes, opts) {
     routeId,
     requestContext,
     dataStrategy,
-    unstable_generateMiddlewareResponse: generateMiddlewareResponse
+    generateMiddlewareResponse
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
     let location = createLocation("", createPath(url), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
-    requestContext = requestContext != null ? requestContext : new unstable_RouterContextProvider();
+    requestContext = requestContext != null ? requestContext : new RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD" && method !== "OPTIONS") {
       throw getInternalRouterError(405, { method });
     } else if (!matches) {
@@ -2962,8 +2956,8 @@ function createStaticHandler(routes, opts) {
     }
     if (generateMiddlewareResponse) {
       invariant(
-        requestContext instanceof unstable_RouterContextProvider,
-        "When using middleware in `staticHandler.queryRoute()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
+        requestContext instanceof RouterContextProvider,
+        "When using middleware in `staticHandler.queryRoute()`, any provided `requestContext` must be an instance of `RouterContextProvider`"
       );
       await loadLazyMiddlewareForMatches(matches, manifest, mapRouteProperties2);
       let response = await runServerMiddlewarePipeline(
@@ -3953,11 +3947,11 @@ function isNonNullable(value) {
 }
 function loadLazyMiddlewareForMatches(matches, manifest, mapRouteProperties2) {
   let promises = matches.map(({ route }) => {
-    if (typeof route.lazy !== "object" || !route.lazy.unstable_middleware) {
+    if (typeof route.lazy !== "object" || !route.lazy.middleware) {
       return void 0;
     }
     return loadLazyRouteProperty({
-      key: "unstable_middleware",
+      key: "middleware",
       route,
       manifest,
       mapRouteProperties: mapRouteProperties2
@@ -3975,7 +3969,7 @@ async function defaultDataStrategy(args) {
   return keyedResults;
 }
 async function defaultDataStrategyWithMiddleware(args) {
-  if (!args.matches.some((m) => m.route.unstable_middleware)) {
+  if (!args.matches.some((m) => m.route.middleware)) {
     return defaultDataStrategy(args);
   }
   return runClientMiddlewarePipeline(args, () => defaultDataStrategy(args));
@@ -4029,7 +4023,7 @@ function runClientMiddlewarePipeline(args, handler) {
 async function runMiddlewarePipeline(args, handler, processResult, isResult, errorHandler) {
   let { matches, request, params, context } = args;
   let tuples = matches.flatMap(
-    (m) => m.route.unstable_middleware ? m.route.unstable_middleware.map((fn) => [m.route.id, fn]) : []
+    (m) => m.route.middleware ? m.route.middleware.map((fn) => [m.route.id, fn]) : []
   );
   let result = await callRouteMiddleware(
     { request, params, context },
@@ -4092,7 +4086,7 @@ async function callRouteMiddleware(args, middlewares, handler, processResult, is
 }
 function getDataStrategyMatchLazyPromises(mapRouteProperties2, manifest, request, match, lazyRoutePropertiesToSkip) {
   let lazyMiddlewarePromise = loadLazyRouteProperty({
-    key: "unstable_middleware",
+    key: "middleware",
     route: match.route,
     manifest,
     mapRouteProperties: mapRouteProperties2
@@ -4192,9 +4186,9 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
     context: scopedContext,
     matches
   };
-  let unstable_runClientMiddleware = isStaticHandler ? () => {
+  let runClientMiddleware = isStaticHandler ? () => {
     throw new Error(
-      "You cannot call `unstable_runClientMiddleware()` from a static handler `dataStrategy`. Middleware is run outside of `dataStrategy` during SSR in order to bubble up the Response.  You can enable middleware via the `respond` API in `query`/`queryRoute`"
+      "You cannot call `runClientMiddleware()` from a static handler `dataStrategy`. Middleware is run outside of `dataStrategy` during SSR in order to bubble up the Response.  You can enable middleware via the `respond` API in `query`/`queryRoute`"
     );
   } : (cb) => {
     let typedDataStrategyArgs = dataStrategyArgs;
@@ -4202,9 +4196,9 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
       return cb({
         ...typedDataStrategyArgs,
         fetcherKey,
-        unstable_runClientMiddleware: () => {
+        runClientMiddleware: () => {
           throw new Error(
-            "Cannot call `unstable_runClientMiddleware()` from within an `unstable_runClientMiddleware` handler"
+            "Cannot call `runClientMiddleware()` from within an `runClientMiddleware` handler"
           );
         }
       });
@@ -4213,7 +4207,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
   let results = await dataStrategyImpl({
     ...dataStrategyArgs,
     fetcherKey,
-    unstable_runClientMiddleware
+    runClientMiddleware
   });
   try {
     await Promise.all(
@@ -4932,6 +4926,7 @@ var FetchersContext = React.createContext(
 FetchersContext.displayName = "Fetchers";
 var AwaitContext = React.createContext(null);
 AwaitContext.displayName = "Await";
+var AwaitContextProvider = (props) => React.createElement(AwaitContext.Provider, props);
 var NavigationContext = React.createContext(
   null
 );
@@ -5599,7 +5594,7 @@ var hydrationRouteProperties = [
 function createMemoryRouter(routes, opts) {
   return createRouter({
     basename: opts?.basename,
-    unstable_getContext: opts?.unstable_getContext,
+    getContext: opts?.getContext,
     future: opts?.future,
     history: createMemoryHistory({
       initialEntries: opts?.initialEntries,
@@ -7103,7 +7098,7 @@ function getTurboStreamSingleFetchDataStrategy(getRouter, manifest, routeModules
     ssr,
     basename
   );
-  return async (args) => args.unstable_runClientMiddleware(dataStrategy);
+  return async (args) => args.runClientMiddleware(dataStrategy);
 }
 function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode, ssr, basename, shouldAllowOptOut = () => true) {
   return async (args) => {
@@ -7899,7 +7894,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
       Object.assign(dataRoute, {
         ...dataRoute,
         ...getRouteComponents(route, routeModule, isSpaMode),
-        unstable_middleware: routeModule.unstable_clientMiddleware,
+        middleware: routeModule.clientMiddleware,
         handle: routeModule.handle,
         shouldRevalidate: getShouldRevalidateFunction(
           dataRoute.path,
@@ -8041,17 +8036,14 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
             }
           });
         } : void 0,
-        unstable_middleware: route.hasClientMiddleware ? async () => {
-          let { unstable_clientMiddleware } = route.clientMiddlewareModule ? await import(
+        middleware: route.hasClientMiddleware ? async () => {
+          let { clientMiddleware } = route.clientMiddlewareModule ? await import(
             /* @vite-ignore */
             /* webpackIgnore: true */
             route.clientMiddlewareModule
           ) : await getLazyRoute();
-          invariant2(
-            unstable_clientMiddleware,
-            "No `unstable_clientMiddleware` export found"
-          );
-          return unstable_clientMiddleware;
+          invariant2(clientMiddleware, "No `clientMiddleware` export found");
+          return clientMiddleware;
         } : void 0,
         shouldRevalidate: async () => {
           let lazyRoute = await getLazyRoute();
@@ -8132,7 +8124,7 @@ async function loadRouteModuleWithBlockingLinks(route, routeModules) {
   return {
     Component: getRouteModuleComponent(routeModule),
     ErrorBoundary: routeModule.ErrorBoundary,
-    unstable_clientMiddleware: routeModule.unstable_clientMiddleware,
+    clientMiddleware: routeModule.clientMiddleware,
     clientAction: routeModule.clientAction,
     clientLoader: routeModule.clientLoader,
     handle: routeModule.handle,
@@ -8975,14 +8967,14 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "0.0.0-experimental-7ed11be";
+    "0.0.0-experimental-795b50c5b";
   }
 } catch (e) {
 }
 function createBrowserRouter(routes, opts) {
   return createRouter({
     basename: opts?.basename,
-    unstable_getContext: opts?.unstable_getContext,
+    getContext: opts?.getContext,
     future: opts?.future,
     history: createBrowserHistory({ window: opts?.window }),
     hydrationData: opts?.hydrationData || parseHydrationData(),
@@ -8997,7 +8989,7 @@ function createBrowserRouter(routes, opts) {
 function createHashRouter(routes, opts) {
   return createRouter({
     basename: opts?.basename,
-    unstable_getContext: opts?.unstable_getContext,
+    getContext: opts?.getContext,
     future: opts?.future,
     history: createHashHistory({ window: opts?.window }),
     hydrationData: opts?.hydrationData || parseHydrationData(),
@@ -9589,7 +9581,6 @@ function useFetcher({
     },
     [fetcherKey, submitImpl]
   );
-  let unstable_reset = React10.useCallback((opts) => router.resetFetcher(fetcherKey, opts), [router, fetcherKey]);
   let FetcherForm = React10.useMemo(() => {
     let FetcherForm2 = React10.forwardRef(
       (props, ref) => {
@@ -9606,11 +9597,10 @@ function useFetcher({
       Form: FetcherForm,
       submit,
       load,
-      unstable_reset,
       ...fetcher,
       data: data2
     }),
-    [FetcherForm, submit, load, unstable_reset, fetcher, data2]
+    [FetcherForm, submit, load, fetcher, data2]
   );
   return fetcherWithComponents;
 }
@@ -9968,7 +9958,7 @@ function createStaticRouter(routes, context, opts = {}) {
     },
     get future() {
       return {
-        unstable_middleware: false,
+        v8_middleware: false,
         ...opts?.future
       };
     },
@@ -10021,9 +10011,6 @@ function createStaticRouter(routes, context, opts = {}) {
     deleteFetcher() {
       throw msg("deleteFetcher");
     },
-    resetFetcher() {
-      throw msg("resetFetcher");
-    },
     dispose() {
       throw msg("dispose");
     },
@@ -10077,8 +10064,8 @@ export {
   invariant,
   createPath,
   parsePath,
-  unstable_createContext,
-  unstable_RouterContextProvider,
+  createContext,
+  RouterContextProvider,
   convertRoutesToDataRoutes,
   matchRoutes,
   generatePath,
@@ -10107,6 +10094,7 @@ export {
   RSCRouterContext,
   ViewTransitionContext,
   FetchersContext,
+  AwaitContextProvider,
   NavigationContext,
   LocationContext,
   RouteContext,