@remix-run/router 1.21.1 → 1.22.0-pre-v6.1

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.21.1
+ * @remix-run/router v1.22.0-pre-v6.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1750,6 +1750,7 @@
     // SSR did the initial scroll restoration.
     let initialScrollRestored = init.hydrationData != null;
     let initialMatches = matchRoutes(dataRoutes, init.history.location, basename);
+    let initialMatchesIsFOW = false;
     let initialErrors = null;
     if (initialMatches == null && !patchRoutesOnNavigationImpl) {
       // If we do not match a user-provided-route, fall back to the root
@@ -1790,6 +1791,7 @@
       if (future.v7_partialHydration) {
         let fogOfWar = checkFogOfWar(null, dataRoutes, init.history.location.pathname);
         if (fogOfWar.active && fogOfWar.matches) {
+          initialMatchesIsFOW = true;
           initialMatches = fogOfWar.matches;
         }
       }
@@ -2318,7 +2320,9 @@
       pendingViewTransitionEnabled = (opts && opts.enableViewTransition) === true;
       let routesToUse = inFlightDataRoutes || dataRoutes;
       let loadingNavigation = opts && opts.overrideNavigation;
-      let matches = matchRoutes(routesToUse, location, basename);
+      let matches = opts != null && opts.initialHydration && state.matches && state.matches.length > 0 && !initialMatchesIsFOW ?
+      // `matchRoutes()` has already been called if we're in here via `router.initialize()`
+      state.matches : matchRoutes(routesToUse, location, basename);
       let flushSync = (opts && opts.flushSync) === true;
       let fogOfWar = checkFogOfWar(matches, routesToUse, location.pathname);
       if (fogOfWar.active && fogOfWar.matches) {
@@ -2854,7 +2858,7 @@
       let abortController = new AbortController();
       let fetchRequest = createClientSideRequest(init.history, path, abortController.signal, submission);
       if (isFogOfWar) {
-        let discoverResult = await discoverRoutes(requestMatches, path, fetchRequest.signal);
+        let discoverResult = await discoverRoutes(requestMatches, new URL(fetchRequest.url).pathname, fetchRequest.signal);
         if (discoverResult.type === "aborted") {
           return;
         } else if (discoverResult.type === "error") {
@@ -3040,7 +3044,7 @@
       let abortController = new AbortController();
       let fetchRequest = createClientSideRequest(init.history, path, abortController.signal);
       if (isFogOfWar) {
-        let discoverResult = await discoverRoutes(matches, path, fetchRequest.signal);
+        let discoverResult = await discoverRoutes(matches, new URL(fetchRequest.url).pathname, fetchRequest.signal);
         if (discoverResult.type === "aborted") {
           return;
         } else if (discoverResult.type === "error") {
@@ -3598,6 +3602,7 @@
         let localManifest = manifest;
         try {
           await patchRoutesOnNavigationImpl({
+            signal,
             path: pathname,
             matches: partialMatches,
             patch: (routeId, children) => {
@@ -4870,18 +4875,24 @@
     }
     if (type === ResultType.error) {
       if (isDataWithResponseInit(result)) {
-        var _result$init2;
+        var _result$init3, _result$init4;
         if (result.data instanceof Error) {
-          var _result$init;
+          var _result$init, _result$init2;
           return {
             type: ResultType.error,
             error: result.data,
-            statusCode: (_result$init = result.init) == null ? void 0 : _result$init.status
+            statusCode: (_result$init = result.init) == null ? void 0 : _result$init.status,
+            headers: (_result$init2 = result.init) != null && _result$init2.headers ? new Headers(result.init.headers) : undefined
           };
         }
 
         // Convert thrown data() to ErrorResponse instances
-        result = new ErrorResponseImpl(((_result$init2 = result.init) == null ? void 0 : _result$init2.status) || 500, undefined, result.data);
+        return {
+          type: ResultType.error,
+          error: new ErrorResponseImpl(((_result$init3 = result.init) == null ? void 0 : _result$init3.status) || 500, undefined, result.data),
+          statusCode: isRouteErrorResponse(result) ? result.status : undefined,
+          headers: (_result$init4 = result.init) != null && _result$init4.headers ? new Headers(result.init.headers) : undefined
+        };
       }
       return {
         type: ResultType.error,
@@ -4890,21 +4901,21 @@
       };
     }
     if (isDeferredData(result)) {
-      var _result$init3, _result$init4;
+      var _result$init5, _result$init6;
       return {
         type: ResultType.deferred,
         deferredData: result,
-        statusCode: (_result$init3 = result.init) == null ? void 0 : _result$init3.status,
-        headers: ((_result$init4 = result.init) == null ? void 0 : _result$init4.headers) && new Headers(result.init.headers)
+        statusCode: (_result$init5 = result.init) == null ? void 0 : _result$init5.status,
+        headers: ((_result$init6 = result.init) == null ? void 0 : _result$init6.headers) && new Headers(result.init.headers)
       };
     }
     if (isDataWithResponseInit(result)) {
-      var _result$init5, _result$init6;
+      var _result$init7, _result$init8;
       return {
         type: ResultType.data,
         data: result.data,
-        statusCode: (_result$init5 = result.init) == null ? void 0 : _result$init5.status,
-        headers: (_result$init6 = result.init) != null && _result$init6.headers ? new Headers(result.init.headers) : undefined
+        statusCode: (_result$init7 = result.init) == null ? void 0 : _result$init7.status,
+        headers: (_result$init8 = result.init) != null && _result$init8.headers ? new Headers(result.init.headers) : undefined
       };
     }
     return {