one 1.2.18 → 1.2.20

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

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useRef","useActiveParams","useParams","usePathname","resolveHref","preloadingLoader","getLoaderPath","dynamicImport","weakKey","useServerContext","_instanceof","left","right","Symbol","hasInstance","promises","errors","loadedData","useLoader","loader","loaderProps","loaderPropsFromServerContext","loaderData","loaderDataFromServerContext","window","useAsyncFn","path","params","pathname","currentPath","replace","preloadedData","currentData","loaded","then","val","catch","err","console","error","getData","loaderJSUrl","response","nativeLoaderJSUrl","loaderJsCodeResp","fetch","ok","Error","status","loaderJsCode","text","result","eval","e"],"sources":["../../src/useLoader.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useSyncExternalStore","useParams","usePathname","resolveHref","preloadingLoader","getLoaderPath","dynamicImport","weakKey","useServerContext","_instanceof","left","right","Symbol","hasInstance","loaderState","subscribers","Set","updateState","path","updates","forEach","callback","subscribe","add","delete","getLoaderState","preloadedData2","data","error","promise","state","hasLoadedOnce","refetchLoader","pathname2","cacheBust","Date","now","loaderJSUrl2","module2","result2","loader","timestamp","err","useLoaderState","loaderProps","loaderPropsFromServerContext","loaderData","loaderDataFromServerContext","params","pathname","currentPath","replace","window","serverData","useAsyncFn","refetch","preloadedData","loaderStateEntry","then","val","catch","console","loadData","loaderJSUrl","nativeLoaderJSUrl","loaderJsCodeResp","fetch","ok","Error","status","loaderJsCode","text","result","eval","e","module"],"sources":["../../src/useLoader.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/utils/cleanUrl.js

@@ -13,16 +13,12 @@ const isClient = typeof window < "u", clientSideURL = isClient ? getURL() : "";
 function getPreloadPath(currentPath) {
   return `${clientSideURL}/assets/${cleanUrl(currentPath.slice(1))}${PRELOAD_JS_POSTFIX}`;
 }
-function getLoaderPath(currentPath, includeUrl = isNative) {
-  const baseURL = includeUrl ? 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))}${LOADER_JS_POSTFIX}`;
+function getLoaderPath(currentPath, includeUrl = isNative, cacheBust) {
+  const baseURL = includeUrl ? 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}${LOADER_JS_POSTFIX}`;
 }
 function getPathFromLoaderPath(loaderPath) {
-  return loaderPath.replace(LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replaceAll(/_/g, "/");
+  return loaderPath.replace(LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replace(/_refetch_\d+_/, "").replaceAll(/_/g, "/");
 }
 export {
   getLoaderPath,

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/utils/cleanUrl.ts"],
-  "mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,oBAAoB;AAE7B,SAAS,SAAS,MAAc;AAC9B,SACE,aAAa,IAAI,EACd,WAAW,KAAK,GAAG,EAEnB,QAAQ,MAAM,EAAE;AAEvB;AAEA,MAAM,WAAW,OAAO,SAAW,KAC7B,gBAAgB,WAAW,OAAO,IAAI;AAErC,SAAS,eAAe,aAAqB;AAClD,SAAO,GAAG,aAAa,WAAW,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC,GAAG,kBAAkB;AACvF;AAEO,SAAS,cACd,aAEA,aAAa,UACb;AACA,QAAM,UAAU,aAAa,OAAO,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,iBAAiB;AACtG;AAEO,SAAS,sBAAsB,YAAoB;AACxD,SAAO,WACJ,QAAQ,yBAAyB,EAAE,EACnC,QAAQ,sBAAsB,EAAE,EAChC,WAAW,MAAM,GAAG;AACzB;",
+  "mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,oBAAoB;AAE7B,SAAS,SAAS,MAAc;AAC9B,SACE,aAAa,IAAI,EACd,WAAW,KAAK,GAAG,EAEnB,QAAQ,MAAM,EAAE;AAEvB;AAEA,MAAM,WAAW,OAAO,SAAW,KAC7B,gBAAgB,WAAW,OAAO,IAAI;AAErC,SAAS,eAAe,aAAqB;AAClD,SAAO,GAAG,aAAa,WAAW,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC,GAAG,kBAAkB;AACvF;AAEO,SAAS,cAAc,aAAqB,aAAa,UAAU,WAAoB;AAC5F,QAAM,UAAU,aAAa,OAAO,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,iBAAiB;AACzF;AAEO,SAAS,sBAAsB,YAAoB;AACxD,SAAO,WACJ,QAAQ,yBAAyB,EAAE,EACnC,QAAQ,sBAAsB,EAAE,EAChC,QAAQ,iBAAiB,EAAE,EAC3B,WAAW,MAAM,GAAG;AACzB;",
   "names": []
 }

package/dist/esm/utils/cleanUrl.mjs

@@ -9,15 +9,16 @@ const isClient = typeof window < "u",
 function getPreloadPath(currentPath) {
   return `${clientSideURL}/assets/${cleanUrl(currentPath.slice(1))}${PRELOAD_JS_POSTFIX}`;
 }
-function getLoaderPath(currentPath, includeUrl = isNative) {
+function getLoaderPath(currentPath, includeUrl = isNative, cacheBust) {
   const baseURL = includeUrl ? 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))}${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}${LOADER_JS_POSTFIX}`;
 }
 function getPathFromLoaderPath(loaderPath) {
-  return loaderPath.replace(LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replaceAll(/_/g, "/");
+  return loaderPath.replace(LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replace(/_refetch_\d+_/, "").replaceAll(/_/g, "/");
 }
 export { getLoaderPath, getPathFromLoaderPath, getPreloadPath };
 //# sourceMappingURL=cleanUrl.mjs.map

package/dist/esm/utils/cleanUrl.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["isNative","LOADER_JS_POSTFIX","LOADER_JS_POSTFIX_REGEX","PRELOAD_JS_POSTFIX","getURL","removeSearch","cleanUrl","path","replaceAll","replace","isClient","window","clientSideURL","getPreloadPath","currentPath","slice","getLoaderPath","includeUrl","baseURL","devPath","process","env","NODE_ENV","currentPathUrl","URL","pathname","getPathFromLoaderPath","loaderPath"],"sources":["../../../src/utils/cleanUrl.ts"],"sourcesContent":[null],"mappings":"AAAA,SACEA,QAAA,EACAC,iBAAA,EACAC,uBAAA,EACAC,kBAAA,QACK;AACP,SAASC,MAAA,QAAc;AACvB,SAASC,YAAA,QAAoB;AAE7B,SAASC,SAASC,IAAA,EAAc;EAC9B,OACEF,YAAA,CAAaE,IAAI,EACdC,UAAA,CAAW,KAAK,GAAG,EAEnBC,OAAA,CAAQ,MAAM,EAAE;AAEvB;AAEA,MAAMC,QAAA,GAAW,OAAOC,MAAA,GAAW;EAC7BC,aAAA,GAAgBF,QAAA,GAAWN,MAAA,CAAO,IAAI;AAErC,SAASS,eAAeC,WAAA,EAAqB;EAClD,OAAO,GAAGF,aAAa,WAAWN,QAAA,CAASQ,WAAA,CAAYC,KAAA,CAAM,CAAC,CAAC,CAAC,GAAGZ,kBAAkB;AACvF;AAEO,SAASa,cACdF,WAAA,EAEAG,UAAA,GAAajB,QAAA,EACb;EACA,MAAMkB,OAAA,GAAUD,UAAA,GAAab,MAAA,CAAO,IAAI;IAClCe,OAAA,GAAUC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,gBAAgB,UAAU;IAE7DC,cAAA,GAAiB,IAAIC,GAAA,CACzBV,WAAA,EACA;IAAA,iDACF;EAEA,OAAO,GAAGI,OAAO,GAAGC,OAAO,WAAWb,QAAA,CAASiB,cAAA,CAAeE,QAAA,CAASV,KAAA,CAAM,CAAC,CAAC,CAAC,GAAGd,iBAAiB;AACtG;AAEO,SAASyB,sBAAsBC,UAAA,EAAoB;EACxD,OAAOA,UAAA,CACJlB,OAAA,CAAQP,uBAAA,EAAyB,EAAE,EACnCO,OAAA,CAAQ,sBAAsB,EAAE,EAChCD,UAAA,CAAW,MAAM,GAAG;AACzB","ignoreList":[]}
+{"version":3,"names":["isNative","LOADER_JS_POSTFIX","LOADER_JS_POSTFIX_REGEX","PRELOAD_JS_POSTFIX","getURL","removeSearch","cleanUrl","path","replaceAll","replace","isClient","window","clientSideURL","getPreloadPath","currentPath","slice","getLoaderPath","includeUrl","cacheBust","baseURL","devPath","process","env","NODE_ENV","currentPathUrl","URL","cleanedUrl","pathname","cacheBustSegment","getPathFromLoaderPath","loaderPath"],"sources":["../../../src/utils/cleanUrl.ts"],"sourcesContent":[null],"mappings":"AAAA,SACEA,QAAA,EACAC,iBAAA,EACAC,uBAAA,EACAC,kBAAA,QACK;AACP,SAASC,MAAA,QAAc;AACvB,SAASC,YAAA,QAAoB;AAE7B,SAASC,SAASC,IAAA,EAAc;EAC9B,OACEF,YAAA,CAAaE,IAAI,EACdC,UAAA,CAAW,KAAK,GAAG,EAEnBC,OAAA,CAAQ,MAAM,EAAE;AAEvB;AAEA,MAAMC,QAAA,GAAW,OAAOC,MAAA,GAAW;EAC7BC,aAAA,GAAgBF,QAAA,GAAWN,MAAA,CAAO,IAAI;AAErC,SAASS,eAAeC,WAAA,EAAqB;EAClD,OAAO,GAAGF,aAAa,WAAWN,QAAA,CAASQ,WAAA,CAAYC,KAAA,CAAM,CAAC,CAAC,CAAC,GAAGZ,kBAAkB;AACvF;AAEO,SAASa,cAAcF,WAAA,EAAqBG,UAAA,GAAajB,QAAA,EAAUkB,SAAA,EAAoB;EAC5F,MAAMC,OAAA,GAAUF,UAAA,GAAab,MAAA,CAAO,IAAI;IAClCgB,OAAA,GAAUC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,gBAAgB,UAAU;IAE7DC,cAAA,GAAiB,IAAIC,GAAA,CAAIX,WAAA,EAAa,oBAAoB;IAE1DY,UAAA,GAAapB,QAAA,CAASkB,cAAA,CAAeG,QAAA,CAASZ,KAAA,CAAM,CAAC,CAAC;IACtDa,gBAAA,GAAmBV,SAAA,GAAY,YAAYA,SAAS,MAAM;EAEhE,OAAO,GAAGC,OAAO,GAAGC,OAAO,WAAWM,UAAU,GAAGE,gBAAgB,GAAG3B,iBAAiB;AACzF;AAEO,SAAS4B,sBAAsBC,UAAA,EAAoB;EACxD,OAAOA,UAAA,CACJrB,OAAA,CAAQP,uBAAA,EAAyB,EAAE,EACnCO,OAAA,CAAQ,sBAAsB,EAAE,EAChCA,OAAA,CAAQ,iBAAiB,EAAE,EAC3BD,UAAA,CAAW,MAAM,GAAG;AACzB","ignoreList":[]}

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

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

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

@@ -1 +1 @@
-{"version":3,"names":["isNative","LOADER_JS_POSTFIX","LOADER_JS_POSTFIX_REGEX","PRELOAD_JS_POSTFIX","getURL","removeSearch","cleanUrl","path","replaceAll","replace","isClient","window","clientSideURL","getPreloadPath","currentPath","slice","getLoaderPath","includeUrl","arguments","length","baseURL","devPath","process","env","NODE_ENV","currentPathUrl","URL","pathname","getPathFromLoaderPath","loaderPath"],"sources":["../../../src/utils/cleanUrl.ts"],"sourcesContent":[null],"mappings":"AAAA,SAAAA,QAAA,EAAAC,iBAAA,EAAAC,uBAAA,EAAAC,kBAAA;AAAA,SACEC,MAAA;AAAA,SACAC,YAAA;AAAA,SACAC,SAAAC,IAAA;EACA,OAAAF,YAAA,CAAAE,IAAA,EAAAC,UAAA,WAAAC,OAAA;AAAA;AAEF,IAAAC,QAAS,UAAAC,MAAc;EAAAC,aAAA,GAAAF,QAAA,GAAAN,MAAA;AACvB,SAASS,eAAAC,WAAoB;EAE7B,OAAS,GAAAF,aAAuB,WAAAN,QAAA,CAAAQ,WAAA,CAAAC,KAAA,OAAAZ,kBAAA;AAC9B;AAMF,SAAAa,cAAAF,WAAA;EAEA,IAAMG,UAAA,GAAWC,SAAO,CAAAC,MAAW,GAC7B,KAAAD,SAAA,EAAgB,WAAW,IAAAA,SAAW,MAAAlB,QAAA;IAAAoB,OAAA,GAAAH,UAAA,GAAAb,MAAA;IAAAiB,OAAA,GAAAC,OAAA,CAAAC,GAAA,CAAAC,QAAA;IAAAC,cAAA,OAAAC,GAAA,CAAAZ,WAAA;EAErC,OAAS,GAAAM,OAAA,GAAAC,OAAe,WAAqBf,QAAA,CAAAmB,cAAA,CAAAE,QAAA,CAAAZ,KAAA,OAAAd,iBAAA;AAClD;AACF,SAAA2B,sBAAAC,UAAA;EAEO,OAASA,UAAA,CAAApB,OACd,CAAAP,uBAEa,MAAAO,OACb,2BAAAD,UAAA;AACA;AAG2B,SACzBQ,aACA,EAAAY,qBAAA,EACFf,cAAA","ignoreList":[]}
+{"version":3,"names":["isNative","LOADER_JS_POSTFIX","LOADER_JS_POSTFIX_REGEX","PRELOAD_JS_POSTFIX","getURL","removeSearch","cleanUrl","path","replaceAll","replace","isClient","window","clientSideURL","getPreloadPath","currentPath","slice","getLoaderPath","includeUrl","arguments","length","cacheBust","baseURL","devPath","process","env","NODE_ENV","currentPathUrl","URL","cleanedUrl","pathname","cacheBustSegment","getPathFromLoaderPath","loaderPath"],"sources":["../../../src/utils/cleanUrl.ts"],"sourcesContent":[null],"mappings":"AAAA,SAAAA,QAAA,EAAAC,iBAAA,EAAAC,uBAAA,EAAAC,kBAAA;AAAA,SACEC,MAAA;AAAA,SACAC,YAAA;AAAA,SACAC,SAAAC,IAAA;EACA,OAAAF,YAAA,CAAAE,IAAA,EAAAC,UAAA,WAAAC,OAAA;AAAA;AAEF,IAAAC,QAAS,UAAAC,MAAc;EAAAC,aAAA,GAAAF,QAAA,GAAAN,MAAA;AACvB,SAASS,eAAAC,WAAoB;EAE7B,OAAS,GAAAF,aAAuB,WAAAN,QAAA,CAAAQ,WAAA,CAAAC,KAAA,OAAAZ,kBAAA;AAC9B;AAMF,SAAAa,cAAAF,WAAA;EAEA,IAAMG,UAAA,GAAWC,SAAO,CAAAC,MAAW,GAC7B,KAAAD,SAAA,EAAgB,WAAW,IAAAA,SAAW,MAAAlB,QAAA;IAAAoB,SAAA,GAAAF,SAAA,CAAAC,MAAA,OAAAD,SAAA;IAAAG,OAAA,GAAAJ,UAAA,GAAAb,MAAA;IAAAkB,OAAA,GAAAC,OAAA,CAAAC,GAAA,CAAAC,QAAA;IAAAC,cAAA,OAAAC,GAAA,CAAAb,WAAA;IAAAc,UAAA,GAAAtB,QAAA,CAAAoB,cAAA,CAAAG,QAAA,CAAAd,KAAA;IAAAe,gBAAA,GAAAV,SAAA,eAAAA,SAAA;EAErC,OAAS,GAAAC,OAAA,GAAAC,OAAe,WAAqBM,UAAA,GAAAE,gBAAA,GAAA7B,iBAAA;AAClD;AACF,SAAA8B,sBAAAC,UAAA;EAEO,OAASA,UAAA,CAAAvB,OAAc,CAAAP,uBAAkC,MAAAO,OAAU,qBAAoB,MAAAA,OAAA,sBAAAD,UAAA;AAC5F;AAQA,SACFQ,aAAA,EAEOe,qBAAS,EACdlB,cAAO","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.2.18",
+  "version": "1.2.20",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -121,17 +121,17 @@
     "@react-navigation/routers": "~7.5.1",
     "@swc/core": "^1.14.0",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/compiler": "1.2.18",
-    "@vxrn/resolve": "1.2.18",
-    "@vxrn/tslib-lite": "1.2.18",
-    "@vxrn/universal-color-scheme": "1.2.18",
-    "@vxrn/use-isomorphic-layout-effect": "1.2.18",
-    "@vxrn/vite-plugin-metro": "1.2.18",
+    "@vxrn/compiler": "1.2.20",
+    "@vxrn/resolve": "1.2.20",
+    "@vxrn/tslib-lite": "1.2.20",
+    "@vxrn/universal-color-scheme": "1.2.20",
+    "@vxrn/use-isomorphic-layout-effect": "1.2.20",
+    "@vxrn/vite-plugin-metro": "1.2.20",
     "babel-dead-code-elimination": "^1.0.10",
     "babel-plugin-module-resolver": "^5.0.2",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.2.18",
+    "create-vxrn": "1.2.20",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~8.0.8",
     "expo-modules-core": "~3.0.24",
@@ -157,7 +157,7 @@
     "vite": "^7.1.12",
     "vite-plugin-barrel": "^0.4.1",
     "vite-tsconfig-paths": "^5.1.4",
-    "vxrn": "1.2.18",
+    "vxrn": "1.2.20",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },
@@ -175,7 +175,7 @@
   "devDependencies": {
     "@react-navigation/core": "^7.13.0",
     "@react-navigation/native": "~7.1.19",
-    "@tamagui/build": "^1.137.3",
+    "@tamagui/build": "^1.138.6",
     "@types/node": "^24.10.0",
     "@types/react-dom": "^19.2.2",
     "@types/xxhashjs": "^0.2.4",

package/src/createHandleRequest.ts

@@ -96,6 +96,7 @@ export async function resolveAPIRoute(
           url,
           loaderProps: {
             path: pathname,
+            search: url.search,
             params,
           },
         }),
@@ -139,6 +140,7 @@ export async function resolveLoaderRoute(
           url,
           loaderProps: {
             path: url.pathname,
+            search: url.search,
             request: route.type === 'ssr' ? request : undefined,
             params: getLoaderParams(url, route),
           },
@@ -176,7 +178,8 @@ export async function resolvePageRoute(
         route,
         url,
         loaderProps: {
-          path: pathname + search,
+          path: pathname,
+          search: search,
           // Ensure SSR loaders receive the original request
           request: route.type === 'ssr' ? request : undefined,
           params: getLoaderParams(url, route),
@@ -265,7 +268,8 @@ export function createHandleRequest(
               continue
             }
 
-            return resolveLoaderRoute(handlers, request, finalUrl, route)
+            const cleanedRequest = new Request(finalUrl, request)
+            return resolveLoaderRoute(handlers, cleanedRequest, finalUrl, route)
           }
 
           if (process.env.NODE_ENV === 'development') {

package/src/index.ts

@@ -69,7 +69,7 @@ export { useNavigation } from './router/useNavigation'
 export type { Endpoint, LoaderProps } from './types'
 // React Navigation
 export { useFocusEffect } from './useFocusEffect'
-export { useLoader } from './useLoader'
+export { useLoader, useLoaderState } from './useLoader'
 export { type ServerHeadInsertionCallback, useServerHeadInsertion } from './useServerHeadInsertion'
 export { isResponse } from './utils/isResponse'
 export { redirect } from './utils/redirect'

package/src/router/router.ts

@@ -65,6 +65,30 @@ export function initialize(
     throw new Error('No routes found')
   }
 
+  if (process.env.NODE_ENV === 'development' && process.env.ONE_DEBUG_ROUTER && routeNode) {
+    const formatRouteTree = (node: RouteNode, indent = '', isLast = true): string => {
+      const prefix = indent + (isLast ? '└─ ' : '├─ ')
+      const childIndent = indent + (isLast ? '   ' : '│  ')
+
+      const dynamicBadge = node.dynamic ? ` [${node.dynamic.map((d) => d.name).join(', ')}]` : ''
+      const typeBadge = node.type !== 'layout' ? ` (${node.type})` : ''
+      const routeName = node.route || '/'
+
+      let line = `${prefix}${routeName}${dynamicBadge}${typeBadge}`
+
+      const visibleChildren = node.children.filter((child) => !child.internal)
+      for (let i = 0; i < visibleChildren.length; i++) {
+        const child = visibleChildren[i]
+        const childIsLast = i === visibleChildren.length - 1
+        line += '\n' + formatRouteTree(child, childIndent, childIsLast)
+      }
+
+      return line
+    }
+
+    console.info(`[one] 📍 Route structure:\n${formatRouteTree(routeNode)}`)
+  }
+
   navigationRef = ref
   setupLinkingAndRouteInfo(initialLocation)
   subscribeToNavigationChanges()
@@ -156,6 +180,9 @@ export function push(url: OneRouter.Href, options?: OneRouter.LinkToOptions) {
 }
 
 export function dismiss(count?: number) {
+  if (process.env.NODE_ENV === 'development' && process.env.ONE_DEBUG_ROUTER) {
+    console.info(`[one] 🔙 dismiss${count ? ` (${count})` : ''}`)
+  }
   navigationRef?.dispatch(StackActions.pop(count))
 }
 
@@ -172,10 +199,16 @@ export function setParams(params: OneRouter.InpurRouteParamsGeneric = {}) {
 }
 
 export function dismissAll() {
+  if (process.env.NODE_ENV === 'development' && process.env.ONE_DEBUG_ROUTER) {
+    console.info(`[one] 🔙 dismissAll`)
+  }
   navigationRef?.dispatch(StackActions.popToTop())
 }
 
 export function goBack() {
+  if (process.env.NODE_ENV === 'development' && process.env.ONE_DEBUG_ROUTER) {
+    console.info(`[one] 🔙 goBack`)
+  }
   assertIsReady(navigationRef)
   navigationRef?.current?.goBack()
 }
@@ -217,6 +250,14 @@ export function updateState(state: OneRouter.ResultState, nextStateParam = state
   const nextRouteInfo = getRouteInfo(state)
 
   if (!deepEqual(routeInfo, nextRouteInfo)) {
+    if (process.env.NODE_ENV === 'development' && process.env.ONE_DEBUG_ROUTER) {
+      const from = routeInfo?.pathname || '(initial)'
+      const to = nextRouteInfo.pathname
+      const params = Object.keys(nextRouteInfo.params || {}).length
+        ? nextRouteInfo.params
+        : undefined
+      console.info(`[one] 🧭 ${from} → ${to}`, params ? { params } : '')
+    }
     routeInfo = nextRouteInfo
   }
 }
@@ -361,6 +402,10 @@ export function preloadRoute(href: string) {
 }
 
 export async function linkTo(href: string, event?: string, options?: OneRouter.LinkToOptions) {
+  if (process.env.NODE_ENV === 'development' && process.env.ONE_DEBUG_ROUTER) {
+    console.info(`[one] 🔗 ${event || 'NAVIGATE'} ${href}`)
+  }
+
   if (href[0] === '#') {
     // this is just linking to a section of the current page on web
     return

package/src/server/oneServe.ts

@@ -1,9 +1,9 @@
-import { extname, join } from 'node:path'
 import { default as FSExtra } from 'fs-extra'
 import type { Hono, MiddlewareHandler } from 'hono'
 import type { BlankEnv } from 'hono/types'
+import { extname, join } from 'node:path'
 import { serveStaticAssets } from 'vxrn'
-import { getServerEntry, serveStatic } from 'vxrn/serve'
+import { getServerEntry } from 'vxrn/serve'
 import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from '../constants'
 import {
   compileManifest,
@@ -170,12 +170,12 @@ url: ${url}`)
         const url = getURLfromRequestURL(request)
 
         const response = await (() => {
-          // this handles the ...rest style routes
-          // where to put this best? can likely be after some of the switch?
+          // this handles all loader refetches or fetches due to navigation
           if (url.pathname.endsWith(LOADER_JS_POSTFIX_UNCACHED)) {
             const originalUrl = getPathFromLoaderPath(url.pathname)
             const finalUrl = new URL(originalUrl, url.origin)
-            return resolveLoaderRoute(requestHandlers, request, finalUrl, route)
+            const cleanedRequest = new Request(finalUrl, request)
+            return resolveLoaderRoute(requestHandlers, cleanedRequest, finalUrl, route)
           }
 
           switch (route.type) {
@@ -297,9 +297,15 @@ url: ${url}`)
         }
 
         const finalUrl = new URL(originalUrl, url.origin)
+        const cleanedRequest = new Request(finalUrl, request)
 
         try {
-          const resolved = await resolveLoaderRoute(requestHandlers, request, finalUrl, loaderRoute)
+          const resolved = await resolveLoaderRoute(
+            requestHandlers,
+            cleanedRequest,
+            finalUrl,
+            loaderRoute
+          )
           return resolved
         } catch (err) {
           console.error(`Error running loader: ${err}`)

package/src/types.ts

@@ -11,6 +11,7 @@ export type RenderApp = (props: RenderAppProps) => Promise<string>
 
 export type LoaderProps<Params extends Object = Record<string, string | string[]>> = {
   path: string
+  search?: string
   params: Params
   request?: Request
 }