react-router 7.8.1 → 7.8.2-pre.0

package/dist/production/{chunk-5Y7ELDIJ.mjs → chunk-4HHN5NDL.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.1
+ * react-router v7.8.2-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -58,7 +58,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-PFDCNQUK.mjs";
+} from "./chunk-O46NJYOA.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -799,21 +799,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
     return handleQueryError(error);
   }
   function handleQueryResult(result) {
-    if (!isResponse(result)) {
-      result = staticContextToResponse(result);
-    }
-    if (isRedirectResponse(result)) {
-      return generateSingleFetchResponse(request, build, serverMode, {
-        result: getSingleFetchRedirect(
-          result.status,
-          result.headers,
-          build.basename
-        ),
-        headers: result.headers,
-        status: SINGLE_FETCH_REDIRECT_STATUS
-      });
-    }
-    return result;
+    return isResponse(result) ? result : staticContextToResponse(result);
   }
   function handleQueryError(error) {
     handleError(error);
@@ -826,15 +812,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
   function staticContextToResponse(context) {
     let headers = getDocumentHeaders(context, build);
     if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
-      return generateSingleFetchResponse(request, build, serverMode, {
-        result: getSingleFetchRedirect(
-          context.statusCode,
-          headers,
-          build.basename
-        ),
-        headers,
-        status: SINGLE_FETCH_REDIRECT_STATUS
-      });
+      return new Response(null, { status: context.statusCode, headers });
     }
     if (context.errors) {
       Object.values(context.errors).forEach((err) => {
@@ -885,21 +863,7 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
     return handleQueryError(error);
   }
   function handleQueryResult(result) {
-    let response = isResponse(result) ? result : staticContextToResponse(result);
-    if (isRedirectResponse(response)) {
-      return generateSingleFetchResponse(request, build, serverMode, {
-        result: {
-          [SingleFetchRedirectSymbol]: getSingleFetchRedirect(
-            response.status,
-            response.headers,
-            build.basename
-          )
-        },
-        headers: response.headers,
-        status: SINGLE_FETCH_REDIRECT_STATUS
-      });
-    }
-    return response;
+    return isResponse(result) ? result : staticContextToResponse(result);
   }
   function handleQueryError(error) {
     handleError(error);
@@ -912,17 +876,7 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
   function staticContextToResponse(context) {
     let headers = getDocumentHeaders(context, build);
     if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
-      return generateSingleFetchResponse(request, build, serverMode, {
-        result: {
-          [SingleFetchRedirectSymbol]: getSingleFetchRedirect(
-            context.statusCode,
-            headers,
-            build.basename
-          )
-        },
-        headers,
-        status: SINGLE_FETCH_REDIRECT_STATUS
-      });
+      return new Response(null, { status: context.statusCode, headers });
     }
     if (context.errors) {
       Object.values(context.errors).forEach((err) => {
@@ -980,6 +934,21 @@ function generateSingleFetchResponse(request, build, serverMode, {
     }
   );
 }
+function generateSingleFetchRedirectResponse(redirectResponse, request, build, serverMode) {
+  let redirect2 = getSingleFetchRedirect(
+    redirectResponse.status,
+    redirectResponse.headers,
+    build.basename
+  );
+  let headers = new Headers(redirectResponse.headers);
+  headers.delete("Location");
+  headers.set("Content-Type", "text/x-script");
+  return generateSingleFetchResponse(request, build, serverMode, {
+    result: request.method === "GET" ? { [SingleFetchRedirectSymbol]: redirect2 } : redirect2,
+    headers,
+    status: SINGLE_FETCH_REDIRECT_STATUS
+  });
+}
 function getSingleFetchRedirect(status, headers, basename) {
   let redirect2 = headers.get("Location");
   if (basename) {
@@ -1205,6 +1174,14 @@ var createRequestHandler = (build, mode) => {
         loadContext,
         handleError
       );
+      if (isRedirectResponse(response)) {
+        response = generateSingleFetchRedirectResponse(
+          response,
+          request,
+          _build,
+          serverMode
+        );
+      }
       if (_build.entry.module.handleDataRequest) {
         response = await _build.entry.module.handleDataRequest(response, {
           context: loadContext,
@@ -1212,29 +1189,11 @@ var createRequestHandler = (build, mode) => {
           request
         });
         if (isRedirectResponse(response)) {
-          let result = getSingleFetchRedirect(
-            response.status,
-            response.headers,
-            _build.basename
-          );
-          if (request.method === "GET") {
-            result = {
-              [SingleFetchRedirectSymbol]: result
-            };
-          }
-          let headers = new Headers(response.headers);
-          headers.set("Content-Type", "text/x-script");
-          return new Response(
-            encodeViaTurboStream(
-              result,
-              request.signal,
-              _build.entry.module.streamTimeout,
-              serverMode
-            ),
-            {
-              status: SINGLE_FETCH_REDIRECT_STATUS,
-              headers
-            }
+          response = generateSingleFetchRedirectResponse(
+            response,
+            request,
+            _build,
+            serverMode
           );
         }
       }

package/dist/production/{chunk-KHPQXKYM.js → chunk-NCRSBAFG.js}

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
- * react-router v7.8.1
+ * react-router v7.8.2-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -699,7 +699,7 @@ function generatePath(originalPath, params = {}) {
       const [, key, optional] = keyMatch;
       let param = params[key];
       invariant(optional === "?" || param != null, `Missing ":${key}" param`);
-      return stringify2(param);
+      return encodeURIComponent(stringify2(param));
     }
     return segment.replace(/\?$/g, "");
   }).filter((segment) => !!segment);
@@ -1004,6 +1004,9 @@ function createRouter(init) {
   );
   let inFlightDataRoutes;
   let basename = init.basename || "/";
+  if (!basename.startsWith("/")) {
+    basename = `/${basename}`;
+  }
   let dataStrategyImpl = init.dataStrategy || defaultDataStrategyWithMiddleware;
   let future = {
     unstable_middleware: false,
@@ -1553,6 +1556,19 @@ function createRouter(init) {
       if (discoverResult.type === "aborted") {
         return { shortCircuited: true };
       } else if (discoverResult.type === "error") {
+        if (discoverResult.partialMatches.length === 0) {
+          let { matches: matches2, route } = getShortCircuitMatches(dataRoutes);
+          return {
+            matches: matches2,
+            pendingActionResult: [
+              route.id,
+              {
+                type: "error" /* error */,
+                error: discoverResult.error
+              }
+            ]
+          };
+        }
         let boundaryId = findNearestBoundary(discoverResult.partialMatches).route.id;
         return {
           matches: discoverResult.partialMatches,
@@ -1684,6 +1700,16 @@ function createRouter(init) {
       if (discoverResult.type === "aborted") {
         return { shortCircuited: true };
       } else if (discoverResult.type === "error") {
+        if (discoverResult.partialMatches.length === 0) {
+          let { matches: matches2, route } = getShortCircuitMatches(dataRoutes);
+          return {
+            matches: matches2,
+            loaderData: {},
+            errors: {
+              [route.id]: discoverResult.error
+            }
+          };
+        }
         let boundaryId = findNearestBoundary(discoverResult.partialMatches).route.id;
         return {
           matches: discoverResult.partialMatches,
@@ -3947,198 +3973,116 @@ async function defaultDataStrategyWithMiddleware(args) {
   if (!args.matches.some((m) => m.route.unstable_middleware)) {
     return defaultDataStrategy(args);
   }
-  let didCallHandler = false;
-  return runClientMiddlewarePipeline(
+  return runClientMiddlewarePipeline(args, () => defaultDataStrategy(args));
+}
+function runServerMiddlewarePipeline(args, handler, errorHandler) {
+  return runMiddlewarePipeline(
     args,
-    () => {
-      didCallHandler = true;
-      return defaultDataStrategy(args);
-    },
-    (error, routeId) => clientMiddlewareErrorHandler(
-      error,
-      routeId,
-      args.matches,
-      didCallHandler
-    )
+    handler,
+    processResult,
+    isResponse,
+    errorHandler
   );
-}
-function clientMiddlewareErrorHandler(error, routeId, matches, didCallHandler) {
-  if (didCallHandler) {
-    return {
-      [routeId]: { type: "error", result: error }
-    };
-  } else {
-    let maxBoundaryIdx = Math.min(
-      // Throwing route
-      matches.findIndex((m) => m.route.id === routeId) || 0,
-      // or the shallowest route that needs to load data
-      matches.findIndex((m) => m.unstable_shouldCallHandler()) || 0
-    );
-    let boundaryRouteId = findNearestBoundary(
-      matches,
-      matches[maxBoundaryIdx].route.id
-    ).route.id;
-    return {
-      [boundaryRouteId]: { type: "error", result: error }
-    };
+  function processResult(result) {
+    return isDataWithResponseInit(result) ? dataWithResponseInitToResponse(result) : result;
   }
 }
-async function runServerMiddlewarePipeline(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 result = await callServerRouteMiddleware(
-    { request, params, context },
-    tuples,
+function runClientMiddlewarePipeline(args, handler) {
+  return runMiddlewarePipeline(
+    args,
     handler,
+    (r) => r,
+    // No post-processing needed on the client
+    isDataStrategyResults,
     errorHandler
   );
-  if (isResponse(result)) {
-    return result;
-  }
-  invariant(false, `Expected a Response to be returned from route middleware`);
-}
-async function callServerRouteMiddleware(args, middlewares, handler, errorHandler, 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();
-    return result;
-  }
-  let [routeId, middleware] = tuple;
-  let nextCalled = false;
-  let nextResult = void 0;
-  let next = async () => {
-    if (nextCalled) {
-      throw new Error("You may only call `next()` once per middleware");
-    }
-    nextCalled = true;
-    try {
-      let result = await callServerRouteMiddleware(
-        args,
-        middlewares,
-        handler,
-        errorHandler,
-        idx + 1
+  function errorHandler(error, routeId, nextResult) {
+    if (nextResult) {
+      return Promise.resolve(
+        Object.assign(nextResult.value, {
+          [routeId]: { type: "error", result: error }
+        })
       );
-      if (isDataWithResponseInit(result)) {
-        result = dataWithResponseInitToResponse(result);
-      }
-      nextResult = result;
-      return nextResult;
-    } catch (e) {
-      nextResult = await errorHandler(e, routeId);
-      return nextResult;
-    }
-  };
-  try {
-    let result = await middleware(
-      {
-        request: args.request,
-        params: args.params,
-        context: args.context
-      },
-      next
-    );
-    if (isDataWithResponseInit(result)) {
-      result = dataWithResponseInitToResponse(result);
-    }
-    if (nextCalled) {
-      return typeof result === "undefined" ? nextResult : result;
-    } else if (isResponse(result)) {
-      return result;
     } else {
-      nextResult = await next();
-      return nextResult;
+      let { matches } = args;
+      let maxBoundaryIdx = Math.min(
+        // Throwing route
+        matches.findIndex((m) => m.route.id === routeId) || 0,
+        // or the shallowest route that needs to load data
+        matches.findIndex((m) => m.unstable_shouldCallHandler()) || 0
+      );
+      let boundaryRouteId = findNearestBoundary(
+        matches,
+        matches[maxBoundaryIdx].route.id
+      ).route.id;
+      return Promise.resolve({
+        [boundaryRouteId]: { type: "error", result: error }
+      });
     }
-  } catch (e) {
-    let response = await errorHandler(e, routeId);
-    return response;
   }
 }
-async function runClientMiddlewarePipeline(args, handler, errorHandler) {
+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]) : []
   );
-  let handlerResult = {};
-  await callClientRouteMiddleware(
+  let result = await callRouteMiddleware(
     { request, params, context },
     tuples,
     handler,
-    errorHandler,
-    handlerResult
+    processResult,
+    isResult,
+    errorHandler
   );
-  return handlerResult;
+  return result;
 }
-async function callClientRouteMiddleware(args, middlewares, handler, errorHandler, handlerResult = {}, idx = 0) {
+async function callRouteMiddleware(args, middlewares, handler, processResult, isResult, errorHandler, 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}`
-    );
+    throw _nullishCoalesce(request.signal.reason, () => ( new Error(`Request aborted: ${request.method} ${request.url}`)));
   }
   let tuple = middlewares[idx];
   if (!tuple) {
     let result = await handler();
-    Object.assign(handlerResult, result);
-    return;
+    return result;
   }
   let [routeId, middleware] = tuple;
-  let nextCalled = false;
+  let nextResult;
   let next = async () => {
-    if (nextCalled) {
+    if (nextResult) {
       throw new Error("You may only call `next()` once per middleware");
     }
-    nextCalled = true;
     try {
-      let result = await callClientRouteMiddleware(
+      let result = await callRouteMiddleware(
         args,
         middlewares,
         handler,
+        processResult,
+        isResult,
         errorHandler,
-        handlerResult,
         idx + 1
       );
-      Object.assign(handlerResult, result);
-    } catch (e) {
-      let result = await errorHandler(e, routeId);
-      Object.assign(handlerResult, result);
+      nextResult = { value: result };
+      return nextResult.value;
+    } catch (error) {
+      nextResult = { value: await errorHandler(error, routeId, nextResult) };
+      return nextResult.value;
     }
   };
   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
-      );
-    }
-    if (!nextCalled) {
-      await next();
+    let value = await middleware(args, next);
+    let result = value != null ? processResult(value) : void 0;
+    if (isResult(result)) {
+      return result;
+    } else if (nextResult) {
+      return _nullishCoalesce(result, () => ( nextResult.value));
+    } else {
+      nextResult = { value: await next() };
+      return nextResult.value;
     }
   } catch (error) {
-    let result = await errorHandler(error, routeId);
-    Object.assign(handlerResult, result);
+    let response = await errorHandler(error, routeId, nextResult);
+    return response;
   }
 }
 function getDataStrategyMatchLazyPromises(mapRouteProperties, manifest, request, match, lazyRoutePropertiesToSkip) {
@@ -4249,28 +4193,17 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
     );
   } : (cb) => {
     let typedDataStrategyArgs = dataStrategyArgs;
-    let didCallHandler = false;
-    return runClientMiddlewarePipeline(
-      typedDataStrategyArgs,
-      () => {
-        didCallHandler = true;
-        return cb({
-          ...typedDataStrategyArgs,
-          fetcherKey,
-          unstable_runClientMiddleware: () => {
-            throw new Error(
-              "Cannot call `unstable_runClientMiddleware()` from within an `unstable_runClientMiddleware` handler"
-            );
-          }
-        });
-      },
-      (error, routeId) => clientMiddlewareErrorHandler(
-        error,
-        routeId,
-        matches,
-        didCallHandler
-      )
-    );
+    return runClientMiddlewarePipeline(typedDataStrategyArgs, () => {
+      return cb({
+        ...typedDataStrategyArgs,
+        fetcherKey,
+        unstable_runClientMiddleware: () => {
+          throw new Error(
+            "Cannot call `unstable_runClientMiddleware()` from within an `unstable_runClientMiddleware` handler"
+          );
+        }
+      });
+    });
   };
   let results = await dataStrategyImpl({
     ...dataStrategyArgs,
@@ -4738,6 +4671,11 @@ function dataWithResponseInitToErrorResponse(data2) {
     data2.data
   );
 }
+function isDataStrategyResults(result) {
+  return result != null && typeof result === "object" && Object.entries(result).every(
+    ([key, value]) => typeof key === "string" && isDataStrategyResult(value)
+  );
+}
 function isDataStrategyResult(result) {
   return result != null && typeof result === "object" && "type" in result && "result" in result && (result.type === "data" /* data */ || result.type === "error" /* error */);
 }
@@ -6326,7 +6264,7 @@ function useResolvedPath(to, { relative } = {}) {
 function useRoutes(routes, locationArg) {
   return useRoutesImpl(routes, locationArg);
 }
-function useRoutesImpl(routes, locationArg, dataRouterState, future) {
+function useRoutesImpl(routes, locationArg, dataRouterState, unstable_onError, future) {
   invariant(
     useInRouterContext(),
     // TODO: This error is probably because they somehow have 2 versions of the
@@ -6398,6 +6336,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
     ),
     parentMatches,
     dataRouterState,
+    unstable_onError,
     future
   );
   if (locationArg && renderedMatches) {
@@ -6466,11 +6405,14 @@ var RenderErrorBoundary = class extends React3.Component {
     };
   }
   componentDidCatch(error, errorInfo) {
-    console.error(
-      "React Router caught the following error during render",
-      error,
-      errorInfo
-    );
+    if (this.props.unstable_onError) {
+      this.props.unstable_onError(error, errorInfo);
+    } else {
+      console.error(
+        "React Router caught the following error during render",
+        error
+      );
+    }
   }
   render() {
     return this.state.error !== void 0 ? /* @__PURE__ */ React3.createElement(RouteContext.Provider, { value: this.props.routeContext }, /* @__PURE__ */ React3.createElement(
@@ -6489,7 +6431,7 @@ function RenderedRoute({ routeContext, match, children }) {
   }
   return /* @__PURE__ */ React3.createElement(RouteContext.Provider, { value: routeContext }, children);
 }
-function _renderMatches(matches, parentMatches = [], dataRouterState = null, future = null) {
+function _renderMatches(matches, parentMatches = [], dataRouterState = null, unstable_onError = null, future = null) {
   if (matches == null) {
     if (!dataRouterState) {
       return null;
@@ -6601,7 +6543,8 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, fut
           component: errorElement,
           error,
           children: getChildren(),
-          routeContext: { outlet: null, matches: matches2, isDataRoute: true }
+          routeContext: { outlet: null, matches: matches2, isDataRoute: true },
+          unstable_onError
         }
       ) : getChildren();
     },