@remix-run/router 0.0.0-experimental-cec61865 → 0.0.0-experimental-0db28b07

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # `@remix-run/router`
 
+## 1.5.0-pre.1
+
+### Patch Changes
+
+- Remove `instanceof` check for `DeferredData` to be resiliant to ESM/CJS boundaries in SSR bundling scenarios ([#10247](https://github.com/remix-run/react-router/pull/10247))
+
+## 1.5.0-pre.0
+
+### Minor Changes
+
+- Added support for [**Future Flags**](https://reactrouter.com/en/main/guides/api-development-strategy) in React Router. The first flag being introduced is `future.v7_normalizeFormMethod` which will normalize the exposed `useNavigation()/useFetcher()` `formMethod` fields as uppercase HTTP methods to align with the `fetch()` behavior. ([#10207](https://github.com/remix-run/react-router/pull/10207))
+
+  - When `future.v7_normalizeFormMethod === false` (default v6 behavior),
+    - `useNavigation().formMethod` is lowercase
+    - `useFetcher().formMethod` is lowercase
+  - When `future.v7_normalizeFormMethod === true`:
+    - `useNavigation().formMethod` is uppercase
+    - `useFetcher().formMethod` is uppercase
+
+### Patch Changes
+
+- Provide fetcher submission to `shouldRevalidate` if the fetcher action redirects ([#10208](https://github.com/remix-run/react-router/pull/10208))
+- Properly handle `lazy()` errors during router initialization ([#10201](https://github.com/remix-run/react-router/pull/10201))
+- Update to latest `@remix-run/web-fetch@4.3.3` ([#10216](https://github.com/remix-run/react-router/pull/10216))
+
 ## 1.4.0
 
 ### Minor Changes
@@ -64,7 +89,7 @@
 
 ### Patch Changes
 
-- Fix `generatePath` incorrectly applying parameters in some cases ([`bc6fefa1`](https://github.com/remix-run/react-router/commit/bc6fefa19019ce9f5250c8b5af9b8c5d3390e9d1))
+- Fix `generatePath` incorrectly applying parameters in some cases ([#10078](https://github.com/remix-run/react-router/pull/10078))
 
 ## 1.3.3
 

package/dist/router.cjs.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v0.0.0-experimental-cec61865
+ * @remix-run/router v0.0.0-experimental-0db28b07
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2147,8 +2147,7 @@ function createRouter(init) {
           formMethod: undefined,
           formAction: undefined,
           formEncType: undefined,
-          formData: undefined,
-          " _hasFetcherDoneAnything ": true
+          formData: undefined
         };
         state.fetchers.set(rf.key, revalidatingFetcher);
       });
@@ -2284,8 +2283,7 @@ function createRouter(init) {
     let fetcher = _extends({
       state: "submitting"
     }, submission, {
-      data: existingFetcher && existingFetcher.data,
-      " _hasFetcherDoneAnything ": true
+      data: existingFetcher && existingFetcher.data
     });
 
     state.fetchers.set(key, fetcher);
@@ -2315,8 +2313,7 @@ function createRouter(init) {
       let loadingFetcher = _extends({
         state: "loading"
       }, submission, {
-        data: undefined,
-        " _hasFetcherDoneAnything ": true
+        data: undefined
       });
 
       state.fetchers.set(key, loadingFetcher);
@@ -2324,8 +2321,7 @@ function createRouter(init) {
         fetchers: new Map(state.fetchers)
       });
       return startRedirectNavigation(state, actionResult, {
-        submission,
-        isFetchActionRedirect: true
+        fetcherSubmission: submission
       });
     } // Process any non-redirect errors thrown
 
@@ -2354,9 +2350,7 @@ function createRouter(init) {
     let loadFetcher = _extends({
       state: "loading",
       data: actionResult.data
-    }, submission, {
-      " _hasFetcherDoneAnything ": true
-    });
+    }, submission);
 
     state.fetchers.set(key, loadFetcher);
     let [matchesToLoad, revalidatingFetchers] = getMatchesToLoad(init.history, state, matches, submission, nextLocation, isRevalidationRequired, cancelledDeferredRoutes, cancelledFetcherLoads, fetchLoadMatches, routesToUse, init.basename, {
@@ -2375,8 +2369,7 @@ function createRouter(init) {
         formMethod: undefined,
         formAction: undefined,
         formEncType: undefined,
-        formData: undefined,
-        " _hasFetcherDoneAnything ": true
+        formData: undefined
       };
       state.fetchers.set(staleKey, revalidatingFetcher);
       fetchControllers.set(staleKey, abortController);
@@ -2414,8 +2407,7 @@ function createRouter(init) {
       formMethod: undefined,
       formAction: undefined,
       formEncType: undefined,
-      formData: undefined,
-      " _hasFetcherDoneAnything ": true
+      formData: undefined
     };
     state.fetchers.set(key, doneFetcher);
     let didAbortFetchLoads = abortStaleFetchLoads(loadId); // If we are currently in a navigation loading state and this fetcher is
@@ -2456,8 +2448,7 @@ function createRouter(init) {
       formEncType: undefined,
       formData: undefined
     }, submission, {
-      data: existingFetcher && existingFetcher.data,
-      " _hasFetcherDoneAnything ": true
+      data: existingFetcher && existingFetcher.data
     });
 
     state.fetchers.set(key, loadingFetcher);
@@ -2517,8 +2508,7 @@ function createRouter(init) {
       formMethod: undefined,
       formAction: undefined,
       formEncType: undefined,
-      formData: undefined,
-      " _hasFetcherDoneAnything ": true
+      formData: undefined
     };
     state.fetchers.set(key, doneFetcher);
     updateState({
@@ -2551,20 +2541,17 @@ function createRouter(init) {
 
     let {
       submission,
-      replace,
-      isFetchActionRedirect
+      fetcherSubmission,
+      replace
     } = _temp === void 0 ? {} : _temp;
 
     if (redirect.revalidate) {
       isRevalidationRequired = true;
     }
 
-    let redirectLocation = createLocation(state.location, redirect.location, // TODO: This can be removed once we get rid of useTransition in Remix v2
-    _extends({
+    let redirectLocation = createLocation(state.location, redirect.location, {
       _isRedirect: true
-    }, isFetchActionRedirect ? {
-      _isFetchActionRedirect: true
-    } : {}));
+    });
     invariant(redirectLocation, "Expected a location on the redirect navigation"); // Check if this an absolute external redirect that goes to a new origin
 
     if (ABSOLUTE_URL_REGEX.test(redirect.location) && isBrowser && typeof ((_window = window) == null ? void 0 : _window.location) !== "undefined") {
@@ -2595,7 +2582,7 @@ function createRouter(init) {
       formData
     } = state.navigation;
 
-    if (!submission && formMethod && formAction && formData && formEncType) {
+    if (!submission && !fetcherSubmission && formMethod && formAction && formData && formEncType) {
       submission = {
         formMethod,
         formAction,
@@ -2607,30 +2594,16 @@ function createRouter(init) {
     // redirected location
 
 
-    if (redirectPreserveMethodStatusCodes.has(redirect.status) && submission && isMutationMethod(submission.formMethod)) {
+    let activeSubmission = submission || fetcherSubmission;
+
+    if (redirectPreserveMethodStatusCodes.has(redirect.status) && activeSubmission && isMutationMethod(activeSubmission.formMethod)) {
       await startNavigation(redirectHistoryAction, redirectLocation, {
-        submission: _extends({}, submission, {
+        submission: _extends({}, activeSubmission, {
           formAction: redirect.location
         }),
         // 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
@@ -2638,11 +2611,14 @@ function createRouter(init) {
         overrideNavigation: {
           state: "loading",
           location: redirectLocation,
+          // Only include navigational submissions on the navigation
           formMethod: submission ? submission.formMethod : undefined,
           formAction: submission ? submission.formAction : undefined,
           formEncType: submission ? submission.formEncType : undefined,
           formData: submission ? submission.formData : undefined
         },
+        // Send fetcher submissions through for shouldRevalidate
+        fetcherSubmission,
         // Preserve this flag across redirects
         preventScrollReset: pendingPreventScrollReset
       });
@@ -2726,8 +2702,7 @@ function createRouter(init) {
         formMethod: undefined,
         formAction: undefined,
         formEncType: undefined,
-        formData: undefined,
-        " _hasFetcherDoneAnything ": true
+        formData: undefined
       };
       state.fetchers.set(key, doneFetcher);
     }
@@ -3802,7 +3777,7 @@ async function callLoaderOrAction(type, request, match, matches, manifest, detec
     };
   }
 
-  if (result instanceof DeferredData) {
+  if (isDeferredData(result)) {
     var _result$init, _result$init2;
 
     return {
@@ -3973,8 +3948,7 @@ function processLoaderData(state, matches, matchesToLoad, results, pendingError,
         formMethod: undefined,
         formAction: undefined,
         formEncType: undefined,
-        formData: undefined,
-        " _hasFetcherDoneAnything ": true
+        formData: undefined
       };
       state.fetchers.set(key, doneFetcher);
     }
@@ -4106,6 +4080,11 @@ function isRedirectResult(result) {
   return (result && result.type) === ResultType.redirect;
 }
 
+function isDeferredData(value) {
+  let deferred = value;
+  return deferred && typeof deferred === "object" && typeof deferred.data === "object" && typeof deferred.subscribe === "function" && typeof deferred.cancel === "function" && typeof deferred.resolveData === "function";
+}
+
 function isResponse(value) {
   return value != null && typeof value.status === "number" && typeof value.statusText === "string" && typeof value.headers === "object" && typeof value.body !== "undefined";
 }
@@ -4247,6 +4226,7 @@ exports.defer = defer;
 exports.generatePath = generatePath;
 exports.getStaticContextFromError = getStaticContextFromError;
 exports.getToPathname = getToPathname;
+exports.isDeferredData = isDeferredData;
 exports.isRouteErrorResponse = isRouteErrorResponse;
 exports.joinPaths = joinPaths;
 exports.json = json;