@remix-run/router 1.4.0 → 1.5.0-pre.0

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.4.0
+ * @remix-run/router v1.5.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1490,7 +1490,12 @@
     let manifest = {}; // Routes in tree format for matching
 
     let dataRoutes = convertRoutesToDataRoutes(init.routes, detectErrorBoundary, undefined, manifest);
-    let inFlightDataRoutes; // Cleanup function for history
+    let inFlightDataRoutes; // Config driven behavior flags
+
+    let future = _extends({
+      v7_normalizeFormMethod: false
+    }, init.future); // Cleanup function for history
+
 
     let unlistenHistory = null; // Externally-provided functions to call on all state changes
 
@@ -1654,35 +1659,16 @@
         }
 
         return startNavigation(historyAction, location);
-      });
+      }); // Kick off initial data load if needed.  Use Pop to avoid modifying history
+      // Note we don't do any handling of lazy here.  For SPA's it'll get handled
+      // in the normal navigation flow.  For SSR it's expected that lazy modules are
+      // resolved prior to router creation since we can't go into a fallbackElement
+      // UI for SSR'd apps
 
-      if (state.initialized) {
-        return router;
-      }
-
-      let lazyMatches = state.matches.filter(m => m.route.lazy);
-
-      if (lazyMatches.length === 0) {
-        // Kick off initial data load if needed.  Use Pop to avoid modifying history
+      if (!state.initialized) {
         startNavigation(exports.Action.Pop, state.location);
-        return router;
-      } // Load lazy modules, then kick off initial data load if needed
-
-
-      let lazyPromises = lazyMatches.map(m => loadLazyRouteModule(m.route, detectErrorBoundary, manifest));
-      Promise.all(lazyPromises).then(() => {
-        let initialized = !state.matches.some(m => m.route.loader) || init.hydrationData != null;
+      }
 
-        if (initialized) {
-          // We already have required loaderData so we can just set initialized
-          updateState({
-            initialized: true
-          });
-        } else {
-          // We still need to kick off initial data loads
-          startNavigation(exports.Action.Pop, state.location);
-        }
-      });
       return router;
     } // Clean up a router and it's side effects
 
@@ -1799,7 +1785,7 @@
         path,
         submission,
         error
-      } = normalizeNavigateOptions(to, opts);
+      } = normalizeNavigateOptions(to, future, opts);
       let currentLocation = state.location;
       let nextLocation = createLocation(state.location, path, opts && opts.state); // When using navigate as a PUSH/REPLACE we aren't reading an already-encoded
       // URL from window.location, so we need to encode it here so the behavior
@@ -1991,7 +1977,7 @@
         shortCircuited,
         loaderData,
         errors
-      } = await handleLoaders(request, location, matches, loadingNavigation, opts && opts.submission, opts && opts.replace, pendingActionData, pendingError);
+      } = await handleLoaders(request, location, matches, loadingNavigation, opts && opts.submission, opts && opts.fetcherSubmission, opts && opts.replace, pendingActionData, pendingError);
 
       if (shortCircuited) {
         return;
@@ -2104,7 +2090,7 @@
     // errors, etc.
 
 
-    async function handleLoaders(request, location, matches, overrideNavigation, submission, replace, pendingActionData, pendingError) {
+    async function handleLoaders(request, location, matches, overrideNavigation, submission, fetcherSubmission, replace, pendingActionData, pendingError) {
       // Figure out the right navigation we want to use for data loading
       let loadingNavigation = overrideNavigation;
 
@@ -2123,7 +2109,7 @@
       // we have it on the loading navigation so use that if available
 
 
-      let activeSubmission = submission ? submission : loadingNavigation.formMethod && loadingNavigation.formAction && loadingNavigation.formData && loadingNavigation.formEncType ? {
+      let activeSubmission = submission || fetcherSubmission ? submission || fetcherSubmission : loadingNavigation.formMethod && loadingNavigation.formAction && loadingNavigation.formData && loadingNavigation.formEncType ? {
         formMethod: loadingNavigation.formMethod,
         formAction: loadingNavigation.formAction,
         formData: loadingNavigation.formData,
@@ -2260,7 +2246,7 @@
       let {
         path,
         submission
-      } = normalizeNavigateOptions(href, opts, true);
+      } = normalizeNavigateOptions(href, future, opts, true);
       let match = getTargetMatch(matches, path);
       pendingPreventScrollReset = (opts && opts.preventScrollReset) === true;
 
@@ -2340,6 +2326,7 @@
           fetchers: new Map(state.fetchers)
         });
         return startRedirectNavigation(state, actionResult, {
+          submission,
           isFetchActionRedirect: true
         });
       } // Process any non-redirect errors thrown
@@ -2630,6 +2617,22 @@
           // Preserve this flag across redirects
           preventScrollReset: pendingPreventScrollReset
         });
+      } else if (isFetchActionRedirect) {
+        // For a fetch action redirect, we kick off a new loading navigation
+        // without the fetcher submission, but we send it along for shouldRevalidate
+        await startNavigation(redirectHistoryAction, redirectLocation, {
+          overrideNavigation: {
+            state: "loading",
+            location: redirectLocation,
+            formMethod: undefined,
+            formAction: undefined,
+            formEncType: undefined,
+            formData: undefined
+          },
+          fetcherSubmission: submission,
+          // Preserve this flag across redirects
+          preventScrollReset: pendingPreventScrollReset
+        });
       } else {
         // Otherwise, we kick off a new loading navigation, preserving the
         // submission info for the duration of this navigation
@@ -2975,11 +2978,11 @@
         requestContext
       } = _temp2 === void 0 ? {} : _temp2;
       let url = new URL(request.url);
-      let method = request.method.toLowerCase();
+      let method = request.method;
       let location = createLocation("", createPath(url), null, "default");
       let matches = matchRoutes(dataRoutes, location, basename); // SSR supports HEAD requests while SPA doesn't
 
-      if (!isValidMethod(method) && method !== "head") {
+      if (!isValidMethod(method) && method !== "HEAD") {
         let error = getInternalRouterError(405, {
           method
         });
@@ -3067,11 +3070,11 @@
         requestContext
       } = _temp3 === void 0 ? {} : _temp3;
       let url = new URL(request.url);
-      let method = request.method.toLowerCase();
+      let method = request.method;
       let location = createLocation("", createPath(url), null, "default");
       let matches = matchRoutes(dataRoutes, location, basename); // SSR supports HEAD requests while SPA doesn't
 
-      if (!isValidMethod(method) && method !== "head" && method !== "options") {
+      if (!isValidMethod(method) && method !== "HEAD" && method !== "OPTIONS") {
         throw getInternalRouterError(405, {
           method
         });
@@ -3364,7 +3367,7 @@
   // URLSearchParams so they behave identically to links with query params
 
 
-  function normalizeNavigateOptions(to, opts, isFetcher) {
+  function normalizeNavigateOptions(to, future, opts, isFetcher) {
     if (isFetcher === void 0) {
       isFetcher = false;
     }
@@ -3390,8 +3393,9 @@
     let submission;
 
     if (opts.formData) {
+      let formMethod = opts.formMethod || "get";
       submission = {
-        formMethod: opts.formMethod || "get",
+        formMethod: future.v7_normalizeFormMethod ? formMethod.toUpperCase() : formMethod.toLowerCase(),
         formAction: stripHashFromPath(path),
         formEncType: opts && opts.formEncType || "application/x-www-form-urlencoded",
         formData: opts.formData
@@ -3831,7 +3835,10 @@
         formMethod,
         formEncType,
         formData
-      } = submission;
+      } = submission; // Didn't think we needed this but it turns out unlike other methods, patch
+      // won't be properly normalized to uppercase and results in a 405 error.
+      // See: https://fetch.spec.whatwg.org/#concept-method
+
       init.method = formMethod.toUpperCase();
       init.body = formEncType === "application/x-www-form-urlencoded" ? convertFormDataToSearchParams(formData) : formData;
     } // Content-Type is inferred (https://fetch.spec.whatwg.org/#dom-request)
@@ -4120,11 +4127,11 @@
   }
 
   function isValidMethod(method) {
-    return validRequestMethods.has(method);
+    return validRequestMethods.has(method.toLowerCase());
   }
 
   function isMutationMethod(method) {
-    return validMutationMethods.has(method);
+    return validMutationMethods.has(method.toLowerCase());
   }
 
   async function resolveDeferredResults(currentMatches, matchesToLoad, results, signal, isFetcher, currentLoaderData) {