one 1.2.57 → 1.2.58

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

@@ -0,0 +1,194 @@
+import path from "path";
+import { parseSync } from "oxc-parser";
+import { normalizePath } from "vite";
+function _type_of(obj) {
+  "@swc/helpers - typeof";
+
+  return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+function findJsxElements(code, filename) {
+  var result = parseSync(filename, code);
+  if (result.errors.length > 0) return [];
+  var locations = [],
+    traversalIndex = 0;
+  function getJsxName(node) {
+    if (!node) return null;
+    if (node.type === "JSXIdentifier") return node.name;
+    if (node.type === "JSXMemberExpression") {
+      var _node_property,
+        obj = getJsxName(node.object);
+      return obj ? `${obj}.${(_node_property = node.property) === null || _node_property === void 0 ? void 0 : _node_property.name}` : null;
+    }
+    return null;
+  }
+  function getLocation(offset) {
+    var before = code.slice(0, offset),
+      lines = before.split(`
+`);
+    return {
+      line: lines.length,
+      column: lines[lines.length - 1].length + 1
+    };
+  }
+  function walk(node) {
+    if (!(!node || (typeof node > "u" ? "undefined" : _type_of(node)) !== "object")) {
+      if (node.type === "JSXOpeningElement" && node.name) {
+        var tagName = getJsxName(node.name);
+        if (tagName && tagName !== "Fragment") {
+          var _node_attributes,
+            hasSourceAttr = (_node_attributes = node.attributes) === null || _node_attributes === void 0 ? void 0 : _node_attributes.some(function (attr) {
+              var _attr_name;
+              return attr.type === "JSXAttribute" && ((_attr_name = attr.name) === null || _attr_name === void 0 ? void 0 : _attr_name.name) === "data-one-source";
+            });
+          if (!hasSourceAttr) {
+            var nameEnd = node.name.end,
+              loc = getLocation(node.start);
+            locations.push({
+              insertOffset: nameEnd,
+              index: traversalIndex++,
+              line: loc.line,
+              column: loc.column
+            });
+          }
+        }
+      }
+      var _iteratorNormalCompletion = !0,
+        _didIteratorError = !1,
+        _iteratorError = void 0;
+      try {
+        for (var _iterator = Object.keys(node)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+          var key = _step.value;
+          if (key !== "parent") {
+            var value = node[key];
+            if (Array.isArray(value)) {
+              var _iteratorNormalCompletion1 = !0,
+                _didIteratorError1 = !1,
+                _iteratorError1 = void 0;
+              try {
+                for (var _iterator1 = value[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) {
+                  var child = _step1.value;
+                  walk(child);
+                }
+              } catch (err) {
+                _didIteratorError1 = !0, _iteratorError1 = err;
+              } finally {
+                try {
+                  !_iteratorNormalCompletion1 && _iterator1.return != null && _iterator1.return();
+                } finally {
+                  if (_didIteratorError1) throw _iteratorError1;
+                }
+              }
+            } else value && (typeof value > "u" ? "undefined" : _type_of(value)) === "object" && walk(value);
+          }
+        }
+      } catch (err) {
+        _didIteratorError = !0, _iteratorError = err;
+      } finally {
+        try {
+          !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+        } finally {
+          if (_didIteratorError) throw _iteratorError;
+        }
+      }
+    }
+  }
+  return walk(result.program), locations.sort(function (a, b) {
+    return b.insertOffset - a.insertOffset;
+  });
+}
+function injectSourceToJsx(code, id) {
+  var [filePath] = id.split("?");
+  if (filePath) {
+    var location = filePath.replace(normalizePath(process.cwd()), "");
+    if (!(!code.includes("<") || !code.includes(">"))) {
+      var jsxLocations = findJsxElements(code, filePath);
+      if (jsxLocations.length !== 0) {
+        var sourceInfoEntries = [...jsxLocations].sort(function (a, b) {
+            return a.index - b.index;
+          }).map(function (jsx2) {
+            return `${jsx2.index}:[${jsx2.line},${jsx2.column}]`;
+          }).join(","),
+          sourceInfoScript = `globalThis.__oneSourceInfo=globalThis.__oneSourceInfo||{};globalThis.__oneSourceInfo["${location}"]={${sourceInfoEntries}};`,
+          result = code,
+          _iteratorNormalCompletion = !0,
+          _didIteratorError = !1,
+          _iteratorError = void 0;
+        try {
+          for (var _iterator = jsxLocations[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+            var jsx = _step.value,
+              sourceAttr = ` data-one-source="${location}:${jsx.index}"`;
+            result = result.slice(0, jsx.insertOffset) + sourceAttr + result.slice(jsx.insertOffset);
+          }
+        } catch (err) {
+          _didIteratorError = !0, _iteratorError = err;
+        } finally {
+          try {
+            !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+          } finally {
+            if (_didIteratorError) throw _iteratorError;
+          }
+        }
+        return result = sourceInfoScript + result, {
+          code: result,
+          map: null
+        };
+      }
+    }
+  }
+}
+async function openInEditor(filePath, line, column) {
+  try {
+    var launch = (await import("launch-editor")).default,
+      fullPath = path.join(process.cwd(), filePath),
+      location = `${fullPath}${line ? `:${line}` : ""}${column ? `:${column}` : ""}`;
+    launch(location, void 0, function (filename, errorMessage) {
+      errorMessage && console.warn(`[one:source-inspector] Failed to open ${filename} in editor:`, errorMessage);
+    });
+  } catch (err) {
+    console.warn("[one:source-inspector] Failed to launch editor:", err);
+  }
+}
+function sourceInspectorPlugin() {
+  return [
+  // Transform plugin - injects data-one-source attributes
+  {
+    name: "one:source-inspector-transform",
+    enforce: "pre",
+    apply: "serve",
+    transform(code, id) {
+      var _this_environment,
+        envName = (_this_environment = this.environment) === null || _this_environment === void 0 ? void 0 : _this_environment.name;
+      if (!(envName === "ios" || envName === "android") && !(id.includes("node_modules") || id.includes("?raw") || id.includes("dist") || id.includes("build")) && !(!id.endsWith(".jsx") && !id.endsWith(".tsx"))) return injectSourceToJsx(code, id);
+    }
+  },
+  // Note: Inspector UI script is now injected via DevHead.tsx for SSR compatibility
+  // Server plugin - handles open-source requests
+  {
+    name: "one:source-inspector-server",
+    apply: "serve",
+    configureServer(server) {
+      server.middlewares.use(async function (req, res, next) {
+        var _req_url;
+        if (!(!((_req_url = req.url) === null || _req_url === void 0) && _req_url.startsWith("/__one/open-source"))) return next();
+        try {
+          var url = new URL(req.url, "http://localhost"),
+            source = url.searchParams.get("source");
+          if (!source) {
+            res.statusCode = 400, res.end("Missing source parameter");
+            return;
+          }
+          var lastColon = source.lastIndexOf(":"),
+            filePath = source.slice(0, lastColon),
+            index = source.slice(lastColon + 1),
+            line = url.searchParams.get("line"),
+            column = url.searchParams.get("column");
+          await openInEditor(filePath, line || void 0, column || void 0), res.statusCode = 200, res.end("OK");
+        } catch (err) {
+          console.error("[one:source-inspector] Error:", err), res.statusCode = 500, res.end("Internal server error");
+        }
+      });
+    }
+  }];
+}
+export { sourceInspectorPlugin };
+//# sourceMappingURL=sourceInspectorPlugin.native.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["path","parseSync","normalizePath","_type_of","obj","Symbol","constructor","findJsxElements","code","filename","result","errors","length","locations","traversalIndex","getJsxName","node","type","name","_node_property","object","property","getLocation","offset","before","slice","lines","split","line","column","walk","tagName","_node_attributes","hasSourceAttr","attributes","some","attr","_attr_name","nameEnd","end","loc","start","push","insertOffset","index","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","keys","iterator","_step","next","done","key","value","Array","isArray","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","child","err","return","program","sort","a","b","injectSourceToJsx","id","filePath","location","replace","process","cwd","includes","jsxLocations","sourceInfoEntries","map","jsx2","join","sourceInfoScript","jsx","sourceAttr"],"sources":["../../../../src/vite/plugins/sourceInspectorPlugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/vite/plugins/virtualEntryPlugin.js

@@ -43,9 +43,17 @@ function getSetupFileImport(environmentName, setupFiles, useStaticImport) {
     ios: "ios",
     android: "android"
   }[environmentName];
-  if (!key) return "";
+  if (!key) return { importStatement: "", promiseDeclaration: "", promiseVarName: "" };
   const setupFile = setupFiles[key];
-  return setupFile ? useStaticImport ? `import ${JSON.stringify(setupFile)}` : `await import(/* @vite-ignore */ ${JSON.stringify(setupFile)})` : "";
+  return setupFile ? useStaticImport ? {
+    importStatement: `import ${JSON.stringify(setupFile)}`,
+    promiseDeclaration: "",
+    promiseVarName: ""
+  } : {
+    importStatement: "",
+    promiseDeclaration: `const __oneSetupPromise = import(/* @vite-ignore */ ${JSON.stringify(setupFile)})`,
+    promiseVarName: "__oneSetupPromise"
+  } : { importStatement: "", promiseDeclaration: "", promiseVarName: "" };
 }
 function createVirtualEntry(options) {
   const routeGlobs = [
@@ -65,13 +73,14 @@ function createVirtualEntry(options) {
     },
     load(id) {
       if (id === resolvedVirtualEntryId) {
-        const isNative = isNativeEnvironment(this.environment), prependCode = getSetupFileImport(
+        const isNative = isNativeEnvironment(this.environment), setupResult = getSetupFileImport(
           this.environment.name,
           setupFiles,
           isNative
-        ), nativewindImport = configuration.enableNativewind ? "import 'react-native-css-interop/dist/runtime/components'" : "";
+        ), nativewindImport = configuration.enableNativewind ? "import 'react-native-css-interop/dist/runtime/components'" : "", setupPromiseArg = setupResult.promiseVarName ? `setupPromise: ${setupResult.promiseVarName},` : "";
         return `
-${prependCode}
+${setupResult.importStatement}
+${setupResult.promiseDeclaration}
 ${nativewindImport}
 
 import { createApp, registerPreloadedRoute as _registerPreloadedRoute } from 'one'
@@ -89,6 +98,7 @@ if (typeof window !== 'undefined') {
 
 // globbing ${JSON.stringify(routeGlobs)}
 export default createApp({
+  ${setupPromiseArg}
   routes: import.meta.glob(${JSON.stringify([...routeGlobs, ...ROUTE_WEB_EXCLUSION_GLOB_PATTERNS.map((p) => `!${p}`)])}, { exhaustive: true }),
   routerRoot: ${JSON.stringify(options.root)},
   flags: ${JSON.stringify(options.flags)},
@@ -102,7 +112,7 @@ ${getSetupFileImport(
           this.environment.name,
           setupFiles,
           isNative
-        )}
+        ).importStatement}
 
 import { createApp } from 'one'
 

package/dist/esm/vite/plugins/virtualEntryPlugin.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/vite/plugins/virtualEntryPlugin.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

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

@@ -31,9 +31,25 @@ function getSetupFileImport(environmentName, setupFiles, useStaticImport) {
     ios: "ios",
     android: "android"
   }[environmentName];
-  if (!key) return "";
+  if (!key) return {
+    importStatement: "",
+    promiseDeclaration: "",
+    promiseVarName: ""
+  };
   const setupFile = setupFiles[key];
-  return setupFile ? useStaticImport ? `import ${JSON.stringify(setupFile)}` : `await import(/* @vite-ignore */ ${JSON.stringify(setupFile)})` : "";
+  return setupFile ? useStaticImport ? {
+    importStatement: `import ${JSON.stringify(setupFile)}`,
+    promiseDeclaration: "",
+    promiseVarName: ""
+  } : {
+    importStatement: "",
+    promiseDeclaration: `const __oneSetupPromise = import(/* @vite-ignore */ ${JSON.stringify(setupFile)})`,
+    promiseVarName: "__oneSetupPromise"
+  } : {
+    importStatement: "",
+    promiseDeclaration: "",
+    promiseVarName: ""
+  };
 }
 function createVirtualEntry(options) {
   const routeGlobs = [`/${options.root}/${ROUTE_GLOB_PATTERN}`, ...(options.router?.ignoredRouteFiles?.map(pattern => `!/${options.root}/${pattern}`) || [])],
@@ -49,10 +65,12 @@ function createVirtualEntry(options) {
     load(id) {
       if (id === resolvedVirtualEntryId) {
         const isNative = isNativeEnvironment(this.environment),
-          prependCode = getSetupFileImport(this.environment.name, setupFiles, isNative),
-          nativewindImport = configuration.enableNativewind ? "import 'react-native-css-interop/dist/runtime/components'" : "";
+          setupResult = getSetupFileImport(this.environment.name, setupFiles, isNative),
+          nativewindImport = configuration.enableNativewind ? "import 'react-native-css-interop/dist/runtime/components'" : "",
+          setupPromiseArg = setupResult.promiseVarName ? `setupPromise: ${setupResult.promiseVarName},` : "";
         return `
-${prependCode}
+${setupResult.importStatement}
+${setupResult.promiseDeclaration}
 ${nativewindImport}
 
 import { createApp, registerPreloadedRoute as _registerPreloadedRoute } from 'one'
@@ -70,6 +88,7 @@ if (typeof window !== 'undefined') {
 
 // globbing ${JSON.stringify(routeGlobs)}
 export default createApp({
+  ${setupPromiseArg}
   routes: import.meta.glob(${JSON.stringify([...routeGlobs, ...ROUTE_WEB_EXCLUSION_GLOB_PATTERNS.map(p => `!${p}`)])}, { exhaustive: true }),
   routerRoot: ${JSON.stringify(options.root)},
   flags: ${JSON.stringify(options.flags)},
@@ -79,7 +98,7 @@ export default createApp({
       if (id === resolvedVirtualEntryIdNative) {
         const isNative = isNativeEnvironment(this.environment);
         return `
-${getSetupFileImport(this.environment.name, setupFiles, isNative)}
+${getSetupFileImport(this.environment.name, setupFiles, isNative).importStatement}
 
 import { createApp } from 'one'
 

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

@@ -1 +1 @@
-{"version":3,"names":["configuration","isNativeEnvironment","API_ROUTE_GLOB_PATTERN","ROUTE_GLOB_PATTERN","ROUTE_NATIVE_EXCLUSION_GLOB_PATTERNS","ROUTE_WEB_EXCLUSION_GLOB_PATTERNS","resolvedVirtualEntryId","resolvedVirtualEntryIdNative","virtualEntryId","virtualEntryIdNative","normalizeSetupFile","setupFile","client","server","ios","android","native","sf","getSetupFileImport","environmentName","setupFiles","useStaticImport","key","ssr","JSON","stringify","createVirtualEntry","options","routeGlobs","root","router","ignoredRouteFiles","map","pattern","apiRouteGlobs","name","enforce","resolveId","id","load","isNative","environment","prependCode","nativewindImport","enableNativewind","p","flags"],"sources":["../../../../src/vite/plugins/virtualEntryPlugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["configuration","isNativeEnvironment","API_ROUTE_GLOB_PATTERN","ROUTE_GLOB_PATTERN","ROUTE_NATIVE_EXCLUSION_GLOB_PATTERNS","ROUTE_WEB_EXCLUSION_GLOB_PATTERNS","resolvedVirtualEntryId","resolvedVirtualEntryIdNative","virtualEntryId","virtualEntryIdNative","normalizeSetupFile","setupFile","client","server","ios","android","native","sf","getSetupFileImport","environmentName","setupFiles","useStaticImport","key","ssr","importStatement","promiseDeclaration","promiseVarName","JSON","stringify","createVirtualEntry","options","routeGlobs","root","router","ignoredRouteFiles","map","pattern","apiRouteGlobs","name","enforce","resolveId","id","load","isNative","environment","setupResult","nativewindImport","enableNativewind","setupPromiseArg","p","flags"],"sources":["../../../../src/vite/plugins/virtualEntryPlugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

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

@@ -32,9 +32,25 @@ function getSetupFileImport(environmentName, setupFiles, useStaticImport) {
       android: "android"
     },
     key = envMap[environmentName];
-  if (!key) return "";
+  if (!key) return {
+    importStatement: "",
+    promiseDeclaration: "",
+    promiseVarName: ""
+  };
   var setupFile = setupFiles[key];
-  return setupFile ? useStaticImport ? `import ${JSON.stringify(setupFile)}` : `await import(/* @vite-ignore */ ${JSON.stringify(setupFile)})` : "";
+  return setupFile ? useStaticImport ? {
+    importStatement: `import ${JSON.stringify(setupFile)}`,
+    promiseDeclaration: "",
+    promiseVarName: ""
+  } : {
+    importStatement: "",
+    promiseDeclaration: `const __oneSetupPromise = import(/* @vite-ignore */ ${JSON.stringify(setupFile)})`,
+    promiseVarName: "__oneSetupPromise"
+  } : {
+    importStatement: "",
+    promiseDeclaration: "",
+    promiseVarName: ""
+  };
 }
 function createVirtualEntry(options) {
   var _options_router_ignoredRouteFiles,
@@ -54,10 +70,12 @@ function createVirtualEntry(options) {
     load(id) {
       if (id === resolvedVirtualEntryId) {
         var isNative = isNativeEnvironment(this.environment),
-          prependCode = getSetupFileImport(this.environment.name, setupFiles, isNative),
-          nativewindImport = configuration.enableNativewind ? "import 'react-native-css-interop/dist/runtime/components'" : "";
+          setupResult = getSetupFileImport(this.environment.name, setupFiles, isNative),
+          nativewindImport = configuration.enableNativewind ? "import 'react-native-css-interop/dist/runtime/components'" : "",
+          setupPromiseArg = setupResult.promiseVarName ? `setupPromise: ${setupResult.promiseVarName},` : "";
         return `
-${prependCode}
+${setupResult.importStatement}
+${setupResult.promiseDeclaration}
 ${nativewindImport}
 
 import { createApp, registerPreloadedRoute as _registerPreloadedRoute } from 'one'
@@ -75,6 +93,7 @@ if (typeof window !== 'undefined') {
 
 // globbing ${JSON.stringify(routeGlobs)}
 export default createApp({
+  ${setupPromiseArg}
   routes: import.meta.glob(${JSON.stringify([...routeGlobs, ...ROUTE_WEB_EXCLUSION_GLOB_PATTERNS.map(function (p) {
           return `!${p}`;
         })])}, { exhaustive: true }),
@@ -85,9 +104,9 @@ export default createApp({
       }
       if (id === resolvedVirtualEntryIdNative) {
         var isNative1 = isNativeEnvironment(this.environment),
-          prependCode1 = getSetupFileImport(this.environment.name, setupFiles, isNative1);
+          setupResult1 = getSetupFileImport(this.environment.name, setupFiles, isNative1);
         return `
-${prependCode1}
+${setupResult1.importStatement}
 
 import { createApp } from 'one'
 

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

@@ -1 +1 @@
-{"version":3,"names":["configuration","isNativeEnvironment","API_ROUTE_GLOB_PATTERN","ROUTE_GLOB_PATTERN","ROUTE_NATIVE_EXCLUSION_GLOB_PATTERNS","ROUTE_WEB_EXCLUSION_GLOB_PATTERNS","resolvedVirtualEntryId","resolvedVirtualEntryIdNative","virtualEntryId","virtualEntryIdNative","normalizeSetupFile","setupFile","client","server","ios","android","native","sf","getSetupFileImport","environmentName","setupFiles","useStaticImport","envMap","ssr","key","JSON","stringify","createVirtualEntry","options","_options_router_ignoredRouteFiles","_options_router","routeGlobs","root","router","ignoredRouteFiles","map","pattern","apiRouteGlobs","name","enforce","resolveId","id","load","isNative","environment","prependCode","nativewindImport","enableNativewind","p","flags","isNative1","prependCode1"],"sources":["../../../../src/vite/plugins/virtualEntryPlugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["configuration","isNativeEnvironment","API_ROUTE_GLOB_PATTERN","ROUTE_GLOB_PATTERN","ROUTE_NATIVE_EXCLUSION_GLOB_PATTERNS","ROUTE_WEB_EXCLUSION_GLOB_PATTERNS","resolvedVirtualEntryId","resolvedVirtualEntryIdNative","virtualEntryId","virtualEntryIdNative","normalizeSetupFile","setupFile","client","server","ios","android","native","sf","getSetupFileImport","environmentName","setupFiles","useStaticImport","envMap","ssr","key","importStatement","promiseDeclaration","promiseVarName","JSON","stringify","createVirtualEntry","options","_options_router_ignoredRouteFiles","_options_router","routeGlobs","root","router","ignoredRouteFiles","map","pattern","apiRouteGlobs","name","enforce","resolveId","id","load","isNative","environment","setupResult","nativewindImport","enableNativewind","setupPromiseArg","p","flags","isNative1","setupResult1"],"sources":["../../../../src/vite/plugins/virtualEntryPlugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.2.57",
+  "version": "1.2.58",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -135,17 +135,17 @@
     "@react-navigation/routers": "~7.5.1",
     "@swc/core": "^1.14.0",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/color-scheme": "1.2.57",
-    "@vxrn/compiler": "1.2.57",
-    "@vxrn/resolve": "1.2.57",
-    "@vxrn/tslib-lite": "1.2.57",
-    "@vxrn/use-isomorphic-layout-effect": "1.2.57",
-    "@vxrn/vite-plugin-metro": "1.2.57",
+    "@vxrn/color-scheme": "1.2.58",
+    "@vxrn/compiler": "1.2.58",
+    "@vxrn/resolve": "1.2.58",
+    "@vxrn/tslib-lite": "1.2.58",
+    "@vxrn/use-isomorphic-layout-effect": "1.2.58",
+    "@vxrn/vite-plugin-metro": "1.2.58",
     "babel-dead-code-elimination": "^1.0.10",
     "babel-plugin-module-resolver": "^5.0.2",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.2.57",
+    "create-vxrn": "1.2.58",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~8.0.8",
     "expo-modules-core": "~3.0.24",
@@ -153,9 +153,11 @@
     "fast-glob": "^3.3.3",
     "fs-extra": "^11.2.0",
     "hono": "^4.10.7",
+    "launch-editor": "^2.10.0",
     "lightningcss": "^1.30.1",
     "micromatch": "^4.0.7",
     "nanoid": "^3.3.7",
+    "oxc-parser": "^0.107.0",
     "perfect-debounce": "^1.0.0",
     "picocolors": "^1.0.0",
     "react": "19.1.0",
@@ -171,7 +173,7 @@
     "vite": "^7.1.12",
     "vite-plugin-barrel": "^0.4.1",
     "vite-tsconfig-paths": "^5.1.4",
-    "vxrn": "1.2.57",
+    "vxrn": "1.2.58",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },

package/src/cli/buildPage.ts

@@ -233,7 +233,7 @@ if (typeof document === 'undefined') globalThis.document = {}
           ${criticalScripts}
           ${deferredLinks}
           ${cssOutput}
-        </head></html>`
+        </head><body></body></html>`
         )
       }
     }

package/src/cli/dev.ts

@@ -39,17 +39,17 @@ export async function dev(args: {
     stop()
   })
 
-  process.on('SIGINT', () => {
+  process.on('SIGINT', async () => {
     try {
-      stop()
+      await stop()
     } finally {
       process.exit(2)
     }
   })
 
-  process.on('SIGTERM', () => {
+  process.on('SIGTERM', async () => {
     try {
-      stop()
+      await stop()
     } finally {
       process.exit(0)
     }

package/src/createApp.tsx

@@ -18,6 +18,11 @@ export type CreateAppProps = {
   routes: Record<string, () => Promise<unknown>>
   routerRoot: string
   flags?: One.Flags
+  /**
+   * Promise that resolves when the setup file has finished loading.
+   * The app will wait for this before rendering to ensure setup code runs first.
+   */
+  setupPromise?: Promise<unknown>
 }
 
 export function createApp(options: CreateAppProps) {
@@ -143,6 +148,10 @@ export function createApp(options: CreateAppProps) {
   const serverContext = getServerContext() || {}
   const routePreloads = serverContext.routePreloads
 
+  // Wait for setup file to complete first (if provided)
+  // This ensures setup code (error handlers, analytics, etc.) runs before the app
+  const setupComplete = options.setupPromise || Promise.resolve()
+
   // preload routes using build-time mapping (production SSG)
   // for SPA/dev mode, fall back to importing root layout directly
   const preloadPromises = routePreloads
@@ -153,7 +162,8 @@ export function createApp(options: CreateAppProps) {
       })
     : [options.routes[`/${options.routerRoot}/_layout.tsx`]?.()]
 
-  return Promise.all(preloadPromises)
+  return setupComplete
+    .then(() => Promise.all(preloadPromises))
     .then(() => {
       return resolveClientLoader(serverContext)
     })

package/src/createHandleRequest.test.ts

@@ -103,7 +103,9 @@ describe('createHandleRequest', () => {
         handlePage: vi.fn().mockResolvedValue('<html></html>'),
         handleLoader: vi.fn().mockResolvedValue('loader data'),
       }
-      const { handler } = createHandleRequest(mockHandlersWithLoader, { routerRoot: '/app' })
+      const { handler } = createHandleRequest(mockHandlersWithLoader, {
+        routerRoot: '/app',
+      })
       // Loader paths are /assets/<path>_<nonce>_vxrn_loader.js - they should reach handleLoader
       // for a matching route (the path /my-page matches the [slug] route)
       await handler(createRequest('/assets/my-page_123_vxrn_loader.js'))

package/src/devtools/registry.ts

@@ -0,0 +1,21 @@
+/**
+ * Simple registry for devtools functions.
+ * This avoids circular dependencies by letting modules register their
+ * devtools functions instead of router.ts importing them.
+ */
+
+type DevtoolsRegistry = {
+  getLoaderTimingHistory?: () => any[]
+}
+
+export const devtoolsRegistry: DevtoolsRegistry = {}
+
+/**
+ * Register a devtools function. Called by modules like useLoader.ts
+ */
+export function registerDevtoolsFunction<K extends keyof DevtoolsRegistry>(
+  key: K,
+  fn: DevtoolsRegistry[K]
+) {
+  devtoolsRegistry[key] = fn
+}