one 1.1.388 → 1.1.390

package/dist/esm/vite/plugins/fixDependenciesPlugin.mjs

@@ -17,7 +17,7 @@ function fixDependenciesPlugin(options) {
       !hasApplied && patches.length && (hasApplied = !0, await applyOptimizePatches(patches, config));
     },
     async configResolved(config) {
-      patches.length && (await applyDependencyPatches(patches, config));
+      !hasApplied && patches.length && (hasApplied = !0, await applyDependencyPatches(patches, config));
     }
   };
 }

package/dist/esm/vite/plugins/fixDependenciesPlugin.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["applyDependencyPatches","applyOptimizePatches","hasApplied","fixDependenciesPlugin","options","patches","key","value","push","module","patchFiles","optimize","name","config","length","configResolved"],"sources":["../../../../src/vite/plugins/fixDependenciesPlugin.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,sBAAA,EAAwBC,oBAAA,QAA2C;AAI5E,IAAIC,UAAA,GAAa;AAEV,SAASC,sBAAsBC,OAAA,EAAuC;EAC3E,MAAMC,OAAA,GAAsB,EAAC;EAC7B,WAAWC,GAAA,IAAOF,OAAA,EAAS;IACzB,MAAMG,KAAA,GAAQH,OAAA,CAAQE,GAAG;IACzBD,OAAA,CAAQG,IAAA,CAAK;MACXC,MAAA,EAAQH,GAAA;MACRI,UAAA,EACEH,KAAA,IAAS,OAAOA,KAAA,IAAU,WACtBA,KAAA,GACA;QACEI,QAAA,EAAUJ;MACZ;IACR,CAAC;EACH;EAEA,OAAO;IACLK,IAAA,EAAM;IAEN,MAAMC,OAAOA,MAAA,EAAQ;MACf,CAACX,UAAA,IAAcG,OAAA,CAAQS,MAAA,KACzBZ,UAAA,GAAa,IACb,MAAMD,oBAAA,CAAqBI,OAAA,EAASQ,MAAM;IAE9C;IAEA,MAAME,eAAeF,MAAA,EAAQ;MACvBR,OAAA,CAAQS,MAAA,KACV,MAAMd,sBAAA,CAAuBK,OAAA,EAASQ,MAAM;IAEhD;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["applyDependencyPatches","applyOptimizePatches","hasApplied","fixDependenciesPlugin","options","patches","key","value","push","module","patchFiles","optimize","name","config","length","configResolved"],"sources":["../../../../src/vite/plugins/fixDependenciesPlugin.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,sBAAA,EAAwBC,oBAAA,QAA2C;AAI5E,IAAIC,UAAA,GAAa;AAEV,SAASC,sBAAsBC,OAAA,EAAuC;EAC3E,MAAMC,OAAA,GAAsB,EAAC;EAC7B,WAAWC,GAAA,IAAOF,OAAA,EAAS;IACzB,MAAMG,KAAA,GAAQH,OAAA,CAAQE,GAAG;IACzBD,OAAA,CAAQG,IAAA,CAAK;MACXC,MAAA,EAAQH,GAAA;MACRI,UAAA,EACEH,KAAA,IAAS,OAAOA,KAAA,IAAU,WACtBA,KAAA,GACA;QACEI,QAAA,EAAUJ;MACZ;IACR,CAAC;EACH;EAEA,OAAO;IACLK,IAAA,EAAM;IAEN,MAAMC,OAAOA,MAAA,EAAQ;MACf,CAACX,UAAA,IAAcG,OAAA,CAAQS,MAAA,KACzBZ,UAAA,GAAa,IACb,MAAMD,oBAAA,CAAqBI,OAAA,EAASQ,MAAM;IAE9C;IAEA,MAAME,eAAeF,MAAA,EAAQ;MACvB,CAACX,UAAA,IAAcG,OAAA,CAAQS,MAAA,KACzBZ,UAAA,GAAa,IACb,MAAMF,sBAAA,CAAuBK,OAAA,EAASQ,MAAM;IAEhD;EACF;AACF","ignoreList":[]}

package/dist/esm/vite/plugins/fixDependenciesPlugin.native.js

@@ -17,7 +17,7 @@ function fixDependenciesPlugin(options) {
       !hasApplied && patches.length && (hasApplied = !0, await applyOptimizePatches(patches, config));
     },
     async configResolved(config) {
-      patches.length && await applyDependencyPatches(patches, config);
+      !hasApplied && patches.length && (hasApplied = !0, await applyDependencyPatches(patches, config));
     }
   };
 }

package/dist/esm/vite/plugins/fixDependenciesPlugin.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/vite/plugins/Users/n8/one/packages/one/src/vite/plugins/fixDependenciesPlugin.ts"],
-  "mappings": "AACA,SAASA,wBAAwBC,4BAA2C;AAI5E,IAAIC,aAAa;AAEV,SAASC,sBAAsBC,SAA6B;AACjE,MAAMC,UAAsB,CAAA;AAC5B,WAAWC,OAAOF,SAAS;AACzB,QAAMG,QAAQH,QAAQE,GAAAA;AACtBD,YAAQG,KAAK;MACXC,QAAQH;MACRI,YACEH,SAAS,OAAOA,SAAU,WACtBA,QACA;QACEI,UAAUJ;MACZ;IACR,CAAA;EACF;AAEA,SAAO;IACLK,MAAM;IAEN,MAAMC,OAAOA,QAAM;AACjB,MAAI,CAACX,cAAcG,QAAQS,WACzBZ,aAAa,IACb,MAAMD,qBAAqBI,SAASQ,MAAAA;IAExC;IAEA,MAAME,eAAeF,QAAM;AACzB,MAAIR,QAAQS,UACV,MAAMd,uBAAuBK,SAASQ,MAAAA;IAE1C;EACF;AACF;",
+  "mappings": "AACA,SAASA,wBAAwBC,4BAA2C;AAI5E,IAAIC,aAAa;AAEV,SAASC,sBAAsBC,SAA6B;AACjE,MAAMC,UAAsB,CAAA;AAC5B,WAAWC,OAAOF,SAAS;AACzB,QAAMG,QAAQH,QAAQE,GAAAA;AACtBD,YAAQG,KAAK;MACXC,QAAQH;MACRI,YACEH,SAAS,OAAOA,SAAU,WACtBA,QACA;QACEI,UAAUJ;MACZ;IACR,CAAA;EACF;AAEA,SAAO;IACLK,MAAM;IAEN,MAAMC,OAAOA,QAAM;AACjB,MAAI,CAACX,cAAcG,QAAQS,WACzBZ,aAAa,IACb,MAAMD,qBAAqBI,SAASQ,MAAAA;IAExC;IAEA,MAAME,eAAeF,QAAM;AACzB,MAAI,CAACX,cAAcG,QAAQS,WACzBZ,aAAa,IACb,MAAMF,uBAAuBK,SAASQ,MAAAA;IAE1C;EACF;AACF;",
   "names": ["applyDependencyPatches", "applyOptimizePatches", "hasApplied", "fixDependenciesPlugin", "options", "patches", "key", "value", "push", "module", "patchFiles", "optimize", "name", "config", "length", "configResolved"]
 }

package/dist/esm/zero/useQuery.js

@@ -2,7 +2,8 @@ import { useRef } from "react";
 import { getQueryKey } from "./getQueryKey";
 import { resolveZeroQuery } from "./resolveQuery";
 import { useQuery as useQueryZero } from "./useQueryZero";
-let clientInitialData = globalThis.__vxrnPostRenderData__;
+import { getServerContext } from "../utils/serverContext";
+let clientInitialData = getServerContext()?.postRenderData;
 const serverQueryData = {};
 globalThis.__vxrnServerData__ = serverQueryData;
 const promises = /* @__PURE__ */ new WeakMap(), useQuery = (query, enable = !0) => {

package/dist/esm/zero/useQuery.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/zero/useQuery.ts"],
-  "mappings": "AAAA,SAAS,cAAc;AACvB,SAAS,mBAAmB;AAC5B,SAAS,wBAAwB;AACjC,SAAS,YAAY,oBAAoB;AAEzC,IAAI,oBAAmC,WAAW;AAGlD,MAAM,kBAAkB,CAAC;AAGzB,WAAW,qBAAwB;AAEnC,MAAM,WAAW,oBAAI,QAAQ,GAMhB,WAAY,CAAC,OAAY,SAAS,OAAS;AACtD,QAAM,WAAW,aAAa,OAAO,MAAM,GAErC,aAAa,OAAe;AAClC,EAAI,SAAS,CAAC,WAAW,YACvB,WAAW,UAAU,YAAY,KAAK;AAExC,QAAM,UAAU,WAAW,WAAW;AAKtC,MAA+C,OAAO,SAAW,KAAa;AAC5E,QAAI,CAAC,MAAO,QAAO,CAAC;AACpB,UAAM,UAAU,SAAS,IAAI,KAAK,GAC5B,QAAQ,gBAAgB,OAAO;AACrC,QAAI,MAAO,QAAO;AAElB,QAAI,CAAC,SAAS;AACZ,YAAMA,WAAU,IAAI,QAAc,CAAC,KAAK,QAAQ;AAC9C,yBAAiB,KAAK,EACnB,KAAK,CAAC,QAAQ;AACb,0BAAgB,OAAO,IAAI,KAC3B,IAAI;AAAA,QACN,CAAC,EACA,MAAM,CAAC,QAAQ;AACd,mBAAS,IAAI,OAAO,IAAI,GACxB,IAAI,GAAG;AAAA,QACT,CAAC;AAAA,MACL,CAAC;AACD,qBAAS,IAAI,OAAOA,QAAO,GACrBA;AAAA,IACR;AAEA,QAAI,QAAS,OAAM;AAEnB,WAAO,CAAC;AAAA,EACV;AAEA,SAAI,qBAAqB,CAAC,WACjB,kBAAkB,OAAO,KAAK,CAAC,IAGjC,YAAY,CAAC;AACtB;",
+  "mappings": "AAAA,SAAS,cAAc;AACvB,SAAS,mBAAmB;AAC5B,SAAS,wBAAwB;AACjC,SAAS,YAAY,oBAAoB;AACzC,SAAS,wBAAwB;AAEjC,IAAI,oBAAmC,iBAAiB,GAAG;AAG3D,MAAM,kBAAkB,CAAC;AAGzB,WAAW,qBAAwB;AAEnC,MAAM,WAAW,oBAAI,QAAQ,GAMhB,WAAY,CAAC,OAAY,SAAS,OAAS;AACtD,QAAM,WAAW,aAAa,OAAO,MAAM,GAErC,aAAa,OAAe;AAClC,EAAI,SAAS,CAAC,WAAW,YACvB,WAAW,UAAU,YAAY,KAAK;AAExC,QAAM,UAAU,WAAW,WAAW;AAKtC,MAA+C,OAAO,SAAW,KAAa;AAC5E,QAAI,CAAC,MAAO,QAAO,CAAC;AACpB,UAAM,UAAU,SAAS,IAAI,KAAK,GAC5B,QAAQ,gBAAgB,OAAO;AACrC,QAAI,MAAO,QAAO;AAElB,QAAI,CAAC,SAAS;AACZ,YAAMA,WAAU,IAAI,QAAc,CAAC,KAAK,QAAQ;AAC9C,yBAAiB,KAAK,EACnB,KAAK,CAAC,QAAQ;AACb,0BAAgB,OAAO,IAAI,KAC3B,IAAI;AAAA,QACN,CAAC,EACA,MAAM,CAAC,QAAQ;AACd,mBAAS,IAAI,OAAO,IAAI,GACxB,IAAI,GAAG;AAAA,QACT,CAAC;AAAA,MACL,CAAC;AACD,qBAAS,IAAI,OAAOA,QAAO,GACrBA;AAAA,IACR;AAEA,QAAI,QAAS,OAAM;AAEnB,WAAO,CAAC;AAAA,EACV;AAEA,SAAI,qBAAqB,CAAC,WACjB,kBAAkB,OAAO,KAAK,CAAC,IAGjC,YAAY,CAAC;AACtB;",
   "names": ["promise"]
 }

package/dist/esm/zero/useQuery.mjs

@@ -2,7 +2,8 @@ import { useRef } from "react";
 import { getQueryKey } from "./getQueryKey.mjs";
 import { resolveZeroQuery } from "./resolveQuery.mjs";
 import { useQuery as useQueryZero } from "./useQueryZero.mjs";
-let clientInitialData = globalThis.__vxrnPostRenderData__;
+import { getServerContext } from "../utils/serverContext.mjs";
+let clientInitialData = getServerContext()?.postRenderData;
 const serverQueryData = {};
 globalThis.__vxrnServerData__ = serverQueryData;
 const promises = /* @__PURE__ */new WeakMap(),

package/dist/esm/zero/useQuery.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useRef","getQueryKey","resolveZeroQuery","useQuery","useQueryZero","clientInitialData","globalThis","__vxrnPostRenderData__","serverQueryData","__vxrnServerData__","promises","WeakMap","query","enable","snapshot","queryIdRef","current","queryId","window","promise","get","value","promise2","Promise","res","rej","then","val","catch","err","set"],"sources":["../../../src/zero/useQuery.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,MAAA,QAAc;AACvB,SAASC,WAAA,QAAmB;AAC5B,SAASC,gBAAA,QAAwB;AACjC,SAASC,QAAA,IAAYC,YAAA,QAAoB;AAEzC,IAAIC,iBAAA,GAAmCC,UAAA,CAAWC,sBAAA;AAGlD,MAAMC,eAAA,GAAkB,CAAC;AAGzBF,UAAA,CAAWG,kBAAA,GAAwBD,eAAA;AAEnC,MAAME,QAAA,GAAW,mBAAIC,OAAA,CAAQ;EAMhBR,QAAA,GAAYA,CAACS,KAAA,EAAYC,MAAA,GAAS,OAAS;IACtD,MAAMC,QAAA,GAAWV,YAAA,CAAaQ,KAAA,EAAOC,MAAM;MAErCE,UAAA,GAAaf,MAAA,CAAe;IAC9BY,KAAA,IAAS,CAACG,UAAA,CAAWC,OAAA,KACvBD,UAAA,CAAWC,OAAA,GAAUf,WAAA,CAAYW,KAAK;IAExC,MAAMK,OAAA,GAAUF,UAAA,CAAWC,OAAA,IAAW;IAKtC,IAA+C,OAAOE,MAAA,GAAW,KAAa;MAC5E,IAAI,CAACN,KAAA,EAAO,OAAO,EAAC;MACpB,MAAMO,OAAA,GAAUT,QAAA,CAASU,GAAA,CAAIR,KAAK;QAC5BS,KAAA,GAAQb,eAAA,CAAgBS,OAAO;MACrC,IAAII,KAAA,EAAO,OAAOA,KAAA;MAElB,IAAI,CAACF,OAAA,EAAS;QACZ,MAAMG,QAAA,GAAU,IAAIC,OAAA,CAAc,CAACC,GAAA,EAAKC,GAAA,KAAQ;UAC9CvB,gBAAA,CAAiBU,KAAK,EACnBc,IAAA,CAAMC,GAAA,IAAQ;YACbnB,eAAA,CAAgBS,OAAO,IAAIU,GAAA,EAC3BH,GAAA,CAAI;UACN,CAAC,EACAI,KAAA,CAAOC,GAAA,IAAQ;YACdnB,QAAA,CAASoB,GAAA,CAAIlB,KAAA,EAAO,IAAI,GACxBa,GAAA,CAAII,GAAG;UACT,CAAC;QACL,CAAC;QACD,MAAAnB,QAAA,CAASoB,GAAA,CAAIlB,KAAA,EAAOU,QAAO,GACrBA,QAAA;MACR;MAEA,IAAIH,OAAA,EAAS,MAAMA,OAAA;MAEnB,OAAO,EAAC;IACV;IAEA,OAAId,iBAAA,IAAqB,CAACS,QAAA,GACjBT,iBAAA,CAAkBY,OAAO,KAAK,EAAC,GAGjCH,QAAA,IAAY,EAAC;EACtB","ignoreList":[]}
+{"version":3,"names":["useRef","getQueryKey","resolveZeroQuery","useQuery","useQueryZero","getServerContext","clientInitialData","postRenderData","serverQueryData","globalThis","__vxrnServerData__","promises","WeakMap","query","enable","snapshot","queryIdRef","current","queryId","window","promise","get","value","promise2","Promise","res","rej","then","val","catch","err","set"],"sources":["../../../src/zero/useQuery.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,MAAA,QAAc;AACvB,SAASC,WAAA,QAAmB;AAC5B,SAASC,gBAAA,QAAwB;AACjC,SAASC,QAAA,IAAYC,YAAA,QAAoB;AACzC,SAASC,gBAAA,QAAwB;AAEjC,IAAIC,iBAAA,GAAmCD,gBAAA,CAAiB,GAAGE,cAAA;AAG3D,MAAMC,eAAA,GAAkB,CAAC;AAGzBC,UAAA,CAAWC,kBAAA,GAAwBF,eAAA;AAEnC,MAAMG,QAAA,GAAW,mBAAIC,OAAA,CAAQ;EAMhBT,QAAA,GAAYA,CAACU,KAAA,EAAYC,MAAA,GAAS,OAAS;IACtD,MAAMC,QAAA,GAAWX,YAAA,CAAaS,KAAA,EAAOC,MAAM;MAErCE,UAAA,GAAahB,MAAA,CAAe;IAC9Ba,KAAA,IAAS,CAACG,UAAA,CAAWC,OAAA,KACvBD,UAAA,CAAWC,OAAA,GAAUhB,WAAA,CAAYY,KAAK;IAExC,MAAMK,OAAA,GAAUF,UAAA,CAAWC,OAAA,IAAW;IAKtC,IAA+C,OAAOE,MAAA,GAAW,KAAa;MAC5E,IAAI,CAACN,KAAA,EAAO,OAAO,EAAC;MACpB,MAAMO,OAAA,GAAUT,QAAA,CAASU,GAAA,CAAIR,KAAK;QAC5BS,KAAA,GAAQd,eAAA,CAAgBU,OAAO;MACrC,IAAII,KAAA,EAAO,OAAOA,KAAA;MAElB,IAAI,CAACF,OAAA,EAAS;QACZ,MAAMG,QAAA,GAAU,IAAIC,OAAA,CAAc,CAACC,GAAA,EAAKC,GAAA,KAAQ;UAC9CxB,gBAAA,CAAiBW,KAAK,EACnBc,IAAA,CAAMC,GAAA,IAAQ;YACbpB,eAAA,CAAgBU,OAAO,IAAIU,GAAA,EAC3BH,GAAA,CAAI;UACN,CAAC,EACAI,KAAA,CAAOC,GAAA,IAAQ;YACdnB,QAAA,CAASoB,GAAA,CAAIlB,KAAA,EAAO,IAAI,GACxBa,GAAA,CAAII,GAAG;UACT,CAAC;QACL,CAAC;QACD,MAAAnB,QAAA,CAASoB,GAAA,CAAIlB,KAAA,EAAOU,QAAO,GACrBA,QAAA;MACR;MAEA,IAAIH,OAAA,EAAS,MAAMA,OAAA;MAEnB,OAAO,EAAC;IACV;IAEA,OAAId,iBAAA,IAAqB,CAACS,QAAA,GACjBT,iBAAA,CAAkBY,OAAO,KAAK,EAAC,GAGjCH,QAAA,IAAY,EAAC;EACtB","ignoreList":[]}

package/dist/esm/zero/useQuery.native.js

@@ -2,7 +2,8 @@ import { useRef } from "react";
 import { getQueryKey } from "./getQueryKey";
 import "./resolveQuery";
 import { useQuery as useQueryZero } from "./useQueryZero";
-var clientInitialData = globalThis.__vxrnPostRenderData__, serverQueryData = {};
+import { getServerContext } from "../utils/serverContext";
+var _getServerContext, clientInitialData = (_getServerContext = getServerContext()) === null || _getServerContext === void 0 ? void 0 : _getServerContext.postRenderData, serverQueryData = {};
 globalThis.__vxrnServerData__ = serverQueryData;
 var useQuery = function(query) {
   var enable = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !0, snapshot = useQueryZero(query, enable), queryIdRef = useRef();

package/dist/esm/zero/useQuery.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/zero/Users/n8/one/packages/one/src/zero/useQuery.ts"],
-  "mappings": "AAAA,SAASA,cAAc;AACvB,SAASC,mBAAmB;AAC5B,OAAiC;AACjC,SAASC,YAAYC,oBAAoB;AAEzC,IAAIC,oBAAmCC,WAAW,wBAG5CC,kBAAkB,CAAC;AAGzBD,WAAW,qBAAwBC;AAQ5B,IAAMC,WAAY,SAACC,OAAAA;MAAYC,SAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAS,IACvCC,WAAWC,aAAaH,OAAOC,MAAAA,GAE/BG,aAAaC,OAAAA;AACnB,EAAIL,SAAS,CAACI,WAAWE,YACvBF,WAAWE,UAAUC,YAAYP,KAAAA;AAEnC,MAAMQ,UAAUJ,WAAWE,WAAW;AAKtC,MAAIG,GAA0E;AAE5E,QAAMC,SACAC;AAGN,QAAI,CAACD;AACH,UAAMA;EAkBV;AAEA,SAAIE,qBAAqB,CAACV,WACjBU,kBAAkBJ,OAAAA,KAAY,CAAA,IAGhCN,YAAY,CAAA;AACrB;",
-  "names": ["useRef", "getQueryKey", "useQuery", "useQueryZero", "clientInitialData", "globalThis", "serverQueryData", "useQuery", "query", "enable", "snapshot", "useQueryZero", "queryIdRef", "useRef", "current", "getQueryKey", "queryId", "process", "promise", "value", "clientInitialData"]
+  "mappings": "AAAA,SAASA,cAAc;AACvB,SAASC,mBAAmB;AAC5B,OAAiC;AACjC,SAASC,YAAYC,oBAAoB;AACzC,SAASC,wBAAwB;IAEMA,mBAAnCC,qBAAmCD,oBAAAA,iBAAAA,OAAAA,QAAAA,sBAAAA,SAAAA,SAAAA,kBAAoBE,gBAGrDC,kBAAkB,CAAC;AAGzBC,WAAW,qBAAwBD;AAQ5B,IAAME,WAAY,SAACC,OAAAA;MAAYC,SAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAS,IACvCC,WAAWC,aAAaH,OAAOC,MAAAA,GAE/BG,aAAaC,OAAAA;AACnB,EAAIL,SAAS,CAACI,WAAWE,YACvBF,WAAWE,UAAUC,YAAYP,KAAAA;AAEnC,MAAMQ,UAAUJ,WAAWE,WAAW;AAKtC,MAAIG,GAA0E;AAE5E,QAAMC,SACAC;AAGN,QAAI,CAACD;AACH,UAAMA;EAkBV;AAEA,SAAIE,qBAAqB,CAACV,WACjBU,kBAAkBJ,OAAAA,KAAY,CAAA,IAGhCN,YAAY,CAAA;AACrB;",
+  "names": ["useRef", "getQueryKey", "useQuery", "useQueryZero", "getServerContext", "clientInitialData", "postRenderData", "serverQueryData", "globalThis", "useQuery", "query", "enable", "snapshot", "useQueryZero", "queryIdRef", "useRef", "current", "getQueryKey", "queryId", "process", "promise", "value", "clientInitialData"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.1.388",
+  "version": "1.1.390",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -89,10 +89,6 @@
     "clean": "tamagui-build clean",
     "clean:build": "tamagui-build clean:build",
     "lint:fix": "../../node_modules/.bin/biome check --apply-unsafe src",
-    "test": "vitest --run --pool=forks",
-    "test:dev": "TEST_ONLY=dev yarn test",
-    "test:prod": "TEST_ONLY=prod yarn test",
-    "test:watch": "vitest --watch",
     "watch": "tamagui-build --watch"
   },
   "dependencies": {
@@ -113,15 +109,15 @@
     "@react-navigation/routers": "~7",
     "@swc/core": "^1.10.4",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/resolve": "1.1.388",
-    "@vxrn/tslib-lite": "1.1.388",
-    "@vxrn/universal-color-scheme": "1.1.388",
-    "@vxrn/use-isomorphic-layout-effect": "1.1.388",
+    "@vxrn/resolve": "1.1.390",
+    "@vxrn/tslib-lite": "1.1.390",
+    "@vxrn/universal-color-scheme": "1.1.390",
+    "@vxrn/use-isomorphic-layout-effect": "1.1.390",
     "babel-dead-code-elimination": "^1.0.6",
     "babel-plugin-react-compiler": "^19.0.0-beta-201e55d-20241215",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.1.388",
+    "create-vxrn": "1.1.390",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~6.3.1",
     "expo-modules-core": "2.1.2",
@@ -147,7 +143,7 @@
     "vite": "^6.0.6",
     "vite-plugin-barrel": "^0.4.1",
     "vite-tsconfig-paths": "^5.0.1",
-    "vxrn": "1.1.388",
+    "vxrn": "1.1.390",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },
@@ -158,10 +154,8 @@
     "@types/url-parse": "^1.4.11",
     "@types/xxhashjs": "^0.2.4",
     "depcheck": "^1.4.7",
-    "get-port": "^7.1.0",
     "react-native": "^0.76.5",
-    "rollup": "^4.29.1",
-    "vitest": "^2.1.8"
+    "rollup": "^4.29.1"
   },
   "peerDependencies": {
     "react-native": "*"

package/src/Root.tsx

@@ -1,4 +1,3 @@
-import { SafeAreaProviderCompat } from '@react-navigation/elements'
 import {
   DarkTheme,
   DefaultTheme,
@@ -6,13 +5,14 @@ import {
   type NavigationContainerProps,
 } from '@react-navigation/native'
 import { useColorScheme } from '@vxrn/universal-color-scheme'
-import { Fragment, useEffect, useState, type FunctionComponent, type ReactNode } from 'react'
+import { useEffect, useState, type FunctionComponent, type ReactNode } from 'react'
 import UpstreamNavigationContainer from './fork/NavigationContainer'
 import { getURL } from './getURL'
 import { ServerLocationContext } from './router/serverLocationContext'
 import { useInitializeOneRouter } from './router/useInitializeOneRouter'
-import type { GlobbedRouteImports, RenderAppProps } from './types'
-import { useViteRoutes } from './useViteRoutes'
+import { useViteRoutes } from './router/useViteRoutes'
+import type { GlobbedRouteImports } from './types'
+import { getServerContext } from './utils/serverContext'
 import { PreloadLinks } from './views/PreloadLinks'
 import { RootErrorBoundary } from './views/RootErrorBoundary'
 import { ScrollRestoration } from './views/ScrollRestoration'
@@ -24,12 +24,12 @@ if (typeof window !== 'undefined') {
   window.__getReactRefreshIgnoredExports = () => ['feedCardQuery', 'feedCardReplyQuery', 'loader']
 }
 
-type RootProps = RenderAppProps &
-  Omit<InnerProps, 'context'> & {
-    isClient?: boolean
-    routes: GlobbedRouteImports
-    routeOptions?: One.RouteOptions
-  }
+type RootProps = Omit<InnerProps, 'context'> & {
+  path: string
+  isClient?: boolean
+  routes: GlobbedRouteImports
+  routeOptions?: One.RouteOptions
+}
 
 type InnerProps = {
   context: One.RouteContext
@@ -51,14 +51,7 @@ type InnerProps = {
 }
 
 export function Root(props: RootProps) {
-  const {
-    path,
-    routes,
-    routeOptions,
-    wrapper: ParentWrapper = Fragment,
-    isClient,
-    navigationContainerProps,
-  } = props
+  const { path, routes, routeOptions, isClient, navigationContainerProps } = props
 
   // ⚠️ <StrictMode> breaks routing!
   const context = useViteRoutes(routes, routeOptions, globalThis['__vxrnVersion'])
@@ -72,28 +65,6 @@ export function Root(props: RootProps) {
 
   // const headContext = useMemo(() => globalThis['vxrn__headContext__'] || {}, [])
 
-  /*
-   * Due to static rendering we need to wrap these top level views in second wrapper
-   * View's like <GestureHandlerRootView /> generate a <div> so if the parent wrapper
-   * is a HTML document, we need to ensure its inside the <body>
-   */
-  const wrapper = (children: any) => {
-    return (
-      <ParentWrapper>
-        {/* default scroll restoration to on, but users can configure it by importing and using themselves */}
-        <ScrollRestoration />
-        {/* <GestureHandlerRootView> */}
-        <SafeAreaProviderCompat>
-          {children}
-
-          {/* Users can override this by adding another StatusBar element anywhere higher in the component tree. */}
-          {/* {!hasViewControllerBasedStatusBarAppearance && <StatusBar style="auto" />} */}
-        </SafeAreaProviderCompat>
-        {/* </GestureHandlerRootView> */}
-      </ParentWrapper>
-    )
-  }
-
   const Component = store.rootComponent
 
   if (!Component) {
@@ -116,7 +87,21 @@ export function Root(props: RootProps) {
         {...navigationContainerProps}
       >
         <ServerLocationContext.Provider value={location}>
-          {wrapper(<Component />)}
+          {/* <GestureHandlerRootView> */}
+          {/*
+           * Due to static rendering we need to wrap these top level views in second wrapper
+           * View's like <GestureHandlerRootView /> generate a <div> so if the parent wrapper
+           * is a HTML document, we need to ensure its inside the <body>
+           */}
+          <>
+            {/* default scroll restoration to on, but users can configure it by importing and using themselves */}
+            <ScrollRestoration />
+            <Component />
+
+            {/* Users can override this by adding another StatusBar element anywhere higher in the component tree. */}
+          </>
+          {/* {!hasViewControllerBasedStatusBarAppearance && <StatusBar style="auto" />} */}
+          {/* </GestureHandlerRootView> */}
         </ServerLocationContext.Provider>
       </UpstreamNavigationContainer>
       <PreloadLinks key="preload-links" />
@@ -125,7 +110,7 @@ export function Root(props: RootProps) {
   )
 
   if (isClient) {
-    if (globalThis['__vxrnHydrateMode__'] === 'spa') {
+    if (getServerContext()?.mode === 'spa') {
       // eslint-disable-next-line react-hooks/rules-of-hooks
       const [show, setShow] = useState(false)
 

package/src/cli/build.ts

@@ -12,7 +12,7 @@ import {
   build as vxrnBuild,
   type ClientManifestEntry,
 } from 'vxrn'
-import { getLoaderPath, getPreloadPath } from '../cleanUrl'
+import { getLoaderPath, getPreloadPath } from '../utils/cleanUrl'
 import * as constants from '../constants'
 import type { RouteInfo } from '../server/createRoutesManifest'
 import type { LoaderProps, RenderApp } from '../types'

package/src/constants.ts

@@ -10,3 +10,7 @@ export const LOADER_JS_POSTFIX_REGEX = new RegExp(LOADER_JS_POSTFIX_REGEX_STRING
 export const LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`
 
 export const PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`
+
+// safari insanely aggressive caching
+export const VIRTUAL_SSR_CSS_ENTRY = `virtual:ssr-css.css`
+export const VIRTUAL_SSR_CSS_HREF = `/@id/__x00__${VIRTUAL_SSR_CSS_ENTRY}`

package/src/createApp.native.tsx

@@ -11,7 +11,7 @@ LogBox.ignoreLogs([/Sending .* with no listeners registered/])
 
 export function createApp(options: CreateAppProps): void {
   const App = () => {
-    let contents = <Root mode="spa" isClient routes={options.routes} path="/" />
+    let contents = <Root isClient routes={options.routes} path="/" />
 
     // if (process.env.ONE_ENABLE_REACT_SCAN) {
     //   console.warn(`React Scan enabled with options: ${process.env.ONE_ENABLE_REACT_SCAN}`)

package/src/createApp.tsx

@@ -6,91 +6,33 @@ import { resolveClientLoader } from './clientLoaderResolver'
 import { render } from './render'
 import { renderToString } from './server-render'
 import type { RenderAppProps } from './types'
-import { rand } from './utils/rand'
 // @ts-ignore
 import ReactDOMServer from 'react-dom/server.browser'
+import {
+  getServerContext,
+  SERVER_CONTEXT_POST_RENDER_STRING,
+  setServerContext,
+} from './utils/serverContext'
 
 export type CreateAppProps = { routes: Record<string, () => Promise<unknown>> }
 
-// replacing Vites since we control the root
-function DevHead({ ssrID }: { ssrID: string }) {
-  if (process.env.NODE_ENV === 'development') {
-    return (
-      <>
-        <link rel="preload" href={ssrID} as="style" />
-        <link rel="stylesheet" href={ssrID} data-ssr-css />
-        <script
-          type="module"
-          dangerouslySetInnerHTML={{
-            __html: `import { createHotContext } from "/@vite/client";
-  const hot = createHotContext("/__clear_ssr_css");
-  hot.on("vite:afterUpdate", () => {
-    document
-      .querySelectorAll("[data-ssr-css]")
-      .forEach(node => node.remove());
-  });`,
-          }}
-        />
-        <script
-          type="module"
-          dangerouslySetInnerHTML={{
-            __html: `import { injectIntoGlobalHook } from "/@react-refresh";
-  injectIntoGlobalHook(window);
-  window.$RefreshReg$ = () => {};
-  window.$RefreshSig$ = () => (type) => type;`,
-          }}
-        />
-      </>
-    )
-  }
-
-  return null
-}
-
 export function createApp(options: CreateAppProps) {
   if (import.meta.env.SSR) {
     return {
       options,
       render: async (props: RenderAppProps) => {
-        const App = () => {
-          let { loaderData, loaderProps, css, mode } = props
-
-          return (
-            <html lang="en-US">
-              <head>
-                {process.env.NODE_ENV === 'development' ? (
-                  <DevHead ssrID={`/@id/__x00__virtual:ssr-css.css?t=${rand()}`} />
-                ) : null}
-
-                <script
-                  dangerouslySetInnerHTML={{
-                    __html: `globalThis['global'] = globalThis`,
-                  }}
-                />
+        let { loaderData, loaderProps, css, mode, loaderServerData } = props
+
+        setServerContext({
+          postRenderData: loaderServerData,
+          loaderData,
+          loaderProps,
+          mode,
+          css,
+        })
 
-                {css?.map((file) => {
-                  return <link key={file} rel="stylesheet" href={file} />
-                })}
-              </head>
-              <body>
-                <Root routes={options.routes} {...props} />
-              </body>
-              {/* could this just be loaded via the same loader.js? as a preload? i think so... */}
-              <script
-                async
-                // @ts-ignore
-                href="one-loader-data"
-                dangerouslySetInnerHTML={{
-                  __html: `
-                      globalThis['__vxrnPostRenderData__'] = { __vxrn__: 'post-render' };
-                      globalThis['__vxrnLoaderData__'] = ${JSON.stringify(loaderData)};
-                      globalThis['__vxrnLoaderProps__'] = ${JSON.stringify(loaderProps)};
-                      globalThis['__vxrnHydrateMode__'] = ${JSON.stringify(mode)};
-                  `,
-                }}
-              />
-            </html>
-          )
+        const App = () => {
+          return <Root routes={options.routes} {...props} />
         }
 
         AppRegistry.registerComponent('App', () => App)
@@ -124,11 +66,14 @@ export function createApp(options: CreateAppProps) {
         }
 
         // now we can grab and serialize in our zero queries
-        const serverData = globalThis['__vxrnServerData__']
+        const serverData = getServerContext()?.postRenderData
         if (serverData) {
           const hasQueryData = Object.keys(serverData).length
           if (hasQueryData) {
-            html = html.replace(`{ __vxrn__: 'post-render' }`, JSON.stringify(serverData))
+            html = html.replace(
+              JSON.stringify(SERVER_CONTEXT_POST_RENDER_STRING),
+              JSON.stringify(serverData)
+            )
           }
         }
 
@@ -142,14 +87,10 @@ export function createApp(options: CreateAppProps) {
 
   return rootLayoutImport
     .then(() => {
-      resolveClientLoader({
-        loaderData: globalThis['__vxrnLoaderData__'],
-        loaderServerData: globalThis['__vxrnLoaderServerData__'],
-        loaderProps: globalThis['__vxrnLoaderProps__'],
-      })
+      resolveClientLoader(getServerContext() || {})
         .then(() => {
           // on client we just render
-          render(<Root mode="spa" isClient routes={options.routes} path={window.location.href} />)
+          render(<Root isClient routes={options.routes} path={window.location.href} />)
         })
         .catch((err) => {
           console.error(`Error running client loader resolver "onClientLoaderResolve":`, err)

package/src/createHandleRequest.ts

@@ -1,7 +1,8 @@
-import { getPathFromLoaderPath } from './cleanUrl'
+import { extname } from 'node:path'
+import { getPathFromLoaderPath } from './utils/cleanUrl'
 import { LOADER_JS_POSTFIX_UNCACHED } from './constants'
 import type { Middleware, MiddlewareContext } from './createMiddleware'
-import type { RouteNode } from './Route'
+import type { RouteNode } from './router/Route'
 import type { RouteInfo, RouteInfoCompiled } from './server/createRoutesManifest'
 import type { LoaderProps } from './types'
 import { getHonoPath } from './utils/getHonoPath'

package/src/fork/getPathFromState.ts

@@ -6,7 +6,7 @@ import {
   matchDynamicName,
   matchGroupName,
   testNotFound,
-} from '../matchers'
+} from '../router/matchers'
 
 type Options<ParamList extends object> = {
   initialRouteName?: string

package/src/fork/getStateFromPath.ts

@@ -2,8 +2,8 @@ import type { PathConfigMap } from '@react-navigation/core'
 import type { InitialState } from '@react-navigation/routers'
 // biome-ignore lint/suspicious/noShadowRestrictedNames: <explanation>
 import escape from 'escape-string-regexp'
-import type { RouteNode } from '../Route'
-import { matchGroupName, stripGroupSegmentsFromPath } from '../matchers'
+import type { RouteNode } from '../router/Route'
+import { matchGroupName, stripGroupSegmentsFromPath } from '../router/matchers'
 import { findFocusedRoute } from './findFocusedRoute'
 import validatePathConfig from './validatePathConfig'
 import type { OneRouter } from '../interfaces/router'

package/src/getReactNavigationConfig.ts

@@ -1,5 +1,5 @@
-import { matchDeepDynamicRouteName, matchDynamicName } from './matchers'
-import type { RouteNode } from './Route'
+import { matchDeepDynamicRouteName, matchDynamicName } from './router/matchers'
+import type { RouteNode } from './router/Route'
 
 export type Screen =
   | string

package/src/hooks.tsx

@@ -1,7 +1,7 @@
 import React, { createContext, type ReactNode } from 'react'
-import { router } from './imperative-api'
+import { router } from './router/imperative-api'
 import type { OneRouter } from './interfaces/router'
-import { RouteParamsContext } from './Route'
+import { RouteParamsContext } from './router/Route'
 import { navigationRef, useStoreRootState, useStoreRouteInfo } from './router/router'
 
 type SearchParams = OneRouter.SearchParams

package/src/index.ts

@@ -9,8 +9,8 @@ export type LinkProps<T extends string | object = string> = OneRouter.LinkProps<
 export type { Endpoint, LoaderProps } from './types'
 
 // base
-export { router } from './imperative-api'
-export { createRoute, route } from './createRoute'
+export { router } from './router/imperative-api'
+export { createRoute, route } from './router/createRoute'
 export { onClientLoaderResolve } from './clientLoaderResolver'
 
 // middleware
@@ -66,5 +66,5 @@ export * from '@vxrn/universal-color-scheme'
 
 // React Navigation
 export { useFocusEffect } from './useFocusEffect'
-export { useNavigation } from './useNavigation'
+export { useNavigation } from './router/useNavigation'
 export { useLoader } from './useLoader'

package/src/layouts/Tabs.tsx

@@ -16,6 +16,9 @@ const TabBar = ({ state, ...restProps }: BottomTabBarProps) => {
   /**
    * With React Navigation v7, spacial routes such as +not-found and _sitemap are being added to `state.routes`, but we don't want them to be shown in the tab bar.
    */
+
+  // TODO due to adding onlyMatching, we can remove this now i think (need to make sure)
+
   const filteredRoutes = state.routes.filter(
     (r) => r.name !== '+not-found' && !r.name.startsWith('_sitemap')
   )
@@ -43,40 +46,44 @@ export const Tabs = withLayoutContext<
   typeof BottomTabNavigator,
   TabNavigationState<ParamListBase>,
   BottomTabNavigationEventMap
->(BottomTabNavigator, (screens) => {
-  // Support the `href` shortcut prop.
-  return screens.map((screen) => {
-    if (typeof screen.options !== 'function' && screen.options?.href !== undefined) {
-      const { href, ...options } = screen.options
-      if (options.tabBarButton) {
-        throw new Error('Cannot use `href` and `tabBarButton` together.')
-      }
-      return {
-        ...screen,
-        options: {
-          ...options,
-          tabBarButton: (props) => {
-            if (href == null) {
-              return null
-            }
-            const children =
-              Platform.OS === 'web' ? props.children : <Pressable>{props.children}</Pressable>
-            return (
-              <Link
-                {...props}
-                style={[{ display: 'flex' }, props.style]}
-                href={href}
-                asChild={Platform.OS !== 'web'}
-                // biome-ignore lint/correctness/noChildrenProp: <explanation>
-                children={children}
-              />
-            )
+>(
+  BottomTabNavigator,
+  (screens) => {
+    // Support the `href` shortcut prop.
+    return screens.map((screen) => {
+      if (typeof screen.options !== 'function' && screen.options?.href !== undefined) {
+        const { href, ...options } = screen.options
+        if (options.tabBarButton) {
+          throw new Error('Cannot use `href` and `tabBarButton` together.')
+        }
+        return {
+          ...screen,
+          options: {
+            ...options,
+            tabBarButton: (props) => {
+              if (href == null) {
+                return null
+              }
+              const children =
+                Platform.OS === 'web' ? props.children : <Pressable>{props.children}</Pressable>
+              return (
+                <Link
+                  {...props}
+                  style={[{ display: 'flex' }, props.style]}
+                  href={href}
+                  asChild={Platform.OS !== 'web'}
+                  // biome-ignore lint/correctness/noChildrenProp: <explanation>
+                  children={children}
+                />
+              )
+            },
           },
-        },
+        }
       }
-    }
-    return screen
-  })
-}, { props: { tabBar: TabBar } })
+      return screen
+    })
+  },
+  { props: { tabBar: TabBar } }
+)
 
 export default Tabs