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

package/dist/router.d.ts

@@ -1,6 +1,6 @@
 import type { History, Location, Path, To } from "./history";
 import { Action as HistoryAction } from "./history";
-import type { AgnosticDataRouteMatch, AgnosticDataRouteObject, FormEncType, FormMethod, DetectErrorBoundaryFunction, RouteData, AgnosticRouteObject, AgnosticRouteMatch } from "./utils";
+import type { AgnosticDataRouteMatch, AgnosticDataRouteObject, FormEncType, FormMethod, DetectErrorBoundaryFunction, RouteData, AgnosticRouteObject, AgnosticRouteMatch, V7_FormMethod, HTMLFormMethod } from "./utils";
 import { DeferredData } from "./utils";
 /**
  * A Router instance manages all navigation and data loading/mutations
@@ -236,15 +236,22 @@ export interface RouterState {
  * Data that can be passed into hydrate a Router from SSR
  */
 export declare type HydrationState = Partial<Pick<RouterState, "loaderData" | "actionData" | "errors">>;
+/**
+ * Future flags to toggle new feature behavior
+ */
+export interface FutureConfig {
+    v7_normalizeFormMethod: boolean;
+}
 /**
  * Initialization options for createRouter
  */
 export interface RouterInit {
-    basename?: string;
     routes: AgnosticRouteObject[];
     history: History;
-    hydrationData?: HydrationState;
+    basename?: string;
     detectErrorBoundary?: DetectErrorBoundaryFunction;
+    future?: FutureConfig;
+    hydrationData?: HydrationState;
 }
 /**
  * State returned from a server-side query() call
@@ -316,7 +323,7 @@ declare type SubmissionNavigateOptions = {
     replace?: boolean;
     state?: any;
     preventScrollReset?: boolean;
-    formMethod?: FormMethod;
+    formMethod?: HTMLFormMethod;
     formEncType?: FormEncType;
     formData: FormData;
 };
@@ -343,7 +350,7 @@ export declare type NavigationStates = {
     Loading: {
         state: "loading";
         location: Location;
-        formMethod: FormMethod | undefined;
+        formMethod: FormMethod | V7_FormMethod | undefined;
         formAction: string | undefined;
         formEncType: FormEncType | undefined;
         formData: FormData | undefined;
@@ -351,7 +358,7 @@ export declare type NavigationStates = {
     Submitting: {
         state: "submitting";
         location: Location;
-        formMethod: FormMethod;
+        formMethod: FormMethod | V7_FormMethod;
         formAction: string;
         formEncType: FormEncType;
         formData: FormData;
@@ -374,7 +381,7 @@ declare type FetcherStates<TData = any> = {
     };
     Loading: {
         state: "loading";
-        formMethod: FormMethod | undefined;
+        formMethod: FormMethod | V7_FormMethod | undefined;
         formAction: string | undefined;
         formEncType: FormEncType | undefined;
         formData: FormData | undefined;
@@ -383,7 +390,7 @@ declare type FetcherStates<TData = any> = {
     };
     Submitting: {
         state: "submitting";
-        formMethod: FormMethod;
+        formMethod: FormMethod | V7_FormMethod;
         formAction: string;
         formEncType: FormEncType;
         formData: FormData;

package/dist/router.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.4.0
+ * @remix-run/router v1.5.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1436,7 +1436,12 @@ function createRouter(init) {
   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
 
@@ -1600,35 +1605,16 @@ function createRouter(init) {
       }
 
       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(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(Action.Pop, state.location);
-      }
-    });
     return router;
   } // Clean up a router and it's side effects
 
@@ -1744,7 +1730,7 @@ function createRouter(init) {
       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
@@ -1936,7 +1922,7 @@ function createRouter(init) {
       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;
@@ -2049,7 +2035,7 @@ function createRouter(init) {
   // 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;
 
@@ -2068,7 +2054,7 @@ function createRouter(init) {
     // 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,
@@ -2205,7 +2191,7 @@ function createRouter(init) {
     let {
       path,
       submission
-    } = normalizeNavigateOptions(href, opts, true);
+    } = normalizeNavigateOptions(href, future, opts, true);
     let match = getTargetMatch(matches, path);
     pendingPreventScrollReset = (opts && opts.preventScrollReset) === true;
 
@@ -2285,6 +2271,7 @@ function createRouter(init) {
         fetchers: new Map(state.fetchers)
       });
       return startRedirectNavigation(state, actionResult, {
+        submission,
         isFetchActionRedirect: true
       });
     } // Process any non-redirect errors thrown
@@ -2575,6 +2562,22 @@ function createRouter(init) {
         // 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
@@ -2920,11 +2923,11 @@ function createStaticHandler(routes, opts) {
       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
       });
@@ -3012,11 +3015,11 @@ function createStaticHandler(routes, opts) {
       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
       });
@@ -3309,7 +3312,7 @@ function isSubmissionNavigation(opts) {
 // 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;
   }
@@ -3335,8 +3338,9 @@ function normalizeNavigateOptions(to, opts, isFetcher) {
   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
@@ -3776,7 +3780,10 @@ function createClientSideRequest(history, location, signal, submission) {
       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)
@@ -4065,11 +4072,11 @@ function isQueryRouteResponse(obj) {
 }
 
 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) {