@tanstack/router-core 1.117.0 → 1.119.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/router-core",
-  "version": "1.117.0",
+  "version": "1.119.0",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/path.ts

@@ -216,6 +216,7 @@ interface InterpolatePathOptions {
 type InterPolatePathResult = {
   interpolatedPath: string
   usedParams: Record<string, unknown>
+  isMissingParams: boolean // true if any params were not available when being looked up in the params object
 }
 export function interpolatePath({
   path,
@@ -238,6 +239,10 @@ export function interpolatePath({
     }
   }
 
+  // Tracking if any params are missing in the `params` object
+  // when interpolating the path
+  let isMissingParams = false
+
   const usedParams: Record<string, unknown> = {}
   const interpolatedPath = joinPaths(
     interpolatedPathSegments.map((segment) => {
@@ -250,6 +255,9 @@ export function interpolatePath({
 
       if (segment.type === 'param') {
         const key = segment.value.substring(1)
+        if (!isMissingParams && !(key in params)) {
+          isMissingParams = true
+        }
         usedParams[key] = params[key]
         if (leaveParams) {
           const value = encodeParam(segment.value)
@@ -261,7 +269,7 @@ export function interpolatePath({
       return segment.value
     }),
   )
-  return { usedParams, interpolatedPath }
+  return { usedParams, interpolatedPath, isMissingParams }
 }
 
 function encodePathParam(value: string, decodeCharMap?: Map<string, string>) {

package/src/router.ts

@@ -2274,10 +2274,6 @@ export class RouterCore<
       return !!(allPreload && !this.state.matches.find((d) => d.id === matchId))
     }
 
-    if (!this.isServer && !this.state.matches.length) {
-      triggerOnReady()
-    }
-
     const handleRedirectAndNotFound = (match: AnyRouteMatch, err: any) => {
       if (isResolvedRedirect(err)) {
         if (!err.reloadDocument) {
@@ -2383,7 +2379,9 @@ export class RouterCore<
                 onReady &&
                 !this.isServer &&
                 !resolvePreload(matchId) &&
-                (route.options.loader || route.options.beforeLoad) &&
+                (route.options.loader ||
+                  route.options.beforeLoad ||
+                  routeNeedsPreload(route)) &&
                 typeof pendingMs === 'number' &&
                 pendingMs !== Infinity &&
                 (route.options.pendingComponent ??
@@ -2668,6 +2666,10 @@ export class RouterCore<
                             loaderData,
                           })
 
+                          // Last but not least, wait for the the components
+                          // to be preloaded before we resolve the match
+                          await route._componentsPromise
+
                           updateMatch(matchId, (prev) => ({
                             ...prev,
                             error: undefined,
@@ -2710,10 +2712,6 @@ export class RouterCore<
                           router: this,
                           match: this.getMatch(matchId)!,
                         })
-
-                        // Last but not least, wait for the the components
-                        // to be preloaded before we resolve the match
-                        await route._componentsPromise
                       } catch (err) {
                         updateMatch(matchId, (prev) => ({
                           ...prev,