react-router 7.7.1 → 7.8.0-pre.0

package/dist/production/{chunk-IZ57JD2V.mjs → chunk-X2NPJMV2.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.7.1
+ * react-router v7.8.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -367,6 +367,10 @@ function unstable_createContext(defaultValue) {
 }
 var _map;
 var unstable_RouterContextProvider = class {
+  /**
+   * Create a new `unstable_RouterContextProvider` instance
+   * @param init An optional initial context map to populate the provider with
+   */
   constructor(init) {
     __privateAdd(this, _map, /* @__PURE__ */ new Map());
     if (init) {
@@ -375,6 +379,14 @@ var unstable_RouterContextProvider = class {
       }
     }
   }
+  /**
+   * Access a value from the context. If no value has been set for the context,
+   * it will return the context's `defaultValue` if provided, or throw an error
+   * if no `defaultValue` was set.
+   * @param context The context to get the value for
+   * @returns The value for the context, or the context's `defaultValue` if no
+   * value was set
+   */
   get(context) {
     if (__privateGet(this, _map).has(context)) {
       return __privateGet(this, _map).get(context);
@@ -384,6 +396,14 @@ var unstable_RouterContextProvider = class {
     }
     throw new Error("No value found for context");
   }
+  /**
+   * Set a value for the context. If the context already has a value set, this
+   * will overwrite it.
+   *
+   * @param context The context to set the value for
+   * @param value The value to set for the context
+   * @returns {void}
+   */
   set(context, value) {
     __privateGet(this, _map).set(context, value);
   }
@@ -489,6 +509,7 @@ function convertRouteMatchToUiMatch(match, loaderData) {
     pathname,
     params,
     data: loaderData[route.id],
+    loaderData: loaderData[route.id],
     handle: route.handle
   };
 }
@@ -1434,9 +1455,7 @@ function createRouter(init) {
       pendingNavigationController.signal,
       opts && opts.submission
     );
-    let scopedContext = new unstable_RouterContextProvider(
-      init.unstable_getContext ? await init.unstable_getContext() : void 0
-    );
+    let scopedContext = init.unstable_getContext ? await init.unstable_getContext() : new unstable_RouterContextProvider();
     let pendingActionResult;
     if (opts && opts.pendingError) {
       pendingActionResult = [
@@ -1703,7 +1722,7 @@ function createRouter(init) {
       pendingActionResult
     );
     pendingNavigationLoadId = ++incrementingLoadId;
-    if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && revalidatingFetchers.length === 0) {
+    if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && !dsMatches.some((m) => m.route.unstable_middleware) && revalidatingFetchers.length === 0) {
       let updatedFetchers2 = markFetchRedirectsDone();
       completeNavigation(
         location,
@@ -1857,9 +1876,7 @@ function createRouter(init) {
       setFetcherError(key, routeId, error, { flushSync });
       return;
     }
-    let scopedContext = new unstable_RouterContextProvider(
-      init.unstable_getContext ? await init.unstable_getContext() : void 0
-    );
+    let scopedContext = init.unstable_getContext ? await init.unstable_getContext() : new unstable_RouterContextProvider();
     let preventScrollReset = (opts && opts.preventScrollReset) === true;
     if (submission && isMutationMethod(submission.formMethod)) {
       await handleFetcherAction(
@@ -2710,20 +2727,13 @@ function createStaticHandler(routes, opts) {
     skipLoaderErrorBubbling,
     skipRevalidation,
     dataStrategy,
-    unstable_stream: stream,
-    unstable_respond: respond
+    unstable_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();
-    let respondOrStreamStaticContext = (ctx) => {
-      return stream ? stream(
-        requestContext,
-        () => Promise.resolve(ctx)
-      ) : respond ? respond(ctx) : ctx;
-    };
     if (!isValidMethod(method) && method !== "HEAD") {
       let error = getInternalRouterError(405, { method });
       let { matches: methodNotAllowedMatches, route } = getShortCircuitMatches(dataRoutes);
@@ -2740,7 +2750,7 @@ function createStaticHandler(routes, opts) {
         loaderHeaders: {},
         actionHeaders: {}
       };
-      return respondOrStreamStaticContext(staticContext);
+      return generateMiddlewareResponse ? generateMiddlewareResponse(() => Promise.resolve(staticContext)) : staticContext;
     } else if (!matches) {
       let error = getInternalRouterError(404, { pathname: location.pathname });
       let { matches: notFoundMatches, route } = getShortCircuitMatches(dataRoutes);
@@ -2757,11 +2767,9 @@ function createStaticHandler(routes, opts) {
         loaderHeaders: {},
         actionHeaders: {}
       };
-      return respondOrStreamStaticContext(staticContext);
+      return generateMiddlewareResponse ? generateMiddlewareResponse(() => Promise.resolve(staticContext)) : staticContext;
     }
-    if (stream || respond && matches.some(
-      (m) => m.route.unstable_middleware || typeof m.route.lazy === "object" && m.route.lazy.unstable_middleware
-    )) {
+    if (generateMiddlewareResponse) {
       invariant(
         requestContext instanceof unstable_RouterContextProvider,
         "When using middleware in `staticHandler.query()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
@@ -2773,7 +2781,7 @@ function createStaticHandler(routes, opts) {
           mapRouteProperties2
         );
         let renderedStaticContext;
-        let response = await runMiddlewarePipeline(
+        let response = await runServerMiddlewarePipeline(
           {
             request,
             matches,
@@ -2782,45 +2790,27 @@ function createStaticHandler(routes, opts) {
             // this to the proper type knowing it's not an `AppLoadContext`
             context: requestContext
           },
-          true,
           async () => {
-            if (stream) {
-              let res2 = await stream(
-                requestContext,
-                async (revalidationRequest) => {
-                  let result3 = await queryImpl(
-                    revalidationRequest,
-                    location,
-                    matches,
-                    requestContext,
-                    dataStrategy || null,
-                    skipLoaderErrorBubbling === true,
-                    null,
-                    filterMatchesToLoad || null,
-                    skipRevalidation === true
-                  );
-                  return isResponse(result3) ? result3 : { location, basename, ...result3 };
+            let res = await generateMiddlewareResponse(
+              async (revalidationRequest) => {
+                let result2 = await queryImpl(
+                  revalidationRequest,
+                  location,
+                  matches,
+                  requestContext,
+                  dataStrategy || null,
+                  skipLoaderErrorBubbling === true,
+                  null,
+                  filterMatchesToLoad || null,
+                  skipRevalidation === true
+                );
+                if (isResponse(result2)) {
+                  return result2;
                 }
-              );
-              return res2;
-            }
-            invariant(respond, "Expected respond to be defined");
-            let result2 = await queryImpl(
-              request,
-              location,
-              matches,
-              requestContext,
-              dataStrategy || null,
-              skipLoaderErrorBubbling === true,
-              null,
-              filterMatchesToLoad || null,
-              skipRevalidation === true
+                renderedStaticContext = { location, basename, ...result2 };
+                return renderedStaticContext;
+              }
             );
-            if (isResponse(result2)) {
-              return result2;
-            }
-            renderedStaticContext = { location, basename, ...result2 };
-            let res = await respond(renderedStaticContext);
             return res;
           },
           async (error, routeId) => {
@@ -2837,7 +2827,9 @@ function createStaticHandler(routes, opts) {
                 error,
                 skipLoaderErrorBubbling ? routeId : findNearestBoundary(matches, routeId).route.id
               );
-              return respondOrStreamStaticContext(staticContext);
+              return generateMiddlewareResponse(
+                () => Promise.resolve(staticContext)
+              );
             } else {
               let boundaryRouteId = skipLoaderErrorBubbling ? routeId : findNearestBoundary(
                 matches,
@@ -2858,7 +2850,9 @@ function createStaticHandler(routes, opts) {
                 actionHeaders: {},
                 loaderHeaders: {}
               };
-              return respondOrStreamStaticContext(staticContext);
+              return generateMiddlewareResponse(
+                () => Promise.resolve(staticContext)
+              );
             }
           }
         );
@@ -2891,7 +2885,7 @@ function createStaticHandler(routes, opts) {
     routeId,
     requestContext,
     dataStrategy,
-    unstable_respond: respond
+    unstable_generateMiddlewareResponse: generateMiddlewareResponse
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
@@ -2912,15 +2906,13 @@ function createStaticHandler(routes, opts) {
     } else if (!match) {
       throw getInternalRouterError(404, { pathname: location.pathname });
     }
-    if (respond && matches.some(
-      (m) => m.route.unstable_middleware || typeof m.route.lazy === "object" && m.route.lazy.unstable_middleware
-    )) {
+    if (generateMiddlewareResponse) {
       invariant(
         requestContext instanceof unstable_RouterContextProvider,
         "When using middleware in `staticHandler.queryRoute()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
       );
       await loadLazyMiddlewareForMatches(matches, manifest, mapRouteProperties2);
-      let response = await runMiddlewarePipeline(
+      let response = await runServerMiddlewarePipeline(
         {
           request,
           matches,
@@ -2929,37 +2921,31 @@ function createStaticHandler(routes, opts) {
           // this to the proper type knowing it's not an `AppLoadContext`
           context: requestContext
         },
-        true,
         async () => {
-          let result2 = await queryImpl(
-            request,
-            location,
-            matches,
-            requestContext,
-            dataStrategy || null,
-            false,
-            match,
-            null,
-            false
+          let res = await generateMiddlewareResponse(
+            async (innerRequest) => {
+              let result2 = await queryImpl(
+                innerRequest,
+                location,
+                matches,
+                requestContext,
+                dataStrategy || null,
+                false,
+                match,
+                null,
+                false
+              );
+              let processed = handleQueryResult(result2);
+              return isResponse(processed) ? processed : typeof processed === "string" ? new Response(processed) : Response.json(processed);
+            }
           );
-          if (isResponse(result2)) {
-            return respond(result2);
-          }
-          let error2 = result2.errors ? Object.values(result2.errors)[0] : void 0;
-          if (error2 !== void 0) {
-            throw error2;
-          }
-          let value = result2.actionData ? Object.values(result2.actionData)[0] : Object.values(result2.loaderData)[0];
-          return typeof value === "string" ? new Response(value) : Response.json(value);
+          return res;
         },
-        (error2) => {
-          if (isResponse(error2)) {
-            return respond(error2);
+        (error) => {
+          if (isResponse(error)) {
+            return Promise.resolve(error);
           }
-          return new Response(String(error2), {
-            status: 500,
-            statusText: "Unexpected Server Error"
-          });
+          throw error;
         }
       );
       return response;
@@ -2975,20 +2961,23 @@ function createStaticHandler(routes, opts) {
       null,
       false
     );
-    if (isResponse(result)) {
-      return result;
-    }
-    let error = result.errors ? Object.values(result.errors)[0] : void 0;
-    if (error !== void 0) {
-      throw error;
-    }
-    if (result.actionData) {
-      return Object.values(result.actionData)[0];
-    }
-    if (result.loaderData) {
-      return Object.values(result.loaderData)[0];
+    return handleQueryResult(result);
+    function handleQueryResult(result2) {
+      if (isResponse(result2)) {
+        return result2;
+      }
+      let error = result2.errors ? Object.values(result2.errors)[0] : void 0;
+      if (error !== void 0) {
+        throw error;
+      }
+      if (result2.actionData) {
+        return Object.values(result2.actionData)[0];
+      }
+      if (result2.loaderData) {
+        return Object.values(result2.loaderData)[0];
+      }
+      return void 0;
     }
-    return void 0;
   }
   async function queryImpl(request, location, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, skipRevalidation) {
     invariant(
@@ -3928,45 +3917,35 @@ async function defaultDataStrategyWithMiddleware(args) {
   if (!args.matches.some((m) => m.route.unstable_middleware)) {
     return defaultDataStrategy(args);
   }
-  return runMiddlewarePipeline(
+  return runClientMiddlewarePipeline(
     args,
-    false,
     () => defaultDataStrategy(args),
     (error, routeId) => ({ [routeId]: { type: "error", result: error } })
   );
 }
-async function runMiddlewarePipeline(args, propagateResult, handler, errorHandler) {
+async function runServerMiddlewarePipeline(args, handler, errorHandler) {
   let { matches, request, params, context } = args;
-  let middlewareState = {
-    handlerResult: void 0
-  };
-  try {
-    let tuples = matches.flatMap(
-      (m) => m.route.unstable_middleware ? m.route.unstable_middleware.map((fn) => [m.route.id, fn]) : []
-    );
-    let result = await callRouteMiddleware(
-      { request, params, context },
-      tuples,
-      propagateResult,
-      middlewareState,
-      handler
-    );
-    return propagateResult ? result : middlewareState.handlerResult;
-  } catch (e) {
-    if (!middlewareState.middlewareError) {
-      throw e;
-    }
-    let result = await errorHandler(
-      middlewareState.middlewareError.error,
-      middlewareState.middlewareError.routeId
+  let tuples = matches.flatMap(
+    (m) => m.route.unstable_middleware ? m.route.unstable_middleware.map((fn) => [m.route.id, fn]) : []
+  );
+  let result = await callServerRouteMiddleware(
+    { request, params, context },
+    tuples,
+    handler,
+    errorHandler
+  );
+  if (isDataWithResponseInit(result)) {
+    return new Response(
+      typeof result.data === "string" ? result.data : JSON.stringify(result.data),
+      { ...result.init }
     );
-    if (propagateResult || !middlewareState.handlerResult) {
-      return result;
-    }
-    return Object.assign(middlewareState.handlerResult, result);
   }
+  if (isResponse(result)) {
+    return result;
+  }
+  invariant(false, `Expected a Response to be returned from route middleware`);
 }
-async function callRouteMiddleware(args, middlewares, propagateResult, middlewareState, handler, idx = 0) {
+async function callServerRouteMiddleware(args, middlewares, handler, errorHandler, idx = 0) {
   let { request } = args;
   if (request.signal.aborted) {
     if (request.signal.reason) {
@@ -3978,8 +3957,8 @@ async function callRouteMiddleware(args, middlewares, propagateResult, middlewar
   }
   let tuple = middlewares[idx];
   if (!tuple) {
-    middlewareState.handlerResult = await handler();
-    return middlewareState.handlerResult;
+    let result = await handler();
+    return result;
   }
   let [routeId, middleware] = tuple;
   let nextCalled = false;
@@ -3989,17 +3968,19 @@ async function callRouteMiddleware(args, middlewares, propagateResult, middlewar
       throw new Error("You may only call `next()` once per middleware");
     }
     nextCalled = true;
-    let result = await callRouteMiddleware(
-      args,
-      middlewares,
-      propagateResult,
-      middlewareState,
-      handler,
-      idx + 1
-    );
-    if (propagateResult) {
+    try {
+      let result = await callServerRouteMiddleware(
+        args,
+        middlewares,
+        handler,
+        errorHandler,
+        idx + 1
+      );
       nextResult = result;
       return nextResult;
+    } catch (e) {
+      nextResult = await errorHandler(e, routeId);
+      return nextResult;
     }
   };
   try {
@@ -4012,21 +3993,92 @@ async function callRouteMiddleware(args, middlewares, propagateResult, middlewar
       next
     );
     if (nextCalled) {
-      if (result === void 0) {
-        return nextResult;
-      } else {
-        return result;
-      }
+      return typeof result === "undefined" ? nextResult : result;
+    } else if (isResponse(result) || isDataWithResponseInit(result)) {
+      return result;
     } else {
-      return next();
+      nextResult = await next();
+      return nextResult;
     }
   } catch (error) {
-    if (!middlewareState.middlewareError) {
-      middlewareState.middlewareError = { routeId, error };
-    } else if (middlewareState.middlewareError.error !== error) {
-      middlewareState.middlewareError = { routeId, error };
+    let response = await errorHandler(error, routeId);
+    return response;
+  }
+}
+async function runClientMiddlewarePipeline(args, handler, 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]) : []
+  );
+  let handlerResult = {};
+  await callClientRouteMiddleware(
+    { request, params, context },
+    tuples,
+    handler,
+    errorHandler,
+    handlerResult
+  );
+  return handlerResult;
+}
+async function callClientRouteMiddleware(args, middlewares, handler, errorHandler, handlerResult = {}, idx = 0) {
+  let { request } = args;
+  if (request.signal.aborted) {
+    if (request.signal.reason) {
+      throw request.signal.reason;
+    }
+    throw new Error(
+      `Request aborted without an \`AbortSignal.reason\`: ${request.method} ${request.url}`
+    );
+  }
+  let tuple = middlewares[idx];
+  if (!tuple) {
+    let result = await handler();
+    Object.assign(handlerResult, result);
+    return;
+  }
+  let [routeId, middleware] = tuple;
+  let nextCalled = false;
+  let next = async () => {
+    if (nextCalled) {
+      throw new Error("You may only call `next()` once per middleware");
+    }
+    nextCalled = true;
+    try {
+      let result = await callClientRouteMiddleware(
+        args,
+        middlewares,
+        handler,
+        errorHandler,
+        handlerResult,
+        idx + 1
+      );
+      Object.assign(handlerResult, result);
+    } catch (e) {
+      let result = await errorHandler(e, routeId);
+      Object.assign(handlerResult, result);
+    }
+  };
+  try {
+    let result = await middleware(
+      {
+        request: args.request,
+        params: args.params,
+        context: args.context
+      },
+      next
+    );
+    if (typeof result !== "undefined") {
+      console.warn(
+        "client middlewares are not intended to return values, the value will be ignored",
+        result
+      );
     }
-    throw error;
+    if (!nextCalled) {
+      await next();
+    }
+  } catch (error) {
+    let result = await errorHandler(error, routeId);
+    Object.assign(handlerResult, result);
   }
 }
 function getDataStrategyMatchLazyPromises(mapRouteProperties2, manifest, request, match, lazyRoutePropertiesToSkip) {
@@ -4137,9 +4189,8 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
     );
   } : (cb) => {
     let typedDataStrategyArgs = dataStrategyArgs;
-    return runMiddlewarePipeline(
+    return runClientMiddlewarePipeline(
       typedDataStrategyArgs,
-      false,
       () => cb({
         ...typedDataStrategyArgs,
         fetcherKey,
@@ -4477,11 +4528,12 @@ function processLoaderData(state, matches, results, pendingActionResult, revalid
   );
   revalidatingFetchers.filter((f) => !f.matches || f.matches.some((m) => m.shouldLoad)).forEach((rf) => {
     let { key, match, controller } = rf;
-    let result = fetcherResults[key];
-    invariant(result, "Did not find corresponding fetcher result");
     if (controller && controller.signal.aborted) {
       return;
-    } else if (isErrorResult(result)) {
+    }
+    let result = fetcherResults[key];
+    invariant(result, "Did not find corresponding fetcher result");
+    if (isErrorResult(result)) {
       let boundaryMatch = findNearestBoundary(state.matches, match?.route.id);
       if (!(errors && errors[boundaryMatch.route.id])) {
         errors = {
@@ -7147,6 +7199,12 @@ async function bubbleMiddlewareErrors(singleFetchPromise, matches, routesParams,
           let routeResult = fetchedData.routes[match.route.id];
           if ("error" in routeResult) {
             middlewareError = routeResult.error;
+            if (results[match.route.id]?.result == null) {
+              results[match.route.id] = {
+                type: "error",
+                result: middlewareError
+              };
+            }
             break;
           }
         }
@@ -8150,12 +8208,14 @@ function getManifestPath(_manifestPath, basename) {
 }
 var MANIFEST_VERSION_STORAGE_KEY = "react-router-manifest-version";
 async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, basename, manifestPath, patchRoutes, signal) {
+  const searchParams = new URLSearchParams();
+  paths.sort().forEach((path) => searchParams.append("p", path));
+  searchParams.set("version", manifest.version);
   let url = new URL(
     getManifestPath(manifestPath, basename),
     window.location.origin
   );
-  paths.sort().forEach((path) => url.searchParams.append("p", path));
-  url.searchParams.set("version", manifest.version);
+  url.search = searchParams.toString();
   if (url.toString().length > URL_LIMIT) {
     nextPaths.clear();
     return;
@@ -8333,7 +8393,7 @@ function getActiveMatches(matches, errors, isSpaMode) {
   return matches;
 }
 var CRITICAL_CSS_DATA_ATTRIBUTE = "data-react-router-critical-css";
-function Links() {
+function Links({ nonce }) {
   let { isSpaMode, manifest, routeModules, criticalCss } = useFrameworkContext();
   let { errors, matches: routerMatches } = useDataRouterStateContext();
   let matches = getActiveMatches(routerMatches, errors, isSpaMode);
@@ -8352,10 +8412,11 @@ function Links() {
     {
       ...{ [CRITICAL_CSS_DATA_ATTRIBUTE]: "" },
       rel: "stylesheet",
-      href: criticalCss.href
+      href: criticalCss.href,
+      nonce
     }
   ) : null, keyedLinks.map(
-    ({ key, link }) => isPageLinkDescriptor(link) ? /* @__PURE__ */ React8.createElement(PrefetchPageLinks, { key, ...link }) : /* @__PURE__ */ React8.createElement("link", { key, ...link })
+    ({ key, link }) => isPageLinkDescriptor(link) ? /* @__PURE__ */ React8.createElement(PrefetchPageLinks, { key, nonce, ...link }) : /* @__PURE__ */ React8.createElement("link", { key, nonce, ...link })
   ));
 }
 function PrefetchPageLinks({ page, ...linkProps }) {
@@ -8466,7 +8527,7 @@ function PrefetchPageLinksImpl({
   return /* @__PURE__ */ React8.createElement(React8.Fragment, null, dataHrefs.map((href) => /* @__PURE__ */ React8.createElement("link", { key: href, rel: "prefetch", as: "fetch", href, ...linkProps })), moduleHrefs.map((href) => /* @__PURE__ */ React8.createElement("link", { key: href, rel: "modulepreload", href, ...linkProps })), keyedPrefetchLinks.map(({ key, link }) => (
     // these don't spread `linkProps` because they are full link descriptors
     // already with their own props
-    /* @__PURE__ */ React8.createElement("link", { key, ...link })
+    /* @__PURE__ */ React8.createElement("link", { key, nonce: linkProps.nonce, ...link })
   )));
 }
 function Meta() {
@@ -8495,6 +8556,7 @@ function Meta() {
     let match = {
       id: routeId,
       data: data2,
+      loaderData: data2,
       meta: [],
       params: _match.params,
       pathname: _match.pathname,
@@ -8505,6 +8567,7 @@ function Meta() {
     if (routeModule?.meta) {
       routeMeta = typeof routeModule.meta === "function" ? routeModule.meta({
         data: data2,
+        loaderData: data2,
         params,
         location,
         matches,
@@ -8845,7 +8908,7 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "7.7.1";
+    "7.8.0-pre.0";
   }
 } catch (e) {
 }