one 1.2.18 → 1.2.19

package/dist/cjs/useLoader.native.js

@@ -22,7 +22,9 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var useLoader_exports = {};
 __export(useLoader_exports, {
-  useLoader: () => useLoader
+  refetchLoader: () => refetchLoader,
+  useLoader: () => useLoader,
+  useLoaderState: () => useLoaderState
 });
 module.exports = __toCommonJS(useLoader_exports);
 var import_react = require("react"),
@@ -36,70 +38,164 @@ var import_react = require("react"),
 function _instanceof(left, right) {
   return right != null && typeof Symbol < "u" && right[Symbol.hasInstance] ? !!right[Symbol.hasInstance](left) : left instanceof right;
 }
-var promises = {},
-  errors = {},
-  loadedData = {};
-function useLoader(loader) {
-  var {
-    loaderProps: loaderPropsFromServerContext,
-    loaderData: loaderDataFromServerContext
-  } = (0, import_one_server_only.useServerContext)() || {};
-  if (typeof window > "u") return useAsyncFn(loader, loaderPropsFromServerContext || {
-    path: (0, import_hooks.usePathname)(),
-    params: (0, import_hooks.useActiveParams)()
+var loaderState = {},
+  subscribers = /* @__PURE__ */new Set();
+function updateState(path, updates) {
+  loaderState[path] = {
+    ...loaderState[path],
+    ...updates
+  }, subscribers.forEach(function (callback) {
+    callback();
+  });
+}
+function subscribe(callback) {
+  return subscribers.add(callback), 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];
+}
+async function refetchLoader(pathname2) {
+  updateState(pathname2, {
+    state: "loading",
+    error: null
   });
-  var params = (0, import_hooks.useParams)(),
+  try {
+    var cacheBust = `${Date.now()}`,
+      loaderJSUrl2 = (0, import_cleanUrl.getLoaderPath)(pathname2, !0, cacheBust),
+      module2 = await (0, import_dynamicImport.dynamicImport)(loaderJSUrl2),
+      result2 = await module2.loader();
+    updateState(pathname2, {
+      data: result2,
+      state: "idle",
+      timestamp: Date.now(),
+      hasLoadedOnce: !0
+    });
+  } catch (err) {
+    throw updateState(pathname2, {
+      error: err,
+      state: "idle"
+    }), err;
+  }
+}
+function useLoaderState(loader) {
+  var {
+      loaderProps: loaderPropsFromServerContext,
+      loaderData: loaderDataFromServerContext
+    } = (0, import_one_server_only.useServerContext)() || {},
+    params = (0, import_hooks.useParams)(),
     pathname = (0, import_hooks.usePathname)(),
     currentPath = (0, import_href.resolveHref)({
       pathname,
       params
-    }).replace(/index$/, "").replace(/\?.*/, ""),
-    preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0,
-    currentData = (0, import_react.useRef)(preloadedData);
-  if ((0, import_react.useEffect)(function () {
-    preloadedData && (loadedData[currentPath] = preloadedData);
-  },
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  [preloadedData]), errors[currentPath]) throw errors[currentPath];
-  var loaded = loadedData[currentPath];
-  if (typeof loaded < "u") return loaded;
-  if (!preloadedData) {
-    if (import_router.preloadingLoader[currentPath] && (typeof import_router.preloadingLoader[currentPath] == "function" && (import_router.preloadingLoader[currentPath] = import_router.preloadingLoader[currentPath]()), promises[currentPath] = import_router.preloadingLoader[currentPath].then(function (val) {
-      loadedData[currentPath] = val;
+    }).replace(/index$/, "");
+  if (typeof window > "u" && loader) {
+    var serverData = useAsyncFn(loader, loaderPropsFromServerContext || {
+      path: pathname,
+      params
+    });
+    return {
+      data: serverData,
+      refetch: async function () {},
+      state: "idle"
+    };
+  }
+  var preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0,
+    loaderStateEntry = (0, import_react.useSyncExternalStore)(subscribe, function () {
+      return getLoaderState(currentPath, preloadedData);
+    }, function () {
+      return getLoaderState(currentPath, preloadedData);
+    }),
+    refetch = (0, import_react.useCallback)(function () {
+      return refetchLoader(currentPath);
+    }, [currentPath]);
+  if (!loader) return {
+    refetch,
+    state: loaderStateEntry.state
+  };
+  if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce && loader) if (import_router.preloadingLoader[currentPath]) {
+    typeof import_router.preloadingLoader[currentPath] == "function" && (import_router.preloadingLoader[currentPath] = import_router.preloadingLoader[currentPath]());
+    var promise = import_router.preloadingLoader[currentPath].then(function (val) {
+      delete import_router.preloadingLoader[currentPath], updateState(currentPath, {
+        data: val,
+        hasLoadedOnce: !0,
+        promise: void 0
+      });
     }).catch(function (err) {
-      console.error("Error loading loader", err), errors[currentPath] = err, delete promises[currentPath], delete import_router.preloadingLoader[currentPath];
-    })), !promises[currentPath]) {
-      var getData = async function () {
-        var loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, !0);
+      console.error("Error running loader()", err), delete import_router.preloadingLoader[currentPath], updateState(currentPath, {
+        error: err,
+        promise: void 0
+      });
+    });
+    loaderStateEntry.promise = promise;
+  } else {
+    var loadData = async function () {
         try {
-          var response = await async function () {
-            var nativeLoaderJSUrl = `${loaderJSUrl}?platform=ios`;
-            try {
-              var 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; }`)();
-              if (typeof result.loader != "function") throw new Error("Loader code isn't exporting a `loader` function");
-              return result;
-            } catch (e) {
-              return console.error(`Error fetching loader from URL: ${nativeLoaderJSUrl}, ${e}`), {
-                loader: function () {
-                  return {};
-                }
-              };
-            }
-            return await (0, import_dynamicImport.dynamicImport)(loaderJSUrl);
-          }();
-          return loadedData[currentPath] = response.loader(), loadedData[currentPath];
+          var loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, !0),
+            nativeLoaderJSUrl = `${loaderJSUrl}?platform=ios`;
+          try {
+            var 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; }`)();
+            if (typeof result.loader != "function") throw new Error("Loader code isn't exporting a `loader` function");
+            var data = await result.loader();
+            updateState(currentPath, {
+              data,
+              hasLoadedOnce: !0,
+              promise: void 0
+            });
+            return;
+          } catch (e) {
+            updateState(currentPath, {
+              data: {},
+              promise: void 0
+            });
+            return;
+          }
+          var loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, !0),
+            module = await (0, import_dynamicImport.dynamicImport)(loaderJSUrl),
+            result = await module.loader();
+          updateState(currentPath, {
+            data: result,
+            hasLoadedOnce: !0,
+            promise: void 0
+          });
         } catch (err) {
-          return console.error(`Error calling loader: ${err}`), errors[currentPath] = err, delete promises[currentPath], null;
+          updateState(currentPath, {
+            error: err,
+            promise: void 0
+          });
         }
-      };
-      promises[currentPath] = getData();
-    }
-    throw promises[currentPath];
+      },
+      promise = loadData();
+    loaderStateEntry.promise = promise;
   }
-  return currentData.current;
+  if (loader) {
+    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,
+      state: loaderStateEntry.state
+    };
+  } else return {
+    refetch,
+    state: loaderStateEntry.state
+  };
+}
+function useLoader(loader2) {
+  var {
+    data: data2
+  } = useLoaderState(loader2);
+  return data2;
 }
 var results = /* @__PURE__ */new Map(),
   started = /* @__PURE__ */new Map();

package/dist/cjs/useLoader.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","useLoader_exports","__export","useLoader","module","exports","import_react","require","import_hooks","import_href","import_router","import_cleanUrl","import_dynamicImport","import_weakKey","import_one_server_only","_instanceof","left","right","Symbol","hasInstance","promises","errors","loadedData","loader","loaderProps","loaderPropsFromServerContext","loaderData","loaderDataFromServerContext","useServerContext","window","useAsyncFn","path","usePathname","params","useActiveParams","useParams","pathname","currentPath","resolveHref","replace","preloadedData","currentData","useRef","useEffect","loaded","preloadingLoader","then","val","catch","err","console","error","getData","loaderJSUrl","getLoaderPath","response","nativeLoaderJSUrl","loaderJsCodeResp","fetch","ok","Error","status","loaderJsCode","text","result","eval","e","dynamicImport"],"sources":["../../src/useLoader.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","useLoader_exports","__export","refetchLoader","useLoader","useLoaderState","module","exports","import_react","require","import_hooks","import_href","import_router","import_cleanUrl","import_dynamicImport","import_weakKey","import_one_server_only","_instanceof","left","right","Symbol","hasInstance","loaderState","subscribers","Set","updateState","path","updates","forEach","callback","subscribe","add","delete","getLoaderState","preloadedData2","data","error","promise","state","hasLoadedOnce","pathname2","cacheBust","Date","now","loaderJSUrl2","getLoaderPath","module2","dynamicImport","result2","loader","timestamp","err","loaderProps","loaderPropsFromServerContext","loaderData","loaderDataFromServerContext","useServerContext","params","useParams","pathname","usePathname","currentPath","resolveHref","replace","window","serverData","useAsyncFn","refetch","preloadedData","loaderStateEntry","useSyncExternalStore","useCallback","preloadingLoader","then","val","catch","console","loadData","loaderJSUrl","nativeLoaderJSUrl","loaderJsCodeResp","fetch","ok","Error","status","loaderJsCode","text","result","eval","e"],"sources":["../../src/useLoader.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,iBAAA;AAAAC,QAAA,CAAAD,iBAAA;EAAAE,aAAA,EAAAA,CAAA,KAAAA,aAAA;EAAAC,SAAA,EAAAA,CAAA,KAAAA,SAAA;EAAAC,cAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAX,YAAkD,CAAAK,iBAClD;AAiBA,IAAAO,YAAM,GAAAC,OACA;EAAAC,YAAc,GAAAD,OAAI,oBAAgB;EAAAE,WAAA,GAAAF,OAAA;EAAAG,aAAA,GAAAH,OAAA;EAAAI,eAAA,GAAAJ,OAAA;EAAAK,oBAAA,GAAAL,OAAA;EAAAM,cAAA,GAAAN,OAAA;EAAAO,sBAAA,GAAAP,OAAA;AAExC,SAASQ,YAAYC,IAAA,EAAcC,KAAA;EACjC,OAAAA,KAAY,IAAI,IAAI,IAAE,OAAGC,MAAY,MAAI,IAAMD,KAAA,CAAAC,MAC/C,CAAAC,WAAY,MAAAF,KAAS,CAAAC,MAAA,CAAAC,WAAa,EAAAH,IAAA,IAAAA,IAAA,YAAAC,KAAA;AAChC;AAAS,IACVG,WAAA;EAAAC,WAAA,sBAAAC,GAAA;AACH,SAAAC,YAAAC,IAAA,EAAAC,OAAA;EAEAL,WAAS,CAAAI,IAAA,CAAU;IACjB,GAAAJ,WAAA,CAAAI,IAAY;IAEd,GAAAC;EAEA,GAAAJ,WAAS,CAAAK,OAAe,WAAcC,QAAA;IACpCA,QAAK;EACiB,EAClB;AAAM;AACC,SACPC,SAASA,CAAAD,QAAA;EAAA,OACTN,WAAO,CAAAQ,GAAA,CAAAF,QAAA;IACP,OAAAN,WAAiB,CAAAS,MAAA,CAAAH,QAAA;EACnB;AAGJ;AAEA,SAAAI,cAAsBA,CAAAP,IAAA,EAAcQ,cAAiC;EACnE,OAAAZ,WAAY,CAAAI,IAAU,MAAAJ,WAAA,CAAAI,IAAA;IACpBS,IAAA,EAAAD,cAAO;IACPE,KAAA,EAAO;IACRC,OAAA;IAEDC,KAAI;IACFC,aAAM,IAAAL;EAMN,IAAAZ,WAAY,CAAAI,IAAA;AAAU;AACd,eACCvB,cAAAqC,SAAA;EAAAf,WACP,CAAAe,SAAgB;IAAIF,KACpB;IACFF,KAAC;EACH;EACE;IAAsB,IACpBK,SAAO,MAAAC,IAAA,CAAAC,GAAA;MAAAC,YAAA,OAAA/B,eAAA,CAAAgC,aAAA,EAAAL,SAAA,MAAAC,SAAA;MAAAK,OAAA,aAAAhC,oBAAA,CAAAiC,aAAA,EAAAH,YAAA;MAAAI,OAAA,SAAAF,OAAA,CAAAG,MAAA;IAAAxB,WACA,CAAAe,SAAA;MACRL,IACK,EAAAa,OAAA;MACRV,KAAA;MACFY,SAAA,EAAAR,IAAA,CAAAC,GAAA;MAEOJ,aAAS;IAYd;EAQA,SAAIY,GAAO;IAQT,MAAA1B,WAPmB,CAAAe,SAAA;MACjBJ,KAAA,EAAAe,GAAA;MACAb,KAAA;IAAgC,IAC9Ba,GAAA;EAAM;AACN;AACF,SAEyB9C,cAASA,CAAA4C,MAAY;EAAA,IAAC;MAAGG,WAAO,EAAOC,4BAAA;MAAAC,UAAA,EAAAC;IAAA,QAAAvC,sBAAA,CAAAwC,gBAAA;IAAAC,MAAA,OAAA/C,YAAA,CAAAgD,SAAA;IAAAC,QAAA,OAAAjD,YAAA,CAAAkD,WAAA;IAAAC,WAAA,OAAAlD,WAAA,CAAAmD,WAAA;MAIpEH,QAAM;MAIJF;IAAA,EACA,CAAAM,OAAM,aAAe;EAA0B,IAC/C,OAAMC,MAAA,MAAe,IAAAf,MAAA;IACvB,IAEMgB,UAAA,GAAUC,UAAA,CAAAjB,MAAA,EAAAI,4BAAgC;MAG5C3B,IAAC,EAAAiC,QAAA;MACHF;IAAO,EACL;IAAA,OACA;MACFtB,IAAA,EAAA8B,UAAA;MAKAE,OAAC,iBAAAA,CAAA,EACD,CAKA;MACM7B,KAAA,EAAO;IAGX;EAEI;EACyB,IAAA8B,aACjB,GAAAf,4BAAA,EAAA3B,IAAA,KAAAmC,WAAA,GAAAN,2BAAA;IAAAc,gBAAA,OAAA7D,YAAA,CAAA8D,oBAAA,EAAAxC,SAAA;MAAA,OACNG,cAAe,CAAA4B,WAAA,EAAAO,aAAA;IAAA,eACf;MAAS,OACVnC,cAAA,CAAA4B,WAAA,EAAAO,aAAA;IAAA;IACHD,OACC,GAAO,IAAA3D,YAAa,CAAA+D,WAAA;MACnB,OAAApE,aAAc,CAAA0D,WAAA;IAEW,IAChBA,WACP,CAAS;EACV,IACH,CAACZ,MAAA,EAEH;IACFkB,OAAO;IAEL7B,KAAA,EAAM+B,gBAAW,CAAA/B;EACf;EAmCE,KAAA+B,gBAAM,CAAAlC,IAAA,KAAAkC,gBAAc,CAAAhC,OAAA,KAAAgC,gBAA2B,CAAA9B,aAChC,IAAAU,MAAM,EAErB,IAAArC,aAAA,CAAY4D,gBAAa,CAAAX,WAAA;IAAA,OACvBjD,aAAM,CAAA4D,gBAAA,CAAAX,WAAA,oBAAAjD,aAAA,CAAA4D,gBAAA,CAAAX,WAAA,IAAAjD,aAAA,CAAA4D,gBAAA,CAAAX,WAAA;IAAA,IAAAxB,OACN,GAAAzB,aAAe,CAAA4D,gBAAA,CAAAX,WAAA,EAAAY,IAAA,WAAAC,GAAA;MAAA,OACf9D,aAAS,CAAA4D,gBAAA,CAAAX,WAAA,GAAApC,WAAA,CAAAoC,WAAA;QACX1B,IAAC,EAAAuC,GAAA;QACHnC,aAAc;QACZF,OAAA,OAAY;MAAa;IAChB,GAAAsC,KACP,WAASxB,GAAA;MAAAyB,OACV,CAAAxC,KAAA,2BAAAe,GAAA,UAAAvC,aAAA,CAAA4D,gBAAA,CAAAX,WAAA,GAAApC,WAAA,CAAAoC,WAAA;QACHzB,KAAA,EAAAe,GAAA;QAGId,OAAA,EAAU;MAChB;IACF;IAIEgC,gBAAQ,CAAAhC,OAAA,GAAAA,OAAA;EAEV,OAAI;IACF,IAAAwC,QAAM,kBAAAA,CAAA,EAAiB;QAKvB;UAIA,IAAMC,WAAA,IAAiB,GAAAjE,eAAA,CAAAgC,aAAA,EAAAgB,WAAA;YAAAkB,iBAAA,MAAAD,WAAA;UAGzB,IAAO;YACC,IAAAE,gBAAiB,SAAAC,KAAA,CAAAF,iBAAA;YACvB,KAAAC,gBAAA,CAAAE,EAAA,EACO,UAAAC,KAAA,CAAiB,oBAAAH,gBAAA,CAAAI,MAAA;YAC1B,IAAAC,YAAA,SAAAL,gBAAA,CAAAM,IAAA;cAAAC,MAAA,GAAAC,IAAA,8BAAAH,YAAA;YACF,WAAAE,MAAA,CAAAtC,MAAA,gBACS,UAAAkC,KAAA;YACL,IAAAhD,IAAA,SAAAoD,MAAA,CAAAtC,MAAA;YACAxB,WAAO,CAAAoC,WAAiB;cAC1B1B,IAAA;cAEJI,aAAA;cAEgBF,OAGd,OAA8E;YACtE;YACD;UACT,SAAAoD,CAAA;YAEMhE,WAAU,CAAAoC,WAAA,EAAI;cAGX1B,IAAA,EAAW;cACZE,OAAO,OAAM;YAEf,CACE,CAAC;YACK;UAEJ;UACA,IAAAyC,WAAgB,OAClBjE,eACG,CAAAgC,aAAgB,EAAAgB,WAAA;YAAAvD,MAAA,aAAAQ,oBAAA,CAAAiC,aAAA,EAAA+B,WAAA;YAAAS,MAAA,SAAAjF,MAAA,CAAA2C,MAAA;UACfxB,WAAY,CAAAoC,WAAU;YAEvB1B,IAAO,EAAAoD,MAAQ;YACdhD,aAAc;YAIpBF,OAAQ,EAAI,KAAK;UACnB;QAGI,SAAAc,GAAU;UAEZ1B,WAAA,CAAAoC,WAAmB;YACfzB,KAAA,EAAAe,GAAA;YAGDd,OAAA;UACT","ignoreList":[]}

package/dist/cjs/utils/cleanUrl.cjs

@@ -36,13 +36,14 @@ const isClient = typeof window < "u",
 function getPreloadPath(currentPath) {
   return `${clientSideURL}/assets/${cleanUrl(currentPath.slice(1))}${import_constants.PRELOAD_JS_POSTFIX}`;
 }
-function getLoaderPath(currentPath, includeUrl = import_constants.isNative) {
+function getLoaderPath(currentPath, includeUrl = import_constants.isNative, cacheBust) {
   const baseURL = includeUrl ? (0, import_getURL.getURL)() : "",
     devPath = process.env.NODE_ENV === "development" ? "/_one" : "",
-    currentPathUrl = new URL(currentPath, "http://example.com"
-    /* not important, just for `new URL()` to work */);
-  return `${baseURL}${devPath}/assets/${cleanUrl(currentPathUrl.pathname.slice(1))}${import_constants.LOADER_JS_POSTFIX}`;
+    currentPathUrl = new URL(currentPath, "http://example.com"),
+    cleanedUrl = cleanUrl(currentPathUrl.pathname.slice(1)),
+    cacheBustSegment = cacheBust ? `_refetch_${cacheBust}_` : "";
+  return `${baseURL}${devPath}/assets/${cleanedUrl}${cacheBustSegment}${import_constants.LOADER_JS_POSTFIX}`;
 }
 function getPathFromLoaderPath(loaderPath) {
-  return loaderPath.replace(import_constants.LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replaceAll(/_/g, "/");
+  return loaderPath.replace(import_constants.LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replace(/_refetch_\d+_/, "").replaceAll(/_/g, "/");
 }

package/dist/cjs/utils/cleanUrl.js

@@ -27,15 +27,11 @@ const isClient = typeof window < "u", clientSideURL = isClient ? (0, import_getU
 function getPreloadPath(currentPath) {
   return `${clientSideURL}/assets/${cleanUrl(currentPath.slice(1))}${import_constants.PRELOAD_JS_POSTFIX}`;
 }
-function getLoaderPath(currentPath, includeUrl = import_constants.isNative) {
-  const baseURL = includeUrl ? (0, import_getURL.getURL)() : "", devPath = process.env.NODE_ENV === "development" ? "/_one" : "", currentPathUrl = new URL(
-    currentPath,
-    "http://example.com"
-    /* not important, just for `new URL()` to work */
-  );
-  return `${baseURL}${devPath}/assets/${cleanUrl(currentPathUrl.pathname.slice(1))}${import_constants.LOADER_JS_POSTFIX}`;
+function getLoaderPath(currentPath, includeUrl = import_constants.isNative, cacheBust) {
+  const baseURL = includeUrl ? (0, import_getURL.getURL)() : "", devPath = process.env.NODE_ENV === "development" ? "/_one" : "", currentPathUrl = new URL(currentPath, "http://example.com"), cleanedUrl = cleanUrl(currentPathUrl.pathname.slice(1)), cacheBustSegment = cacheBust ? `_refetch_${cacheBust}_` : "";
+  return `${baseURL}${devPath}/assets/${cleanedUrl}${cacheBustSegment}${import_constants.LOADER_JS_POSTFIX}`;
 }
 function getPathFromLoaderPath(loaderPath) {
-  return loaderPath.replace(import_constants.LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replaceAll(/_/g, "/");
+  return loaderPath.replace(import_constants.LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replace(/_refetch_\d+_/, "").replaceAll(/_/g, "/");
 }
 //# sourceMappingURL=cleanUrl.js.map

package/dist/cjs/utils/cleanUrl.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/utils/cleanUrl.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAKO,yBACP,gBAAuB,sBACvB,sBAA6B;AAE7B,SAAS,SAAS,MAAc;AAC9B,aACE,kCAAa,IAAI,EACd,WAAW,KAAK,GAAG,EAEnB,QAAQ,MAAM,EAAE;AAEvB;AAEA,MAAM,WAAW,OAAO,SAAW,KAC7B,gBAAgB,eAAW,sBAAO,IAAI;AAErC,SAAS,eAAe,aAAqB;AAClD,SAAO,GAAG,aAAa,WAAW,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC,GAAG,mCAAkB;AACvF;AAEO,SAAS,cACd,aAEA,aAAa,2BACb;AACA,QAAM,UAAU,iBAAa,sBAAO,IAAI,IAClC,UAAU,QAAQ,IAAI,aAAa,gBAAgB,UAAU,IAE7D,iBAAiB,IAAI;AAAA,IACzB;AAAA,IACA;AAAA;AAAA,EACF;AAEA,SAAO,GAAG,OAAO,GAAG,OAAO,WAAW,SAAS,eAAe,SAAS,MAAM,CAAC,CAAC,CAAC,GAAG,kCAAiB;AACtG;AAEO,SAAS,sBAAsB,YAAoB;AACxD,SAAO,WACJ,QAAQ,0CAAyB,EAAE,EACnC,QAAQ,sBAAsB,EAAE,EAChC,WAAW,MAAM,GAAG;AACzB;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAKO,yBACP,gBAAuB,sBACvB,sBAA6B;AAE7B,SAAS,SAAS,MAAc;AAC9B,aACE,kCAAa,IAAI,EACd,WAAW,KAAK,GAAG,EAEnB,QAAQ,MAAM,EAAE;AAEvB;AAEA,MAAM,WAAW,OAAO,SAAW,KAC7B,gBAAgB,eAAW,sBAAO,IAAI;AAErC,SAAS,eAAe,aAAqB;AAClD,SAAO,GAAG,aAAa,WAAW,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC,GAAG,mCAAkB;AACvF;AAEO,SAAS,cAAc,aAAqB,aAAa,2BAAU,WAAoB;AAC5F,QAAM,UAAU,iBAAa,sBAAO,IAAI,IAClC,UAAU,QAAQ,IAAI,aAAa,gBAAgB,UAAU,IAE7D,iBAAiB,IAAI,IAAI,aAAa,oBAAoB,GAE1D,aAAa,SAAS,eAAe,SAAS,MAAM,CAAC,CAAC,GACtD,mBAAmB,YAAY,YAAY,SAAS,MAAM;AAEhE,SAAO,GAAG,OAAO,GAAG,OAAO,WAAW,UAAU,GAAG,gBAAgB,GAAG,kCAAiB;AACzF;AAEO,SAAS,sBAAsB,YAAoB;AACxD,SAAO,WACJ,QAAQ,0CAAyB,EAAE,EACnC,QAAQ,sBAAsB,EAAE,EAChC,QAAQ,iBAAiB,EAAE,EAC3B,WAAW,MAAM,GAAG;AACzB;",
   "names": []
 }

package/dist/cjs/utils/cleanUrl.native.js

@@ -40,12 +40,15 @@ function getPreloadPath(currentPath) {
 }
 function getLoaderPath(currentPath) {
   var includeUrl = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : import_constants.isNative,
+    cacheBust = arguments.length > 2 ? arguments[2] : void 0,
     baseURL = includeUrl ? (0, import_getURL.getURL)() : "",
     devPath = process.env.NODE_ENV === "development" ? "/_one" : "",
-    currentPathUrl = new URL(currentPath, "http://example.com");
-  return `${baseURL}${devPath}/assets/${cleanUrl(currentPathUrl.pathname.slice(1))}${import_constants.LOADER_JS_POSTFIX}`;
+    currentPathUrl = new URL(currentPath, "http://example.com"),
+    cleanedUrl = cleanUrl(currentPathUrl.pathname.slice(1)),
+    cacheBustSegment = cacheBust ? `_refetch_${cacheBust}_` : "";
+  return `${baseURL}${devPath}/assets/${cleanedUrl}${cacheBustSegment}${import_constants.LOADER_JS_POSTFIX}`;
 }
 function getPathFromLoaderPath(loaderPath) {
-  return loaderPath.replace(import_constants.LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replaceAll(/_/g, "/");
+  return loaderPath.replace(import_constants.LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replace(/_refetch_\d+_/, "").replaceAll(/_/g, "/");
 }
 //# sourceMappingURL=cleanUrl.native.js.map

package/dist/cjs/utils/cleanUrl.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","cleanUrl_exports","__export","getLoaderPath","getPathFromLoaderPath","getPreloadPath","module","exports","import_constants","require","import_getURL","import_removeSearch","cleanUrl","path","removeSearch","replaceAll","replace","isClient","window","clientSideURL","getURL","currentPath","slice","PRELOAD_JS_POSTFIX","includeUrl","arguments","length","isNative","baseURL","devPath","process","env","NODE_ENV","currentPathUrl","URL","pathname","LOADER_JS_POSTFIX","loaderPath","LOADER_JS_POSTFIX_REGEX"],"sources":["../../../src/utils/cleanUrl.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,gBAAA;AAAAC,QAAA,CAAAD,gBAAA;EAAAE,aAAA,EAAAA,CAAA,KAAAA,aAAA;EAAAC,qBAAA,EAAAA,CAAA,KAAAA,qBAAA;EAAAC,cAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAX,YAKO,CAAAK,gBAAA;AAIP,IAAAO,gBAAkB,GAAAC,OAAc;EAAAC,aAAA,GAAAD,OAAA;EAAAE,mBAAA,GAAAF,OAAA;AAC9B,SAAAG,QACEA,CAAAC,IAAA;EAKJ,WAAAF,mBAAA,CAAAG,YAAA,EAAAD,IAAA,EAAAE,UAAA,WAAAC,OAAA;AAEA;AAGO,IAAAC,QAAS,UAAAC,MAAe;EAAAC,aAAqB,GAAAF,QAAA,OAAAP,aAAA,CAAAU,MAAA;AAClD,SAAOf,cAAGA,CAAAgB,WAAa,EAAW;EACpC,UAAAF,aAAA,WAAAP,QAAA,CAAAS,WAAA,CAAAC,KAAA,OAAAd,gBAAA,CAAAe,kBAAA;AAEO;AAKL,SAAMpB,aAAUA,CAAAkB,WAAA,EAAa;EAGF,IACzBG,UAAA,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA,MAAAjB,gBAAA,CAAAmB,QAAA;IAAAC,OAAA,GAAAJ,UAAA,OAAAd,aAAA,CAAAU,MAAA;IAAAS,OAAA,GAAAC,OAAA,CAAAC,GAAA,CAAAC,QAAA;IAAAC,cAAA,OAAAC,GAAA,CAAAb,WAAA;EAAA,OACA,GAAAO,OAAA,GAAAC,OAAA,WAAAjB,QAAA,CAAAqB,cAAA,CAAAE,QAAA,CAAAb,KAAA,OAAAd,gBAAA,CAAA4B,iBAAA;AAAA;AAAA,SACFhC,sBAAAiC,UAAA;EAEA,OAAOA,UAAU,CAAArB,OAAG,CAAAR,gBAAkB,CAAA8B,uBAAwB,KAAS,CAAAtB,OAAQ,CAAC,oBAAG,MAAAD,UAAA,CAAiB;AACtG","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","cleanUrl_exports","__export","getLoaderPath","getPathFromLoaderPath","getPreloadPath","module","exports","import_constants","require","import_getURL","import_removeSearch","cleanUrl","path","removeSearch","replaceAll","replace","isClient","window","clientSideURL","getURL","currentPath","slice","PRELOAD_JS_POSTFIX","includeUrl","arguments","length","isNative","cacheBust","baseURL","devPath","process","env","NODE_ENV","currentPathUrl","URL","cleanedUrl","pathname","cacheBustSegment","LOADER_JS_POSTFIX","loaderPath","LOADER_JS_POSTFIX_REGEX"],"sources":["../../../src/utils/cleanUrl.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,gBAAA;AAAAC,QAAA,CAAAD,gBAAA;EAAAE,aAAA,EAAAA,CAAA,KAAAA,aAAA;EAAAC,qBAAA,EAAAA,CAAA,KAAAA,qBAAA;EAAAC,cAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAX,YAKO,CAAAK,gBAAA;AAIP,IAAAO,gBAAkB,GAAAC,OAAc;EAAAC,aAAA,GAAAD,OAAA;EAAAE,mBAAA,GAAAF,OAAA;AAC9B,SAAAG,QACEA,CAAAC,IAAA;EAKJ,WAAAF,mBAAA,CAAAG,YAAA,EAAAD,IAAA,EAAAE,UAAA,WAAAC,OAAA;AAEA;AAGO,IAAAC,QAAS,UAAAC,MAAe;EAAAC,aAAqB,GAAAF,QAAA,OAAAP,aAAA,CAAAU,MAAA;AAClD,SAAOf,cAAGA,CAAAgB,WAAa,EAAW;EACpC,UAAAF,aAAA,WAAAP,QAAA,CAAAS,WAAA,CAAAC,KAAA,OAAAd,gBAAA,CAAAe,kBAAA;AAEO;AACL,SAAMpB,aAAUA,CAAAkB,WAAA,EAAa;EAQ7B,IAAAG,UAAU,GAAOC,SAAG,CAAOC,MAAA,QAAWD,SAAU,CAAG,gBAAgBA,SAAG,MAAAjB,gBAAA,CAAAmB,QAAiB;IAAAC,SAAA,GAAAH,SAAA,CAAAC,MAAA,OAAAD,SAAA;IAAAI,OAAA,GAAAL,UAAA,OAAAd,aAAA,CAAAU,MAAA;IAAAU,OAAA,GAAAC,OAAA,CAAAC,GAAA,CAAAC,QAAA;IAAAC,cAAA,OAAAC,GAAA,CAAAd,WAAA;IAAAe,UAAA,GAAAxB,QAAA,CAAAsB,cAAA,CAAAG,QAAA,CAAAf,KAAA;IAAAgB,gBAAA,GAAAV,SAAA,eAAAA,SAAA;EACzF,UAAAC,OAAA,GAAAC,OAAA,WAAAM,UAAA,GAAAE,gBAAA,GAAA9B,gBAAA,CAAA+B,iBAAA;AAEO;AACL,SAAOnC,qBACIA,CAAAoC,UAAA;EAIb,OAAAA,UAAA,CAAAxB,OAAA,CAAAR,gBAAA,CAAAiC,uBAAA,MAAAzB,OAAA,2BAAAA,OAAA,sBAAAD,UAAA","ignoreList":[]}

package/dist/esm/createHandleRequest.js

@@ -32,6 +32,7 @@ async function resolveAPIRoute(handlers, request, url, route) {
         url,
         loaderProps: {
           path: pathname,
+          search: url.search,
           params
         }
       }),
@@ -62,6 +63,7 @@ async function resolveLoaderRoute(handlers, request, url, route) {
         url,
         loaderProps: {
           path: url.pathname,
+          search: url.search,
           request: route.type === "ssr" ? request : void 0,
           params: getLoaderParams(url, route)
         }
@@ -83,7 +85,8 @@ async function resolvePageRoute(handlers, request, url, route) {
     route,
     url,
     loaderProps: {
-      path: pathname + search,
+      path: pathname,
+      search,
       // Ensure SSR loaders receive the original request
       request: route.type === "ssr" ? request : void 0,
       params: getLoaderParams(url, route)
@@ -133,8 +136,10 @@ function createHandleRequest(handlers, { routerRoot }) {
           if (route.file === "")
             continue;
           const finalUrl = new URL(originalUrl, url.origin);
-          if (finalUrl.search = url.search, !!route.compiledRegex.test(finalUrl.pathname))
-            return resolveLoaderRoute(handlers, request, finalUrl, route);
+          if (finalUrl.search = url.search, !route.compiledRegex.test(finalUrl.pathname))
+            continue;
+          const cleanedRequest = new Request(finalUrl, request);
+          return resolveLoaderRoute(handlers, cleanedRequest, finalUrl, route);
         }
         return process.env.NODE_ENV === "development" && console.error("No matching route found for loader!", {
           originalUrl,

package/dist/esm/createHandleRequest.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createHandleRequest.ts"],
-  "mappings": "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",
+  "mappings": "AAAA,SAAS,kCAAkC;AAK3C,SAAS,6BAA6B;AACtC,SAAS,kBAAkB;AAC3B,SAAS,mBAAmB;AAC5B,SAAS,oBAAoB,uBAAuB;AAmBpD,eAAsB,eACpB,UACA,SACA,OACA,aACmB;AACnB,QAAM,cAAc,MAAM;AAE1B,MAAI,CAAC,aAAa;AAChB,WAAO,MAAM,YAAY;AAE3B,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,kCAAkC;AAGpD,QAAM,UAA6B,CAAC;AAEpC,iBAAe,SAAS,OAAkC;AACxD,UAAM,mBAAmB,YAAa,KAAK;AAG3C,QAAI,CAAC;AACH,aAAO,MAAM,YAAY;AAG3B,UAAM,YAAY,MAAM,SAAS,eAAgB,gBAAgB,IAAI;AAIrE,QAAI,CAAC;AACH,YAAM,IAAI,MAAM,wCAAwC,iBAAiB,UAAU,EAAE;AASvF,UAAM,WAAW,MAAM,SAAS,EAAE,SAAS,MAL9B,YACJ,SAAS,QAAQ,CAAC,GAIsB,QAAQ,CAAC;AAE1D,WAAI,YAKG,SAAS,QAAQ,CAAC;AAAA,EAC3B;AAGA,SAAO,SAAS,CAAC;AACnB;AAEA,eAAsB,gBACpB,UACA,SACA,KACA,OACA;AACA,QAAM,EAAE,SAAS,IAAI,KACf,SAAS,eAAe,UAAU,KAAK;AAE7C,MAAI;AACF,WAAO;AAAA,MACL,MACE,SAAS,UAAW;AAAA,QAClB;AAAA,QACA;AAAA,QACA;AAAA,QACA,aAAa;AAAA,UACX,MAAM;AAAA,UACN,QAAQ,IAAI;AAAA,UACZ;AAAA,QACF;AAAA,MACF,CAAC;AAAA,MACH;AAAA,MACA,UAAU,CAAC;AAAA,IACb;AAAA,EACF,SAAS,KAAK;AACZ,QAAI,WAAW,GAAG;AAChB,aAAO;AAGT,UAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,MAAM;AAAA,sCAAyC,QAAQ;AAAA;AAAA,UAE3D,GAAG;AAAA;AAAA;AAAA;AAAA,OAIN,GAGG;AAAA,EACR;AACF;AAEA,eAAsB,mBACpB,UACA,SACA,KACA,OACA;AACA,SAAO,MAAM,eAAe,UAAU,SAAS,OAAO,YAC7C,MAAM,gBAAgB,YAAY;AACvC,UAAM,UAAU,IAAI,QAAQ;AAC5B,YAAQ,IAAI,gBAAgB,iBAAiB;AAE7C,QAAI;AACF,YAAM,iBAAiB,MAAM,SAAS,aAAc;AAAA,QAClD;AAAA,QACA;AAAA,QACA;AAAA,QACA,aAAa;AAAA,UACX,MAAM,IAAI;AAAA,UACV,QAAQ,IAAI;AAAA,UACZ,SAAS,MAAM,SAAS,QAAQ,UAAU;AAAA,UAC1C,QAAQ,gBAAgB,KAAK,KAAK;AAAA,QACpC;AAAA,MACF,CAAC;AAED,aAAO,IAAI,SAAS,gBAAgB;AAAA,QAClC;AAAA,MACF,CAAC;AAAA,IACH,SAAS,KAAK;AAEZ,UAAI,WAAW,GAAG;AAChB,eAAO;AAGT,oBAAQ,MAAM,yBAAyB,GAAG,EAAE,GAEtC;AAAA,IACR;AAAA,EACF,CAAC,CACF;AACH;AAEA,eAAsB,iBACpB,UACA,SACA,KACA,OACA;AACA,QAAM,EAAE,UAAU,OAAO,IAAI;AAE7B,SAAO,gBAAgB,YACJ,MAAM,eAAe,UAAU,SAAS,OAAO,YACvD,MAAM,SAAS,WAAY;AAAA,IAChC;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa;AAAA,MACX,MAAM;AAAA,MACN;AAAA;AAAA,MAEA,SAAS,MAAM,SAAS,QAAQ,UAAU;AAAA,MAC1C,QAAQ,gBAAgB,KAAK,KAAK;AAAA,IACpC;AAAA,EACF,CAAC,CACF,CAEF;AACH;AAEO,SAAS,qBAAqB,SAAkB;AACrD,QAAM,YAAY,QAAQ,OAAO;AACjC,SAAO,IAAI;AAAA,IACT,aAAa;AAAA,IACb,QAAQ,QAAQ,IAAI,MAAM,IAAI,UAAU,QAAQ,QAAQ,IAAI,MAAM,CAAC,KAAK;AAAA,EAC1E;AACF;AAEA,SAAS,kBAAkB,OAAqC;AAC9D,SAAO;AAAA,IACL,GAAG;AAAA,IACH,eAAe,IAAI,OAAO,MAAM,UAAU;AAAA,EAC5C;AACF;AAEO,SAAS,gBAAgB,UAG9B;AACA,SAAO;AAAA,IACL,YAAY,SAAS,WAAW,IAAI,iBAAiB;AAAA,IACrD,WAAW,SAAS,UAAU,IAAI,iBAAiB;AAAA,EACrD;AACF;AAGO,SAAS,oBACd,UACA,EAAE,WAAW,GACb;AACA,QAAM,WAAW,YAAY,EAAE,WAAW,CAAC;AAC3C,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,oBAAoB;AAEtC,QAAM,mBAAmB,gBAAgB,QAAQ;AAEjD,SAAO;AAAA,IACL;AAAA,IACA,SAAS,eAA6B,SAAmD;AACvF,YAAM,MAAM,qBAAqB,OAAO,GAClC,EAAE,UAAU,OAAO,IAAI;AAE7B,UAAI,aAAa,gBAAgB,SAAS,WAAW,IAAI;AACvD,eAAO;AAGT,UAAI,SAAS,WAAW;AACtB,cAAM,WAAW,iBAAiB,UAAU,KAAK,CAAC,UACzC,MAAM,cAAc,KAAK,QAAQ,CACzC;AACD,YAAI;AACF,iBAAO,MAAM,gBAAgB,UAAU,SAAS,KAAK,QAAQ;AAAA,MAEjE;AAEA,UAAI,QAAQ,WAAW;AACrB,eAAO;AAGT,UAAI,SAAS,gBACwB,SAAS,SAAS,0BAA0B,GAE/C;AAC9B,cAAM,cAAc,sBAAsB,QAAQ;AAElD,mBAAW,SAAS,iBAAiB,YAAY;AAC/C,cAAI,MAAM,SAAS;AAEjB;AAGF,gBAAM,WAAW,IAAI,IAAI,aAAa,IAAI,MAAM;AAGhD,cAFA,SAAS,SAAS,IAAI,QAElB,CAAC,MAAM,cAAc,KAAK,SAAS,QAAQ;AAC7C;AAGF,gBAAM,iBAAiB,IAAI,QAAQ,UAAU,OAAO;AACpD,iBAAO,mBAAmB,UAAU,gBAAgB,UAAU,KAAK;AAAA,QACrE;AAEA,eAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,MAAM,uCAAuC;AAAA,UACnD;AAAA,UACA;AAAA,UACA,QAAQ,SAAS;AAAA,QACnB,CAAC,GAKI,SAAS,MAAM;AAAA,MACxB;AAGF,UAAI,SAAS;AACX,mBAAW,SAAS,iBAAiB;AACnC,cAAK,MAAM,cAAc,KAAK,QAAQ;AAGtC,mBAAO,iBAAiB,UAAU,SAAS,KAAK,KAAK;AAAA;AAIzD,aAAO;AAAA,IACT;AAAA,EACF;AACF;AAEA,SAAS,gBACP,KACA,QACA;AACA,QAAM,SAAiC,CAAC,GAClC,QAAQ,IAAI,OAAO,OAAO,aAAa,EAAE,KAAK,IAAI,QAAQ;AAChE,MAAI,OAAO;AACT,eAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,MAAM,MAAM,GAAG;AACvD,YAAM,WAAW,OAAO,UAAU,GAAG;AACrC,aAAO,QAAQ,IAAI;AAAA,IACrB;AAEF,SAAO;AACT;AAGA,SAAS,eAAe,UAAkB,OAA0B;AAElE,QAAM,QADQ,IAAI,OAAO,MAAM,UAAU,EACrB,KAAK,QAAQ;AACjC,SAAK,QACE,OAAO;AAAA,IACZ,OAAO,QAAQ,MAAM,SAAS,EAAE,IAAI,CAAC,CAAC,KAAK,KAAK,MACvC,CAAC,OAAQ,MAAM,SAAS,GAAG,KAAK,EAAa,CACrD;AAAA,EACH,IALmB,CAAC;AAMtB;",
   "names": []
 }

package/dist/esm/createHandleRequest.mjs

@@ -34,6 +34,7 @@ async function resolveAPIRoute(handlers, request, url, route) {
       url,
       loaderProps: {
         path: pathname,
+        search: url.search,
         params
       }
     }), request, params || {});
@@ -60,6 +61,7 @@ async function resolveLoaderRoute(handlers, request, url, route) {
         url,
         loaderProps: {
           path: url.pathname,
+          search: url.search,
           request: route.type === "ssr" ? request : void 0,
           params: getLoaderParams(url, route)
         }
@@ -83,7 +85,8 @@ async function resolvePageRoute(handlers, request, url, route) {
     route,
     url,
     loaderProps: {
-      path: pathname + search,
+      path: pathname,
+      search,
       // Ensure SSR loaders receive the original request
       request: route.type === "ssr" ? request : void 0,
       params: getLoaderParams(url, route)
@@ -133,7 +136,9 @@ function createHandleRequest(handlers, {
         for (const route of compiledManifest.pageRoutes) {
           if (route.file === "") continue;
           const finalUrl = new URL(originalUrl, url.origin);
-          if (finalUrl.search = url.search, !!route.compiledRegex.test(finalUrl.pathname)) return resolveLoaderRoute(handlers, request, finalUrl, route);
+          if (finalUrl.search = url.search, !route.compiledRegex.test(finalUrl.pathname)) continue;
+          const cleanedRequest = new Request(finalUrl, request);
+          return resolveLoaderRoute(handlers, cleanedRequest, finalUrl, route);
         }
         return process.env.NODE_ENV === "development" && console.error("No matching route found for loader!", {
           originalUrl,

package/dist/esm/createHandleRequest.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["LOADER_JS_POSTFIX_UNCACHED","getPathFromLoaderPath","isResponse","getManifest","resolveAPIEndpoint","resolveResponse","runMiddlewares","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","context","dispatch","index","middlewareModule","exported","default","contextKey","response","next","resolveAPIRoute","url","pathname","params","getRouteParams","handleAPI","loaderProps","path","err","process","env","NODE_ENV","console","error","resolveLoaderRoute","headers","Headers","set","loaderResponse","handleLoader","type","getLoaderParams","Response","resolvePageRoute","search","handlePage","getURLfromRequestURL","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","compileManifest","manifest","pageRoutes","map","apiRoutes","createHandleRequest","routerRoot","compiledManifest","handler","startsWith","apiRoute","find","test","method","endsWith","originalUrl","file","finalUrl","origin","routes","config","match","exec","groups","key","value","Object","entries","namedKey","routeKeys","fromEntries"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["LOADER_JS_POSTFIX_UNCACHED","getPathFromLoaderPath","isResponse","getManifest","resolveAPIEndpoint","resolveResponse","runMiddlewares","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","context","dispatch","index","middlewareModule","exported","default","contextKey","response","next","resolveAPIRoute","url","pathname","params","getRouteParams","handleAPI","loaderProps","path","search","err","process","env","NODE_ENV","console","error","resolveLoaderRoute","headers","Headers","set","loaderResponse","handleLoader","type","getLoaderParams","Response","resolvePageRoute","handlePage","getURLfromRequestURL","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","compileManifest","manifest","pageRoutes","map","apiRoutes","createHandleRequest","routerRoot","compiledManifest","handler","startsWith","apiRoute","find","test","method","endsWith","originalUrl","file","finalUrl","origin","cleanedRequest","Request","routes","config","match","exec","groups","key","value","Object","entries","namedKey","routeKeys","fromEntries"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/createHandleRequest.native.js

@@ -39,6 +39,7 @@ async function resolveAPIRoute(handlers, request, url, route) {
         url,
         loaderProps: {
           path: pathname,
+          search: url.search,
           params
         }
       });
@@ -67,6 +68,7 @@ async function resolveLoaderRoute(handlers, request, url, route) {
           url,
           loaderProps: {
             path: url.pathname,
+            search: url.search,
             request: route.type === "ssr" ? request : void 0,
             params: getLoaderParams(url, route)
           }
@@ -93,7 +95,8 @@ async function resolvePageRoute(handlers, request, url, route) {
         route,
         url,
         loaderProps: {
-          path: pathname + search,
+          path: pathname,
+          search,
           // Ensure SSR loaders receive the original request
           request: route.type === "ssr" ? request : void 0,
           params: getLoaderParams(url, route)
@@ -156,7 +159,10 @@ function createHandleRequest(handlers, param) {
               var route = _step.value;
               if (route.file !== "") {
                 var finalUrl = new URL(originalUrl, url.origin);
-                if (finalUrl.search = url.search, !!route.compiledRegex.test(finalUrl.pathname)) return resolveLoaderRoute(handlers, request, finalUrl, route);
+                if (finalUrl.search = url.search, !!route.compiledRegex.test(finalUrl.pathname)) {
+                  var cleanedRequest = new Request(finalUrl, request);
+                  return resolveLoaderRoute(handlers, cleanedRequest, finalUrl, route);
+                }
               }
             }
           } catch (err) {

package/dist/esm/createHandleRequest.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["LOADER_JS_POSTFIX_UNCACHED","getPathFromLoaderPath","isResponse","getManifest","resolveAPIEndpoint","resolveResponse","runMiddlewares","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","context","dispatch","index","_this","middlewareModule","exported","default","contextKey","next","response","resolveAPIRoute","url","pathname","params","getRouteParams","handleAPI","loaderProps","path","err","process","env","NODE_ENV","console","error","resolveLoaderRoute","headers","Headers","set","loaderResponse","handleLoader","type","getLoaderParams","Response","resolvePageRoute","search","resolved","handlePage","getURLfromRequestURL","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","compileManifest","manifest","pageRoutes","map","apiRoutes","createHandleRequest","param","routerRoot","compiledManifest","handler","startsWith","apiRoute","find","route2","test","method","isClientRequestingNewRoute","endsWith","originalUrl","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","done","value","file","finalUrl","origin","return","routes"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["LOADER_JS_POSTFIX_UNCACHED","getPathFromLoaderPath","isResponse","getManifest","resolveAPIEndpoint","resolveResponse","runMiddlewares","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","context","dispatch","index","_this","middlewareModule","exported","default","contextKey","next","response","resolveAPIRoute","url","pathname","params","getRouteParams","handleAPI","loaderProps","path","search","err","process","env","NODE_ENV","console","error","resolveLoaderRoute","headers","Headers","set","loaderResponse","handleLoader","type","getLoaderParams","Response","resolvePageRoute","resolved","handlePage","getURLfromRequestURL","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","compileManifest","manifest","pageRoutes","map","apiRoutes","createHandleRequest","param","routerRoot","compiledManifest","handler","startsWith","apiRoute","find","route2","test","method","isClientRequestingNewRoute","endsWith","originalUrl","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","done","value","file","finalUrl","origin","cleanedRequest","Request","return","routes"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/experimental-useLoaderState.js

@@ -0,0 +1,32 @@
+import { useCallback, useEffect, useState } from "react";
+import { useParams, usePathname } from "./hooks";
+import { resolveHref } from "./link/href";
+import { getLoaderPath } from "./utils/cleanUrl";
+import { dynamicImport } from "./utils/dynamicImport";
+function experimentalUseLoaderState(loader) {
+  const params = useParams(), pathname = usePathname(), currentPath = resolveHref({ pathname, params }).replace(/index$/, ""), [data, setData] = useState(null), [state, setState] = useState("loading"), [error, setError] = useState(null), fetchLoader = useCallback(
+    async (bustCache = !1) => {
+      setState("loading"), setError(null);
+      try {
+        let loaderJSUrl = getLoaderPath(currentPath, !0);
+        bustCache && (loaderJSUrl += `${loaderJSUrl.includes("?") ? "&" : "?"}_t=${Date.now()}`);
+        const result = await (await dynamicImport(loaderJSUrl)).loader();
+        setData(result), setState("idle");
+      } catch (err) {
+        console.error("Error loading:", err), setError(err), setState("idle");
+      }
+    },
+    [currentPath]
+  );
+  useEffect(() => {
+    fetchLoader(!1);
+  }, [currentPath]);
+  const refetch = useCallback(() => {
+    fetchLoader(!0);
+  }, [fetchLoader]);
+  return { data, refetch, state, error };
+}
+export {
+  experimentalUseLoaderState
+};
+//# sourceMappingURL=experimental-useLoaderState.js.map

package/dist/esm/experimental-useLoaderState.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../src/experimental-useLoaderState.ts"],
+  "mappings": "AAAA,SAAS,aAAa,WAAW,gBAAgB;AACjD,SAAS,WAAW,mBAAmB;AACvC,SAAS,mBAAmB;AAC5B,SAAS,qBAAqB;AAC9B,SAAS,qBAAqB;AAGvB,SAAS,2BAAoD,QAAgB;AAClF,QAAM,SAAS,UAAU,GACnB,WAAW,YAAY,GACvB,cAAc,YAAY,EAAE,UAAoB,OAAO,CAAC,EAAE,QAAQ,UAAU,EAAE,GAE9E,CAAC,MAAM,OAAO,IAAI,SAAc,IAAI,GACpC,CAAC,OAAO,QAAQ,IAAI,SAA6B,SAAS,GAC1D,CAAC,OAAO,QAAQ,IAAI,SAAuB,IAAI,GAE/C,cAAc;AAAA,IAClB,OAAO,YAAY,OAAU;AAC3B,eAAS,SAAS,GAClB,SAAS,IAAI;AAEb,UAAI;AACF,YAAI,cAAc,cAAc,aAAa,EAAI;AAGjD,QAAI,cACF,eAAe,GAAG,YAAY,SAAS,GAAG,IAAI,MAAM,GAAG,MAAM,KAAK,IAAI,CAAC;AAIzE,cAAM,SAAS,OADA,MAAM,cAAc,WAAW,GAClB,OAAO;AAEnC,gBAAQ,MAAM,GACd,SAAS,MAAM;AAAA,MACjB,SAAS,KAAK;AACZ,gBAAQ,MAAM,kBAAkB,GAAG,GACnC,SAAS,GAAY,GACrB,SAAS,MAAM;AAAA,MACjB;AAAA,IACF;AAAA,IACA,CAAC,WAAW;AAAA,EACd;AAEA,YAAU,MAAM;AACd,gBAAY,EAAK;AAAA,EACnB,GAAG,CAAC,WAAW,CAAC;AAEhB,QAAM,UAAU,YAAY,MAAM;AAChC,gBAAY,EAAI;AAAA,EAClB,GAAG,CAAC,WAAW,CAAC;AAEhB,SAAO,EAAE,MAAM,SAAS,OAAO,MAAM;AACvC;",
+  "names": []
+}