@remix-run/router 1.0.5-pre.1 → 1.0.5-pre.2

package/dist/router.d.ts

@@ -236,8 +236,13 @@ export interface StaticHandlerContext {
  */
 export interface StaticHandler {
     dataRoutes: AgnosticDataRouteObject[];
-    query(request: Request): Promise<StaticHandlerContext | Response>;
-    queryRoute(request: Request, routeId?: string): Promise<any>;
+    query(request: Request, opts?: {
+        requestContext?: unknown;
+    }): Promise<StaticHandlerContext | Response>;
+    queryRoute(request: Request, opts?: {
+        routeId?: string;
+        requestContext?: unknown;
+    }): Promise<any>;
 }
 /**
  * Subscriber function signature for changes to router state

package/dist/router.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.0.5-pre.1
+ * @remix-run/router v1.0.5-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2444,7 +2444,10 @@ function unstable_createStaticHandler(routes, opts) {
    * return it directly.
    */
 
-  async function query(request) {
+  async function query(request, _temp) {
+    let {
+      requestContext
+    } = _temp === void 0 ? {} : _temp;
     let url = new URL(request.url);
     let method = request.method.toLowerCase();
     let location = createLocation("", createPath(url), null, "default");
@@ -2494,7 +2497,7 @@ function unstable_createStaticHandler(routes, opts) {
       };
     }
 
-    let result = await queryImpl(request, location, matches);
+    let result = await queryImpl(request, location, matches, requestContext);
 
     if (isResponse(result)) {
       return result;
@@ -2530,7 +2533,11 @@ function unstable_createStaticHandler(routes, opts) {
    */
 
 
-  async function queryRoute(request, routeId) {
+  async function queryRoute(request, _temp2) {
+    let {
+      routeId,
+      requestContext
+    } = _temp2 === void 0 ? {} : _temp2;
     let url = new URL(request.url);
     let method = request.method.toLowerCase();
     let location = createLocation("", createPath(url), null, "default");
@@ -2560,7 +2567,7 @@ function unstable_createStaticHandler(routes, opts) {
       });
     }
 
-    let result = await queryImpl(request, location, matches, match);
+    let result = await queryImpl(request, location, matches, requestContext, match);
 
     if (isResponse(result)) {
       return result;
@@ -2581,16 +2588,16 @@ function unstable_createStaticHandler(routes, opts) {
     return Object.values(routeData || {})[0];
   }
 
-  async function queryImpl(request, location, matches, routeMatch) {
+  async function queryImpl(request, location, matches, requestContext, routeMatch) {
     invariant(request.signal, "query()/queryRoute() requests must contain an AbortController signal");
 
     try {
       if (isSubmissionMethod(request.method.toLowerCase())) {
-        let result = await submit(request, matches, routeMatch || getTargetMatch(matches, location), routeMatch != null);
+        let result = await submit(request, matches, routeMatch || getTargetMatch(matches, location), requestContext, routeMatch != null);
         return result;
       }
 
-      let result = await loadRouteData(request, matches, routeMatch);
+      let result = await loadRouteData(request, matches, requestContext, routeMatch);
       return isResponse(result) ? result : _extends({}, result, {
         actionData: null,
         actionHeaders: {}
@@ -2617,7 +2624,7 @@ function unstable_createStaticHandler(routes, opts) {
     }
   }
 
-  async function submit(request, matches, actionMatch, isRouteRequest) {
+  async function submit(request, matches, actionMatch, requestContext, isRouteRequest) {
     let result;
 
     if (!actionMatch.route.action) {
@@ -2636,7 +2643,7 @@ function unstable_createStaticHandler(routes, opts) {
         error
       };
     } else {
-      result = await callLoaderOrAction("action", request, actionMatch, matches, basename, true, isRouteRequest);
+      result = await callLoaderOrAction("action", request, actionMatch, matches, basename, true, isRouteRequest, requestContext);
 
       if (request.signal.aborted) {
         let method = isRouteRequest ? "queryRoute" : "query";
@@ -2687,7 +2694,7 @@ function unstable_createStaticHandler(routes, opts) {
       // Store off the pending error - we use it to determine which loaders
       // to call and will commit it when we complete the navigation
       let boundaryMatch = findNearestBoundary(matches, actionMatch.route.id);
-      let context = await loadRouteData(request, matches, undefined, {
+      let context = await loadRouteData(request, matches, requestContext, undefined, {
         [boundaryMatch.route.id]: result.error
       }); // action status codes take precedence over loader status codes
 
@@ -2704,7 +2711,7 @@ function unstable_createStaticHandler(routes, opts) {
     let loaderRequest = new Request(request.url, {
       signal: request.signal
     });
-    let context = await loadRouteData(loaderRequest, matches);
+    let context = await loadRouteData(loaderRequest, matches, requestContext);
     return _extends({}, context, result.statusCode ? {
       statusCode: result.statusCode
     } : {}, {
@@ -2717,7 +2724,7 @@ function unstable_createStaticHandler(routes, opts) {
     });
   }
 
-  async function loadRouteData(request, matches, routeMatch, pendingActionError) {
+  async function loadRouteData(request, matches, requestContext, routeMatch, pendingActionError) {
     let isRouteRequest = routeMatch != null; // Short circuit if we have no loaders to run (queryRoute())
 
     if (isRouteRequest && !(routeMatch != null && routeMatch.route.loader)) {
@@ -2741,7 +2748,7 @@ function unstable_createStaticHandler(routes, opts) {
       };
     }
 
-    let results = await Promise.all([...matchesToLoad.map(match => callLoaderOrAction("loader", request, match, matches, basename, true, isRouteRequest))]);
+    let results = await Promise.all([...matchesToLoad.map(match => callLoaderOrAction("loader", request, match, matches, basename, true, isRouteRequest, requestContext))]);
 
     if (request.signal.aborted) {
       let method = isRouteRequest ? "queryRoute" : "query";
@@ -2951,7 +2958,7 @@ function shouldRevalidateLoader(currentLocation, currentMatch, submission, locat
   return defaultShouldRevalidate;
 }
 
-async function callLoaderOrAction(type, request, match, matches, basename, isStaticRequest, isRouteRequest) {
+async function callLoaderOrAction(type, request, match, matches, basename, isStaticRequest, isRouteRequest, requestContext) {
   if (basename === void 0) {
     basename = "/";
   }
@@ -2979,7 +2986,8 @@ async function callLoaderOrAction(type, request, match, matches, basename, isSta
     invariant(handler, "Could not find the " + type + " to run on the \"" + match.route.id + "\" route");
     result = await Promise.race([handler({
       request,
-      params: match.params
+      params: match.params,
+      context: requestContext
     }), abortPromise]);
     invariant(result !== undefined, "You defined " + (type === "action" ? "an action" : "a loader") + " for route " + ("\"" + match.route.id + "\" but didn't return anything from your `" + type + "` ") + "function. Please return a value or `null`.");
   } catch (e) {
@@ -3271,13 +3279,12 @@ function getShortCircuitMatches(routes) {
   };
 }
 
-function getInternalRouterError(status, _temp) {
+function getInternalRouterError(status, _temp3) {
   let {
     pathname,
     routeId,
-    method,
-    message
-  } = _temp === void 0 ? {} : _temp;
+    method
+  } = _temp3 === void 0 ? {} : _temp3;
   let statusText = "Unknown Server Error";
   let errorMessage = "Unknown @remix-run/router error";