@remix-run/router 0.0.0-experimental-acfea932 → 0.0.0-experimental-2272fa73

package/dist/router.cjs.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v0.0.0-experimental-acfea932
+ * @remix-run/router v0.0.0-experimental-2272fa73
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -4133,7 +4133,7 @@ async function loadLazyRouteModule(route, mapRouteProperties, manifest) {
 
 // Default implementation of `dataStrategy` which fetches all loaders in parallel
 function defaultDataStrategy(opts) {
-  return Promise.all(opts.matches.map(m => m.bikeshed_loadRoute()));
+  return Promise.all(opts.matches.map(m => m.resolve()));
 }
 async function callDataStrategyImpl(dataStrategyImpl, type, request, matchesToLoad, matches, manifest, mapRouteProperties, requestContext) {
   let routeIdsToLoad = matchesToLoad.reduce((acc, m) => acc.add(m.route.id), new Set());
@@ -4144,14 +4144,14 @@ async function callDataStrategyImpl(dataStrategyImpl, type, request, matchesToLo
   // back out below.
   let results = await dataStrategyImpl({
     matches: matches.map(match => {
-      let bikeshed_load = routeIdsToLoad.has(match.route.id);
-      // `bikeshed_loadRoute` encapsulates the route.lazy, executing the
+      let shouldLoad = routeIdsToLoad.has(match.route.id);
+      // `resolve` encapsulates the route.lazy, executing the
       // loader/action, and mapping return values/thrown errors to a
       // HandlerResult.  Users can pass a callback to take fine-grained control
       // over the execution of the loader/action
-      let bikeshed_loadRoute = handlerOverride => {
+      let resolve = handlerOverride => {
         loadedMatches.add(match.route.id);
-        return bikeshed_load ? callLoaderOrAction(type, request, match, manifest, mapRouteProperties, handlerOverride, requestContext) :
+        return shouldLoad ? callLoaderOrAction(type, request, match, manifest, mapRouteProperties, handlerOverride, requestContext) :
         // TODO: What's the best thing to do here - return an empty "success" result?
         // Or return a success result with the current route loader/action data?
         // We strip these results out if the route didn't need to be revalidated in
@@ -4163,8 +4163,8 @@ async function callDataStrategyImpl(dataStrategyImpl, type, request, matchesToLo
         });
       };
       return _extends({}, match, {
-        bikeshed_load,
-        bikeshed_loadRoute
+        shouldLoad,
+        resolve
       });
     }),
     request,
@@ -4175,7 +4175,7 @@ async function callDataStrategyImpl(dataStrategyImpl, type, request, matchesToLo
   // ensures a route is fully loaded
   // Throw if any loadRoute implementations not called since they are what
   // ensure a route is fully loaded
-  matches.forEach(m => invariant(loadedMatches.has(m.route.id), "`match.bikeshed_loadRoute()` was not called for route id \"" + m.route.id + "\". " + "You must call `match.bikeshed_loadRoute()` on every match passed to " + "`dataStrategy` to ensure all routes are properly loaded."));
+  matches.forEach(m => invariant(loadedMatches.has(m.route.id), "`match.resolve()` was not called for route id \"" + m.route.id + "\". " + "You must call `match.resolve()` on every match passed to " + "`dataStrategy` to ensure all routes are properly loaded."));
 
   // Filter out any middleware-only matches for which we didn't need to run handlers
   return results.filter((_, i) => routeIdsToLoad.has(matches[i].route.id));
@@ -4217,7 +4217,7 @@ async function callLoaderOrAction(type, request, match, manifest, mapRouteProper
         runHandler(handler).catch(e => {
           handlerError = e;
         }), loadLazyRouteModule(match.route, mapRouteProperties, manifest)]);
-        if (handlerError) {
+        if (handlerError !== undefined) {
           throw handlerError;
         }
         result = values[0];