react-router 0.0.0-experimental-4841e12b → 0.0.0-experimental-3e5084cc

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * React Router v0.0.0-experimental-4841e12b
+ * React Router v0.0.0-experimental-3e5084cc
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -538,21 +538,17 @@ function _renderMatches(matches, parentMatches, dataRouterState, future) {
   }
 
   // If we're in a partial hydration mode, detect if we need to render down to
-  // a given Fallback while we load the rest of the hydration data
+  // a given InitialFallback while we load the rest of the hydration data
   let renderFallback = false;
   let fallbackIndex = -1;
   if (dataRouterState && future && future.v7_partialHydration) {
     for (let i = 0; i < renderedMatches.length; i++) {
       let match = renderedMatches[i];
       // Track the deepest fallback up until the first route without data
-      if (match.route.Fallback || match.route.fallbackElement) {
+      if (match.route.InitialFallback || match.route.initialFallbackElement) {
         fallbackIndex = i;
       }
       if (match.route.loader && match.route.id && dataRouterState.loaderData[match.route.id] === undefined && (!dataRouterState.errors || dataRouterState.errors[match.route.id] === undefined)) {
-        // TODO:
-        // TODO: Add unit tests for this error flow!
-        // TODO:
-
         // We found the first route without data/errors which means it's loader
         // still needs to run.  Flag that we need to render a fallback and
         // render up until the appropriate fallback
@@ -569,20 +565,20 @@ function _renderMatches(matches, parentMatches, dataRouterState, future) {
   return renderedMatches.reduceRight((outlet, match, index) => {
     // Only data routers handle errors/fallbacks
     let error;
-    let fallback = false;
+    let shouldRenderInitialFallback = false;
     let errorElement = null;
-    let fallbackElement = null;
+    let initialFallbackElement = null;
     if (dataRouterState) {
       error = errors && match.route.id ? errors[match.route.id] : null;
       errorElement = match.route.errorElement || defaultErrorElement;
       if (renderFallback) {
         if (fallbackIndex < 0 && index === 0) {
-          warningOnce("route-fallback", false, "No `Fallback` element provided to render during initial hydration");
-          fallback = true;
-          fallbackElement = null;
+          warningOnce("route-fallback", false, "No `InitialFallback` element provided to render during initial hydration");
+          shouldRenderInitialFallback = true;
+          initialFallbackElement = null;
         } else if (fallbackIndex === index) {
-          fallback = true;
-          fallbackElement = match.route.fallbackElement || null;
+          shouldRenderInitialFallback = true;
+          initialFallbackElement = match.route.initialFallbackElement || null;
         }
       }
     }
@@ -591,8 +587,8 @@ function _renderMatches(matches, parentMatches, dataRouterState, future) {
       let children;
       if (error) {
         children = errorElement;
-      } else if (fallback) {
-        children = fallbackElement;
+      } else if (shouldRenderInitialFallback) {
+        children = initialFallbackElement;
       } else if (match.route.Component) {
         // Note: This is a de-optimized path since React won't re-use the
         // ReactElement since it's identity changes with each new
@@ -1372,15 +1368,15 @@ function mapRouteProperties(route) {
       Component: undefined
     });
   }
-  if (route.Fallback) {
+  if (route.InitialFallback) {
     if (process.env.NODE_ENV !== "production") {
-      if (route.fallbackElement) {
-        process.env.NODE_ENV !== "production" ? UNSAFE_warning(false, "You should not include both `Fallback` and `fallbackElement` on your route - " + "`Fallback` will be used.") : void 0;
+      if (route.initialFallbackElement) {
+        process.env.NODE_ENV !== "production" ? UNSAFE_warning(false, "You should not include both `InitialFallback` and `initialFallbackElement` on your route - " + "`InitialFallback` will be used.") : void 0;
       }
     }
     Object.assign(updates, {
-      fallbackElement: /*#__PURE__*/React.createElement(route.Fallback),
-      Fallback: undefined
+      initialFallbackElement: /*#__PURE__*/React.createElement(route.InitialFallback),
+      InitialFallback: undefined
     });
   }
   if (route.ErrorBoundary) {