one 1.14.4 → 1.15.0

package/dist/esm/useLoader.native.js

@@ -15,55 +15,74 @@ import { weakKey } from "./utils/weakKey.native.js";
 import { useServerContext } from "./vite/one-server-only.native.js";
 import { setSSRLoaderData } from "./server/ssrLoaderData.native.js";
 function _instanceof(left, right) {
-  return right != null && typeof Symbol < "u" && right[Symbol.hasInstance] ? !!right[Symbol.hasInstance](left) : left instanceof right;
+  if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+    return !!right[Symbol.hasInstance](left);
+  } else {
+    return left instanceof right;
+  }
 }
-var loaderTimingHistory = [],
-  MAX_TIMING_HISTORY = 50,
-  recordLoaderTiming = process.env.NODE_ENV === "development" ? function (entry) {
-    loaderTimingHistory.unshift(entry), loaderTimingHistory.length > MAX_TIMING_HISTORY && loaderTimingHistory.pop(), typeof window < "u" && typeof CustomEvent < "u" && (window.dispatchEvent(new CustomEvent("one-loader-timing", {
+var LOADER_TIMEOUT = process.env.ONE_LOADER_TIMEOUT_MS ? +process.env.ONE_LOADER_TIMEOUT_MS : 6e4;
+var loaderTimingHistory = [];
+var MAX_TIMING_HISTORY = 50;
+var recordLoaderTiming = process.env.NODE_ENV === "development" ? function (entry) {
+  loaderTimingHistory.unshift(entry);
+  if (loaderTimingHistory.length > MAX_TIMING_HISTORY) {
+    loaderTimingHistory.pop();
+  }
+  if (typeof window !== "undefined" && typeof CustomEvent !== "undefined") {
+    window.dispatchEvent(new CustomEvent("one-loader-timing", {
       detail: entry
-    })), entry.error && window.dispatchEvent(new CustomEvent("one-error", {
-      detail: {
-        error: {
-          message: entry.error,
-          name: "LoaderError"
-        },
-        route: {
-          pathname: entry.path
-        },
-        timestamp: Date.now(),
-        type: "loader"
-      }
-    })));
-  } : void 0;
+    }));
+    if (entry.error) {
+      window.dispatchEvent(new CustomEvent("one-error", {
+        detail: {
+          error: {
+            message: entry.error,
+            name: "LoaderError"
+          },
+          route: {
+            pathname: entry.path
+          },
+          timestamp: Date.now(),
+          type: "loader"
+        }
+      }));
+    }
+  }
+} : void 0;
 function getLoaderTimingHistory() {
   return loaderTimingHistory;
 }
 registerDevtoolsFunction("getLoaderTimingHistory", getLoaderTimingHistory);
 registerDevtoolsFunction("recordLoaderTiming", recordLoaderTiming);
-var loaderState = {},
-  subscribers = /* @__PURE__ */new Set();
+var loaderState = {};
+var subscribers = /* @__PURE__ */new Set();
 function updateState(path, updates) {
   loaderState[path] = {
     ...loaderState[path],
     ...updates
-  }, subscribers.forEach(function (callback) {
+  };
+  subscribers.forEach(function (callback) {
     callback();
   });
 }
 function subscribe(callback) {
-  return subscribers.add(callback), function () {
+  subscribers.add(callback);
+  return function () {
     return subscribers.delete(callback);
   };
 }
 function getLoaderState(path, preloadedData2) {
-  return loaderState[path] || (loaderState[path] = {
-    data: preloadedData2,
-    error: void 0,
-    promise: void 0,
-    state: "idle",
-    hasLoadedOnce: !!preloadedData2
-  }), loaderState[path];
+  if (!loaderState[path]) {
+    loaderState[path] = {
+      data: preloadedData2,
+      error: void 0,
+      promise: void 0,
+      state: "idle",
+      hasLoadedOnce: !!preloadedData2
+    };
+  }
+  return loaderState[path];
 }
 async function refetchLoader(pathname2) {
   var startTime2 = performance.now();
@@ -72,43 +91,45 @@ async function refetchLoader(pathname2) {
     error: null
   });
   try {
-    var _dynamicImport2,
-      cacheBust = `${Date.now()}`,
-      loaderJSUrl2 = getLoaderPath(pathname2, !0, cacheBust),
-      moduleLoadStart2 = performance.now(),
-      module2 = await ((_dynamicImport2 = dynamicImport(loaderJSUrl2)) === null || _dynamicImport2 === void 0 ? void 0 : _dynamicImport2.catch(function () {
-        return null;
-      })),
-      moduleLoadTime2 = performance.now() - moduleLoadStart2;
-    if (!module2?.loader) {
+    var _dynamicImport2;
+    var cacheBust = `${Date.now()}`;
+    var loaderJSUrl2 = getLoaderPath(pathname2, true, cacheBust);
+    var moduleLoadStart2 = performance.now();
+    var module2 = await ((_dynamicImport2 = dynamicImport(loaderJSUrl2)) === null || _dynamicImport2 === void 0 ? void 0 : _dynamicImport2.catch(function () {
+      return null;
+    }));
+    var moduleLoadTime2 = performance.now() - moduleLoadStart2;
+    if (!(module2 === null || module2 === void 0 ? void 0 : module2.loader)) {
       updateState(pathname2, {
         data: void 0,
         state: "idle",
-        hasLoadedOnce: !0
+        hasLoadedOnce: true
       });
       return;
     }
-    var executionStart2 = performance.now(),
-      result2 = await module2.loader(),
-      executionTime2 = performance.now() - executionStart2,
-      totalTime2 = performance.now() - startTime2;
-    if (result2?.__oneRedirect) {
-      recordLoaderTiming?.({
+    var executionStart2 = performance.now();
+    var result2 = await module2.loader();
+    var executionTime2 = performance.now() - executionStart2;
+    var totalTime2 = performance.now() - startTime2;
+    if (result2 === null || result2 === void 0 ? void 0 : result2.__oneRedirect) {
+      recordLoaderTiming === null || recordLoaderTiming === void 0 ? void 0 : recordLoaderTiming({
         path: pathname2,
         startTime: startTime2,
         moduleLoadTime: moduleLoadTime2,
         executionTime: executionTime2,
         totalTime: totalTime2,
         source: "refetch"
-      }), updateState(pathname2, {
+      });
+      updateState(pathname2, {
         data: void 0,
         state: "idle",
-        hasLoadedOnce: !0
-      }), router.replace(result2.__oneRedirect);
+        hasLoadedOnce: true
+      });
+      router.replace(result2.__oneRedirect);
       return;
     }
-    if (result2?.__oneError === 404) {
-      recordLoaderTiming?.({
+    if ((result2 === null || result2 === void 0 ? void 0 : result2.__oneError) === 404) {
+      recordLoaderTiming === null || recordLoaderTiming === void 0 ? void 0 : recordLoaderTiming({
         path: pathname2,
         startTime: startTime2,
         moduleLoadTime: moduleLoadTime2,
@@ -128,13 +149,16 @@ async function refetchLoader(pathname2) {
       data: result2,
       state: "idle",
       timestamp: Date.now(),
-      hasLoadedOnce: !0
+      hasLoadedOnce: true
     });
-    var currentMatches = getClientMatchesSnapshot(),
-      pageMatch = currentMatches[currentMatches.length - 1],
-      normalizedPathname = pathname2.replace(/\/$/, "") || "/",
-      normalizedMatchPathname = (pageMatch?.pathname || "").replace(/\/$/, "") || "/";
-    pageMatch && normalizedMatchPathname === normalizedPathname && updateMatchLoaderData(pageMatch.routeId, result2), recordLoaderTiming?.({
+    var currentMatches = getClientMatchesSnapshot();
+    var pageMatch = currentMatches[currentMatches.length - 1];
+    var normalizedPathname = pathname2.replace(/\/$/, "") || "/";
+    var normalizedMatchPathname = ((pageMatch === null || pageMatch === void 0 ? void 0 : pageMatch.pathname) || "").replace(/\/$/, "") || "/";
+    if (pageMatch && normalizedMatchPathname === normalizedPathname) {
+      updateMatchLoaderData(pageMatch.routeId, result2);
+    }
+    recordLoaderTiming === null || recordLoaderTiming === void 0 ? void 0 : recordLoaderTiming({
       path: pathname2,
       startTime: startTime2,
       moduleLoadTime: moduleLoadTime2,
@@ -144,58 +168,67 @@ async function refetchLoader(pathname2) {
     });
   } catch (err) {
     var totalTime1 = performance.now() - startTime2;
-    throw updateState(pathname2, {
+    updateState(pathname2, {
       error: err,
       state: "idle"
-    }), recordLoaderTiming?.({
+    });
+    recordLoaderTiming === null || recordLoaderTiming === void 0 ? void 0 : recordLoaderTiming({
       path: pathname2,
       startTime: startTime2,
       totalTime: totalTime1,
       error: _instanceof(err, Error) ? err.message : String(err),
       source: "refetch"
-    }), err;
+    });
+    throw err;
   }
 }
-process.env.NODE_ENV === "development" && typeof window < "u" && (window.__oneRefetchLoader = refetchLoader);
+if (process.env.NODE_ENV === "development" && typeof window !== "undefined") {
+  ;
+  window.__oneRefetchLoader = refetchLoader;
+}
 async function refetchMatchLoader(routeId, currentPath2) {
-  var _dynamicImport2,
-    cacheBust = `${Date.now()}`,
-    loaderJSUrl2 = getLoaderPath(currentPath2, !0, cacheBust),
-    module2 = await ((_dynamicImport2 = dynamicImport(loaderJSUrl2)) === null || _dynamicImport2 === void 0 ? void 0 : _dynamicImport2.catch(function () {
-      return null;
-    }));
-  if (module2?.loader) {
-    var result2 = await module2.loader();
-    result2?.__oneRedirect || result2?.__oneError || updateMatchLoaderData(routeId, result2);
-  }
+  var _dynamicImport2;
+  var cacheBust = `${Date.now()}`;
+  var loaderJSUrl2 = getLoaderPath(currentPath2, true, cacheBust);
+  var module2 = await ((_dynamicImport2 = dynamicImport(loaderJSUrl2)) === null || _dynamicImport2 === void 0 ? void 0 : _dynamicImport2.catch(function () {
+    return null;
+  }));
+  if (!(module2 === null || module2 === void 0 ? void 0 : module2.loader)) return;
+  var result2 = await module2.loader();
+  if ((result2 === null || result2 === void 0 ? void 0 : result2.__oneRedirect) || (result2 === null || result2 === void 0 ? void 0 : result2.__oneError)) return;
+  updateMatchLoaderData(routeId, result2);
 }
 function useLoaderState(loader) {
   var {
-      loaderProps: loaderPropsFromServerContext,
-      loaderData: loaderDataFromServerContext
-    } = useServerContext() || {},
-    params = useParams(),
-    pathname = usePathname(),
-    currentPath = pathname.replace(/\/index$/, "").replace(/\/$/, "") || "/";
-  if (typeof window > "u") {
+    loaderProps: loaderPropsFromServerContext,
+    loaderData: loaderDataFromServerContext
+  } = useServerContext() || {};
+  var params = useParams();
+  var pathname = usePathname();
+  var currentPath = pathname.replace(/\/index$/, "").replace(/\/$/, "") || "/";
+  if (typeof window === "undefined") {
     if (loader) {
-      if (ssrLoaderData.has(loader)) return {
-        data: ssrLoaderData.get(loader),
-        refetch: async function () {},
-        state: "idle"
-      };
-      var serverContext = useServerContext();
-      if (serverContext?.matches) {
-        var contextKey = useContextKey(),
-          match = serverContext.matches.find(function (m) {
-            return getContextKey(m.routeId) === contextKey;
-          });
-        if (match && match.loaderData !== void 0) return {
-          data: match.loaderData,
+      if (ssrLoaderData.has(loader)) {
+        return {
+          data: ssrLoaderData.get(loader),
           refetch: async function () {},
           state: "idle"
         };
       }
+      var serverContext = useServerContext();
+      if (serverContext === null || serverContext === void 0 ? void 0 : serverContext.matches) {
+        var contextKey = useContextKey();
+        var match = serverContext.matches.find(function (m) {
+          return getContextKey(m.routeId) === contextKey;
+        });
+        if (match && match.loaderData !== void 0) {
+          return {
+            data: match.loaderData,
+            refetch: async function () {},
+            state: "idle"
+          };
+        }
+      }
       var serverData = useAsyncFn(loader, loaderPropsFromServerContext || {
         path: pathname,
         params
@@ -206,112 +239,154 @@ function useLoaderState(loader) {
         state: "idle"
       };
     }
-    if (loaderDataFromServerContext !== void 0) return {
-      data: loaderDataFromServerContext,
-      refetch: async function () {},
-      state: "idle"
-    };
+    if (loaderDataFromServerContext !== void 0) {
+      return {
+        data: loaderDataFromServerContext,
+        refetch: async function () {},
+        state: "idle"
+      };
+    }
   }
   var matchRouteId = loader ? function () {
-      var result2 = loader();
-      return typeof result2 == "string" && result2.startsWith("./") ? result2 : null;
-    }() : null,
-    clientMatches = useSyncExternalStore(subscribeToClientMatches, getClientMatchesSnapshot, getClientMatchesSnapshot),
-    serverContextPath = loaderPropsFromServerContext?.path,
-    preloadedData = serverContextPath === currentPath ? loaderDataFromServerContext : void 0,
-    loaderStateEntry = useSyncExternalStore(subscribe, function () {
-      return getLoaderState(currentPath, preloadedData);
-    }, function () {
-      return getLoaderState(currentPath, preloadedData);
-    }),
-    refetch = useCallback(function () {
-      return refetchLoader(currentPath);
-    }, [currentPath]);
+    var result2 = loader();
+    return typeof result2 === "string" && result2.startsWith("./") ? result2 : null;
+  }() : null;
+  var clientMatches = useSyncExternalStore(subscribeToClientMatches, getClientMatchesSnapshot, getClientMatchesSnapshot);
+  var serverContextPath = loaderPropsFromServerContext === null || loaderPropsFromServerContext === void 0 ? void 0 : loaderPropsFromServerContext.path;
+  var preloadedData = serverContextPath === currentPath ? loaderDataFromServerContext : void 0;
+  var loaderStateEntry = useSyncExternalStore(subscribe, function () {
+    return getLoaderState(currentPath, preloadedData);
+  }, function () {
+    return getLoaderState(currentPath, preloadedData);
+  });
+  var refetch = useCallback(function () {
+    return refetchLoader(currentPath);
+  }, [currentPath]);
   if (matchRouteId) {
-    var _clientMatches_,
-      match = clientMatches.find(function (m) {
-        return m.routeId === matchRouteId;
-      }),
-      isPageMatch = clientMatches.length > 0 && ((_clientMatches_ = clientMatches[clientMatches.length - 1]) === null || _clientMatches_ === void 0 ? void 0 : _clientMatches_.routeId) === matchRouteId,
-      matchPathNormalized = (match?.pathname || "").replace(/\/$/, "") || "/",
-      matchPathFresh = !isPageMatch || matchPathNormalized === currentPath;
-    if (match && match.loaderData != null && matchPathFresh) return {
-      data: match.loaderData,
-      // refetch updates both loaderState (for useLoaderState() consumers without a loader)
-      // and the match entry (for this component and useMatches consumers)
-      refetch: async function () {
-        await refetchLoader(currentPath);
-        var fresh = loaderState[currentPath];
-        fresh?.data != null && updateMatchLoaderData(matchRouteId, fresh.data);
-      },
+    var _clientMatches_;
+    var match = clientMatches.find(function (m) {
+      return m.routeId === matchRouteId;
+    });
+    var isPageMatch = clientMatches.length > 0 && ((_clientMatches_ = clientMatches[clientMatches.length - 1]) === null || _clientMatches_ === void 0 ? void 0 : _clientMatches_.routeId) === matchRouteId;
+    var matchPathNormalized = ((match === null || match === void 0 ? void 0 : match.pathname) || "").replace(/\/$/, "") || "/";
+    var matchPathFresh = !isPageMatch || matchPathNormalized === currentPath;
+    if (match && match.loaderData != null && matchPathFresh) {
+      return {
+        data: match.loaderData,
+        // refetch updates both loaderState (for useLoaderState() consumers without a loader)
+        // and the match entry (for this component and useMatches consumers)
+        refetch: async function () {
+          await refetchLoader(currentPath);
+          var fresh = loaderState[currentPath];
+          if ((fresh === null || fresh === void 0 ? void 0 : fresh.data) != null) {
+            updateMatchLoaderData(matchRouteId, fresh.data);
+          }
+        },
+        state: loaderStateEntry.state
+      };
+    }
+  }
+  if (!loader) {
+    return {
+      refetch,
       state: loaderStateEntry.state
     };
   }
-  if (!loader) return {
-    refetch,
-    state: loaderStateEntry.state
-  };
   if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce) {
     var resolvedPreloadData = preloadedLoaderData[currentPath];
-    if (resolvedPreloadData != null) delete preloadedLoaderData[currentPath], delete preloadingLoader[currentPath], loaderStateEntry.data = resolvedPreloadData, loaderStateEntry.hasLoadedOnce = !0;else if (preloadingLoader[currentPath]) {
-      var preloadPromise = preloadingLoader[currentPath],
-        promise = preloadPromise.then(function (val) {
-          delete preloadingLoader[currentPath], delete preloadedLoaderData[currentPath], val != null ? updateState(currentPath, {
+    if (resolvedPreloadData != null) {
+      delete preloadedLoaderData[currentPath];
+      delete preloadingLoader[currentPath];
+      loaderStateEntry.data = resolvedPreloadData;
+      loaderStateEntry.hasLoadedOnce = true;
+    } else if (preloadingLoader[currentPath]) {
+      var preloadPromise = preloadingLoader[currentPath];
+      var promise = preloadPromise.then(function (val) {
+        delete preloadingLoader[currentPath];
+        delete preloadedLoaderData[currentPath];
+        if (val != null) {
+          updateState(currentPath, {
             data: val,
-            hasLoadedOnce: !0,
-            promise: void 0
-          }) : updateState(currentPath, {
+            hasLoadedOnce: true,
             promise: void 0
           });
-        }).catch(function (err) {
-          console.error("Error running loader()", err), delete preloadingLoader[currentPath], updateState(currentPath, {
-            error: err,
+        } else {
+          updateState(currentPath, {
             promise: void 0
           });
+        }
+      }).catch(function (err) {
+        console.error(`Error running loader()`, err);
+        delete preloadingLoader[currentPath];
+        updateState(currentPath, {
+          error: err,
+          promise: void 0
         });
+      });
       loaderStateEntry.promise = promise;
     } else {
       var loadData = async function () {
-          var startTime = performance.now();
-          try {
-            var _dynamicImport, nativeLoaderJSUrl;
-            if (process.env.NODE_ENV === "development") nativeLoaderJSUrl = `${getLoaderPath(currentPath, !0)}?platform=native`;else {
+        var startTime = performance.now();
+        try {
+          var _dynamicImport;
+          if (true) {
+            var nativeLoaderJSUrl;
+            if (process.env.NODE_ENV === "development") {
+              nativeLoaderJSUrl = `${getLoaderPath(currentPath, true)}?platform=native`;
+            } else {
               var {
-                  getURL
-                } = require("./getURL"),
-                base = getURL(),
-                cleanedPath = currentPath.slice(1).replace(/\/$/, "").replaceAll("_", "__").replaceAll("/", "_");
+                getURL
+              } = require("./getURL");
+              var base = getURL();
+              var cleanedPath = currentPath.slice(1).replace(/\/$/, "").replaceAll("_", "__").replaceAll("/", "_");
               nativeLoaderJSUrl = `${base}/assets/${cleanedPath}${LOADER_JS_POSTFIX_UNCACHED.replace(".js", ".native.js")}`;
             }
             try {
-              var moduleLoadStart = performance.now(),
-                loaderJsCodeResp = await fetch(nativeLoaderJSUrl);
-              if (!loaderJsCodeResp.ok) throw new Error(`Response not ok: ${loaderJsCodeResp.status}`);
-              var loaderJsCode = await loaderJsCodeResp.text(),
-                result = eval(`() => { var exports = {}; ${loaderJsCode}; return exports; }`)(),
-                moduleLoadTime = performance.now() - moduleLoadStart;
-              if (typeof result.loader != "function") throw new Error("Loader code isn't exporting a `loader` function");
-              var executionStart = performance.now(),
-                data = await result.loader(),
-                executionTime = performance.now() - executionStart,
-                totalTime = performance.now() - startTime;
-              if (data?.__oneRedirect) {
-                recordLoaderTiming?.({
+              var moduleLoadStart = performance.now();
+              var controller = new AbortController();
+              var timeoutId = setTimeout(function () {
+                return controller.abort();
+              }, LOADER_TIMEOUT);
+              var loaderJsCode;
+              try {
+                var loaderJsCodeResp = await fetch(nativeLoaderJSUrl, {
+                  signal: controller.signal
+                });
+                if (!loaderJsCodeResp.ok) {
+                  throw new Error(`Response not ok: ${loaderJsCodeResp.status}`);
+                }
+                loaderJsCode = await loaderJsCodeResp.text();
+              } finally {
+                clearTimeout(timeoutId);
+              }
+              var result = eval(`() => { var exports = {}; ${loaderJsCode}; return exports; }`)();
+              var moduleLoadTime = performance.now() - moduleLoadStart;
+              if (typeof result.loader !== "function") {
+                throw new Error("Loader code isn't exporting a `loader` function");
+              }
+              var executionStart = performance.now();
+              var data = await result.loader();
+              var executionTime = performance.now() - executionStart;
+              var totalTime = performance.now() - startTime;
+              if (data === null || data === void 0 ? void 0 : data.__oneRedirect) {
+                recordLoaderTiming === null || recordLoaderTiming === void 0 ? void 0 : recordLoaderTiming({
                   path: currentPath,
                   startTime,
                   moduleLoadTime,
                   executionTime,
                   totalTime,
                   source: "initial"
-                }), updateState(currentPath, {
+                });
+                updateState(currentPath, {
                   data: void 0,
-                  hasLoadedOnce: !0,
+                  hasLoadedOnce: true,
                   promise: void 0
-                }), router.replace(data.__oneRedirect);
+                });
+                router.replace(data.__oneRedirect);
                 return;
               }
-              if (data?.__oneError === 404) {
-                recordLoaderTiming?.({
+              if ((data === null || data === void 0 ? void 0 : data.__oneError) === 404) {
+                recordLoaderTiming === null || recordLoaderTiming === void 0 ? void 0 : recordLoaderTiming({
                   path: currentPath,
                   startTime,
                   moduleLoadTime,
@@ -329,9 +404,10 @@ function useLoaderState(loader) {
               }
               updateState(currentPath, {
                 data,
-                hasLoadedOnce: !0,
+                hasLoadedOnce: true,
                 promise: void 0
-              }), recordLoaderTiming?.({
+              });
+              recordLoaderTiming === null || recordLoaderTiming === void 0 ? void 0 : recordLoaderTiming({
                 path: currentPath,
                 startTime,
                 moduleLoadTime,
@@ -346,70 +422,37 @@ function useLoaderState(loader) {
               updateState(currentPath, {
                 data: {},
                 promise: void 0
-              }), recordLoaderTiming?.({
-                path: currentPath,
-                startTime,
-                totalTime,
-                error: _instanceof(e, Error) ? e.message : String(e),
-                source: "initial"
-              });
-              return;
-            }
-            var loaderJSUrl = getLoaderPath(currentPath, !0),
-              moduleLoadStart = performance.now(),
-              module = await ((_dynamicImport = dynamicImport(loaderJSUrl)) === null || _dynamicImport === void 0 ? void 0 : _dynamicImport.catch(function () {
-                return null;
-              })),
-              moduleLoadTime = performance.now() - moduleLoadStart;
-            if (!module?.loader) {
-              updateState(currentPath, {
-                data: void 0,
-                hasLoadedOnce: !0,
-                promise: void 0
               });
-              return;
-            }
-            var executionStart = performance.now(),
-              result = await module.loader(),
-              executionTime = performance.now() - executionStart,
-              totalTime = performance.now() - startTime;
-            if (result?.__oneRedirect) {
-              recordLoaderTiming?.({
-                path: currentPath,
-                startTime,
-                moduleLoadTime,
-                executionTime,
-                totalTime,
-                source: "initial"
-              }), updateState(currentPath, {
-                data: void 0,
-                hasLoadedOnce: !0,
-                promise: void 0
-              }), router.replace(result.__oneRedirect);
-              return;
-            }
-            if (result?.__oneError === 404) {
-              recordLoaderTiming?.({
+              recordLoaderTiming === null || recordLoaderTiming === void 0 ? void 0 : recordLoaderTiming({
                 path: currentPath,
                 startTime,
-                moduleLoadTime,
-                executionTime,
                 totalTime,
+                error: _instanceof(e, Error) ? e.message : String(e),
                 source: "initial"
               });
-              var notFoundRoute = findNearestNotFoundRoute(currentPath, routeNode);
-              setNotFoundState({
-                notFoundPath: result.__oneNotFoundPath || "/+not-found",
-                notFoundRouteNode: notFoundRoute || void 0,
-                originalPath: currentPath
-              });
               return;
             }
+          }
+          var loaderJSUrl = getLoaderPath(currentPath, true);
+          var moduleLoadStart = performance.now();
+          var module = await ((_dynamicImport = dynamicImport(loaderJSUrl)) === null || _dynamicImport === void 0 ? void 0 : _dynamicImport.catch(function () {
+            return null;
+          }));
+          var moduleLoadTime = performance.now() - moduleLoadStart;
+          if (!(module === null || module === void 0 ? void 0 : module.loader)) {
             updateState(currentPath, {
-              data: result,
-              hasLoadedOnce: !0,
+              data: void 0,
+              hasLoadedOnce: true,
               promise: void 0
-            }), recordLoaderTiming?.({
+            });
+            return;
+          }
+          var executionStart = performance.now();
+          var result = await module.loader();
+          var executionTime = performance.now() - executionStart;
+          var totalTime = performance.now() - startTime;
+          if (result === null || result === void 0 ? void 0 : result.__oneRedirect) {
+            recordLoaderTiming === null || recordLoaderTiming === void 0 ? void 0 : recordLoaderTiming({
               path: currentPath,
               startTime,
               moduleLoadTime,
@@ -417,26 +460,69 @@ function useLoaderState(loader) {
               totalTime,
               source: "initial"
             });
-          } catch (err) {
-            var totalTime = performance.now() - startTime;
             updateState(currentPath, {
-              error: err,
+              data: void 0,
+              hasLoadedOnce: true,
               promise: void 0
-            }), recordLoaderTiming?.({
+            });
+            router.replace(result.__oneRedirect);
+            return;
+          }
+          if ((result === null || result === void 0 ? void 0 : result.__oneError) === 404) {
+            recordLoaderTiming === null || recordLoaderTiming === void 0 ? void 0 : recordLoaderTiming({
               path: currentPath,
               startTime,
+              moduleLoadTime,
+              executionTime,
               totalTime,
-              error: _instanceof(err, Error) ? err.message : String(err),
               source: "initial"
             });
+            var notFoundRoute = findNearestNotFoundRoute(currentPath, routeNode);
+            setNotFoundState({
+              notFoundPath: result.__oneNotFoundPath || "/+not-found",
+              notFoundRouteNode: notFoundRoute || void 0,
+              originalPath: currentPath
+            });
+            return;
           }
-        },
-        promise = loadData();
+          updateState(currentPath, {
+            data: result,
+            hasLoadedOnce: true,
+            promise: void 0
+          });
+          recordLoaderTiming === null || recordLoaderTiming === void 0 ? void 0 : recordLoaderTiming({
+            path: currentPath,
+            startTime,
+            moduleLoadTime,
+            executionTime,
+            totalTime,
+            source: "initial"
+          });
+        } catch (err) {
+          var totalTime = performance.now() - startTime;
+          updateState(currentPath, {
+            error: err,
+            promise: void 0
+          });
+          recordLoaderTiming === null || recordLoaderTiming === void 0 ? void 0 : recordLoaderTiming({
+            path: currentPath,
+            startTime,
+            totalTime,
+            error: _instanceof(err, Error) ? err.message : String(err),
+            source: "initial"
+          });
+        }
+      };
+      var promise = loadData();
       loaderStateEntry.promise = promise;
     }
   }
-  if (loaderStateEntry.error && !loaderStateEntry.hasLoadedOnce) throw loaderStateEntry.error;
-  if (loaderStateEntry.data === void 0 && loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce) throw loaderStateEntry.promise;
+  if (loaderStateEntry.error && !loaderStateEntry.hasLoadedOnce) {
+    throw loaderStateEntry.error;
+  }
+  if (loaderStateEntry.data === void 0 && loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce) {
+    throw loaderStateEntry.promise;
+  }
   return {
     data: loaderStateEntry.data,
     refetch,
@@ -449,24 +535,33 @@ function useLoader(loader2) {
   } = useLoaderState(loader2);
   return data2;
 }
-var results = /* @__PURE__ */new Map(),
-  started = /* @__PURE__ */new Map();
+var results = /* @__PURE__ */new Map();
+var started = /* @__PURE__ */new Map();
 function resetLoaderState() {
-  results.clear(), started.clear();
+  results.clear();
+  started.clear();
 }
 function useAsyncFn(val, props) {
   var key = (val ? weakKey(val) : "") + JSON.stringify(props);
-  if (val && !started.get(key)) {
-    started.set(key, !0);
-    var next = val(props);
-    _instanceof(next, Promise) && (next = next.then(function (final) {
-      results.set(key, final);
-    }).catch(function (err) {
-      console.error("Error running loader()", err), results.set(key, void 0);
-    })), results.set(key, next);
+  if (val) {
+    if (!started.get(key)) {
+      started.set(key, true);
+      var next = val(props);
+      if (_instanceof(next, Promise)) {
+        next = next.then(function (final) {
+          results.set(key, final);
+        }).catch(function (err) {
+          console.error(`Error running loader()`, err);
+          results.set(key, void 0);
+        });
+      }
+      results.set(key, next);
+    }
   }
   var current = results.get(key);
-  if (_instanceof(current, Promise)) throw current;
+  if (_instanceof(current, Promise)) {
+    throw current;
+  }
   return current;
 }
 export { getLoaderTimingHistory, refetchLoader, refetchMatchLoader, resetLoaderState, setSSRLoaderData, useLoader, useLoaderState };