one 1.1.388 → 1.1.390

package/dist/cjs/vite/plugins/fixDependenciesPlugin.cjs

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

package/dist/cjs/vite/plugins/fixDependenciesPlugin.js

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

package/dist/cjs/vite/plugins/fixDependenciesPlugin.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/vite/plugins/fixDependenciesPlugin.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAA4E;AAI5E,IAAI,aAAa;AAEV,SAAS,sBAAsB,SAAuC;AAC3E,QAAM,UAAsB,CAAC;AAC7B,aAAW,OAAO,SAAS;AACzB,UAAM,QAAQ,QAAQ,GAAG;AACzB,YAAQ,KAAK;AAAA,MACX,QAAQ;AAAA,MACR,YACE,SAAS,OAAO,SAAU,WACtB,QACA;AAAA,QACE,UAAU;AAAA,MACZ;AAAA,IACR,CAAC;AAAA,EACH;AAEA,SAAO;AAAA,IACL,MAAM;AAAA,IAEN,MAAM,OAAO,QAAQ;AACnB,MAAI,CAAC,cAAc,QAAQ,WACzB,aAAa,IACb,UAAM,kCAAqB,SAAS,MAAM;AAAA,IAE9C;AAAA,IAEA,MAAM,eAAe,QAAQ;AAC3B,MAAI,QAAQ,UACV,UAAM,oCAAuB,SAAS,MAAM;AAAA,IAEhD;AAAA,EACF;AACF;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAA4E;AAI5E,IAAI,aAAa;AAEV,SAAS,sBAAsB,SAAuC;AAC3E,QAAM,UAAsB,CAAC;AAC7B,aAAW,OAAO,SAAS;AACzB,UAAM,QAAQ,QAAQ,GAAG;AACzB,YAAQ,KAAK;AAAA,MACX,QAAQ;AAAA,MACR,YACE,SAAS,OAAO,SAAU,WACtB,QACA;AAAA,QACE,UAAU;AAAA,MACZ;AAAA,IACR,CAAC;AAAA,EACH;AAEA,SAAO;AAAA,IACL,MAAM;AAAA,IAEN,MAAM,OAAO,QAAQ;AACnB,MAAI,CAAC,cAAc,QAAQ,WACzB,aAAa,IACb,UAAM,kCAAqB,SAAS,MAAM;AAAA,IAE9C;AAAA,IAEA,MAAM,eAAe,QAAQ;AAC3B,MAAI,CAAC,cAAc,QAAQ,WACzB,aAAa,IACb,UAAM,oCAAuB,SAAS,MAAM;AAAA,IAEhD;AAAA,EACF;AACF;",
   "names": []
 }

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

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

package/dist/cjs/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;;;;;kBAA4E,iBAIxEA,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,UAAMa,kCAAqBV,SAASQ,MAAAA;IAExC;IAEA,MAAMG,eAAeH,QAAM;AACzB,MAAIR,QAAQS,UACV,UAAMG,oCAAuBZ,SAASQ,MAAAA;IAE1C;EACF;AACF;",
+  "mappings": ";;;;;;;;;;;;;;;AACA;;;;;kBAA4E,iBAIxEA,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,UAAMa,kCAAqBV,SAASQ,MAAAA;IAExC;IAEA,MAAMG,eAAeH,QAAM;AACzB,MAAI,CAACX,cAAcG,QAAQS,WACzBZ,aAAa,IACb,UAAMe,oCAAuBZ,SAASQ,MAAAA;IAE1C;EACF;AACF;",
   "names": ["hasApplied", "fixDependenciesPlugin", "options", "patches", "key", "value", "push", "module", "patchFiles", "optimize", "name", "config", "length", "applyOptimizePatches", "configResolved", "applyDependencyPatches"]
 }

package/dist/cjs/zero/useQuery.cjs

@@ -26,8 +26,9 @@ module.exports = __toCommonJS(useQuery_exports);
 var import_react = require("react"),
   import_getQueryKey = require("./getQueryKey.cjs"),
   import_resolveQuery = require("./resolveQuery.cjs"),
-  import_useQueryZero = require("./useQueryZero.cjs");
-let clientInitialData = globalThis.__vxrnPostRenderData__;
+  import_useQueryZero = require("./useQueryZero.cjs"),
+  import_serverContext = require("../utils/serverContext.cjs");
+let clientInitialData = (0, import_serverContext.getServerContext)()?.postRenderData;
 const serverQueryData = {};
 globalThis.__vxrnServerData__ = serverQueryData;
 const promises = /* @__PURE__ */new WeakMap(),

package/dist/cjs/zero/useQuery.js

@@ -17,8 +17,8 @@ __export(useQuery_exports, {
   useQuery: () => useQuery
 });
 module.exports = __toCommonJS(useQuery_exports);
-var import_react = require("react"), import_getQueryKey = require("./getQueryKey"), import_resolveQuery = require("./resolveQuery"), import_useQueryZero = require("./useQueryZero");
-let clientInitialData = globalThis.__vxrnPostRenderData__;
+var import_react = require("react"), import_getQueryKey = require("./getQueryKey"), import_resolveQuery = require("./resolveQuery"), import_useQueryZero = require("./useQueryZero"), import_serverContext = require("../utils/serverContext");
+let clientInitialData = (0, import_serverContext.getServerContext)()?.postRenderData;
 const serverQueryData = {};
 globalThis.__vxrnServerData__ = serverQueryData;
 const promises = /* @__PURE__ */ new WeakMap(), useQuery = (query, enable = !0) => {

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/zero/useQuery.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAuB,kBACvB,qBAA4B,0BAC5B,sBAAiC,2BACjC,sBAAyC;AAEzC,IAAI,oBAAmC,WAAW;AAGlD,MAAM,kBAAkB,CAAC;AAGzB,WAAW,qBAAwB;AAEnC,MAAM,WAAW,oBAAI,QAAQ,GAMhB,WAAY,CAAC,OAAY,SAAS,OAAS;AACtD,QAAM,eAAW,oBAAAA,UAAa,OAAO,MAAM,GAErC,iBAAa,qBAAe;AAClC,EAAI,SAAS,CAAC,WAAW,YACvB,WAAW,cAAU,gCAAY,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,YAAMC,WAAU,IAAI,QAAc,CAAC,KAAK,QAAQ;AAC9C,kDAAiB,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;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAuB,kBACvB,qBAA4B,0BAC5B,sBAAiC,2BACjC,sBAAyC,2BACzC,uBAAiC;AAEjC,IAAI,wBAAmC,uCAAiB,GAAG;AAG3D,MAAM,kBAAkB,CAAC;AAGzB,WAAW,qBAAwB;AAEnC,MAAM,WAAW,oBAAI,QAAQ,GAMhB,WAAY,CAAC,OAAY,SAAS,OAAS;AACtD,QAAM,eAAW,oBAAAA,UAAa,OAAO,MAAM,GAErC,iBAAa,qBAAe;AAClC,EAAI,SAAS,CAAC,WAAW,YACvB,WAAW,cAAU,gCAAY,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,YAAMC,WAAU,IAAI,QAAc,CAAC,KAAK,QAAQ;AAC9C,kDAAiB,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": ["useQueryZero", "promise"]
 }

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

@@ -18,7 +18,7 @@ __export(useQuery_exports, {
   useQuery: () => useQuery
 });
 module.exports = __toCommonJS(useQuery_exports);
-var import_react = require("react"), import_getQueryKey = require("./getQueryKey"), import_resolveQuery = require("./resolveQuery"), import_useQueryZero = require("./useQueryZero"), clientInitialData = globalThis.__vxrnPostRenderData__, serverQueryData = {};
+var import_react = require("react"), import_getQueryKey = require("./getQueryKey"), import_resolveQuery = require("./resolveQuery"), import_useQueryZero = require("./useQueryZero"), import_serverContext = require("../utils/serverContext"), _getServerContext, clientInitialData = (_getServerContext = (0, import_serverContext.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 = (0, import_useQueryZero.useQuery)(query, enable), queryIdRef = (0, import_react.useRef)();

package/dist/cjs/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;;;;;mBAAuB,kBACvB,qBAA4B,0BAC5B,sBAAiC,2BACjC,sBAAyC,2BAErCA,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,eAAWC,oBAAAA,UAAaH,OAAOC,MAAAA,GAE/BG,iBAAaC,qBAAAA;AACnB,EAAIL,SAAS,CAACI,WAAWE,YACvBF,WAAWE,cAAUC,gCAAYP,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": ["clientInitialData", "globalThis", "serverQueryData", "useQuery", "query", "enable", "snapshot", "useQueryZero", "queryIdRef", "useRef", "current", "getQueryKey", "queryId", "process", "promise", "value", "clientInitialData"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA,mBAAuB,kBACvB,qBAA4B,0BAC5B,sBAAiC,2BACjC,sBAAyC,2BACzC,uBAAiC,mCAEMA,mBAAnCC,qBAAmCD,wBAAAA,uCAAAA,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,eAAWC,oBAAAA,UAAaH,OAAOC,MAAAA,GAE/BG,iBAAaC,qBAAAA;AACnB,EAAIL,SAAS,CAACI,WAAWE,YACvBF,WAAWE,cAAUC,gCAAYP,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": ["getServerContext", "clientInitialData", "postRenderData", "serverQueryData", "globalThis", "useQuery", "query", "enable", "snapshot", "useQueryZero", "queryIdRef", "useRef", "current", "getQueryKey", "queryId", "process", "promise", "value", "clientInitialData"]
 }

package/dist/esm/Root.js

@@ -1,32 +1,22 @@
-import { SafeAreaProviderCompat } from "@react-navigation/elements";
 import {
   DarkTheme,
   DefaultTheme
 } from "@react-navigation/native";
 import { useColorScheme } from "@vxrn/universal-color-scheme";
-import { Fragment, useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import UpstreamNavigationContainer from "./fork/NavigationContainer";
 import { getURL } from "./getURL";
 import { ServerLocationContext } from "./router/serverLocationContext";
 import { useInitializeOneRouter } from "./router/useInitializeOneRouter";
-import { useViteRoutes } from "./useViteRoutes";
+import { useViteRoutes } from "./router/useViteRoutes";
+import { getServerContext } from "./utils/serverContext";
 import { PreloadLinks } from "./views/PreloadLinks";
 import { RootErrorBoundary } from "./views/RootErrorBoundary";
 import { ScrollRestoration } from "./views/ScrollRestoration";
-import { jsx, jsxs } from "react/jsx-runtime";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 typeof window < "u" && (window.__getReactRefreshIgnoredExports = () => ["feedCardQuery", "feedCardReplyQuery", "loader"]);
 function Root(props) {
-  const {
-    path,
-    routes,
-    routeOptions,
-    wrapper: ParentWrapper = Fragment,
-    isClient,
-    navigationContainerProps
-  } = props, context = useViteRoutes(routes, routeOptions, globalThis.__vxrnVersion), location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : new URL(path || "/", getURL()), store = useInitializeOneRouter(context, location), [colorScheme] = useColorScheme(), wrapper = (children) => /* @__PURE__ */ jsxs(ParentWrapper, { children: [
-    /* @__PURE__ */ jsx(ScrollRestoration, {}),
-    /* @__PURE__ */ jsx(SafeAreaProviderCompat, { children })
-  ] }), Component = store.rootComponent;
+  const { path, routes, routeOptions, isClient, navigationContainerProps } = props, context = useViteRoutes(routes, routeOptions, globalThis.__vxrnVersion), location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : new URL(path || "/", getURL()), store = useInitializeOneRouter(context, location), [colorScheme] = useColorScheme(), Component = store.rootComponent;
   if (!Component)
     throw new Error("No root component found");
   const contents = (
@@ -44,14 +34,17 @@ function Root(props) {
             enabled: !1
           },
           ...navigationContainerProps,
-          children: /* @__PURE__ */ jsx(ServerLocationContext.Provider, { value: location, children: wrapper(/* @__PURE__ */ jsx(Component, {})) })
+          children: /* @__PURE__ */ jsx(ServerLocationContext.Provider, { value: location, children: /* @__PURE__ */ jsxs(Fragment, { children: [
+            /* @__PURE__ */ jsx(ScrollRestoration, {}),
+            /* @__PURE__ */ jsx(Component, {})
+          ] }) })
         }
       ),
       /* @__PURE__ */ jsx(PreloadLinks, {}, "preload-links")
     ] })
   );
   if (isClient) {
-    if (globalThis.__vxrnHydrateMode__ === "spa") {
+    if (getServerContext()?.mode === "spa") {
       const [show, setShow] = useState(!1);
       return useEffect(() => {
         setShow(!0);

package/dist/esm/Root.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Root.tsx"],
-  "mappings": "AAAA,SAAS,8BAA8B;AACvC;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AACP,SAAS,sBAAsB;AAC/B,SAAS,UAAU,WAAW,gBAAwD;AACtF,OAAO,iCAAiC;AACxC,SAAS,cAAc;AACvB,SAAS,6BAA6B;AACtC,SAAS,8BAA8B;AAEvC,SAAS,qBAAqB;AAC9B,SAAS,oBAAoB;AAC7B,SAAS,yBAAyB;AAClC,SAAS,yBAAyB;AAgE5B,SAEE,KAFF;AA5DF,OAAO,SAAW,QAEpB,OAAO,kCAAkC,MAAM,CAAC,iBAAiB,sBAAsB,QAAQ;AA6B1F,SAAS,KAAK,OAAkB;AACrC,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA,SAAS,gBAAgB;AAAA,IACzB;AAAA,IACA;AAAA,EACF,IAAI,OAGE,UAAU,cAAc,QAAQ,cAAc,WAAW,aAAgB,GACzE,WACJ,OAAO,SAAW,OAAe,OAAO,WACpC,IAAI,IAAI,QAAQ,OAAO,SAAS,QAAQ,KAAK,OAAO,SAAS,IAAI,IACjE,IAAI,IAAI,QAAQ,KAAK,OAAO,CAAC,GAE7B,QAAQ,uBAAuB,SAAS,QAAQ,GAChD,CAAC,WAAW,IAAI,eAAe,GAS/B,UAAU,CAAC,aAEb,qBAAC,iBAEC;AAAA,wBAAC,qBAAkB;AAAA,IAEnB,oBAAC,0BACE,UAIH;AAAA,KAEF,GAIE,YAAY,MAAM;AAExB,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,yBAAyB;AAG3C,QAAM;AAAA;AAAA,IAEJ,qBAAC,qBAEC;AAAA;AAAA,QAAC;AAAA;AAAA,UACC,KAAK,MAAM;AAAA,UACX,cAAc,MAAM;AAAA,UACpB,SAAS,MAAM;AAAA,UACf;AAAA,UACA,OAAO,gBAAgB,SAAS,YAAY;AAAA,UAC5C,eAAe;AAAA,YACb,SAAS;AAAA,UACX;AAAA,UACC,GAAG;AAAA,UAEJ,8BAAC,sBAAsB,UAAtB,EAA+B,OAAO,UACpC,kBAAQ,oBAAC,aAAU,CAAE,GACxB;AAAA;AAAA,MACF;AAAA,MACA,oBAAC,kBAAiB,eAAgB;AAAA,OACpC;AAAA;AAIF,MAAI,UAAU;AACZ,QAAI,WAAW,wBAA2B,OAAO;AAE/C,YAAM,CAAC,MAAM,OAAO,IAAI,SAAS,EAAK;AAGtC,uBAAU,MAAM;AACd,gBAAQ,EAAI;AAAA,MACd,GAAG,CAAC,CAAC,GAEE,OAAO,WAAW;AAAA,IAC3B;AACA,WAAO;AAAA,EACT;AAEA,SAAO;AACT;AAqCA,IAAI;AAEA,QAAQ,IAAI,aAAa,eAC3B,oBAAoB,CAAC,WAA6B;AAChD,QAAM,UAA2C,OAAO;AAExD,MAAI,UAAU,eAAe,OAAO,IAAI,IACtC,UAAU,iBAAiB,KAAK,UAAU,OAAO,OAAO,CAAC,KAAK,EAChE;AAEA,UAAQ,OAAO,MAAM;AAAA,IACnB,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH,MAAI,SAAS,OACX,WAAW;AAAA;AAAA,6BAAkC,QAAQ,IAAI,OAEzD,WAAW;AAAA;AAAA;AAGb;AAAA,IACF,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH,iBAAW;AAAA;AAAA;AACX;AAAA,IACF,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH,iBAAW;AAAA;AAAA;AACX;AAAA,EACJ;AAIA,MAFA,WAAW;AAAA;AAAA,uEAEP,QAAQ,IAAI,aAAa;AAC3B,UAAM,IAAI,MAAM,OAAO;AAEzB,UAAQ,MAAM,OAAO;AACvB,IAEA,oBAAoB,MAAM;AAAC;",
+  "mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AACP,SAAS,sBAAsB;AAC/B,SAAS,WAAW,gBAAwD;AAC5E,OAAO,iCAAiC;AACxC,SAAS,cAAc;AACvB,SAAS,6BAA6B;AACtC,SAAS,8BAA8B;AACvC,SAAS,qBAAqB;AAE9B,SAAS,wBAAwB;AACjC,SAAS,oBAAoB;AAC7B,SAAS,yBAAyB;AAClC,SAAS,yBAAyB;AA8ExB,mBAEE,KAFF;AA1EN,OAAO,SAAW,QAEpB,OAAO,kCAAkC,MAAM,CAAC,iBAAiB,sBAAsB,QAAQ;AA6B1F,SAAS,KAAK,OAAkB;AACrC,QAAM,EAAE,MAAM,QAAQ,cAAc,UAAU,yBAAyB,IAAI,OAGrE,UAAU,cAAc,QAAQ,cAAc,WAAW,aAAgB,GACzE,WACJ,OAAO,SAAW,OAAe,OAAO,WACpC,IAAI,IAAI,QAAQ,OAAO,SAAS,QAAQ,KAAK,OAAO,SAAS,IAAI,IACjE,IAAI,IAAI,QAAQ,KAAK,OAAO,CAAC,GAE7B,QAAQ,uBAAuB,SAAS,QAAQ,GAChD,CAAC,WAAW,IAAI,eAAe,GAI/B,YAAY,MAAM;AAExB,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,yBAAyB;AAG3C,QAAM;AAAA;AAAA,IAEJ,qBAAC,qBAEC;AAAA;AAAA,QAAC;AAAA;AAAA,UACC,KAAK,MAAM;AAAA,UACX,cAAc,MAAM;AAAA,UACpB,SAAS,MAAM;AAAA,UACf;AAAA,UACA,OAAO,gBAAgB,SAAS,YAAY;AAAA,UAC5C,eAAe;AAAA,YACb,SAAS;AAAA,UACX;AAAA,UACC,GAAG;AAAA,UAEJ,8BAAC,sBAAsB,UAAtB,EAA+B,OAAO,UAOrC,2CAEE;AAAA,gCAAC,qBAAkB;AAAA,YACnB,oBAAC,aAAU;AAAA,aAGb,GAGF;AAAA;AAAA,MACF;AAAA,MACA,oBAAC,kBAAiB,eAAgB;AAAA,OACpC;AAAA;AAIF,MAAI,UAAU;AACZ,QAAI,iBAAiB,GAAG,SAAS,OAAO;AAEtC,YAAM,CAAC,MAAM,OAAO,IAAI,SAAS,EAAK;AAGtC,uBAAU,MAAM;AACd,gBAAQ,EAAI;AAAA,MACd,GAAG,CAAC,CAAC,GAEE,OAAO,WAAW;AAAA,IAC3B;AACA,WAAO;AAAA,EACT;AAEA,SAAO;AACT;AAqCA,IAAI;AAEA,QAAQ,IAAI,aAAa,eAC3B,oBAAoB,CAAC,WAA6B;AAChD,QAAM,UAA2C,OAAO;AAExD,MAAI,UAAU,eAAe,OAAO,IAAI,IACtC,UAAU,iBAAiB,KAAK,UAAU,OAAO,OAAO,CAAC,KAAK,EAChE;AAEA,UAAQ,OAAO,MAAM;AAAA,IACnB,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH,MAAI,SAAS,OACX,WAAW;AAAA;AAAA,6BAAkC,QAAQ,IAAI,OAEzD,WAAW;AAAA;AAAA;AAGb;AAAA,IACF,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH,iBAAW;AAAA;AAAA;AACX;AAAA,IACF,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH,iBAAW;AAAA;AAAA;AACX;AAAA,EACJ;AAIA,MAFA,WAAW;AAAA;AAAA,uEAEP,QAAQ,IAAI,aAAa;AAC3B,UAAM,IAAI,MAAM,OAAO;AAEzB,UAAQ,MAAM,OAAO;AACvB,IAEA,oBAAoB,MAAM;AAAC;",
   "names": []
 }

package/dist/esm/Root.mjs

@@ -1,23 +1,22 @@
-import { SafeAreaProviderCompat } from "@react-navigation/elements";
 import { DarkTheme, DefaultTheme } from "@react-navigation/native";
 import { useColorScheme } from "@vxrn/universal-color-scheme";
-import { Fragment, useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import UpstreamNavigationContainer from "./fork/NavigationContainer.mjs";
 import { getURL } from "./getURL.mjs";
 import { ServerLocationContext } from "./router/serverLocationContext.mjs";
 import { useInitializeOneRouter } from "./router/useInitializeOneRouter.mjs";
-import { useViteRoutes } from "./useViteRoutes.mjs";
+import { useViteRoutes } from "./router/useViteRoutes.mjs";
+import { getServerContext } from "./utils/serverContext.mjs";
 import { PreloadLinks } from "./views/PreloadLinks.mjs";
 import { RootErrorBoundary } from "./views/RootErrorBoundary.mjs";
 import { ScrollRestoration } from "./views/ScrollRestoration.mjs";
-import { jsx, jsxs } from "react/jsx-runtime";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 typeof window < "u" && (window.__getReactRefreshIgnoredExports = () => ["feedCardQuery", "feedCardReplyQuery", "loader"]);
 function Root(props) {
   const {
       path,
       routes,
       routeOptions,
-      wrapper: ParentWrapper = Fragment,
       isClient,
       navigationContainerProps
     } = props,
@@ -25,11 +24,6 @@ function Root(props) {
     location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : new URL(path || "/", getURL()),
     store = useInitializeOneRouter(context, location),
     [colorScheme] = useColorScheme(),
-    wrapper = children => /* @__PURE__ */jsxs(ParentWrapper, {
-      children: [/* @__PURE__ */jsx(ScrollRestoration, {}), /* @__PURE__ */jsx(SafeAreaProviderCompat, {
-        children
-      })]
-    }),
     Component = store.rootComponent;
   if (!Component) throw new Error("No root component found");
   const contents =
@@ -48,12 +42,14 @@ function Root(props) {
       ...navigationContainerProps,
       children: /* @__PURE__ */jsx(ServerLocationContext.Provider, {
         value: location,
-        children: wrapper(/* @__PURE__ */jsx(Component, {}))
+        children: /* @__PURE__ */jsxs(Fragment, {
+          children: [/* @__PURE__ */jsx(ScrollRestoration, {}), /* @__PURE__ */jsx(Component, {})]
+        })
       })
     }), /* @__PURE__ */jsx(PreloadLinks, {}, "preload-links")]
   });
   if (isClient) {
-    if (globalThis.__vxrnHydrateMode__ === "spa") {
+    if (getServerContext()?.mode === "spa") {
       const [show, setShow] = useState(!1);
       return useEffect(() => {
         setShow(!0);

package/dist/esm/Root.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["SafeAreaProviderCompat","DarkTheme","DefaultTheme","useColorScheme","Fragment","useEffect","useState","UpstreamNavigationContainer","getURL","ServerLocationContext","useInitializeOneRouter","useViteRoutes","PreloadLinks","RootErrorBoundary","ScrollRestoration","jsx","jsxs","window","__getReactRefreshIgnoredExports","Root","props","path","routes","routeOptions","wrapper","ParentWrapper","isClient","navigationContainerProps","context","globalThis","__vxrnVersion","location","URL","href","store","colorScheme","children","Component","rootComponent","Error","contents","ref","navigationRef","initialState","linking","onUnhandledAction","theme","documentTitle","enabled","Provider","value","__vxrnHydrateMode__","show","setShow","process","env","NODE_ENV","action","payload","message","type","JSON","stringify","name","console","error"],"sources":["../../src/Root.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["DarkTheme","DefaultTheme","useColorScheme","useEffect","useState","UpstreamNavigationContainer","getURL","ServerLocationContext","useInitializeOneRouter","useViteRoutes","getServerContext","PreloadLinks","RootErrorBoundary","ScrollRestoration","Fragment","jsx","jsxs","window","__getReactRefreshIgnoredExports","Root","props","path","routes","routeOptions","isClient","navigationContainerProps","context","globalThis","__vxrnVersion","location","URL","href","store","colorScheme","Component","rootComponent","Error","contents","children","ref","navigationRef","initialState","linking","onUnhandledAction","theme","documentTitle","enabled","Provider","value","mode","show","setShow","process","env","NODE_ENV","action","payload","message","type","JSON","stringify","name","console","error"],"sources":["../../src/Root.tsx"],"sourcesContent":[null],"mappings":"AAAA,SACEA,SAAA,EACAC,YAAA,QAGK;AACP,SAASC,cAAA,QAAsB;AAC/B,SAASC,SAAA,EAAWC,QAAA,QAAwD;AAC5E,OAAOC,2BAAA,MAAiC;AACxC,SAASC,MAAA,QAAc;AACvB,SAASC,qBAAA,QAA6B;AACtC,SAASC,sBAAA,QAA8B;AACvC,SAASC,aAAA,QAAqB;AAE9B,SAASC,gBAAA,QAAwB;AACjC,SAASC,YAAA,QAAoB;AAC7B,SAASC,iBAAA,QAAyB;AAClC,SAASC,iBAAA,QAAyB;AA8ExB,SAAAC,QAAA,EAEEC,GAAA,EAFFC,IAAA;AA1EN,OAAOC,MAAA,GAAW,QAEpBA,MAAA,CAAOC,+BAAA,GAAkC,MAAM,CAAC,iBAAiB,sBAAsB,QAAQ;AA6B1F,SAASC,KAAKC,KAAA,EAAkB;EACrC,MAAM;MAAEC,IAAA;MAAMC,MAAA;MAAQC,YAAA;MAAcC,QAAA;MAAUC;IAAyB,IAAIL,KAAA;IAGrEM,OAAA,GAAUjB,aAAA,CAAca,MAAA,EAAQC,YAAA,EAAcI,UAAA,CAAWC,aAAgB;IACzEC,QAAA,GACJ,OAAOZ,MAAA,GAAW,OAAeA,MAAA,CAAOY,QAAA,GACpC,IAAIC,GAAA,CAAIT,IAAA,IAAQJ,MAAA,CAAOY,QAAA,CAASE,IAAA,IAAQ,KAAKd,MAAA,CAAOY,QAAA,CAASE,IAAI,IACjE,IAAID,GAAA,CAAIT,IAAA,IAAQ,KAAKf,MAAA,CAAO,CAAC;IAE7B0B,KAAA,GAAQxB,sBAAA,CAAuBkB,OAAA,EAASG,QAAQ;IAChD,CAACI,WAAW,IAAI/B,cAAA,CAAe;IAI/BgC,SAAA,GAAYF,KAAA,CAAMG,aAAA;EAExB,IAAI,CAACD,SAAA,EACH,MAAM,IAAIE,KAAA,CAAM,yBAAyB;EAG3C,MAAMC,QAAA;EAAA;EAEJ;EAAArB,IAAA,CAACJ,iBAAA;IAEC0B,QAAA,kBAAAvB,GAAA,CAACV,2BAAA;MACCkC,GAAA,EAAKP,KAAA,CAAMQ,aAAA;MACXC,YAAA,EAAcT,KAAA,CAAMS,YAAA;MACpBC,OAAA,EAASV,KAAA,CAAMU,OAAA;MACfC,iBAAA;MACAC,KAAA,EAAOX,WAAA,KAAgB,SAASjC,SAAA,GAAYC,YAAA;MAC5C4C,aAAA,EAAe;QACbC,OAAA,EAAS;MACX;MACC,GAAGrB,wBAAA;MAEJa,QAAA,iBAAAvB,GAAA,CAACR,qBAAA,CAAsBwC,QAAA,EAAtB;QAA+BC,KAAA,EAAOnB,QAAA;QAOrCS,QAAA,iBAAAtB,IAAA,CAAAF,QAAA;UAEEwB,QAAA,kBAAAvB,GAAA,CAACF,iBAAA,IAAkB,GACnB,eAAAE,GAAA,CAACmB,SAAA,IAAU;QAAA,CAGb;MAAA,CAGF;IAAA,CACF,GACA,eAAAnB,GAAA,CAACJ,YAAA,MAAiB,eAAgB;EAAA,CACpC;EAIF,IAAIa,QAAA,EAAU;IACZ,IAAId,gBAAA,CAAiB,GAAGuC,IAAA,KAAS,OAAO;MAEtC,MAAM,CAACC,IAAA,EAAMC,OAAO,IAAI/C,QAAA,CAAS,EAAK;MAGtC,OAAAD,SAAA,CAAU,MAAM;QACdgD,OAAA,CAAQ,EAAI;MACd,GAAG,EAAE,GAEED,IAAA,GAAOb,QAAA,GAAW;IAC3B;IACA,OAAOA,QAAA;EACT;EAEA,OAAOA,QAAA;AACT;AAqCA,IAAIM,iBAAA;AAEAS,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,eAC3BX,iBAAA,GAAqBY,MAAA,IAA6B;EAChD,MAAMC,OAAA,GAA2CD,MAAA,CAAOC,OAAA;EAExD,IAAIC,OAAA,GAAU,eAAeF,MAAA,CAAOG,IAAI,IACtCF,OAAA,GAAU,iBAAiBG,IAAA,CAAKC,SAAA,CAAUL,MAAA,CAAOC,OAAO,CAAC,KAAK,EAChE;EAEA,QAAQD,MAAA,CAAOG,IAAA;IACb,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;MACCF,OAAA,EAASK,IAAA,GACXJ,OAAA,IAAW;AAAA;AAAA,6BAAkCD,OAAA,CAAQK,IAAI,OAEzDJ,OAAA,IAAW;AAAA;AAAA;MAGb;IACF,KAAK;IACL,KAAK;IACL,KAAK;MACHA,OAAA,IAAW;AAAA;AAAA;MACX;IACF,KAAK;IACL,KAAK;IACL,KAAK;MACHA,OAAA,IAAW;AAAA;AAAA;MACX;EACJ;EAIA,IAFAA,OAAA,IAAW;AAAA;AAAA,uEAEPL,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,QAC3B,MAAM,IAAIlB,KAAA,CAAMqB,OAAO;EAEzBK,OAAA,CAAQC,KAAA,CAAMN,OAAO;AACvB,IAEAd,iBAAA,GAAoBA,CAAA,KAAM,CAAC","ignoreList":[]}

package/dist/esm/Root.native.js

@@ -1,13 +1,13 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { SafeAreaProviderCompat } from "@react-navigation/elements";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { DarkTheme, DefaultTheme } from "@react-navigation/native";
 import { useColorScheme } from "@vxrn/universal-color-scheme";
-import { Fragment, useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import UpstreamNavigationContainer from "./fork/NavigationContainer";
 import { getURL } from "./getURL";
 import { ServerLocationContext } from "./router/serverLocationContext";
 import { useInitializeOneRouter } from "./router/useInitializeOneRouter";
-import { useViteRoutes } from "./useViteRoutes";
+import { useViteRoutes } from "./router/useViteRoutes";
+import { getServerContext } from "./utils/serverContext";
 import { PreloadLinks } from "./views/PreloadLinks";
 import { RootErrorBoundary } from "./views/RootErrorBoundary";
 import { ScrollRestoration } from "./views/ScrollRestoration";
@@ -19,18 +19,7 @@ typeof window < "u" && (window.__getReactRefreshIgnoredExports = function() {
   ];
 });
 function Root(props) {
-  var { path, routes, routeOptions, wrapper: ParentWrapper = Fragment, isClient, navigationContainerProps } = props, context = useViteRoutes(routes, routeOptions, globalThis.__vxrnVersion), location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : new URL(path || "/", getURL()), store = useInitializeOneRouter(context, location), [colorScheme] = useColorScheme(), wrapper = function(children) {
-    return /* @__PURE__ */ _jsxs(ParentWrapper, {
-      children: [
-        /* default scroll restoration to on, but users can configure it by importing and using themselves */
-        /* @__PURE__ */ _jsx(ScrollRestoration, {}),
-        /* <GestureHandlerRootView> */
-        /* @__PURE__ */ _jsx(SafeAreaProviderCompat, {
-          children
-        })
-      ]
-    });
-  }, Component = store.rootComponent;
+  var { path, routes, routeOptions, isClient, navigationContainerProps } = props, context = useViteRoutes(routes, routeOptions, globalThis.__vxrnVersion), location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : new URL(path || "/", getURL()), store = useInitializeOneRouter(context, location), [colorScheme] = useColorScheme(), Component = store.rootComponent;
   if (!Component)
     throw new Error("No root component found");
   var contents = (
@@ -50,15 +39,33 @@ function Root(props) {
           ...navigationContainerProps,
           children: /* @__PURE__ */ _jsx(ServerLocationContext.Provider, {
             value: location,
-            children: wrapper(/* @__PURE__ */ _jsx(Component, {}))
+            children: (
+              /* <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>
+              */
+              /* @__PURE__ */ _jsxs(_Fragment, {
+                children: [
+                  /* default scroll restoration to on, but users can configure it by importing and using themselves */
+                  /* @__PURE__ */ _jsx(ScrollRestoration, {}),
+                  /* @__PURE__ */ _jsx(Component, {})
+                ]
+              })
+            )
           })
         }),
+        /* Users can override this by adding another StatusBar element anywhere higher in the component tree. */
+        /* {!hasViewControllerBasedStatusBarAppearance && <StatusBar style="auto" />} */
+        /* </GestureHandlerRootView> */
         /* @__PURE__ */ _jsx(PreloadLinks, {}, "preload-links")
       ]
     })
   );
   if (isClient) {
-    if (globalThis.__vxrnHydrateMode__ === "spa") {
+    var _getServerContext;
+    if (((_getServerContext = getServerContext()) === null || _getServerContext === void 0 ? void 0 : _getServerContext.mode) === "spa") {
       var [show, setShow] = useState(!1);
       return useEffect(function() {
         setShow(!0);

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/one/packages/one/src/Root.tsx"],
-  "mappings": ";AAAA,SAASA,8BAA8B;AACvC,SACEC,WACAC,oBAGK;AACP,SAASC,sBAAsB;AAC/B,SAASC,UAAUC,WAAWC,gBAAwD;AACtF,OAAOC,iCAAiC;AACxC,SAASC,cAAc;AACvB,SAASC,6BAA6B;AACtC,SAASC,8BAA8B;AAEvC,SAASC,qBAAqB;AAC9B,SAASC,oBAAoB;AAC7B,SAASC,yBAAyB;AAClC,SAASC,yBAAyB;AAI9B,OAAOC,SAAW,QAEpBA,OAAOC,kCAAkC,WAAA;SAAM;IAAC;IAAiB;IAAsB;;;AA6BlF,SAASC,KAAKC,OAAgB;AACnC,MAAM,EACJC,MACAC,QACAC,cACAC,SAASC,gBAAgBnB,UACzBoB,UACAC,yBAAwB,IACtBP,OAGEQ,UAAUf,cAAcS,QAAQC,cAAcM,WAAW,aAAgB,GACzEC,WACJ,OAAOb,SAAW,OAAeA,OAAOa,WACpC,IAAIC,IAAIV,QAAQJ,OAAOa,SAASE,QAAQ,KAAKf,OAAOa,SAASE,IAAI,IACjE,IAAID,IAAIV,QAAQ,KAAKX,OAAAA,CAAAA,GAErBuB,QAAQrB,uBAAuBgB,SAASE,QAAAA,GACxC,CAACI,WAAAA,IAAe7B,eAAAA,GAShBmB,UAAU,SAACW,UAAAA;AACf,WACE,sBAACV,eAAAA;;;QAEC,qBAACT,mBAAAA,CAAAA,CAAAA;;QAED,qBAACd,wBAAAA;;;;;EASP,GAEMkC,YAAYH,MAAMI;AAExB,MAAI,CAACD;AACH,UAAM,IAAIE,MAAM,yBAAyB;AAG3C,MAAMC;;IAEJ,sBAACxB,mBAAAA;;;QAEC,qBAACN,6BAAAA;UACC+B,KAAKP,MAAMQ;UACXC,cAAcT,MAAMS;UACpBC,SAASV,MAAMU;UACfC;UACAC,OAAOX,gBAAgB,SAAS/B,YAAYC;UAC5C0C,eAAe;YACbC,SAAS;UACX;UACC,GAAGpB;oBAEJ,qBAAChB,sBAAsBqC,UAAQ;YAACC,OAAOnB;sBACpCN,QAAQ,qBAACY,WAAAA,CAAAA,CAAAA,CAAAA;;;QAGd,qBAACtB,cAAAA,CAAAA,GAAiB,eAAA;;;;AAKtB,MAAIY,UAAU;AACZ,QAAIG,WAAW,wBAA2B,OAAO;AAE/C,UAAM,CAACqB,MAAMC,OAAAA,IAAW3C,SAAS,EAAA;AAGjCD,uBAAU,WAAA;AACR4C,gBAAQ,EAAA;MACV,GAAG,CAAA,CAAE,GAEED,OAAOX,WAAW;IAC3B;AACA,WAAOA;EACT;AAEA,SAAOA;AACT;AAqCA,IAAIK;AAEAQ,QAAQC,IAAIC,aAAa,eAC3BV,oBAAoB,SAACW,QAAAA;AACnB,MAAMC,UAA2CD,OAAOC,SAEpDC,UAAU,eAAeF,OAAOG,IAAI,IACtCF,UAAU,iBAAiBG,KAAKC,UAAUL,OAAOC,OAAO,CAAA,KAAM,EAAA;AAGhE,UAAQD,OAAOG,MAAI;IACjB,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;AACH,MAAIF,SAASK,OACXJ,WAAW;;6BAAkCD,QAAQK,IAAI,OAEzDJ,WAAW;;;AAGb;IACF,KAAK;IACL,KAAK;IACL,KAAK;AACHA,iBAAW;;;AACX;IACF,KAAK;IACL,KAAK;IACL,KAAK;AACHA,iBAAW;;;AACX;EACJ;AAIA,MAFAA,WAAW;;uEAEPL,QAAQC,IAAIC,aAAa;AAC3B,UAAM,IAAIhB,MAAMmB,OAAAA;AAElBK,UAAQC,MAAMN,OAAAA;AAChB,IAEAb,oBAAoB,WAAA;AAAO;",
-  "names": ["SafeAreaProviderCompat", "DarkTheme", "DefaultTheme", "useColorScheme", "Fragment", "useEffect", "useState", "UpstreamNavigationContainer", "getURL", "ServerLocationContext", "useInitializeOneRouter", "useViteRoutes", "PreloadLinks", "RootErrorBoundary", "ScrollRestoration", "window", "__getReactRefreshIgnoredExports", "Root", "props", "path", "routes", "routeOptions", "wrapper", "ParentWrapper", "isClient", "navigationContainerProps", "context", "globalThis", "location", "URL", "href", "store", "colorScheme", "children", "Component", "rootComponent", "Error", "contents", "ref", "navigationRef", "initialState", "linking", "onUnhandledAction", "theme", "documentTitle", "enabled", "Provider", "value", "show", "setShow", "process", "env", "NODE_ENV", "action", "payload", "message", "type", "JSON", "stringify", "name", "console", "error"]
+  "mappings": ";AAAA,SACEA,WACAC,oBAGK;AACP,SAASC,sBAAsB;AAC/B,SAASC,WAAWC,gBAAwD;AAC5E,OAAOC,iCAAiC;AACxC,SAASC,cAAc;AACvB,SAASC,6BAA6B;AACtC,SAASC,8BAA8B;AACvC,SAASC,qBAAqB;AAE9B,SAASC,wBAAwB;AACjC,SAASC,oBAAoB;AAC7B,SAASC,yBAAyB;AAClC,SAASC,yBAAyB;AAI9B,OAAOC,SAAW,QAEpBA,OAAOC,kCAAkC,WAAA;SAAM;IAAC;IAAiB;IAAsB;;;AA6BlF,SAASC,KAAKC,OAAgB;AACnC,MAAM,EAAEC,MAAMC,QAAQC,cAAcC,UAAUC,yBAAwB,IAAKL,OAGrEM,UAAUd,cAAcU,QAAQC,cAAcI,WAAW,aAAgB,GACzEC,WACJ,OAAOX,SAAW,OAAeA,OAAOW,WACpC,IAAIC,IAAIR,QAAQJ,OAAOW,SAASE,QAAQ,KAAKb,OAAOW,SAASE,IAAI,IACjE,IAAID,IAAIR,QAAQ,KAAKZ,OAAAA,CAAAA,GAErBsB,QAAQpB,uBAAuBe,SAASE,QAAAA,GACxC,CAACI,WAAAA,IAAe3B,eAAAA,GAIhB4B,YAAYF,MAAMG;AAExB,MAAI,CAACD;AACH,UAAM,IAAIE,MAAM,yBAAyB;AAG3C,MAAMC;;IAEJ,sBAACrB,mBAAAA;;;QAEC,qBAACP,6BAAAA;UACC6B,KAAKN,MAAMO;UACXC,cAAcR,MAAMQ;UACpBC,SAAST,MAAMS;UACfC;UACAC,OAAOV,gBAAgB,SAAS7B,YAAYC;UAC5CuC,eAAe;YACbC,SAAS;UACX;UACC,GAAGnB;oBAEJ,qBAACf,sBAAsBmC,UAAQ;YAACC,OAAOlB;;;;;;;;cAOrC,sBAAA,WAAA;;;kBAEE,qBAACZ,mBAAAA,CAAAA,CAAAA;kBACD,qBAACiB,WAAAA,CAAAA,CAAAA;;;;;;;;;QAQP,qBAACnB,cAAAA,CAAAA,GAAiB,eAAA;;;;AAKtB,MAAIU,UAAU;QACRX;AAAJ,UAAIA,oBAAAA,iBAAAA,OAAAA,QAAAA,sBAAAA,SAAAA,SAAAA,kBAAoBkC,UAAS,OAAO;AAEtC,UAAM,CAACC,MAAMC,OAAAA,IAAW1C,SAAS,EAAA;AAGjCD,uBAAU,WAAA;AACR2C,gBAAQ,EAAA;MACV,GAAG,CAAA,CAAE,GAEED,OAAOZ,WAAW;IAC3B;AACA,WAAOA;EACT;AAEA,SAAOA;AACT;AAqCA,IAAIK;AAEAS,QAAQC,IAAIC,aAAa,eAC3BX,oBAAoB,SAACY,QAAAA;AACnB,MAAMC,UAA2CD,OAAOC,SAEpDC,UAAU,eAAeF,OAAOG,IAAI,IACtCF,UAAU,iBAAiBG,KAAKC,UAAUL,OAAOC,OAAO,CAAA,KAAM,EAAA;AAGhE,UAAQD,OAAOG,MAAI;IACjB,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;AACH,MAAIF,SAASK,OACXJ,WAAW;;6BAAkCD,QAAQK,IAAI,OAEzDJ,WAAW;;;AAGb;IACF,KAAK;IACL,KAAK;IACL,KAAK;AACHA,iBAAW;;;AACX;IACF,KAAK;IACL,KAAK;IACL,KAAK;AACHA,iBAAW;;;AACX;EACJ;AAIA,MAFAA,WAAW;;uEAEPL,QAAQC,IAAIC,aAAa;AAC3B,UAAM,IAAIjB,MAAMoB,OAAAA;AAElBK,UAAQC,MAAMN,OAAAA;AAChB,IAEAd,oBAAoB,WAAA;AAAO;",
+  "names": ["DarkTheme", "DefaultTheme", "useColorScheme", "useEffect", "useState", "UpstreamNavigationContainer", "getURL", "ServerLocationContext", "useInitializeOneRouter", "useViteRoutes", "getServerContext", "PreloadLinks", "RootErrorBoundary", "ScrollRestoration", "window", "__getReactRefreshIgnoredExports", "Root", "props", "path", "routes", "routeOptions", "isClient", "navigationContainerProps", "context", "globalThis", "location", "URL", "href", "store", "colorScheme", "Component", "rootComponent", "Error", "contents", "ref", "navigationRef", "initialState", "linking", "onUnhandledAction", "theme", "documentTitle", "enabled", "Provider", "value", "mode", "show", "setShow", "process", "env", "NODE_ENV", "action", "payload", "message", "type", "JSON", "stringify", "name", "console", "error"]
 }

package/dist/esm/cli/build.js

@@ -10,7 +10,7 @@ import {
   rollupRemoveUnusedImportsPlugin,
   build as vxrnBuild
 } from "vxrn";
-import { getLoaderPath, getPreloadPath } from "../cleanUrl";
+import { getLoaderPath, getPreloadPath } from "../utils/cleanUrl";
 import * as constants from "../constants";
 import { toAbsolute } from "../utils/toAbsolute";
 import { getManifest } from "../vite/getManifest";

package/dist/esm/cli/build.mjs

@@ -5,7 +5,7 @@ import Path, { join, relative, resolve } from "node:path";
 import { nodeExternals } from "rollup-plugin-node-externals";
 import { mergeConfig, build as viteBuild } from "vite";
 import { fillOptions, getOptimizeDeps, rollupRemoveUnusedImportsPlugin, build as vxrnBuild } from "vxrn";
-import { getLoaderPath, getPreloadPath } from "../cleanUrl.mjs";
+import { getLoaderPath, getPreloadPath } from "../utils/cleanUrl.mjs";
 import * as constants from "../constants.mjs";
 import { toAbsolute } from "../utils/toAbsolute.mjs";
 import { getManifest } from "../vite/getManifest.mjs";

package/dist/esm/cli/build.native.js

@@ -5,7 +5,7 @@ import Path, { join, relative, resolve } from "node:path";
 import { nodeExternals } from "rollup-plugin-node-externals";
 import { mergeConfig, build as viteBuild } from "vite";
 import { fillOptions, getOptimizeDeps, rollupRemoveUnusedImportsPlugin, build as vxrnBuild } from "vxrn";
-import { getLoaderPath, getPreloadPath } from "../cleanUrl";
+import { getLoaderPath, getPreloadPath } from "../utils/cleanUrl";
 import * as constants from "../constants";
 import { toAbsolute } from "../utils/toAbsolute";
 import { getManifest } from "../vite/getManifest";

package/dist/esm/constants.js

@@ -1,4 +1,4 @@
-const isWebClient = typeof window < "u", isWebServer = typeof window > "u", isNative = !1, CACHE_KEY = `${process.env.ONE_CACHE_KEY ?? Math.round(Math.random() * 1e8)}`, LOADER_JS_POSTFIX_UNCACHED = "_vxrn_loader.js", LOADER_JS_POSTFIX_REGEX_STRING = `_\\d+${LOADER_JS_POSTFIX_UNCACHED}$`, LOADER_JS_POSTFIX_REGEX = new RegExp(LOADER_JS_POSTFIX_REGEX_STRING), LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`, PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`;
+const isWebClient = typeof window < "u", isWebServer = typeof window > "u", isNative = !1, CACHE_KEY = `${process.env.ONE_CACHE_KEY ?? Math.round(Math.random() * 1e8)}`, LOADER_JS_POSTFIX_UNCACHED = "_vxrn_loader.js", LOADER_JS_POSTFIX_REGEX_STRING = `_\\d+${LOADER_JS_POSTFIX_UNCACHED}$`, LOADER_JS_POSTFIX_REGEX = new RegExp(LOADER_JS_POSTFIX_REGEX_STRING), LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`, PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`, VIRTUAL_SSR_CSS_ENTRY = "virtual:ssr-css.css", VIRTUAL_SSR_CSS_HREF = `/@id/__x00__${VIRTUAL_SSR_CSS_ENTRY}`;
 export {
   CACHE_KEY,
   LOADER_JS_POSTFIX,
@@ -6,6 +6,8 @@ export {
   LOADER_JS_POSTFIX_REGEX_STRING,
   LOADER_JS_POSTFIX_UNCACHED,
   PRELOAD_JS_POSTFIX,
+  VIRTUAL_SSR_CSS_ENTRY,
+  VIRTUAL_SSR_CSS_HREF,
   isNative,
   isWebClient,
   isWebServer

package/dist/esm/constants.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/constants.ts"],
-  "mappings": "AAAO,MAAM,cAAyD,OAAO,SAAW,KAC3E,cAAyD,OAAO,SAAW,KAC3E,WAAW,IAEX,YAAY,GAAG,QAAQ,IAAI,iBAAiB,KAAK,MAAM,KAAK,OAAO,IAAI,GAAW,CAAC,IAEnF,6BAA6B,mBAC7B,iCAAiC,QAAQ,0BAA0B,KACnE,0BAA0B,IAAI,OAAO,8BAA8B,GACnE,oBAAoB,IAAI,SAAS,GAAG,0BAA0B,IAE9D,qBAAqB,IAAI,SAAS;",
+  "mappings": "AAAO,MAAM,cAAyD,OAAO,SAAW,KAC3E,cAAyD,OAAO,SAAW,KAC3E,WAAW,IAEX,YAAY,GAAG,QAAQ,IAAI,iBAAiB,KAAK,MAAM,KAAK,OAAO,IAAI,GAAW,CAAC,IAEnF,6BAA6B,mBAC7B,iCAAiC,QAAQ,0BAA0B,KACnE,0BAA0B,IAAI,OAAO,8BAA8B,GACnE,oBAAoB,IAAI,SAAS,GAAG,0BAA0B,IAE9D,qBAAqB,IAAI,SAAS,eAGlC,wBAAwB,uBACxB,uBAAuB,eAAe,qBAAqB;",
   "names": []
 }

package/dist/esm/constants.mjs

@@ -6,6 +6,8 @@ const isWebClient = typeof window < "u",
   LOADER_JS_POSTFIX_REGEX_STRING = `_\\d+${LOADER_JS_POSTFIX_UNCACHED}$`,
   LOADER_JS_POSTFIX_REGEX = new RegExp(LOADER_JS_POSTFIX_REGEX_STRING),
   LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`,
-  PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`;
-export { CACHE_KEY, LOADER_JS_POSTFIX, LOADER_JS_POSTFIX_REGEX, LOADER_JS_POSTFIX_REGEX_STRING, LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX, isNative, isWebClient, isWebServer };
+  PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`,
+  VIRTUAL_SSR_CSS_ENTRY = "virtual:ssr-css.css",
+  VIRTUAL_SSR_CSS_HREF = `/@id/__x00__${VIRTUAL_SSR_CSS_ENTRY}`;
+export { CACHE_KEY, LOADER_JS_POSTFIX, LOADER_JS_POSTFIX_REGEX, LOADER_JS_POSTFIX_REGEX_STRING, LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX, VIRTUAL_SSR_CSS_ENTRY, VIRTUAL_SSR_CSS_HREF, isNative, isWebClient, isWebServer };
 //# sourceMappingURL=constants.mjs.map

package/dist/esm/constants.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["isWebClient","window","isWebServer","isNative","CACHE_KEY","process","env","ONE_CACHE_KEY","Math","round","random","LOADER_JS_POSTFIX_UNCACHED","LOADER_JS_POSTFIX_REGEX_STRING","LOADER_JS_POSTFIX_REGEX","RegExp","LOADER_JS_POSTFIX","PRELOAD_JS_POSTFIX"],"sources":["../../src/constants.ts"],"sourcesContent":[null],"mappings":"AAAO,MAAMA,WAAA,GAAyD,OAAOC,MAAA,GAAW;EAC3EC,WAAA,GAAyD,OAAOD,MAAA,GAAW;EAC3EE,QAAA,GAAW;EAEXC,SAAA,GAAY,GAAGC,OAAA,CAAQC,GAAA,CAAIC,aAAA,IAAiBC,IAAA,CAAKC,KAAA,CAAMD,IAAA,CAAKE,MAAA,CAAO,IAAI,GAAW,CAAC;EAEnFC,0BAAA,GAA6B;EAC7BC,8BAAA,GAAiC,QAAQD,0BAA0B;EACnEE,uBAAA,GAA0B,IAAIC,MAAA,CAAOF,8BAA8B;EACnEG,iBAAA,GAAoB,IAAIX,SAAS,GAAGO,0BAA0B;EAE9DK,kBAAA,GAAqB,IAAIZ,SAAS","ignoreList":[]}
+{"version":3,"names":["isWebClient","window","isWebServer","isNative","CACHE_KEY","process","env","ONE_CACHE_KEY","Math","round","random","LOADER_JS_POSTFIX_UNCACHED","LOADER_JS_POSTFIX_REGEX_STRING","LOADER_JS_POSTFIX_REGEX","RegExp","LOADER_JS_POSTFIX","PRELOAD_JS_POSTFIX","VIRTUAL_SSR_CSS_ENTRY","VIRTUAL_SSR_CSS_HREF"],"sources":["../../src/constants.ts"],"sourcesContent":[null],"mappings":"AAAO,MAAMA,WAAA,GAAyD,OAAOC,MAAA,GAAW;EAC3EC,WAAA,GAAyD,OAAOD,MAAA,GAAW;EAC3EE,QAAA,GAAW;EAEXC,SAAA,GAAY,GAAGC,OAAA,CAAQC,GAAA,CAAIC,aAAA,IAAiBC,IAAA,CAAKC,KAAA,CAAMD,IAAA,CAAKE,MAAA,CAAO,IAAI,GAAW,CAAC;EAEnFC,0BAAA,GAA6B;EAC7BC,8BAAA,GAAiC,QAAQD,0BAA0B;EACnEE,uBAAA,GAA0B,IAAIC,MAAA,CAAOF,8BAA8B;EACnEG,iBAAA,GAAoB,IAAIX,SAAS,GAAGO,0BAA0B;EAE9DK,kBAAA,GAAqB,IAAIZ,SAAS;EAGlCa,qBAAA,GAAwB;EACxBC,oBAAA,GAAuB,eAAeD,qBAAqB","ignoreList":[]}

package/dist/esm/constants.native.js

@@ -1,4 +1,4 @@
-var isWebClient = !1, isWebServer = !1, isNative = !0, _process_env_ONE_CACHE_KEY, CACHE_KEY = `${(_process_env_ONE_CACHE_KEY = process.env.ONE_CACHE_KEY) !== null && _process_env_ONE_CACHE_KEY !== void 0 ? _process_env_ONE_CACHE_KEY : Math.round(Math.random() * 1e8)}`, LOADER_JS_POSTFIX_UNCACHED = "_vxrn_loader.js", LOADER_JS_POSTFIX_REGEX_STRING = `_\\d+${LOADER_JS_POSTFIX_UNCACHED}$`, LOADER_JS_POSTFIX_REGEX = new RegExp(LOADER_JS_POSTFIX_REGEX_STRING), LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`, PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`;
+var isWebClient = !1, isWebServer = !1, isNative = !0, _process_env_ONE_CACHE_KEY, CACHE_KEY = `${(_process_env_ONE_CACHE_KEY = process.env.ONE_CACHE_KEY) !== null && _process_env_ONE_CACHE_KEY !== void 0 ? _process_env_ONE_CACHE_KEY : Math.round(Math.random() * 1e8)}`, LOADER_JS_POSTFIX_UNCACHED = "_vxrn_loader.js", LOADER_JS_POSTFIX_REGEX_STRING = `_\\d+${LOADER_JS_POSTFIX_UNCACHED}$`, LOADER_JS_POSTFIX_REGEX = new RegExp(LOADER_JS_POSTFIX_REGEX_STRING), LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`, PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`, VIRTUAL_SSR_CSS_ENTRY = "virtual:ssr-css.css", VIRTUAL_SSR_CSS_HREF = `/@id/__x00__${VIRTUAL_SSR_CSS_ENTRY}`;
 export {
   CACHE_KEY,
   LOADER_JS_POSTFIX,
@@ -6,6 +6,8 @@ export {
   LOADER_JS_POSTFIX_REGEX_STRING,
   LOADER_JS_POSTFIX_UNCACHED,
   PRELOAD_JS_POSTFIX,
+  VIRTUAL_SSR_CSS_ENTRY,
+  VIRTUAL_SSR_CSS_HREF,
   isNative,
   isWebClient,
   isWebServer

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/one/packages/one/src/constants.ts"],
-  "mappings": "AAAO,IAAMA,cAAcC,IACdC,cAAcD,IACdE,WAAWF,IAEIA,4BAAfG,YAAY,IAAGH,6BAAAA,QAAQI,IAAIC,mBAAa,QAAzBL,+BAAAA,SAAAA,6BAA6BM,KAAKC,MAAMD,KAAKE,OAAM,IAAK,GAAA,CAAA,IAEvEC,6BAA6B,mBAC7BC,iCAAiC,QAAQD,0BAAAA,KACzCE,0BAA0B,IAAIC,OAAOF,8BAAAA,GACrCG,oBAAoB,IAAIV,SAAAA,GAAYM,0BAAAA,IAEpCK,qBAAqB,IAAIX,SAAAA;",
-  "names": ["isWebClient", "process", "isWebServer", "isNative", "CACHE_KEY", "env", "ONE_CACHE_KEY", "Math", "round", "random", "LOADER_JS_POSTFIX_UNCACHED", "LOADER_JS_POSTFIX_REGEX_STRING", "LOADER_JS_POSTFIX_REGEX", "RegExp", "LOADER_JS_POSTFIX", "PRELOAD_JS_POSTFIX"]
+  "mappings": "AAAO,IAAMA,cAAcC,IACdC,cAAcD,IACdE,WAAWF,IAEIA,4BAAfG,YAAY,IAAGH,6BAAAA,QAAQI,IAAIC,mBAAa,QAAzBL,+BAAAA,SAAAA,6BAA6BM,KAAKC,MAAMD,KAAKE,OAAM,IAAK,GAAA,CAAA,IAEvEC,6BAA6B,mBAC7BC,iCAAiC,QAAQD,0BAAAA,KACzCE,0BAA0B,IAAIC,OAAOF,8BAAAA,GACrCG,oBAAoB,IAAIV,SAAAA,GAAYM,0BAAAA,IAEpCK,qBAAqB,IAAIX,SAAAA,eAGzBY,wBAAwB,uBACxBC,uBAAuB,eAAeD,qBAAAA;",
+  "names": ["isWebClient", "process", "isWebServer", "isNative", "CACHE_KEY", "env", "ONE_CACHE_KEY", "Math", "round", "random", "LOADER_JS_POSTFIX_UNCACHED", "LOADER_JS_POSTFIX_REGEX_STRING", "LOADER_JS_POSTFIX_REGEX", "RegExp", "LOADER_JS_POSTFIX", "PRELOAD_JS_POSTFIX", "VIRTUAL_SSR_CSS_ENTRY", "VIRTUAL_SSR_CSS_HREF"]
 }

package/dist/esm/createApp.js

@@ -4,79 +4,26 @@ import { Root } from "./Root";
 import { resolveClientLoader } from "./clientLoaderResolver";
 import { render } from "./render";
 import { renderToString } from "./server-render";
-import { rand } from "./utils/rand";
 import ReactDOMServer from "react-dom/server.browser";
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-function DevHead({ ssrID }) {
-  return process.env.NODE_ENV === "development" ? /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsx("link", { rel: "preload", href: ssrID, as: "style" }),
-    /* @__PURE__ */ jsx("link", { rel: "stylesheet", href: ssrID, "data-ssr-css": !0 }),
-    /* @__PURE__ */ jsx(
-      "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());
-  });`
-        }
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "script",
-      {
-        type: "module",
-        dangerouslySetInnerHTML: {
-          __html: `import { injectIntoGlobalHook } from "/@react-refresh";
-  injectIntoGlobalHook(window);
-  window.$RefreshReg$ = () => {};
-  window.$RefreshSig$ = () => (type) => type;`
-        }
-      }
-    )
-  ] }) : null;
-}
+import {
+  getServerContext,
+  SERVER_CONTEXT_POST_RENDER_STRING,
+  setServerContext
+} from "./utils/serverContext";
+import { jsx } from "react/jsx-runtime";
 function createApp(options) {
   return import.meta.env.SSR ? {
     options,
     render: async (props) => {
-      const App = () => {
-        let { loaderData, loaderProps, css, mode } = props;
-        return /* @__PURE__ */ jsxs("html", { lang: "en-US", children: [
-          /* @__PURE__ */ jsxs("head", { children: [
-            process.env.NODE_ENV === "development" ? /* @__PURE__ */ jsx(DevHead, { ssrID: `/@id/__x00__virtual:ssr-css.css?t=${rand()}` }) : null,
-            /* @__PURE__ */ jsx(
-              "script",
-              {
-                dangerouslySetInnerHTML: {
-                  __html: "globalThis['global'] = globalThis"
-                }
-              }
-            ),
-            css?.map((file) => /* @__PURE__ */ jsx("link", { rel: "stylesheet", href: file }, file))
-          ] }),
-          /* @__PURE__ */ jsx("body", { children: /* @__PURE__ */ jsx(Root, { routes: options.routes, ...props }) }),
-          /* @__PURE__ */ jsx(
-            "script",
-            {
-              async: !0,
-              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)};
-                  `
-              }
-            }
-          )
-        ] });
-      };
+      let { loaderData, loaderProps, css, mode, loaderServerData } = props;
+      setServerContext({
+        postRenderData: loaderServerData,
+        loaderData,
+        loaderProps,
+        mode,
+        css
+      });
+      const App = () => /* @__PURE__ */ jsx(Root, { routes: options.routes, ...props });
       AppRegistry.registerComponent("App", () => App);
       const Application = AppRegistry.getApplication("App", {}), rootElement = Application.element.props.children;
       let html = await renderToString(rootElement, {
@@ -92,16 +39,15 @@ function createApp(options) {
         if (!`${err}`.includes("sheet is not defined"))
           throw err;
       }
-      const serverData = globalThis.__vxrnServerData__;
-      return serverData && Object.keys(serverData).length && (html = html.replace("{ __vxrn__: 'post-render' }", JSON.stringify(serverData))), html;
+      const serverData = getServerContext()?.postRenderData;
+      return serverData && Object.keys(serverData).length && (html = html.replace(
+        JSON.stringify(SERVER_CONTEXT_POST_RENDER_STRING),
+        JSON.stringify(serverData)
+      )), html;
     }
   } : (options.routes["/app/_layout.tsx"]?.()).then(() => {
-    resolveClientLoader({
-      loaderData: globalThis.__vxrnLoaderData__,
-      loaderServerData: globalThis.__vxrnLoaderServerData__,
-      loaderProps: globalThis.__vxrnLoaderProps__
-    }).then(() => {
-      render(/* @__PURE__ */ jsx(Root, { mode: "spa", isClient: !0, routes: options.routes, path: window.location.href }));
+    resolveClientLoader(getServerContext() || {}).then(() => {
+      render(/* @__PURE__ */ jsx(Root, { isClient: !0, routes: options.routes, path: window.location.href }));
     }).catch((err) => {
       console.error('Error running client loader resolver "onClientLoaderResolve":', err);
     });