npm - one - Versions diffs - 1.1.389 → 1.1.390 - Mend

one 1.1.389 → 1.1.390

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (547) hide show

package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs CHANGED Viewed

@@ -8,6 +8,7 @@ import { promiseWithResolvers } from "../../utils/promiseWithResolvers.mjs";
 import { LoaderDataCache } from "../../vite/constants.mjs";
 import { replaceLoader } from "../../vite/replaceLoader.mjs";
 import { virtalEntryIdClient, virtualEntryId } from "./virtualEntryConstants.mjs";
+import { setServerContext } from "../../utils/serverContext.mjs";
 const USE_SERVER_ENV = !1;
 //!!process.env.USE_SERVER_ENV
 function createFileSystemRouterPlugin(options) {
@@ -23,7 +24,7 @@ function createFileSystemRouterPlugin(options) {
         url,
         loaderProps
       }) {
-        if (console.info(` \u24F5  [${route.type}] ${url} resolved to ${route.file}`), route.type === "spa") return `<html><head>
+        if (console.info(` \u24F5  [${route.type}] ${url} resolved to ${route.isNotFound ? "\u203C\uFE0F 404 not found" : route.file}`), route.type === "spa") return `<html><head>
             <script>globalThis['global'] = globalThis</script>
             <script>globalThis['__vxrnIsSPA'] = true</script>
             <script type="module">
@@ -49,7 +50,10 @@ function createFileSystemRouterPlugin(options) {
           eval("process.env.TAMAGUI_IS_SERVER = '1'");
           const entry = await runner.import(virtualEntryId),
             render = entry.default.render;
-          globalThis.__vxrnLoaderData__ = loaderData, globalThis.__vxrnLoaderProps__ = loaderProps, LoaderDataCache[route.file] = loaderData;
+          setServerContext({
+            loaderData,
+            loaderProps
+          }), LoaderDataCache[route.file] = loaderData;
           const is404 = route.isNotFound || !exported.default,
             html = await render({
               mode: route.type === "ssg" ? "ssg" : route.type === "ssr" ? "ssr" : "spa",
@@ -139,7 +143,7 @@ ${stack}
            * see: https://vitejs.dev/config/dep-optimization-options.html#optimizedeps-entries
            * and: https://github.com/remix-run/remix/pull/9921
            */
-          entries: [...new Set(handleRequest.manifest.pageRoutes.flatMap(route2 => [join("app", route2.file), ...(route2.layouts?.map(layout => join("app", layout.contextKey)) || [])]))]
+          entries: [...new Set(handleRequest.manifest.pageRoutes.flatMap(route2 => [join("./app", route2.file), ...(route2.layouts?.flatMap(layout => layout.contextKey ? [join("./app", layout.contextKey)] : []) || [])]))]
         }
       };
     },

package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["join","debounce","createServerModuleRunner","createHandleRequest","isResponse","isStatusRedirect","promiseWithResolvers","LoaderDataCache","replaceLoader","virtalEntryIdClient","virtualEntryId","USE_SERVER_ENV","createFileSystemRouterPlugin","options","preloads","runner","server","handleRequest","createRequestHandler","renderPromise","handlePage","route","url","loaderProps","console","info","type","file","promise","resolve","routeFile","clearCache","globalThis","__vxrnresetState","exported","import","loaderData","loader","eval","entry","render","default","__vxrnLoaderData__","__vxrnLoaderProps__","is404","isNotFound","html","mode","path","Response","status","headers","err","error","href","title","pathname","message","Error","stack","subMessage","test","handleLoader","request","route2","url2","loaderProps2","routeFile2","transformedJS","transformRequest","code","loaderData2","platform","searchParams","get","environments","JSON","stringify","handleAPI","loadMiddleware","contextKey","name","enforce","apply","config","userConfig","manifest","pageRoutes","optimizeDeps","entries","Set","flatMap","layouts","map","layout","configureServer","serverIn","ssr","appDir","process","cwd","fileWatcherChangeListener","startsWith","watcher","addListener","middlewares","use","req","res","next","redirects","web","URL","host","redirect","regexStr","source","replace","match","RegExp","destination","params","forEach","param","index","warn","writeHead","permanent","Location","end","reply","handler","convertIncomingMessageToRequest","value","key","cookies","split","cookie","appendHeader","setHeader","location","statusCode","statusMessage","statusText","outString","body","locked","write","streamToString","stream","reader","getReader","decoder","TextDecoder","result","done","read","decode","releaseLock","originalUrl","urlBase","urlString","Headers","append","Request","method","includes","readStream","Promise","resolve2","reject","chunks","on","chunk","push","Buffer","concat"],"sources":["../../../../src/vite/plugins/fileSystemRouterPlugin.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1	+ {"version":3,"names":["join","debounce","createServerModuleRunner","createHandleRequest","isResponse","isStatusRedirect","promiseWithResolvers","LoaderDataCache","replaceLoader","virtalEntryIdClient","virtualEntryId","setServerContext","USE_SERVER_ENV","createFileSystemRouterPlugin","options","preloads","runner","server","handleRequest","createRequestHandler","renderPromise","handlePage","route","url","loaderProps","console","info","type","isNotFound","file","promise","resolve","routeFile","clearCache","globalThis","__vxrnresetState","exported","import","loaderData","loader","eval","entry","render","default","is404","html","mode","path","Response","status","headers","err","error","href","title","pathname","message","Error","stack","subMessage","test","handleLoader","request","route2","url2","loaderProps2","routeFile2","transformedJS","transformRequest","code","loaderData2","platform","searchParams","get","environments","JSON","stringify","handleAPI","loadMiddleware","contextKey","name","enforce","apply","config","userConfig","manifest","pageRoutes","optimizeDeps","entries","Set","flatMap","layouts","layout","configureServer","serverIn","ssr","appDir","process","cwd","fileWatcherChangeListener","startsWith","watcher","addListener","middlewares","use","req","res","next","redirects","web","URL","host","redirect","regexStr","source","replace","match","RegExp","destination","params","forEach","param","index","warn","writeHead","permanent","Location","end","reply","handler","convertIncomingMessageToRequest","value","key","cookies","split","cookie","appendHeader","setHeader","location","statusCode","statusMessage","statusText","outString","body","locked","write","streamToString","stream","reader","getReader","decoder","TextDecoder","result","done","read","decode","releaseLock","originalUrl","urlBase","urlString","Headers","append","Request","method","includes","readStream","Promise","resolve2","reject","chunks","on","chunk","push","Buffer","concat"],"sources":["../../../../src/vite/plugins/fileSystemRouterPlugin.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js CHANGED Viewed

@@ -8,6 +8,7 @@ import { promiseWithResolvers } from "../../utils/promiseWithResolvers";
 import { LoaderDataCache } from "../../vite/constants";
 import { replaceLoader } from "../../vite/replaceLoader";
 import { virtalEntryIdClient, virtualEntryId } from "./virtualEntryConstants";
+import { setServerContext } from "../../utils/serverContext";
 function _type_of(obj) {
   "@swc/helpers - typeof";
   return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
@@ -23,7 +24,7 @@ function createFileSystemRouterPlugin(options) {
     return createHandleRequest({
       async handlePage(param) {
         var { route, url, loaderProps } = param;
-        if (console.info(` \u24F5  [${route.type}] ${url} resolved to ${route.file}`), route.type === "spa")
+        if (console.info(` \u24F5  [${route.type}] ${url} resolved to ${route.isNotFound ? "\u203C\uFE0F 404 not found" : route.file}`), route.type === "spa")
           return `<html><head>
             <script>globalThis['global'] = globalThis</script>
             <script>globalThis['__vxrnIsSPA'] = true</script>
@@ -45,7 +46,10 @@ function createFileSystemRouterPlugin(options) {
           var exported = routeFile === "" ? {} : await runner.import(routeFile), loaderData = await ((_exported_loader = exported.loader) === null || _exported_loader === void 0 ? void 0 : _exported_loader.call(exported, loaderProps));
           eval("process.env.TAMAGUI_IS_SERVER = '1'");
           var entry = await runner.import(virtualEntryId), render = entry.default.render;
-          globalThis.__vxrnLoaderData__ = loaderData, globalThis.__vxrnLoaderProps__ = loaderProps, LoaderDataCache[route.file] = loaderData;
+          setServerContext({
+            loaderData,
+            loaderProps
+          }), LoaderDataCache[route.file] = loaderData;
           var is404 = route.isNotFound || !exported.default, html = await render({
             mode: route.type === "ssg" ? "ssg" : route.type === "ssr" ? "ssr" : "spa",
             loaderData,
@@ -124,9 +128,11 @@ ${stack}
           ...new Set(handleRequest.manifest.pageRoutes.flatMap(function(route2) {
             var _route_layouts;
             return [
-              join("app", route2.file),
-              ...((_route_layouts = route2.layouts) === null || _route_layouts === void 0 ? void 0 : _route_layouts.map(function(layout) {
-                return join("app", layout.contextKey);
+              join("./app", route2.file),
+              ...((_route_layouts = route2.layouts) === null || _route_layouts === void 0 ? void 0 : _route_layouts.flatMap(function(layout) {
+                return layout.contextKey ? [
+                  join("./app", layout.contextKey)
+                ] : [];
               })) || []
             ];
           }))

package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js.map CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/vite/plugins/Users/n8/one/packages/one/src/vite/plugins/fileSystemRouterPlugin.tsx"],
-  "mappings": "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",
-  "names": ["join", "debounce", "createServerModuleRunner", "createHandleRequest", "isResponse", "isStatusRedirect", "promiseWithResolvers", "LoaderDataCache", "replaceLoader", "virtalEntryIdClient", "virtualEntryId", "USE_SERVER_ENV", "createFileSystemRouterPlugin", "options", "preloads", "runner", "server", "handleRequest", "createRequestHandler", "renderPromise", "handlePage", "route", "url", "loaderProps", "console", "info", "type", "file", "promise", "resolve", "globalThis", "exported", "routeFile", "clearCache", "import", "loaderData", "loader", "eval", "entry", "render", "default", "is404", "isNotFound", "html", "mode", "path", "Response", "status", "headers", "err", "error", "href", "title", "pathname", "message", "Error", "stack", "isDuplicateReactError", "test", "subMessage", "handleLoader", "param", "request", "transformedJS", "transformRequest", "code", "platform", "searchParams", "get", "environment", "environments", "nativeTransformedJS", "JSON", "stringify", "handleAPI", "loadMiddleware", "contextKey", "name", "enforce", "apply", "config", "userConfig", "manifest", "pageRoutes", "routesAndLayouts", "Set", "flatMap", "layouts", "map", "layout", "optimizeDeps", "entries", "configureServer", "serverIn", "ssr", "appDir", "process", "cwd", "fileWatcherChangeListener", "startsWith", "watcher", "addListener", "middlewares", "use", "req", "res", "next", "redirects", "web", "URL", "host", "redirect", "regexStr", "source", "replace", "match", "RegExp", "destination", "params", "forEach", "index", "warn", "writeHead", "permanent", "Location", "end", "reply", "handler", "convertIncomingMessageToRequest", "value", "key", "cookies", "split", "_iteratorNormalCompletion", "_didIteratorError", "_iteratorError", "_iterator", "_step", "cookie", "appendHeader", "setHeader", "location", "statusCode", "statusMessage", "statusText", "outString", "body", "locked", "write", "streamToString", "stream", "reader", "getReader", "decoder", "TextDecoder", "result", "done", "read", "decode", "releaseLock", "originalUrl", "urlBase", "urlString", "Headers", "append", "Request", "method", "includes", "readStream", "Promise", "reject", "chunks", "on", "chunk", "push", "Buffer", "concat"]
+  "mappings": "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",
+  "names": ["join", "debounce", "createServerModuleRunner", "createHandleRequest", "isResponse", "isStatusRedirect", "promiseWithResolvers", "LoaderDataCache", "replaceLoader", "virtalEntryIdClient", "virtualEntryId", "setServerContext", "USE_SERVER_ENV", "createFileSystemRouterPlugin", "options", "preloads", "runner", "server", "handleRequest", "createRequestHandler", "renderPromise", "handlePage", "route", "url", "loaderProps", "console", "info", "type", "isNotFound", "file", "promise", "resolve", "globalThis", "exported", "routeFile", "clearCache", "import", "loaderData", "loader", "eval", "entry", "render", "default", "is404", "html", "mode", "path", "Response", "status", "headers", "err", "error", "href", "title", "pathname", "message", "Error", "stack", "isDuplicateReactError", "test", "subMessage", "handleLoader", "param", "request", "transformedJS", "transformRequest", "code", "platform", "searchParams", "get", "environment", "environments", "nativeTransformedJS", "JSON", "stringify", "handleAPI", "loadMiddleware", "contextKey", "name", "enforce", "apply", "config", "userConfig", "manifest", "pageRoutes", "routesAndLayouts", "Set", "flatMap", "layouts", "layout", "optimizeDeps", "entries", "configureServer", "serverIn", "ssr", "appDir", "process", "cwd", "fileWatcherChangeListener", "startsWith", "watcher", "addListener", "middlewares", "use", "req", "res", "next", "redirects", "web", "URL", "host", "redirect", "regexStr", "source", "replace", "match", "RegExp", "destination", "params", "forEach", "index", "warn", "writeHead", "permanent", "Location", "end", "reply", "handler", "convertIncomingMessageToRequest", "value", "key", "cookies", "split", "_iteratorNormalCompletion", "_didIteratorError", "_iteratorError", "_iterator", "_step", "cookie", "appendHeader", "setHeader", "location", "statusCode", "statusMessage", "statusText", "outString", "body", "locked", "write", "streamToString", "stream", "reader", "getReader", "decoder", "TextDecoder", "result", "done", "read", "decode", "releaseLock", "originalUrl", "urlBase", "urlString", "Headers", "append", "Request", "method", "includes", "readStream", "Promise", "reject", "chunks", "on", "chunk", "push", "Buffer", "concat"]
 }

package/dist/esm/zero/useQuery.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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":[]}
1	+ {"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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.1.389",
+  "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.389",
-    "@vxrn/tslib-lite": "1.1.389",
-    "@vxrn/universal-color-scheme": "1.1.389",
-    "@vxrn/use-isomorphic-layout-effect": "1.1.389",
+    "@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.389",
+    "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.389",
+    "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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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)