vxrn 0.1.44 → 0.1.46

package/dist/esm/utils/getHtml.js

@@ -1,13 +1,19 @@
 function getHtml({
   template,
-  props,
+  loaderData,
   appHtml,
   headHtml,
   css
 }) {
-  const propsHtml = `
-<script>globalThis['__vxrnProps']=${JSON.stringify(props)}</script>`;
-  return template.replace("<!--ssr-outlet-->", appHtml + propsHtml).replace("<!--head-outlet-->", `${headHtml}
+  if (!template.includes("<!--ssr-outlet-->"))
+    throw new Error("No <!--ssr-outlet--> found in html to inject SSR contents");
+  if (!template.includes("<!--head-outlet-->"))
+    throw new Error("No <!--head-outlet--> found in html to inject SSR contents");
+  const loaderDataString = `
+<script>globalThis['__vxrnLoaderData__']=${JSON.stringify(
+    loaderData
+  )}</script>`;
+  return template.replace("<!--ssr-outlet-->", appHtml + loaderDataString).replace("<!--head-outlet-->", `${headHtml}
 ${css ? `<style>${css}</style>` : ""}`);
 }
 export {

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/utils/getHtml.ts"],
-  "mappings": "AAAO,SAAS,QAAQ;AAAA,EACtB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAAyF;AACvF,QAAM,YAAY;AAAA,oCAAuC,KAAK,UAAU,KAAK,CAAC;AAC9E,SAAO,SACJ,QAAQ,qBAAqB,UAAU,SAAS,EAChD,QAAQ,sBAAsB,GAAG,QAAQ;AAAA,EAAK,MAAM,UAAU,GAAG,aAAa,EAAE,EAAE;AACvF;",
+  "mappings": "AAAO,SAAS,QAAQ;AAAA,EACtB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAA8F;AAC5F,MAAI,CAAC,SAAS,SAAS,mBAAmB;AACxC,UAAM,IAAI,MAAM,2DAA2D;AAE7E,MAAI,CAAC,SAAS,SAAS,oBAAoB;AACzC,UAAM,IAAI,MAAM,4DAA4D;AAE9E,QAAM,mBAAmB;AAAA,2CAA8C,KAAK;AAAA,IAC1E;AAAA,EACF,CAAC;AACD,SAAO,SACJ,QAAQ,qBAAqB,UAAU,gBAAgB,EACvD,QAAQ,sBAAsB,GAAG,QAAQ;AAAA,EAAK,MAAM,UAAU,GAAG,aAAa,EAAE,EAAE;AACvF;",
   "names": []
 }

package/dist/esm/utils/getHtml.mjs

@@ -1,13 +1,15 @@
 function getHtml({
   template,
-  props,
+  loaderData,
   appHtml,
   headHtml,
   css
 }) {
-  const propsHtml = `
-<script>globalThis['__vxrnProps']=${JSON.stringify(props)}</script>`;
-  return template.replace("<!--ssr-outlet-->", appHtml + propsHtml).replace("<!--head-outlet-->", `${headHtml}
+  if (!template.includes("<!--ssr-outlet-->")) throw new Error("No <!--ssr-outlet--> found in html to inject SSR contents");
+  if (!template.includes("<!--head-outlet-->")) throw new Error("No <!--head-outlet--> found in html to inject SSR contents");
+  const loaderDataString = `
+<script>globalThis['__vxrnLoaderData__']=${JSON.stringify(loaderData)}</script>`;
+  return template.replace("<!--ssr-outlet-->", appHtml + loaderDataString).replace("<!--head-outlet-->", `${headHtml}
 ${css ? `<style>${css}</style>` : ""}`);
 }
 export { getHtml };

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

@@ -1,7 +1,12 @@
 function getHtml(param) {
-  var template = param.template, props = param.props, appHtml = param.appHtml, headHtml = param.headHtml, css = param.css, propsHtml = `
-<script>globalThis['__vxrnProps']=`.concat(JSON.stringify(props), "</script>");
-  return template.replace("<!--ssr-outlet-->", appHtml + propsHtml).replace("<!--head-outlet-->", "".concat(headHtml, `
+  var template = param.template, loaderData = param.loaderData, appHtml = param.appHtml, headHtml = param.headHtml, css = param.css;
+  if (!template.includes("<!--ssr-outlet-->"))
+    throw new Error("No <!--ssr-outlet--> found in html to inject SSR contents");
+  if (!template.includes("<!--head-outlet-->"))
+    throw new Error("No <!--head-outlet--> found in html to inject SSR contents");
+  var loaderDataString = `
+<script>globalThis['__vxrnLoaderData__']=`.concat(JSON.stringify(loaderData), "</script>");
+  return template.replace("<!--ssr-outlet-->", appHtml + loaderDataString).replace("<!--head-outlet-->", "".concat(headHtml, `
 `).concat(css ? "<style>".concat(css, "</style>") : ""));
 }
 export {

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/utils/Users/n8/vxrn/packages/vxrn/src/utils/getHtml.ts"],
-  "mappings": "AAAO,SAASA,QAAQ,OAM+D;MALrFC,WADsB,MACtBA,UACAC,QAFsB,MAEtBA,OACAC,UAHsB,MAGtBA,SACAC,WAJsB,MAItBA,UACAC,MALsB,MAKtBA,KAEMC,YAAa;oCAA4D,OAAtBC,KAAKC,UAAUN,KAAAA,GAAO,WAAA;AAC/E,SAAOD,SACJQ,QAAS,qBAAoBN,UAAUG,SAAAA,EACvCG,QAAS,sBAAsB,GAAeJ,OAAbD,UAAS;CAAA,EAAuC,OAAnCC,MAAO,UAAa,OAAJA,KAAI,UAAA,IAAa,EAAA,CAAA;AACpF;",
-  "names": ["getHtml", "template", "props", "appHtml", "headHtml", "css", "propsHtml", "JSON", "stringify", "replace"]
+  "mappings": "AAAO,SAASA,QAAQ,OAMoE;MAL1FC,WADsB,MACtBA,UACAC,aAFsB,MAEtBA,YACAC,UAHsB,MAGtBA,SACAC,WAJsB,MAItBA,UACAC,MALsB,MAKtBA;AAEA,MAAI,CAACJ,SAASK,SAAU,mBAAA;AACtB,UAAM,IAAIC,MAAO,2DAAA;AAEnB,MAAI,CAACN,SAASK,SAAU,oBAAA;AACtB,UAAM,IAAIC,MAAO,4DAAA;AAEnB,MAAMC,mBAAoB;2CAExB,OAFqEC,KAAKC,UAC1ER,UAAAA,GACA,WAAA;AACF,SAAOD,SACJU,QAAS,qBAAoBR,UAAUK,gBAAAA,EACvCG,QAAS,sBAAsB,GAAeN,OAAbD,UAAS;CAAA,EAAuC,OAAnCC,MAAO,UAAa,OAAJA,KAAI,UAAA,IAAa,EAAA,CAAA;AACpF;",
+  "names": ["getHtml", "template", "loaderData", "appHtml", "headHtml", "css", "includes", "Error", "loaderDataString", "JSON", "stringify", "replace"]
 }

package/dist/esm/utils/getOptionsFilled.js

@@ -5,16 +5,21 @@ import FSExtra from "fs-extra";
 import { getPort } from "get-port-please";
 const require2 = createRequire(import.meta.url);
 async function getOptionsFilled(options) {
-  const { host = "127.0.0.1", root = process.cwd() } = options, defaultPort = options.port || 8081, port = await getPort({
+  const { host = "127.0.0.1", root = process.cwd(), entries } = options, defaultPort = options.port || 8081, port = await getPort({
     port: defaultPort,
     portRange: [defaultPort, defaultPort + 1e3]
-  }), packageRootDir = join(require2.resolve("vxrn"), "../../.."), cacheDir = join(root, "node_modules", ".cache", "vxrn"), internalPatchesDir = join(packageRootDir, "patches"), userPatchesDir = join(root, "patches"), [state, packageJSON] = await Promise.all([
+  }), packageRootDir = join(require2.resolve("vxrn"), "../../.."), cacheDir = join(root, "node_modules", ".vxrn"), internalPatchesDir = join(packageRootDir, "patches"), userPatchesDir = join(root, "patches"), [state, packageJSON] = await Promise.all([
     //
     readState(cacheDir),
     readPackageJSON()
   ]);
   return {
     ...options,
+    entries: {
+      native: "./src/entry-native.tsx",
+      server: "./src/entry-server.tsx",
+      ...entries
+    },
     packageJSON,
     state,
     packageRootDir,

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/utils/getOptionsFilled.ts"],
-  "mappings": "AAAA,SAAS,YAAY;AACrB,SAAS,uBAAuB;AAChC,SAAS,qBAAqB;AAC9B,OAAO,aAAa;AAEpB,SAAS,eAAe;AAExB,MAAMA,WAAU,cAAc,YAAY,GAAG;AAI7C,eAAsB,iBAAiB,SAAqB;AAC1D,QAAM,EAAE,OAAO,aAAa,OAAO,QAAQ,IAAI,EAAE,IAAI,SAE/C,cAAc,QAAQ,QAAQ,MAC9B,OAAO,MAAM,QAAQ;AAAA,IACzB,MAAM;AAAA,IACN,WAAW,CAAC,aAAa,cAAc,GAAI;AAAA,EAC7C,CAAC,GAEK,iBAAiB,KAAKA,SAAQ,QAAQ,MAAM,GAAG,UAAU,GAEzD,WAAW,KAAK,MAAM,gBAAgB,UAAU,MAAM,GACtD,qBAAqB,KAAK,gBAAgB,SAAS,GACnD,iBAAiB,KAAK,MAAM,SAAS,GACrC,CAAC,OAAO,WAAW,IAAI,MAAM,QAAQ,IAAI;AAAA;AAAA,IAE7C,UAAU,QAAQ;AAAA,IAClB,gBAAgB;AAAA,EAClB,CAAC;AACD,SAAO;AAAA,IACL,GAAG;AAAA,IACH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;AAMA,eAAe,UAAU,UAAkB;AACzC,QAAM,YAAY,KAAK,UAAU,YAAY;AAI7C,SAHsB,MAAM,QAAQ,WAAW,SAAS,IACpD,MAAM,QAAQ,SAAS,SAAS,IAChC,CAAC;AAEP;",
+  "mappings": "AAAA,SAAS,YAAY;AACrB,SAAS,uBAAuB;AAChC,SAAS,qBAAqB;AAC9B,OAAO,aAAa;AAEpB,SAAS,eAAe;AAExB,MAAMA,WAAU,cAAc,YAAY,GAAG;AAI7C,eAAsB,iBAAiB,SAAqB;AAC1D,QAAM,EAAE,OAAO,aAAa,OAAO,QAAQ,IAAI,GAAG,QAAQ,IAAI,SAExD,cAAc,QAAQ,QAAQ,MAC9B,OAAO,MAAM,QAAQ;AAAA,IACzB,MAAM;AAAA,IACN,WAAW,CAAC,aAAa,cAAc,GAAI;AAAA,EAC7C,CAAC,GAEK,iBAAiB,KAAKA,SAAQ,QAAQ,MAAM,GAAG,UAAU,GAEzD,WAAW,KAAK,MAAM,gBAAgB,OAAO,GAC7C,qBAAqB,KAAK,gBAAgB,SAAS,GACnD,iBAAiB,KAAK,MAAM,SAAS,GACrC,CAAC,OAAO,WAAW,IAAI,MAAM,QAAQ,IAAI;AAAA;AAAA,IAE7C,UAAU,QAAQ;AAAA,IAClB,gBAAgB;AAAA,EAClB,CAAC;AACD,SAAO;AAAA,IACL,GAAG;AAAA,IACH,SAAS;AAAA,MACP,QAAQ;AAAA,MACR,QAAQ;AAAA,MACR,GAAG;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;AAMA,eAAe,UAAU,UAAkB;AACzC,QAAM,YAAY,KAAK,UAAU,YAAY;AAI7C,SAHsB,MAAM,QAAQ,WAAW,SAAS,IACpD,MAAM,QAAQ,SAAS,SAAS,IAChC,CAAC;AAEP;",
   "names": ["require"]
 }

package/dist/esm/utils/getOptionsFilled.mjs

@@ -7,7 +7,8 @@ const require2 = createRequire(import.meta.url);
 async function getOptionsFilled(options) {
   const {
       host = "127.0.0.1",
-      root = process.cwd()
+      root = process.cwd(),
+      entries
     } = options,
     defaultPort = options.port || 8081,
     port = await getPort({
@@ -15,7 +16,7 @@ async function getOptionsFilled(options) {
       portRange: [defaultPort, defaultPort + 1e3]
     }),
     packageRootDir = join(require2.resolve("vxrn"), "../../.."),
-    cacheDir = join(root, "node_modules", ".cache", "vxrn"),
+    cacheDir = join(root, "node_modules", ".vxrn"),
     internalPatchesDir = join(packageRootDir, "patches"),
     userPatchesDir = join(root, "patches"),
     [state, packageJSON] = await Promise.all([
@@ -23,6 +24,11 @@ async function getOptionsFilled(options) {
     readState(cacheDir), readPackageJSON()]);
   return {
     ...options,
+    entries: {
+      native: "./src/entry-native.tsx",
+      server: "./src/entry-server.tsx",
+      ...entries
+    },
     packageJSON,
     state,
     packageRootDir,

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

@@ -205,11 +205,11 @@ function getOptionsFilled(options) {
 }
 function _getOptionsFilled() {
   return _getOptionsFilled = _async_to_generator(function(options) {
-    var _options_host, host, _options_root, root, defaultPort, port, packageRootDir, cacheDir, internalPatchesDir, userPatchesDir, _ref, state, packageJSON;
+    var _options_host, host, _options_root, root, entries, defaultPort, port, packageRootDir, cacheDir, internalPatchesDir, userPatchesDir, _ref, state, packageJSON;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          return _options_host = options.host, host = _options_host === void 0 ? "127.0.0.1" : _options_host, _options_root = options.root, root = _options_root === void 0 ? process.cwd() : _options_root, defaultPort = options.port || 8081, [
+          return _options_host = options.host, host = _options_host === void 0 ? "127.0.0.1" : _options_host, _options_root = options.root, root = _options_root === void 0 ? process.cwd() : _options_root, entries = options.entries, defaultPort = options.port || 8081, [
             4,
             getPort({
               port: defaultPort,
@@ -220,7 +220,7 @@ function _getOptionsFilled() {
             })
           ];
         case 1:
-          return port = _state.sent(), packageRootDir = join(require2.resolve("vxrn"), "../../.."), cacheDir = join(root, "node_modules", ".cache", "vxrn"), internalPatchesDir = join(packageRootDir, "patches"), userPatchesDir = join(root, "patches"), [
+          return port = _state.sent(), packageRootDir = join(require2.resolve("vxrn"), "../../.."), cacheDir = join(root, "node_modules", ".vxrn"), internalPatchesDir = join(packageRootDir, "patches"), userPatchesDir = join(root, "patches"), [
             4,
             Promise.all([
               //
@@ -235,6 +235,10 @@ function _getOptionsFilled() {
           ]), state = _ref[0], packageJSON = _ref[1], [
             2,
             _object_spread_props(_object_spread({}, options), {
+              entries: _object_spread({
+                native: "./src/entry-native.tsx",
+                server: "./src/entry-server.tsx"
+              }, entries),
               packageJSON,
               state,
               packageRootDir,

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/utils/Users/n8/vxrn/packages/vxrn/src/utils/getOptionsFilled.ts"],
-  "mappings": "AAAA,SAASA,YAAY;AACrB,SAASC,uBAAuB;AAChC,SAASC,qBAAqB;AAC9B,OAAOC,aAAa;AAEpB,SAASC,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAExB,IAAMC,WAAUH,cAAc,YAAYI,GAAG;AAI7C,SAAsBC,iBAAiBC,SAAmB;SAApCD,kBAAAA,MAAAA,MAAAA,SAAAA;;SAAAA,oBAAAA;AAAAA,6BAAf,oBAAA,SAAgCC,SAAmB;uBAChDC,MAAAA,eAAoBC,MAEtBC,aACAC,MAKAC,gBAEAC,UACAC,oBACAC,gBACuB,MAAtBC,OAAOC;;;;iCAbuCV,QAA7CC,MAAAA,OAAAA,kBAAAA,SAAO,cAAA,eAAA,gBAAsCD,QAAzBE,MAAAA,OAAAA,kBAAAA,SAAOS,QAAQC,IAAG,IAAA,eAExCT,cAAcH,QAAQI,QAAQ,MACvB;;YAAMR,QAAQ;cACzBQ,MAAMD;cACNU,WAAS;gBAAGV;gBAAaA,cAAc;;YACzC,CAAA;;;AAHMC,wBAAO,OAAA,KAAA,GAKPC,iBAAiBb,KAAKK,SAAQiB,QAAQ,MAAA,GAAS,UAAA,GAE/CR,WAAWd,KAAKU,MAAM,gBAAgB,UAAU,MAAA,GAChDK,qBAAqBf,KAAKa,gBAAgB,SAAA,GAC1CG,iBAAiBhB,KAAKU,MAAM,SAAA,GACL;;YAAMa,QAAQC,IAAG;;cAE5CC,UAAUX,QAAAA;cACVb,gBAAAA;;;;AAH2B,wBAAA,iBAAA,MAAA,QAAA;YAAA,OAAA,KAAA;;cAAtBgB,QAAsB,KAAA,CAAA,GAAfC,cAAe,KAAA,CAAA,GAK7B;;YAAO,qBAAA,eAAA,CAAA,GACFV,OAAAA,GAAAA;cACHU;cACAD;cACAJ;cACAC;cACAE;cACAD;cACAN;cACAC;cACAE;;;;;EAEJ,CAAA,GA/BsBL,kBAAAA,MAAAA,MAAAA,SAAAA;;SAqCPkB,UAAUX,UAAgB;SAA1BW,WAAAA,MAAAA,MAAAA,SAAAA;;SAAAA,aAAAA;AAAAA,sBAAf,oBAAA,SAAyBX,UAAgB;QACjCY,WACAT,OAAAA;;;;AADAS,6BAAY1B,KAAKc,UAAU,YAAA,GACX;;YAAMX,QAAQwB,WAAWD,SAAAA;;;iBAAzB,OAAA,KAAA,IAClB;;YAAMvB,QAAQyB,SAASF,SAAAA;cADL;;;;;wBAClB,OAAA,KAAA;;;;;iBACA,CAAC;;AAFCT,yBAAAA,MAGN;;YAAOA;;;;EACT,CAAA,GANeQ,WAAAA,MAAAA,MAAAA,SAAAA;;",
-  "names": ["join", "readPackageJSON", "createRequire", "FSExtra", "getPort", "require", "url", "getOptionsFilled", "options", "host", "root", "defaultPort", "port", "packageRootDir", "cacheDir", "internalPatchesDir", "userPatchesDir", "state", "packageJSON", "process", "cwd", "portRange", "resolve", "Promise", "all", "readState", "statePath", "pathExists", "readJSON"]
+  "mappings": "AAAA,SAASA,YAAY;AACrB,SAASC,uBAAuB;AAChC,SAASC,qBAAqB;AAC9B,OAAOC,aAAa;AAEpB,SAASC,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAExB,IAAMC,WAAUH,cAAc,YAAYI,GAAG;AAI7C,SAAsBC,iBAAiBC,SAAmB;SAApCD,kBAAAA,MAAAA,MAAAA,SAAAA;;SAAAA,oBAAAA;AAAAA,6BAAf,oBAAA,SAAgCC,SAAmB;uBAChDC,MAAAA,eAAoBC,MAAsBC,SAE5CC,aACAC,MAKAC,gBAEAC,UACAC,oBACAC,gBACuB,MAAtBC,OAAOC;;;;iCAbgDX,QAAtDC,MAAAA,OAAAA,kBAAAA,SAAO,cAAA,eAAA,gBAA+CD,QAAlCE,MAAAA,OAAAA,kBAAAA,SAAOU,QAAQC,IAAG,IAAA,eAAIV,UAAYH,QAAZG,SAE5CC,cAAcJ,QAAQK,QAAQ,MACvB;;YAAMT,QAAQ;cACzBS,MAAMD;cACNU,WAAS;gBAAGV;gBAAaA,cAAc;;YACzC,CAAA;;;AAHMC,wBAAO,OAAA,KAAA,GAKPC,iBAAiBd,KAAKK,SAAQkB,QAAQ,MAAA,GAAS,UAAA,GAE/CR,WAAWf,KAAKU,MAAM,gBAAgB,OAAA,GACtCM,qBAAqBhB,KAAKc,gBAAgB,SAAA,GAC1CG,iBAAiBjB,KAAKU,MAAM,SAAA,GACL;;YAAMc,QAAQC,IAAG;;cAE5CC,UAAUX,QAAAA;cACVd,gBAAAA;;;;AAH2B,wBAAA,iBAAA,MAAA,QAAA;YAAA,OAAA,KAAA;;cAAtBiB,QAAsB,KAAA,CAAA,GAAfC,cAAe,KAAA,CAAA,GAK7B;;YAAO,qBAAA,eAAA,CAAA,GACFX,OAAAA,GAAAA;cACHG,SAAS,eAAA;gBACPgB,QAAQ;gBACRC,QAAQ;iBACLjB,OAAAA;cAELQ;cACAD;cACAJ;cACAC;cACAE;cACAD;cACAP;cACAC;cACAG;;;;;EAEJ,CAAA,GApCsBN,kBAAAA,MAAAA,MAAAA,SAAAA;;SA0CPmB,UAAUX,UAAgB;SAA1BW,WAAAA,MAAAA,MAAAA,SAAAA;;SAAAA,aAAAA;AAAAA,sBAAf,oBAAA,SAAyBX,UAAgB;QACjCc,WACAX,OAAAA;;;;AADAW,6BAAY7B,KAAKe,UAAU,YAAA,GACX;;YAAMZ,QAAQ2B,WAAWD,SAAAA;;;iBAAzB,OAAA,KAAA,IAClB;;YAAM1B,QAAQ4B,SAASF,SAAAA;cADL;;;;;wBAClB,OAAA,KAAA;;;;;iBACA,CAAC;;AAFCX,yBAAAA,MAGN;;YAAOA;;;;EACT,CAAA,GANeQ,WAAAA,MAAAA,MAAAA,SAAAA;;",
+  "names": ["join", "readPackageJSON", "createRequire", "FSExtra", "getPort", "require", "url", "getOptionsFilled", "options", "host", "root", "entries", "defaultPort", "port", "packageRootDir", "cacheDir", "internalPatchesDir", "userPatchesDir", "state", "packageJSON", "process", "cwd", "portRange", "resolve", "Promise", "all", "readState", "native", "server", "statePath", "pathExists", "readJSON"]
 }

package/dist/esm/utils/readVXRNConfig.js

@@ -4,6 +4,12 @@ import jiti from "jiti";
 async function readVXRNConfig() {
   if (!await FSExtra.pathExists("vxrn.config.ts"))
     return {};
+  if (process.env.VXRN_CJS) {
+    const userConfig = jiti(process.cwd(), {
+      esmResolve: !0
+    })("./vxrn.config.ts");
+    return resolveOptionalAsyncFunction(userConfig?.default ?? {});
+  }
   try {
     const vite = await createServer({
       logLevel: "silent",
@@ -11,13 +17,16 @@ async function readVXRNConfig() {
     }), userConfig = await vite.ssrLoadModule("./vxrn.config.ts", {
       fixStacktrace: !0
     });
-    return await vite.close(), userConfig?.default ?? {};
+    return await vite.close(), resolveOptionalAsyncFunction(userConfig?.default ?? {});
   } catch (err) {
-    return console.info("Error loading config via ESM, attempting CJS, DEBUG=1 to see logs"), process.env.DEBUG && console.info(err), jiti(process.cwd(), {
-      esmResolve: !0
-    })("./vxrn.config.ts")?.default ?? {};
+    throw console.info(
+      " [vxrn] Error loading config via ESM, attempting CJS, set VXRN_CJS=1 to run in cjs mode"
+    ), err;
   }
 }
+async function resolveOptionalAsyncFunction(value) {
+  return typeof value == "function" && (value = value()), value instanceof Promise && (value = await value), value;
+}
 export {
   readVXRNConfig
 };

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/utils/readVXRNConfig.ts"],
-  "mappings": "AAAA,OAAO,aAAa;AAEpB,SAAS,oBAAoB;AAC7B,OAAO,UAAU;AAEjB,eAAsB,iBAAsC;AAC1D,MAAI,CAAE,MAAM,QAAQ,WAAW,gBAAgB;AAC7C,WAAO,CAAC;AAIV,MAAI;AAEF,UAAM,OAAO,MAAM,aAAa;AAAA,MAC9B,UAAU;AAAA,MACV,SAAS;AAAA,IACX,CAAC,GAEK,aAAa,MAAM,KAAK,cAAc,oBAAoB;AAAA,MAC9D,eAAe;AAAA,IACjB,CAAC;AAED,iBAAM,KAAK,MAAM,GACV,YAAY,WAAW,CAAC;AAAA,EACjC,SAAS,KAAK;AACZ,mBAAQ,KAAK,mEAAmE,GAC5E,QAAQ,IAAI,SACd,QAAQ,KAAK,GAAG,GAGE,KAAK,QAAQ,IAAI,GAAG;AAAA,MACtC,YAAY;AAAA,IACd,CAAC,EAC8B,kBAAkB,GAC9B,WAAW,CAAC;AAAA,EACjC;AACF;",
+  "mappings": "AAAA,OAAO,aAAa;AAEpB,SAAS,oBAAoB;AAC7B,OAAO,UAAU;AAEjB,eAAsB,iBAAsC;AAC1D,MAAI,CAAE,MAAM,QAAQ,WAAW,gBAAgB;AAC7C,WAAO,CAAC;AAGV,MAAI,QAAQ,IAAI,UAAU;AAIxB,UAAM,aAHc,KAAK,QAAQ,IAAI,GAAG;AAAA,MACtC,YAAY;AAAA,IACd,CAAC,EAC8B,kBAAkB;AACjD,WAAO,6BAA6B,YAAY,WAAW,CAAC,CAAC;AAAA,EAC/D;AAGA,MAAI;AAEF,UAAM,OAAO,MAAM,aAAa;AAAA,MAC9B,UAAU;AAAA,MACV,SAAS;AAAA,IACX,CAAC,GAEK,aAAa,MAAM,KAAK,cAAc,oBAAoB;AAAA,MAC9D,eAAe;AAAA,IACjB,CAAC;AAED,iBAAM,KAAK,MAAM,GACV,6BAA6B,YAAY,WAAW,CAAC,CAAC;AAAA,EAC/D,SAAS,KAAK;AACZ,kBAAQ;AAAA,MACN;AAAA,IACF,GACM;AAAA,EACR;AACF;AAEA,eAAe,6BAA6B,OAAY;AACtD,SAAI,OAAO,SAAU,eACnB,QAAQ,MAAM,IAEZ,iBAAiB,YACnB,QAAQ,MAAM,QAET;AACT;",
   "names": []
 }

package/dist/esm/utils/readVXRNConfig.mjs

@@ -3,6 +3,12 @@ import { createServer } from "vite";
 import jiti from "jiti";
 async function readVXRNConfig() {
   if (!(await FSExtra.pathExists("vxrn.config.ts"))) return {};
+  if (process.env.VXRN_CJS) {
+    const userConfig = jiti(process.cwd(), {
+      esmResolve: !0
+    })("./vxrn.config.ts");
+    return resolveOptionalAsyncFunction(userConfig?.default ?? {});
+  }
   try {
     const vite = await createServer({
         logLevel: "silent",
@@ -11,11 +17,12 @@ async function readVXRNConfig() {
       userConfig = await vite.ssrLoadModule("./vxrn.config.ts", {
         fixStacktrace: !0
       });
-    return await vite.close(), userConfig?.default ?? {};
+    return await vite.close(), resolveOptionalAsyncFunction(userConfig?.default ?? {});
   } catch (err) {
-    return console.info("Error loading config via ESM, attempting CJS, DEBUG=1 to see logs"), process.env.DEBUG && console.info(err), jiti(process.cwd(), {
-      esmResolve: !0
-    })("./vxrn.config.ts")?.default ?? {};
+    throw console.info(" [vxrn] Error loading config via ESM, attempting CJS, set VXRN_CJS=1 to run in cjs mode"), err;
   }
 }
+async function resolveOptionalAsyncFunction(value) {
+  return typeof value == "function" && (value = value()), value instanceof Promise && (value = await value), value;
+}
 export { readVXRNConfig };

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

@@ -25,6 +25,9 @@ function _async_to_generator(fn) {
     });
   };
 }
+function _instanceof(left, right) {
+  return right != null && typeof Symbol < "u" && right[Symbol.hasInstance] ? !!right[Symbol.hasInstance](left) : left instanceof right;
+}
 function _ts_generator(thisArg, body) {
   var f, y, t, g, _ = {
     label: 0,
@@ -121,7 +124,7 @@ function readVXRNConfig() {
 }
 function _readVXRNConfig() {
   return _readVXRNConfig = _async_to_generator(function() {
-    var vite, userConfig, _userConfig_default, err, requireFile, userConfig1, _userConfig_default1;
+    var requireFile, userConfig, _userConfig_default, vite, userConfig1, _userConfig_default1, err;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -135,6 +138,13 @@ function _readVXRNConfig() {
               2,
               {}
             ];
+          if (process.env.VXRN_CJS)
+            return requireFile = jiti(process.cwd(), {
+              esmResolve: !0
+            }), userConfig = requireFile("./vxrn.config.ts"), [
+              2,
+              resolveOptionalAsyncFunction((_userConfig_default = userConfig == null ? void 0 : userConfig.default) !== null && _userConfig_default !== void 0 ? _userConfig_default : {})
+            ];
           _state.label = 2;
         case 2:
           return _state.trys.push([
@@ -157,22 +167,17 @@ function _readVXRNConfig() {
             })
           ];
         case 4:
-          return userConfig = _state.sent(), [
+          return userConfig1 = _state.sent(), [
             4,
             vite.close()
           ];
         case 5:
           return _state.sent(), [
             2,
-            (_userConfig_default = userConfig == null ? void 0 : userConfig.default) !== null && _userConfig_default !== void 0 ? _userConfig_default : {}
+            resolveOptionalAsyncFunction((_userConfig_default1 = userConfig1 == null ? void 0 : userConfig1.default) !== null && _userConfig_default1 !== void 0 ? _userConfig_default1 : {})
           ];
         case 6:
-          return err = _state.sent(), console.info("Error loading config via ESM, attempting CJS, DEBUG=1 to see logs"), process.env.DEBUG && console.info(err), requireFile = jiti(process.cwd(), {
-            esmResolve: !0
-          }), userConfig1 = requireFile("./vxrn.config.ts"), [
-            2,
-            (_userConfig_default1 = userConfig1 == null ? void 0 : userConfig1.default) !== null && _userConfig_default1 !== void 0 ? _userConfig_default1 : {}
-          ];
+          throw err = _state.sent(), console.info(" [vxrn] Error loading config via ESM, attempting CJS, set VXRN_CJS=1 to run in cjs mode"), err;
         case 7:
           return [
             2
@@ -181,6 +186,32 @@ function _readVXRNConfig() {
     });
   }), _readVXRNConfig.apply(this, arguments);
 }
+function resolveOptionalAsyncFunction(value) {
+  return _resolveOptionalAsyncFunction.apply(this, arguments);
+}
+function _resolveOptionalAsyncFunction() {
+  return _resolveOptionalAsyncFunction = _async_to_generator(function(value) {
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          return typeof value == "function" && (value = value()), _instanceof(value, Promise) ? [
+            4,
+            value
+          ] : [
+            3,
+            2
+          ];
+        case 1:
+          value = _state.sent(), _state.label = 2;
+        case 2:
+          return [
+            2,
+            value
+          ];
+      }
+    });
+  }), _resolveOptionalAsyncFunction.apply(this, arguments);
+}
 export {
   readVXRNConfig
 };

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/utils/Users/n8/vxrn/packages/vxrn/src/utils/readVXRNConfig.ts"],
-  "mappings": "AAAA,OAAOA,aAAa;AAEpB,SAASC,oBAAoB;AAC7B,OAAOC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEjB,SAAsBC,iBAAAA;SAAAA,gBAAAA,MAAAA,MAAAA,SAAAA;;SAAAA,kBAAAA;AAAAA,2BAAf,oBAAA,WAAA;QAQGC,MAKAC,YAKCA,qBACAC,KAMDC,aAGAF,aACCA;;;;AA5BH,iBAAA;;YAAML,QAAQQ,WAAW,gBAAA;;;AAA/B,cAAI,CAAE,OAAA,KAAA;AACJ,mBAAA;;cAAO,CAAC;;;;;;;;;cAMK;;YAAMP,aAAa;cAC9BQ,UAAU;cACVC,SAAS;YACX,CAAA;;;AAHMN,wBAAO,OAAA,KAAA,GAKM;;YAAMA,KAAKO,cAAc,oBAAoB;cAC9DC,eAAe;YACjB,CAAA;;;AAFMP,8BAAa,OAAA,KAAA,GAInB;;YAAMD,KAAKS,MAAK;;;AAAhB,wBAAA,KAAA,GACA;;aAAOR,sBAAAA,cAAAA,OAAAA,SAAAA,WAAYS,aAAO,QAAnBT,wBAAAA,SAAAA,sBAAuB,CAAC;;;AACxBC,uBAAAA,OAAAA,KAAAA,GACPS,QAAQC,KAAM,mEAAA,GACVC,QAAQC,IAAIC,SACdJ,QAAQC,KAAKV,GAAAA,GAGTC,cAAcL,KAAKe,QAAQG,IAAG,GAAI;YACtCC,YAAY;UACd,CAAA,GACMhB,cAAaE,YAAY,kBAAA,GAC/B;;aAAOF,uBAAAA,eAAAA,OAAAA,SAAAA,YAAYS,aAAO,QAAnBT,yBAAAA,SAAAA,uBAAuB,CAAC;;;;;;;;EAEnC,CAAA,GA/BsBF,gBAAAA,MAAAA,MAAAA,SAAAA;;",
-  "names": ["FSExtra", "createServer", "jiti", "readVXRNConfig", "vite", "userConfig", "err", "requireFile", "pathExists", "logLevel", "appType", "ssrLoadModule", "fixStacktrace", "close", "default", "console", "info", "process", "env", "DEBUG", "cwd", "esmResolve"]
+  "mappings": "AAAA,OAAOA,aAAa;AAEpB,SAASC,oBAAoB;AAC7B,OAAOC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEjB,SAAsBC,iBAAAA;SAAAA,gBAAAA,MAAAA,MAAAA,SAAAA;;SAAAA,kBAAAA;AAAAA,2BAAf,oBAAA,WAAA;QAMGC,aAGAC,YAC8BA,qBAM9BC,MAKAD,aAK8BA,sBAC7BE;;;;AA1BH,iBAAA;;YAAMP,QAAQQ,WAAW,gBAAA;;;AAA/B,cAAI,CAAE,OAAA,KAAA;AACJ,mBAAA;;cAAO,CAAC;;AAGV,cAAIC,QAAQC,IAAIC;AACRP,iCAAcF,KAAKO,QAAQG,IAAG,GAAI;cACtCC,YAAY;YACd,CAAA,GACMR,aAAaD,YAAY,kBAAA,GAC/B;;cAAOU,8BAA6BT,sBAAAA,cAAAA,OAAAA,SAAAA,WAAYU,aAAO,QAAnBV,wBAAAA,SAAAA,sBAAuB,CAAC,CAAA;;;;;;;;;cAM/C;;YAAMJ,aAAa;cAC9Be,UAAU;cACVC,SAAS;YACX,CAAA;;;AAHMX,wBAAO,OAAA,KAAA,GAKM;;YAAMA,KAAKY,cAAc,oBAAoB;cAC9DC,eAAe;YACjB,CAAA;;;AAFMd,+BAAa,OAAA,KAAA,GAInB;;YAAMC,KAAKc,MAAK;;;AAAhB,wBAAA,KAAA,GACA;;YAAON,8BAA6BT,uBAAAA,eAAAA,OAAAA,SAAAA,YAAYU,aAAO,QAAnBV,yBAAAA,SAAAA,uBAAuB,CAAC,CAAA;;;AACrDE,sBAAAA,OAAAA,KAAAA,GACPc,QAAQC,KACL,yFAAA,GAEGf;;;;;;;EAEV,CAAA,GAjCsBJ,gBAAAA,MAAAA,MAAAA,SAAAA;;SAmCPW,6BAA6BS,OAAU;SAAvCT,8BAAAA,MAAAA,MAAAA,SAAAA;;SAAAA,gCAAAA;AAAAA,yCAAf,oBAAA,SAA4CS,OAAU;;;;iBAChD,OAAOA,SAAU,eACnBA,QAAQA,MAAAA,IAED,YAALA,OAAiBC,OAAAA,IACX;;YAAMD;cADZA;;;;;AACFA,kBAAQ,OAAA,KAAA;;AAEV,iBAAA;;YAAOA;;;;EACT,CAAA,GAReT,8BAAAA,MAAAA,MAAAA,SAAAA;;",
+  "names": ["FSExtra", "createServer", "jiti", "readVXRNConfig", "requireFile", "userConfig", "vite", "err", "pathExists", "process", "env", "VXRN_CJS", "cwd", "esmResolve", "resolveOptionalAsyncFunction", "default", "logLevel", "appType", "ssrLoadModule", "fixStacktrace", "close", "console", "info", "value", "Promise"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxrn",
-  "version": "0.1.44",
+  "version": "0.1.46",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "type": "module",
@@ -29,19 +29,18 @@
     "@babel/code-frame": "^7.21.4",
     "@vitejs/plugin-react": "^4.2.1",
     "@vitejs/plugin-react-swc": "^3.6.0",
-    "@vxrn/react-native-prebuilt": "0.1.44",
-    "@vxrn/router": "0.1.44",
-    "@vxrn/safe-area": "0.1.44",
-    "@vxrn/vite-flow": "0.1.44",
-    "@vxrn/vite-native-client": "0.1.44",
-    "@vxrn/vite-native-hmr": "0.1.44",
-    "@vxrn/vite-native-swc": "0.1.44",
+    "@vxrn/react-native-prebuilt": "0.1.46",
+    "@vxrn/router": "0.1.46",
+    "@vxrn/safe-area": "0.1.46",
+    "@vxrn/vite-flow": "0.1.46",
+    "@vxrn/vite-native-client": "0.1.46",
+    "@vxrn/vite-native-hmr": "0.1.46",
+    "@vxrn/vite-native-swc": "0.1.46",
     "citty": "^0.1.6",
     "crossws": "^0.2.4",
     "es-module-lexer": "^1.3.0",
     "esbuild": "~0.19.3",
     "esm-resolve": "^1.0.8",
-    "execa": "^5.0.0",
     "fast-glob": "^3.2.11",
     "find-node-modules": "^2.1.3",
     "fs-extra": "^11.2.0",

package/src/cli.ts

@@ -7,7 +7,11 @@ const dev = defineCommand({
     version: '0.0.0',
     description: 'Start the dev server',
   },
-  args: {},
+  args: {
+    clean: {
+      type: 'boolean',
+    },
+  },
   async run({ args }) {
     const userConfig = await readVXRNConfig()
     const { dev } = await import(
@@ -15,6 +19,7 @@ const dev = defineCommand({
       './exports/dev.mjs'
     )
     const { start, stop } = await dev({
+      clean: args.clean,
       root: process.cwd(),
       host: '127.0.0.1',
       webConfig: {

package/src/constants.ts

@@ -1,7 +1,10 @@
-import type { SSROptions, UserConfig } from 'vite'
+import type { UserConfig } from 'vite'
 
 export const DEFAULT_PORT = 8081
 
+// TODO move to router
+export const EMPTY_LOADER_STRING = `function loader() {/* ✷✷✷ */};`
+
 export const nativeExtensions = [
   '.native.tsx',
   '.native.jsx',

package/src/exports/build.ts

@@ -25,6 +25,11 @@ const { ensureDir, existsSync, readFile, pathExists } = FSExtra
 
 // web only for now
 
+// TODO:
+//  - make this only build native or web bundles
+//  - move router stuff into router package
+//  - generateStaticPages becomes a vite 'post' postbuild callback in router plugin
+
 export const build = async (optionsIn: VXRNConfig) => {
   const options = await getOptionsFilled(optionsIn)
 
@@ -159,9 +164,8 @@ async function generateStaticPages(
         return await Promise.all(
           paramsList.map(async (params) => {
             const path = getUrl(params)
-            const props =
-              (await exported.generateStaticProps?.({ path: getUrl(params), params })) ?? {}
-            return { path, props }
+            const loaderData = (await exported.loader?.({ path: getUrl(params), params })) ?? {}
+            return { path, loaderData }
           })
         )
 
@@ -207,8 +211,8 @@ async function generateStaticPages(
   const cssString = await FSExtra.readFile(tmpCssFile, 'utf-8')
 
   // pre-render each route...
-  for (const { path, props } of allRoutes) {
-    const { appHtml, headHtml } = await render({ path, props })
+  for (const { path, loaderData } of allRoutes) {
+    const { appHtml, headHtml } = await render({ path })
     const slashFileName = `${path === '/' ? '/index' : path}.html`
     const clientHtmlPath = toAbsolute(`dist/client${slashFileName}`)
     const clientHtml = existsSync(clientHtmlPath) ? await readFile(clientHtmlPath, 'utf-8') : null
@@ -216,7 +220,7 @@ async function generateStaticPages(
       template: clientHtml || template,
       appHtml,
       headHtml,
-      props,
+      loaderData,
       css: cssString,
     })
     const filePath = toAbsolute(`dist/static${slashFileName}`)