Updates for Remix on RR 6.4

packages/react-router-dom/.eslintrc

@@ -7,6 +7,7 @@
     "__DEV__": true
   },
   "rules": {
-    "strict": 0
+    "strict": 0,
+    "no-restricted-syntax": ["error", "LogicalExpression[operator='??']"]
   }
 }

packages/react-router-dom/dom.ts

@@ -245,5 +245,5 @@ export function getFormSubmissionInfo(
   let { protocol, host } = window.location;
   let url = new URL(action, `${protocol}//${host}`);
 
-  return { url, method, encType, formData };
+  return { url, method: method.toLowerCase(), encType, formData };
 }

packages/react-router-dom/index.tsx

@@ -252,6 +252,10 @@ function deserializeErrors(
         val.data,
         val.internal === true
       );
+    } else if (val && val.__type === "Error") {
+      let error = new Error(val.message);
+      error.stack = val.stack;
+      serialized[key] = error;
     } else {
       serialized[key] = val;
     }
@@ -650,7 +654,14 @@ const FormImpl = React.forwardRef<HTMLFormElement, FormImplProps>(
       let submitter = (event as unknown as HTMLSubmitEvent).nativeEvent
         .submitter as HTMLFormSubmitter | null;
 
-      submit(submitter || event.currentTarget, { method, replace, relative });
+      let submitMethod =
+        (submitter?.formMethod as FormMethod | undefined) || method;
+
+      submit(submitter || event.currentTarget, {
+        method: submitMethod,
+        replace,
+        relative,
+      });
     };
 
     return (
@@ -916,10 +927,9 @@ export function useFormAction(
   invariant(routeContext, "useFormAction must be used inside a RouteContext");
 
   let [match] = routeContext.matches.slice(-1);
-  let resolvedAction = action ?? ".";
   // Shallow clone path so we can modify it below, otherwise we modify the
   // object referenced by useMemo inside useResolvedPath
-  let path = { ...useResolvedPath(resolvedAction, { relative }) };
+  let path = { ...useResolvedPath(action ? action : ".", { relative }) };
 
   // Previously we set the default action to ".". The problem with this is that
   // `useResolvedPath(".")` excludes search params and the hash of the resolved

packages/react-router-dom/server.tsx

@@ -157,6 +157,12 @@ function serializeErrors(
     // deserializeErrors in react-router-dom/index.tsx :)
     if (isRouteErrorResponse(val)) {
       serialized[key] = { ...val, __type: "RouteErrorResponse" };
+    } else if (val instanceof Error) {
+      serialized[key] = {
+        message: val.message,
+        stack: val.stack,
+        __type: "Error",
+      };
     } else {
       serialized[key] = val;
     }

packages/react-router/.eslintrc

@@ -7,6 +7,7 @@
     "__DEV__": true
   },
   "rules": {
-    "strict": 0
+    "strict": 0,
+    "no-restricted-syntax": ["error", "LogicalExpression[operator='??']"]
   }
 }

packages/router/.eslintrc

@@ -3,7 +3,11 @@
     "browser": true,
     "commonjs": true
   },
+  "globals": {
+    "__DEV__": true
+  },
   "rules": {
-    "strict": 0
+    "strict": 0,
+    "no-restricted-syntax": ["error", "LogicalExpression[operator='??']"]
   }
 }

packages/router/router.ts

@@ -1327,7 +1327,7 @@ export function createRouter(init: RouterInit): Router {
       state.fetchers.set(key, loadingFetcher);
       updateState({ fetchers: new Map(state.fetchers) });
 
-      return startRedirectNavigation(state, actionResult);
+      return startRedirectNavigation(state, actionResult, false, true);
     }
 
     // Process any non-redirect errors thrown
@@ -1587,13 +1587,23 @@ export function createRouter(init: RouterInit): Router {
   async function startRedirectNavigation(
     state: RouterState,
     redirect: RedirectResult,
-    replace?: boolean
+    replace?: boolean,
+    isFetchActionRedirect?: boolean
   ) {
     if (redirect.revalidate) {
       isRevalidationRequired = true;
     }
 
-    let redirectLocation = createLocation(state.location, redirect.location);
+    let redirectLocation = createLocation(
+      state.location,
+      redirect.location,
+      // TODO: This can be removed once we get rid of useTransition in Remix v2
+      isFetchActionRedirect
+        ? {
+            isFetchActionRedirect: true,
+          }
+        : undefined
+    );
     invariant(
       redirectLocation,
       "Expected a location on the redirect navigation"
@@ -2252,7 +2262,10 @@ export function unstable_createStaticHandler(
     if (matchesToLoad.length === 0) {
       return {
         matches,
-        loaderData: {},
+        loaderData: matches.reduce(
+          (acc, m) => Object.assign(acc, { [m.route.id]: null }),
+          {}
+        ),
         errors: pendingActionError || null,
         statusCode: 200,
         loaderHeaders: {},
@@ -2280,7 +2293,9 @@ export function unstable_createStaticHandler(
 
     // Can't do anything with these without the Remix side of things, so just
     // cancel them for now
-    results.forEach((result) => {
+    let executedLoaders = new Set<string>();
+    results.forEach((result, i) => {
+      executedLoaders.add(matchesToLoad[i].route.id);
       if (isDeferredResult(result)) {
         result.deferredData.cancel();
       }
@@ -2294,6 +2309,16 @@ export function unstable_createStaticHandler(
       pendingActionError
     );
 
+    // Add a null for any routes that didn't have loaders so we know they've been
+    // previously "executed" and qualify as a revalidation on subsequent
+    // invocations.  This is mostly needed for SSr scenarios where there may be
+    // no server loader but there may be a client loaders to fetch code split bundles
+    matches.forEach((match) => {
+      if (!executedLoaders.has(match.route.id)) {
+        context.loaderData[match.route.id] = null;
+      }
+    });
+
     return {
       ...context,
       matches,