@tanstack/router-core 1.127.2 → 1.127.8

package/dist/cjs/index.d.cts

@@ -23,7 +23,7 @@ export { defaultParseSearch, defaultStringifySearch, parseSearchWith, stringifyS
 export type { SearchSerializer, SearchParser } from './searchParams.cjs';
 export type { OptionalStructuralSharing } from './structuralSharing.cjs';
 export { last, functionalUpdate, pick, replaceEqualDeep, isPlainObject, isPlainArray, deepEqual, escapeJSON, shallow, createControlledPromise, isModuleNotFoundError, } from './utils.cjs';
-export type { NoInfer, IsAny, PickAsRequired, PickRequired, PickOptional, WithoutEmpty, Expand, DeepPartial, MakeDifferenceOptional, IsUnion, IsNonEmptyObject, Assign, IntersectAssign, Timeout, Updater, NonNullableUpdater, StringLiteral, ThrowOrOptional, ThrowConstraint, ControlledPromise, ExtractObjects, PartialMergeAllObject, MergeAllPrimitive, ExtractPrimitives, PartialMergeAll, Constrain, ConstrainLiteral, UnionToIntersection, MergeAllObjects, MergeAll, ValidateJSON, StrictOrFrom, LooseReturnType, LooseAsyncReturnType, } from './utils.cjs';
+export type { NoInfer, IsAny, PickAsRequired, PickRequired, PickOptional, WithoutEmpty, Expand, DeepPartial, MakeDifferenceOptional, IsUnion, IsNonEmptyObject, Assign, IntersectAssign, Timeout, Updater, NonNullableUpdater, StringLiteral, ThrowOrOptional, ThrowConstraint, ControlledPromise, ExtractObjects, PartialMergeAllObject, MergeAllPrimitive, ExtractPrimitives, PartialMergeAll, Constrain, ConstrainLiteral, UnionToIntersection, MergeAllObjects, MergeAll, ValidateJSON, StrictOrFrom, LooseReturnType, LooseAsyncReturnType, Awaitable, } from './utils.cjs';
 export type { StandardSchemaValidatorProps, StandardSchemaValidator, AnyStandardSchemaValidator, StandardSchemaValidatorTypes, AnyStandardSchemaValidateSuccess, AnyStandardSchemaValidateFailure, AnyStandardSchemaValidateIssue, AnyStandardSchemaValidateInput, AnyStandardSchemaValidate, ValidatorObj, AnyValidatorObj, ValidatorAdapter, AnyValidatorAdapter, AnyValidatorFn, ValidatorFn, Validator, AnyValidator, AnySchema, DefaultValidator, ResolveSearchValidatorInputFn, ResolveSearchValidatorInput, ResolveValidatorInputFn, ResolveValidatorInput, ResolveValidatorOutputFn, ResolveValidatorOutput, } from './validators.cjs';
 export type { UseRouteContextBaseOptions, UseRouteContextOptions, UseRouteContextResult, } from './useRouteContext.cjs';
 export type { UseSearchResult, ResolveUseSearch } from './useSearch.cjs';

package/dist/cjs/router.cjs

@@ -48,7 +48,6 @@ class RouterCore {
     this.isScrollRestoring = false;
     this.isScrollRestorationSetup = false;
     this.startTransition = (fn) => fn();
-    this.isShell = false;
     this.update = (newOptions) => {
       var _a;
       if (newOptions.notFoundRoute) {
@@ -103,9 +102,6 @@ class RouterCore {
           "selector(:active-view-transition-type(a)"
         );
       }
-      if (this.latestLocation.search.__TSS_SHELL) {
-        this.isShell = true;
-      }
     };
     this.buildRouteTree = () => {
       const { routesById, routesByPath, flatRoutes } = processRouteTree({
@@ -513,10 +509,7 @@ class RouterCore {
           throw redirect.redirect({ href: nextLocation.href });
         }
       }
-      let pendingMatches = this.matchRoutes(this.latestLocation);
-      if (this.isShell) {
-        pendingMatches = pendingMatches.slice(0, 1);
-      }
+      const pendingMatches = this.matchRoutes(this.latestLocation);
       this.__store.setState((s) => ({
         ...s,
         status: "pending",
@@ -711,32 +704,6 @@ class RouterCore {
       const triggerOnReady = async () => {
         if (!rendered) {
           rendered = true;
-          if (!allPreload && !this.isServer) {
-            matches.forEach((match) => {
-              const {
-                id: matchId,
-                routeId,
-                _forcePending,
-                minPendingPromise
-              } = match;
-              const route = this.looseRoutesById[routeId];
-              const pendingMinMs = route.options.pendingMinMs ?? this.options.defaultPendingMinMs;
-              if (_forcePending && pendingMinMs && !minPendingPromise) {
-                const minPendingPromise2 = utils.createControlledPromise();
-                updateMatch(matchId, (prev) => ({
-                  ...prev,
-                  minPendingPromise: minPendingPromise2
-                }));
-                setTimeout(() => {
-                  minPendingPromise2.resolve();
-                  updateMatch(matchId, (prev) => ({
-                    ...prev,
-                    minPendingPromise: void 0
-                  }));
-                }, pendingMinMs);
-              }
-            });
-          }
           await (onReady == null ? void 0 : onReady());
         }
       };
@@ -840,46 +807,50 @@ class RouterCore {
                 const route = this.looseRoutesById[routeId];
                 const pendingMs = route.options.pendingMs ?? this.options.defaultPendingMs;
                 if (this.isServer) {
-                  const defaultSsr = this.options.defaultSsr ?? true;
                   let ssr;
-                  if ((parentMatch == null ? void 0 : parentMatch.ssr) === false) {
-                    ssr = false;
+                  if (this.isShell()) {
+                    ssr = matchId === root.rootRouteId;
                   } else {
-                    let tempSsr;
-                    if (route.options.ssr === void 0) {
-                      tempSsr = defaultSsr;
-                    } else if (typeof route.options.ssr === "function") {
-                      let makeMaybe = function(value, error) {
-                        if (error) {
-                          return { status: "error", error };
-                        }
-                        return { status: "success", value };
-                      };
-                      const { search, params } = this.getMatch(matchId);
-                      const ssrFnContext = {
-                        search: makeMaybe(search, existingMatch.searchError),
-                        params: makeMaybe(params, existingMatch.paramsError),
-                        location,
-                        matches: matches.map((match) => ({
-                          index: match.index,
-                          pathname: match.pathname,
-                          fullPath: match.fullPath,
-                          staticData: match.staticData,
-                          id: match.id,
-                          routeId: match.routeId,
-                          search: makeMaybe(match.search, match.searchError),
-                          params: makeMaybe(match.params, match.paramsError),
-                          ssr: match.ssr
-                        }))
-                      };
-                      tempSsr = await route.options.ssr(ssrFnContext) ?? defaultSsr;
-                    } else {
-                      tempSsr = route.options.ssr;
-                    }
-                    if (tempSsr === true && (parentMatch == null ? void 0 : parentMatch.ssr) === "data-only") {
-                      ssr = "data-only";
+                    const defaultSsr = this.options.defaultSsr ?? true;
+                    if ((parentMatch == null ? void 0 : parentMatch.ssr) === false) {
+                      ssr = false;
                     } else {
-                      ssr = tempSsr;
+                      let tempSsr;
+                      if (route.options.ssr === void 0) {
+                        tempSsr = defaultSsr;
+                      } else if (typeof route.options.ssr === "function") {
+                        let makeMaybe = function(value, error) {
+                          if (error) {
+                            return { status: "error", error };
+                          }
+                          return { status: "success", value };
+                        };
+                        const { search, params } = this.getMatch(matchId);
+                        const ssrFnContext = {
+                          search: makeMaybe(search, existingMatch.searchError),
+                          params: makeMaybe(params, existingMatch.paramsError),
+                          location,
+                          matches: matches.map((match) => ({
+                            index: match.index,
+                            pathname: match.pathname,
+                            fullPath: match.fullPath,
+                            staticData: match.staticData,
+                            id: match.id,
+                            routeId: match.routeId,
+                            search: makeMaybe(match.search, match.searchError),
+                            params: makeMaybe(match.params, match.paramsError),
+                            ssr: match.ssr
+                          }))
+                        };
+                        tempSsr = await route.options.ssr(ssrFnContext) ?? defaultSsr;
+                      } else {
+                        tempSsr = route.options.ssr;
+                      }
+                      if (tempSsr === true && (parentMatch == null ? void 0 : parentMatch.ssr) === "data-only") {
+                        ssr = "data-only";
+                      } else {
+                        ssr = tempSsr;
+                      }
                     }
                   }
                   updateMatch(matchId, (prev) => ({
@@ -1047,8 +1018,6 @@ class RouterCore {
                           ...head
                         }));
                         return this.getMatch(matchId);
-                      } else {
-                        await potentialPendingMinPromise();
                       }
                     } else if (prevMatch.loaderPromise) {
                       if (prevMatch.status === "success" && !sync && !prevMatch.preload) {
@@ -1157,10 +1126,10 @@ class RouterCore {
                           handleRedirectAndNotFound(this.getMatch(matchId), err);
                         }
                       };
-                      const { status, invalid, _forcePending } = this.getMatch(matchId);
+                      const { status, invalid } = this.getMatch(matchId);
                       loaderShouldRunAsync = status === "success" && (invalid || (shouldReload ?? age > staleAge));
                       if (preload && route.options.preload === false) {
-                      } else if (loaderShouldRunAsync && !sync && !_forcePending) {
+                      } else if (loaderShouldRunAsync && !sync) {
                         loaderIsRunningAsync = true;
                         (async () => {
                           try {
@@ -1181,9 +1150,6 @@ class RouterCore {
                       } else if (status !== "success" || loaderShouldRunAsync && sync) {
                         await runLoader();
                       } else {
-                        if (_forcePending) {
-                          await potentialPendingMinPromise();
-                        }
                         const head = await executeHead();
                         updateMatch(matchId, (prev) => ({
                           ...prev,
@@ -1204,8 +1170,7 @@ class RouterCore {
                         loaderPromise: loaderIsRunningAsync ? prev.loaderPromise : void 0,
                         invalid: false,
                         pendingTimeout: void 0,
-                        _dehydrated: void 0,
-                        _forcePending: void 0
+                        _dehydrated: void 0
                       };
                     });
                     return this.getMatch(matchId);
@@ -1463,6 +1428,9 @@ class RouterCore {
       self.__TSR_ROUTER__ = this;
     }
   }
+  isShell() {
+    return this.options.isShell;
+  }
   get state() {
     return this.__store.state;
   }