one 1.2.21 → 1.2.22-1765155190908

package/dist/esm/router/useViteRoutes.js

@@ -2,6 +2,54 @@ let lastVersion = 0, context;
 function useViteRoutes(routes, routerRoot, options, version) {
   return version && version > lastVersion && (context = null, lastVersion = version), context || loadRoutes(routes, routerRoot, options), context;
 }
+let preloadedModules = {};
+function registerPreloadedRoute(key, module) {
+  preloadedModules[key] = module;
+}
+function getPreloadedModule(key) {
+  return preloadedModules[key];
+}
+function getPreloadedModuleKeys() {
+  return Object.keys(preloadedModules);
+}
+function matchDynamicRoute(routePattern, actualPath) {
+  const routeSegments = routePattern.split("/"), pathSegments = actualPath.split("/");
+  if (routeSegments.some((s) => s.startsWith("[..."))) {
+    const catchAllIdx = routeSegments.findIndex((s) => s.startsWith("[..."));
+    for (let i = 0; i < catchAllIdx; i++)
+      if (routeSegments[i] && !routeSegments[i].startsWith("[") && routeSegments[i] !== pathSegments[i])
+        return !1;
+    return pathSegments.length >= catchAllIdx;
+  }
+  if (routeSegments.length !== pathSegments.length) return !1;
+  for (let i = 0; i < routeSegments.length; i++) {
+    const routeSeg = routeSegments[i], pathSeg = pathSegments[i];
+    if (!(routeSeg.startsWith("[") && routeSeg.endsWith("]")) && routeSeg !== pathSeg)
+      return !1;
+  }
+  return !0;
+}
+async function preloadRouteModules(href) {
+  const globbed = globalThis.__importMetaGlobbed;
+  if (!globbed) return;
+  const normalizedHref = href === "/" ? "" : href.replace(/^\//, "").replace(/\/$/, ""), promises = [];
+  for (const key of Object.keys(globbed)) {
+    let routePath = key.replace(/^\/[^/]+\//, "");
+    routePath = routePath.replace(/\([^)]+\)\//g, ""), routePath = routePath.replace(/\/_layout\.tsx$/, "").replace(/\/index(\+[a-z]+)?\.tsx$/, "").replace(/(\+[a-z]+)?\.tsx$/, ""), routePath = routePath.replace(/^\//, "");
+    const isStaticMatch = routePath === normalizedHref || // exact match
+    routePath.startsWith(normalizedHref + "/") || // child route
+    normalizedHref.startsWith(routePath + "/") || // parent layout
+    routePath === "" || // root layout
+    normalizedHref !== "" && routePath === normalizedHref.split("/")[0], isDynamicMatch = routePath.includes("[") && matchDynamicRoute(routePath, normalizedHref);
+    (isStaticMatch || isDynamicMatch) && typeof globbed[key] == "function" && promises.push(
+      globbed[key]().then((mod) => {
+        preloadedModules[key] = mod;
+      }).catch(() => {
+      })
+    );
+  }
+  await Promise.all(promises);
+}
 function loadRoutes(paths, routerRoot, options) {
   return context || (globalThis.__importMetaGlobbed = paths, context = globbedRoutesToRouteContext(paths, routerRoot, options), context);
 }
@@ -19,6 +67,9 @@ function globbedRoutesToRouteContext(paths, routerRoot, options) {
   function resolve(id) {
     if (clearTimeout(clears[id]), loadedRoutes[id])
       return loadedRoutes[id];
+    const preloadKey = id.replace("./", `/${routerRoot}/`), preloaded = getPreloadedModule(preloadKey);
+    if (preloaded)
+      return loadedRoutes[id] = preloaded, preloaded;
     if (typeof routesSync[id] != "function")
       return routesSync[id];
     throw promises[id] || (promises[id] = routesSync[id]().then((val) => (loadedRoutes[id] = val, delete promises[id], clears[id] = setTimeout(() => {
@@ -26,31 +77,18 @@ function globbedRoutesToRouteContext(paths, routerRoot, options) {
     }, 500), val)).catch((err) => {
       console.error("Error loading route", id, err, new Error().stack), loadedRoutes[id] = {
         default: () => null
-        // <View
-        //   style={{
-        //     position: 'absolute',
-        //     top: 0,
-        //     left: 0,
-        //     right: 0,
-        //     bottom: 0,
-        //     alignItems: 'center',
-        //     justifyContent: 'center',
-        //     backgroundColor: '#000',
-        //     gap: 20,
-        //   }}
-        // >
-        //   <Text style={{ fontSize: 24, color: '#fff' }}>Error loading route</Text>
-        //   <Text style={{ fontSize: 16, color: '#fff' }}>{id}</Text>
-        //   <Text style={{ fontSize: 18, color: '#fff', maxWidth: 800 }}>{`${err}`}</Text>
-        // </View>
       }, delete promises[id];
     }), process.env.NODE_ENV === "development" && (promises[id].stack = new Error().stack)), promises[id];
   }
   return resolve.keys = () => moduleKeys, resolve.id = "", resolve.resolve = (id) => id, resolve;
 }
 export {
+  getPreloadedModule,
+  getPreloadedModuleKeys,
   globbedRoutesToRouteContext,
   loadRoutes,
+  preloadRouteModules,
+  registerPreloadedRoute,
   useViteRoutes
 };
 //# sourceMappingURL=useViteRoutes.js.map

package/dist/esm/router/useViteRoutes.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/router/useViteRoutes.tsx"],
-  "mappings": "AAKA,IAAI,cAAc,GACd;AAGG,SAAS,cACd,QACA,YACA,SACA,SACA;AACA,SAAI,WAAW,UAAU,gBAEvB,UAAU,MACV,cAAc,UAGX,WACH,WAAW,QAAQ,YAAY,OAAO,GAGjC;AACT;AAEO,SAAS,WACd,OACA,YACA,SACA;AACA,SAAI,YACJ,WAAW,sBAAyB,OACpC,UAAU,4BAA4B,OAAO,YAAY,OAAO,GACzD;AACT;AAEO,SAAS,4BACd,OACA,YACA,SACkB;AAElB,QAAM,aAAa,CAAC,GACd,WAAW,CAAC,GACZ,eAAe,CAAC,GAChB,SAAS,CAAC;AAEhB,SAAO,KAAK,KAAK,EAAE,QAAQ,CAAC,SAAS;AACnC,QAAI,CAAC,MAAM,IAAI,GAAG;AAChB,cAAQ,MAAM,gCAAgC,IAAI,EAAE;AACpD;AAAA,IACF;AACA,UAAM,oBAAoB,MAAM,IAAI,GAC9B,sBAAsB,KAAK,QAAQ,IAAI,UAAU,KAAK,IAAI,GAE1D,eAAe,oBAAoB,MAAM,CAAC,EAAE,QAAQ,cAAc,EAAE;AAC1E,IAAI,SAAS,aAAa,YAAY,MAAM,SAC1C,QAAQ,KAAK,aAAa,YAAY,EAAE,GAExC,aAAa,mBAAmB,IAAI,MAC3B,QAGT,WAAW,mBAAmB,IAAI;AAAA,EAEtC,CAAC;AAED,QAAM,aAAa,OAAO,KAAK,UAAU;AAEzC,WAAS,QAAQ,IAAY;AAG3B,QAFA,aAAa,OAAO,EAAE,CAAC,GAEnB,aAAa,EAAE;AACjB,aAAO,aAAa,EAAE;AAGxB,QAAI,OAAO,WAAW,EAAE,KAAM;AAC5B,aAAO,WAAW,EAAE;AAGtB,UAAK,SAAS,EAAE,MACd,SAAS,EAAE,IAAI,WAAW,EAAE,EAAE,EAC3B,KAAK,CAAC,SACL,aAAa,EAAE,IAAI,KACnB,OAAO,SAAS,EAAE,GAGlB,OAAO,EAAE,IAAI,WAAW,MAAM;AAC5B,aAAO,aAAa,EAAE;AAAA,IACxB,GAAG,GAAG,GAEC,IACR,EACA,MAAM,CAAC,QAAQ;AACd,cAAQ,MAAM,uBAAuB,IAAI,KAAK,IAAI,MAAM,EAAE,KAAK,GAC/D,aAAa,EAAE,IAAI;AAAA,QACjB,SAAS,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,MAkBjB,GACA,OAAO,SAAS,EAAE;AAAA,IACpB,CAAC,GAEC,QAAQ,IAAI,aAAa,kBAC3B,SAAS,EAAE,EAAE,QAAQ,IAAI,MAAM,EAAE,SAO/B,SAAS,EAAE;AAAA,EACnB;AAEA,iBAAQ,OAAO,MAAM,YACrB,QAAQ,KAAK,IACb,QAAQ,UAAU,CAAC,OAAe,IAE3B;AACT;",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/router/useViteRoutes.mjs

@@ -3,6 +3,56 @@ let lastVersion = 0,
 function useViteRoutes(routes, routerRoot, options, version) {
   return version && version > lastVersion && (context = null, lastVersion = version), context || loadRoutes(routes, routerRoot, options), context;
 }
+let preloadedModules = {};
+function registerPreloadedRoute(key, module) {
+  preloadedModules[key] = module;
+}
+function getPreloadedModule(key) {
+  return preloadedModules[key];
+}
+function getPreloadedModuleKeys() {
+  return Object.keys(preloadedModules);
+}
+function matchDynamicRoute(routePattern, actualPath) {
+  const routeSegments = routePattern.split("/"),
+    pathSegments = actualPath.split("/");
+  if (routeSegments.some(s => s.startsWith("[..."))) {
+    const catchAllIdx = routeSegments.findIndex(s => s.startsWith("[..."));
+    for (let i = 0; i < catchAllIdx; i++) if (routeSegments[i] && !routeSegments[i].startsWith("[") && routeSegments[i] !== pathSegments[i]) return !1;
+    return pathSegments.length >= catchAllIdx;
+  }
+  if (routeSegments.length !== pathSegments.length) return !1;
+  for (let i = 0; i < routeSegments.length; i++) {
+    const routeSeg = routeSegments[i],
+      pathSeg = pathSegments[i];
+    if (!(routeSeg.startsWith("[") && routeSeg.endsWith("]")) && routeSeg !== pathSeg) return !1;
+  }
+  return !0;
+}
+async function preloadRouteModules(href) {
+  const globbed = globalThis.__importMetaGlobbed;
+  if (!globbed) return;
+  const normalizedHref = href === "/" ? "" : href.replace(/^\//, "").replace(/\/$/, ""),
+    promises = [];
+  for (const key of Object.keys(globbed)) {
+    let routePath = key.replace(/^\/[^/]+\//, "");
+    routePath = routePath.replace(/\([^)]+\)\//g, ""), routePath = routePath.replace(/\/_layout\.tsx$/, "").replace(/\/index(\+[a-z]+)?\.tsx$/, "").replace(/(\+[a-z]+)?\.tsx$/, ""), routePath = routePath.replace(/^\//, "");
+    const isStaticMatch = routePath === normalizedHref ||
+      // exact match
+      routePath.startsWith(normalizedHref + "/") ||
+      // child route
+      normalizedHref.startsWith(routePath + "/") ||
+      // parent layout
+      routePath === "" ||
+      // root layout
+      normalizedHref !== "" && routePath === normalizedHref.split("/")[0],
+      isDynamicMatch = routePath.includes("[") && matchDynamicRoute(routePath, normalizedHref);
+    (isStaticMatch || isDynamicMatch) && typeof globbed[key] == "function" && promises.push(globbed[key]().then(mod => {
+      preloadedModules[key] = mod;
+    }).catch(() => {}));
+  }
+  await Promise.all(promises);
+}
 function loadRoutes(paths, routerRoot, options) {
   return context || (globalThis.__importMetaGlobbed = paths, context = globbedRoutesToRouteContext(paths, routerRoot, options), context);
 }
@@ -24,33 +74,19 @@ function globbedRoutesToRouteContext(paths, routerRoot, options) {
   const moduleKeys = Object.keys(routesSync);
   function resolve(id) {
     if (clearTimeout(clears[id]), loadedRoutes[id]) return loadedRoutes[id];
+    const preloadKey = id.replace("./", `/${routerRoot}/`),
+      preloaded = getPreloadedModule(preloadKey);
+    if (preloaded) return loadedRoutes[id] = preloaded, preloaded;
     if (typeof routesSync[id] != "function") return routesSync[id];
     throw promises[id] || (promises[id] = routesSync[id]().then(val => (loadedRoutes[id] = val, delete promises[id], clears[id] = setTimeout(() => {
       delete loadedRoutes[id];
     }, 500), val)).catch(err => {
       console.error("Error loading route", id, err, new Error().stack), loadedRoutes[id] = {
         default: () => null
-        // <View
-        //   style={{
-        //     position: 'absolute',
-        //     top: 0,
-        //     left: 0,
-        //     right: 0,
-        //     bottom: 0,
-        //     alignItems: 'center',
-        //     justifyContent: 'center',
-        //     backgroundColor: '#000',
-        //     gap: 20,
-        //   }}
-        // >
-        //   <Text style={{ fontSize: 24, color: '#fff' }}>Error loading route</Text>
-        //   <Text style={{ fontSize: 16, color: '#fff' }}>{id}</Text>
-        //   <Text style={{ fontSize: 18, color: '#fff', maxWidth: 800 }}>{`${err}`}</Text>
-        // </View>
       }, delete promises[id];
     }), process.env.NODE_ENV === "development" && (promises[id].stack = new Error().stack)), promises[id];
   }
   return resolve.keys = () => moduleKeys, resolve.id = "", resolve.resolve = id => id, resolve;
 }
-export { globbedRoutesToRouteContext, loadRoutes, useViteRoutes };
+export { getPreloadedModule, getPreloadedModuleKeys, globbedRoutesToRouteContext, loadRoutes, preloadRouteModules, registerPreloadedRoute, useViteRoutes };
 //# sourceMappingURL=useViteRoutes.mjs.map

package/dist/esm/router/useViteRoutes.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["lastVersion","context","useViteRoutes","routes","routerRoot","options","version","loadRoutes","paths","globalThis","__importMetaGlobbed","globbedRoutesToRouteContext","routesSync","promises","loadedRoutes","clears","Object","keys","forEach","path","console","error","loadRouteFunction","pathWithoutRelative","replace","originalPath","slice","routeModes","info","moduleKeys","resolve","id","clearTimeout","then","val","setTimeout","catch","err","Error","stack","default","process","env","NODE_ENV"],"sources":["../../../src/router/useViteRoutes.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["lastVersion","context","useViteRoutes","routes","routerRoot","options","version","loadRoutes","preloadedModules","registerPreloadedRoute","key","module","getPreloadedModule","getPreloadedModuleKeys","Object","keys","matchDynamicRoute","routePattern","actualPath","routeSegments","split","pathSegments","some","s","startsWith","catchAllIdx","findIndex","i","length","routeSeg","pathSeg","endsWith","preloadRouteModules","href","globbed","globalThis","__importMetaGlobbed","normalizedHref","replace","promises","routePath","isStaticMatch","isDynamicMatch","includes","push","then","mod","catch","Promise","all","paths","globbedRoutesToRouteContext","routesSync","loadedRoutes","clears","forEach","path","console","error","loadRouteFunction","pathWithoutRelative","originalPath","slice","routeModes","info","moduleKeys","resolve","id","clearTimeout","preloadKey","preloaded","val","setTimeout","err","Error","stack","default","process","env","NODE_ENV"],"sources":["../../../src/router/useViteRoutes.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/router/useViteRoutes.native.js

@@ -3,6 +3,75 @@ var lastVersion = 0,
 function useViteRoutes(routes, routerRoot, options, version) {
   return version && version > lastVersion && (context = null, lastVersion = version), context || loadRoutes(routes, routerRoot, options), context;
 }
+var preloadedModules = {};
+function registerPreloadedRoute(key, module) {
+  preloadedModules[key] = module;
+}
+function getPreloadedModule(key) {
+  return preloadedModules[key];
+}
+function getPreloadedModuleKeys() {
+  return Object.keys(preloadedModules);
+}
+function matchDynamicRoute(routePattern, actualPath) {
+  var routeSegments = routePattern.split("/"),
+    pathSegments = actualPath.split("/"),
+    hasCatchAll = routeSegments.some(function (s) {
+      return s.startsWith("[...");
+    });
+  if (hasCatchAll) {
+    for (var catchAllIdx = routeSegments.findIndex(function (s) {
+        return s.startsWith("[...");
+      }), i = 0; i < catchAllIdx; i++) if (routeSegments[i] && !routeSegments[i].startsWith("[") && routeSegments[i] !== pathSegments[i]) return !1;
+    return pathSegments.length >= catchAllIdx;
+  }
+  if (routeSegments.length !== pathSegments.length) return !1;
+  for (var i1 = 0; i1 < routeSegments.length; i1++) {
+    var routeSeg = routeSegments[i1],
+      pathSeg = pathSegments[i1];
+    if (!(routeSeg.startsWith("[") && routeSeg.endsWith("]")) && routeSeg !== pathSeg) return !1;
+  }
+  return !0;
+}
+async function preloadRouteModules(href) {
+  var globbed = globalThis.__importMetaGlobbed;
+  if (globbed) {
+    var normalizedHref = href === "/" ? "" : href.replace(/^\//, "").replace(/\/$/, ""),
+      promises = [],
+      _iteratorNormalCompletion = !0,
+      _didIteratorError = !1,
+      _iteratorError = void 0;
+    try {
+      for (var _loop = function () {
+          var key = _step.value,
+            routePath = key.replace(/^\/[^/]+\//, "");
+          routePath = routePath.replace(/\([^)]+\)\//g, ""), routePath = routePath.replace(/\/_layout\.tsx$/, "").replace(/\/index(\+[a-z]+)?\.tsx$/, "").replace(/(\+[a-z]+)?\.tsx$/, ""), routePath = routePath.replace(/^\//, "");
+          var isStaticMatch = routePath === normalizedHref ||
+            // exact match
+            routePath.startsWith(normalizedHref + "/") ||
+            // child route
+            normalizedHref.startsWith(routePath + "/") ||
+            // parent layout
+            routePath === "" ||
+            // root layout
+            normalizedHref !== "" && routePath === normalizedHref.split("/")[0],
+            isDynamicMatch = routePath.includes("[") && matchDynamicRoute(routePath, normalizedHref);
+          (isStaticMatch || isDynamicMatch) && typeof globbed[key] == "function" && promises.push(globbed[key]().then(function (mod) {
+            preloadedModules[key] = mod;
+          }).catch(function () {}));
+        }, _iterator = Object.keys(globbed)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) _loop();
+    } catch (err) {
+      _didIteratorError = !0, _iteratorError = err;
+    } finally {
+      try {
+        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+      } finally {
+        if (_didIteratorError) throw _iteratorError;
+      }
+    }
+    await Promise.all(promises);
+  }
+}
 function loadRoutes(paths, routerRoot, options) {
   return context || (globalThis.__importMetaGlobbed = paths, context = globbedRoutesToRouteContext(paths, routerRoot, options), context);
 }
@@ -27,6 +96,9 @@ function globbedRoutesToRouteContext(paths, routerRoot, options) {
   var moduleKeys = Object.keys(routesSync);
   function resolve(id) {
     if (clearTimeout(clears[id]), loadedRoutes[id]) return loadedRoutes[id];
+    var preloadKey = id.replace("./", `/${routerRoot}/`),
+      preloaded = getPreloadedModule(preloadKey);
+    if (preloaded) return loadedRoutes[id] = preloaded, preloaded;
     if (typeof routesSync[id] != "function") return routesSync[id];
     throw promises[id] || (promises[id] = routesSync[id]().then(function (val) {
       return loadedRoutes[id] = val, delete promises[id], clears[id] = setTimeout(function () {
@@ -46,5 +118,5 @@ function globbedRoutesToRouteContext(paths, routerRoot, options) {
     return id;
   }, resolve;
 }
-export { globbedRoutesToRouteContext, loadRoutes, useViteRoutes };
+export { getPreloadedModule, getPreloadedModuleKeys, globbedRoutesToRouteContext, loadRoutes, preloadRouteModules, registerPreloadedRoute, useViteRoutes };
 //# sourceMappingURL=useViteRoutes.native.js.map

package/dist/esm/router/useViteRoutes.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["lastVersion","context","useViteRoutes","routes","routerRoot","options","version","loadRoutes","paths","globalThis","__importMetaGlobbed","globbedRoutesToRouteContext","routesSync","promises","loadedRoutes","clears","Object","keys","forEach","path","_options_routeModes","console","error","loadRouteFunction","pathWithoutRelative","replace","originalPath","slice","routeModes","info","moduleKeys","resolve","id","clearTimeout","then","val","setTimeout","catch","err","Error","stack","default","process","env","NODE_ENV"],"sources":["../../../src/router/useViteRoutes.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["lastVersion","context","useViteRoutes","routes","routerRoot","options","version","loadRoutes","preloadedModules","registerPreloadedRoute","key","module","getPreloadedModule","getPreloadedModuleKeys","Object","keys","matchDynamicRoute","routePattern","actualPath","routeSegments","split","pathSegments","hasCatchAll","some","s","startsWith","catchAllIdx","findIndex","i","length","i1","routeSeg","pathSeg","endsWith","preloadRouteModules","href","globbed","globalThis","__importMetaGlobbed","normalizedHref","replace","promises","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","_step","value","routePath","isStaticMatch","isDynamicMatch","includes","push","then","mod","catch","_iterator","Symbol","iterator","next","done","err","return","Promise","all","paths","globbedRoutesToRouteContext","routesSync","loadedRoutes","clears","forEach","path","_options_routeModes","console","error","loadRouteFunction","pathWithoutRelative","originalPath","slice","routeModes","info","moduleKeys","resolve","id","clearTimeout"],"sources":["../../../src/router/useViteRoutes.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/useLoader.js

@@ -1,7 +1,6 @@
 import { useCallback, useSyncExternalStore } from "react";
 import { useParams, usePathname } from "./hooks";
-import { resolveHref } from "./link/href";
-import { preloadingLoader } from "./router/router";
+import { preloadedLoaderData, preloadingLoader } from "./router/router";
 import { getLoaderPath } from "./utils/cleanUrl";
 import { dynamicImport } from "./utils/dynamicImport";
 import { weakKey } from "./utils/weakKey";
@@ -45,7 +44,7 @@ async function refetchLoader(pathname2) {
   }
 }
 function useLoaderState(loader) {
-  const { loaderProps: loaderPropsFromServerContext, loaderData: loaderDataFromServerContext } = useServerContext() || {}, params = useParams(), pathname = usePathname(), currentPath = resolveHref({ pathname, params }).replace(/index$/, "");
+  const { loaderProps: loaderPropsFromServerContext, loaderData: loaderDataFromServerContext } = useServerContext() || {}, params = useParams(), pathname = usePathname(), currentPath = pathname.replace(/\/index$/, "").replace(/\/$/, "") || "/";
   if (typeof window > "u" && loader)
     return { data: useAsyncFn(
       loader,
@@ -55,7 +54,7 @@ function useLoaderState(loader) {
       }
     ), refetch: async () => {
     }, state: "idle" };
-  const preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0, loaderStateEntry = useSyncExternalStore(
+  const serverContextPath = loaderPropsFromServerContext?.path, preloadedData = serverContextPath === currentPath ? loaderDataFromServerContext : void 0, loaderStateEntry = useSyncExternalStore(
     subscribe,
     () => getLoaderState(currentPath, preloadedData),
     () => getLoaderState(currentPath, preloadedData)
@@ -65,11 +64,13 @@ function useLoaderState(loader) {
       refetch,
       state: loaderStateEntry.state
     };
-  if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce && loader)
-    if (preloadingLoader[currentPath]) {
-      typeof preloadingLoader[currentPath] == "function" && (preloadingLoader[currentPath] = preloadingLoader[currentPath]());
+  if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce && loader) {
+    const resolvedPreloadData = preloadedLoaderData[currentPath];
+    if (resolvedPreloadData !== void 0)
+      delete preloadedLoaderData[currentPath], delete preloadingLoader[currentPath], loaderStateEntry.data = resolvedPreloadData, loaderStateEntry.hasLoadedOnce = !0;
+    else if (preloadingLoader[currentPath]) {
       const promise2 = preloadingLoader[currentPath].then((val) => {
-        delete preloadingLoader[currentPath], updateState(currentPath, {
+        delete preloadingLoader[currentPath], delete preloadedLoaderData[currentPath], updateState(currentPath, {
           data: val,
           hasLoadedOnce: !0,
           promise: void 0
@@ -99,6 +100,7 @@ function useLoaderState(loader) {
       }, promise = loadData();
       loaderStateEntry.promise = promise;
     }
+  }
   if (loader) {
     if (loaderStateEntry.error && !loaderStateEntry.hasLoadedOnce)
       throw loaderStateEntry.error;

package/dist/esm/useLoader.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useLoader.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["preloadedData", "pathname", "loaderJSUrl", "result", "promise", "loader", "data"]
 }

package/dist/esm/useLoader.mjs

@@ -1,7 +1,6 @@
 import { useCallback, useSyncExternalStore } from "react";
 import { useParams, usePathname } from "./hooks.mjs";
-import { resolveHref } from "./link/href.mjs";
-import { preloadingLoader } from "./router/router.mjs";
+import { preloadedLoaderData, preloadingLoader } from "./router/router.mjs";
 import { getLoaderPath } from "./utils/cleanUrl.mjs";
 import { dynamicImport } from "./utils/dynamicImport.mjs";
 import { weakKey } from "./utils/weakKey.mjs";
@@ -57,10 +56,7 @@ function useLoaderState(loader) {
     } = useServerContext() || {},
     params = useParams(),
     pathname = usePathname(),
-    currentPath = resolveHref({
-      pathname,
-      params
-    }).replace(/index$/, "");
+    currentPath = pathname.replace(/\/index$/, "").replace(/\/$/, "") || "/";
   if (typeof window > "u" && loader) return {
     data: useAsyncFn(loader, loaderPropsFromServerContext || {
       path: pathname,
@@ -69,48 +65,51 @@ function useLoaderState(loader) {
     refetch: async () => {},
     state: "idle"
   };
-  const preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0,
+  const serverContextPath = loaderPropsFromServerContext?.path,
+    preloadedData = serverContextPath === currentPath ? loaderDataFromServerContext : void 0,
     loaderStateEntry = useSyncExternalStore(subscribe, () => getLoaderState(currentPath, preloadedData), () => getLoaderState(currentPath, preloadedData)),
     refetch = useCallback(() => refetchLoader(currentPath), [currentPath]);
   if (!loader) return {
     refetch,
     state: loaderStateEntry.state
   };
-  if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce && loader) if (preloadingLoader[currentPath]) {
-    typeof preloadingLoader[currentPath] == "function" && (preloadingLoader[currentPath] = preloadingLoader[currentPath]());
-    const promise2 = preloadingLoader[currentPath].then(val => {
-      delete preloadingLoader[currentPath], updateState(currentPath, {
-        data: val,
-        hasLoadedOnce: !0,
-        promise: void 0
-      });
-    }).catch(err => {
-      console.error("Error running loader()", err), delete preloadingLoader[currentPath], updateState(currentPath, {
-        error: err,
-        promise: void 0
+  if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce && loader) {
+    const resolvedPreloadData = preloadedLoaderData[currentPath];
+    if (resolvedPreloadData !== void 0) delete preloadedLoaderData[currentPath], delete preloadingLoader[currentPath], loaderStateEntry.data = resolvedPreloadData, loaderStateEntry.hasLoadedOnce = !0;else if (preloadingLoader[currentPath]) {
+      const promise2 = preloadingLoader[currentPath].then(val => {
+        delete preloadingLoader[currentPath], delete preloadedLoaderData[currentPath], updateState(currentPath, {
+          data: val,
+          hasLoadedOnce: !0,
+          promise: void 0
+        });
+      }).catch(err => {
+        console.error("Error running loader()", err), delete preloadingLoader[currentPath], updateState(currentPath, {
+          error: err,
+          promise: void 0
+        });
       });
-    });
-    loaderStateEntry.promise = promise2;
-  } else {
-    const loadData = async () => {
-        try {
-          const loaderJSUrl = getLoaderPath(currentPath, !0),
-            module = await dynamicImport(loaderJSUrl),
-            result = await module.loader();
-          updateState(currentPath, {
-            data: result,
-            hasLoadedOnce: !0,
-            promise: void 0
-          });
-        } catch (err) {
-          updateState(currentPath, {
-            error: err,
-            promise: void 0
-          });
-        }
-      },
-      promise = loadData();
-    loaderStateEntry.promise = promise;
+      loaderStateEntry.promise = promise2;
+    } else {
+      const loadData = async () => {
+          try {
+            const loaderJSUrl = getLoaderPath(currentPath, !0),
+              module = await dynamicImport(loaderJSUrl),
+              result = await module.loader();
+            updateState(currentPath, {
+              data: result,
+              hasLoadedOnce: !0,
+              promise: void 0
+            });
+          } catch (err) {
+            updateState(currentPath, {
+              error: err,
+              promise: void 0
+            });
+          }
+        },
+        promise = loadData();
+      loaderStateEntry.promise = promise;
+    }
   }
   if (loader) {
     if (loaderStateEntry.error && !loaderStateEntry.hasLoadedOnce) throw loaderStateEntry.error;

package/dist/esm/useLoader.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useSyncExternalStore","useParams","usePathname","resolveHref","preloadingLoader","getLoaderPath","dynamicImport","weakKey","useServerContext","loaderState","subscribers","Set","updateState","path","updates","forEach","callback","subscribe","add","delete","getLoaderState","preloadedData2","data","error","promise","state","hasLoadedOnce","refetchLoader","pathname2","cacheBust","Date","now","loaderJSUrl2","result2","loader","timestamp","err","useLoaderState","loaderProps","loaderPropsFromServerContext","loaderData","loaderDataFromServerContext","params","pathname","currentPath","replace","window","useAsyncFn","refetch","preloadedData","loaderStateEntry","promise2","then","val","catch","console","loadData","loaderJSUrl","module","result","useLoader","loader2","data2","results","Map","started","props","key","JSON","stringify","get","set","next","Promise","final","current"],"sources":["../../src/useLoader.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useSyncExternalStore","useParams","usePathname","preloadedLoaderData","preloadingLoader","getLoaderPath","dynamicImport","weakKey","useServerContext","loaderState","subscribers","Set","updateState","path","updates","forEach","callback","subscribe","add","delete","getLoaderState","preloadedData2","data","error","promise","state","hasLoadedOnce","refetchLoader","pathname2","cacheBust","Date","now","loaderJSUrl2","result2","loader","timestamp","err","useLoaderState","loaderProps","loaderPropsFromServerContext","loaderData","loaderDataFromServerContext","params","pathname","currentPath","replace","window","useAsyncFn","refetch","serverContextPath","preloadedData","loaderStateEntry","resolvedPreloadData","promise2","then","val","catch","console","loadData","loaderJSUrl","module","result","useLoader","loader2","data2","results","Map","started","props","key","JSON","stringify","get","set","next","Promise","final","current"],"sources":["../../src/useLoader.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}