one 1.10.1 → 1.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -154,17 +154,17 @@
     "@react-navigation/routers": "~7.5.1",
     "@swc/core": "^1.14.0",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/color-scheme": "1.10.1",
-    "@vxrn/compiler": "1.10.1",
-    "@vxrn/resolve": "1.10.1",
-    "@vxrn/tslib-lite": "1.10.1",
-    "@vxrn/use-isomorphic-layout-effect": "1.10.1",
-    "@vxrn/vite-plugin-metro": "1.10.1",
+    "@vxrn/color-scheme": "1.10.2",
+    "@vxrn/compiler": "1.10.2",
+    "@vxrn/resolve": "1.10.2",
+    "@vxrn/tslib-lite": "1.10.2",
+    "@vxrn/use-isomorphic-layout-effect": "1.10.2",
+    "@vxrn/vite-plugin-metro": "1.10.2",
     "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.10.1",
+    "create-vxrn": "1.10.2",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~8.0.8",
     "expo-modules-core": "~3.0.24",
@@ -189,7 +189,7 @@
     "use-latest-callback": "^0.2.3",
     "vite": "^7.1.12",
     "vite-tsconfig-paths": "^6.0.5",
-    "vxrn": "1.10.1",
+    "vxrn": "1.10.2",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },

package/src/cli/build.ts

@@ -9,7 +9,6 @@ import {
   type ClientManifestEntry,
   fillOptions,
   getOptimizeDeps,
-  loadEnv,
   rollupRemoveUnusedImportsPlugin,
   build as vxrnBuild,
 } from 'vxrn'
@@ -150,9 +149,7 @@ export async function build(args: {
       //   }) as any,
       // ],
 
-      define: {
-        ...vxrnOutput!.processEnvDefines,
-      },
+      define: vxrnOutput!.processEnvDefines,
 
       ssr: {
         noExternal: true,
@@ -183,7 +180,7 @@ export async function build(args: {
           // prevents it from shaking out the exports
           preserveEntrySignatures: 'strict',
           input: input,
-          external: (id) => false,
+          external: () => false,
           output: {
             entryFileNames: '[name]',
             exports: 'auto',
@@ -960,7 +957,7 @@ export async function build(args: {
 
       // Generate lazy imports for middlewares
       // The key must match the contextKey used to look up the middleware (e.g., "dist/middlewares/_middleware.js")
-      for (const [middlewareFile, builtPath] of Object.entries(builtMiddlewares)) {
+      for (const [, builtPath] of Object.entries(builtMiddlewares)) {
         const importPath = './' + builtPath.replace(/^dist\//, '')
         middlewareRouteMap.push(`  '${builtPath}': () => import('${importPath}')`)
       }
@@ -1160,17 +1157,3 @@ async function moveAllFiles(src: string, dest: string) {
     console.error('Error moving files:', err)
   }
 }
-
-function escapeRegex(string: string) {
-  return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // $& means the whole matched string
-}
-
-function buildRegexExcludingDeps(deps: string[]) {
-  // Sanitize each dependency
-  const sanitizedDeps = deps.map((dep) => escapeRegex(dep))
-  // Join them with the OR operator |
-  const exclusionPattern = sanitizedDeps.join('|')
-  // Build the final regex pattern
-  const regexPattern = `node_modules/(?!(${exclusionPattern})).*`
-  return new RegExp(regexPattern)
-}

package/src/cli/buildPage.ts

@@ -1,7 +1,7 @@
 import { join } from 'node:path'
 import FSExtra from 'fs-extra'
 import * as constants from '../constants'
-import type { LoaderProps, RenderApp } from '../types'
+import type { LoaderProps } from '../types'
 import { getLoaderPath, getPreloadCSSPath, getPreloadPath } from '../utils/cleanUrl'
 import { isResponse } from '../utils/isResponse'
 import { toAbsolute } from '../utils/toAbsolute'
@@ -28,8 +28,8 @@ export function printBuildTimings() {
   if (!buildTiming) return
   console.info('\n📊 Build timing breakdown:')
   for (const [label, times] of Object.entries(timings)) {
-    const avg = times.reduce((a, b) => a + b, 0) / times.length
     const total = times.reduce((a, b) => a + b, 0)
+    const avg = total / times.length
     console.info(
       `  ${label}: ${avg.toFixed(1)}ms avg, ${total.toFixed(0)}ms total (${times.length} calls)`
     )
@@ -451,12 +451,10 @@ params:\n\n${JSON.stringify(params || null, null, 2)}`
 }
 
 async function getRender(serverEntry: string) {
-  let render: RenderApp | null = null
-
   try {
     const serverImport = await import(serverEntry)
 
-    render =
+    const render =
       serverImport.default.render ||
       // for an unknown reason this is necessary
       serverImport.default.default?.render
@@ -464,6 +462,8 @@ async function getRender(serverEntry: string) {
     if (typeof render !== 'function') {
       throw new Error(`didn't find render function in entry: ${serverEntry}`)
     }
+
+    return render
   } catch (err) {
     console.error(`❌ Error importing the root entry:`)
     console.error(`  This error happened in the built file: ${serverEntry}`)
@@ -471,8 +471,6 @@ async function getRender(serverEntry: string) {
     console.error(err['stack'])
     throw err
   }
-
-  return render
 }
 
 function removeTrailingSlash(path: string) {

package/src/cli/daemon.ts

@@ -67,7 +67,7 @@ async function daemonStart(args: { port?: string; host?: string; tui?: boolean }
 }
 
 async function daemonStop() {
-  const { isDaemonRunning, getSocketPath, cleanupSocket } = await import('../daemon/ipc')
+  const { isDaemonRunning, getSocketPath } = await import('../daemon/ipc')
 
   if (!(await isDaemonRunning())) {
     console.log(colors.yellow('Daemon is not running'))
@@ -182,7 +182,7 @@ export async function openPlatform(platform: 'ios' | 'android') {
 }
 
 async function daemonRoute(args: { app?: string; slot?: string; project?: string }) {
-  const { isDaemonRunning, getDaemonStatus, setDaemonRoute, clearDaemonRoute } =
+  const { isDaemonRunning, getDaemonStatus, setDaemonRoute } =
     await import('../daemon/ipc')
 
   if (!(await isDaemonRunning())) {

package/src/createHandleRequest.ts

@@ -305,6 +305,7 @@ export function createHandleRequest(
         pathname.startsWith('/@vite/') ||
         pathname.startsWith('/@fs/') ||
         pathname.startsWith('/@id/') ||
+        pathname.startsWith('/node_modules/') ||
         pathname.startsWith('/debugger-frontend') ||
         pathname.startsWith('/inspector')
       ) {
@@ -403,7 +404,7 @@ function getLoaderParams(
   config: { compiledRegex: RegExp; routeKeys: Record<string, string> }
 ) {
   const params: Record<string, string> = {}
-  const match = new RegExp(config.compiledRegex).exec(url.pathname)
+  const match = config.compiledRegex.exec(url.pathname)
   if (match?.groups) {
     for (const [key, value] of Object.entries(match.groups)) {
       const namedKey = config.routeKeys[key]

package/src/daemon/server.ts

@@ -31,29 +31,17 @@ async function getAppNameForServer(root: string): Promise<string | null> {
       }
     }
 
-    // try app.config.ts - execute it to get the config
-    const appConfigTsPath = path.join(root, 'app.config.ts')
-    if (fs.existsSync(appConfigTsPath)) {
-      // read the file and look for name pattern
-      const content = fs.readFileSync(appConfigTsPath, 'utf-8')
-      // simple regex to find name: "..." or name: '...'
-      const nameMatch = content.match(/name:\s*['"]([^'"]+)['"]/)
-      if (nameMatch) {
-        const name = nameMatch[1]
-        serverAppNames.set(root, name)
-        return name
-      }
-    }
-
-    // try app.config.js
-    const appConfigJsPath = path.join(root, 'app.config.js')
-    if (fs.existsSync(appConfigJsPath)) {
-      const content = fs.readFileSync(appConfigJsPath, 'utf-8')
-      const nameMatch = content.match(/name:\s*['"]([^'"]+)['"]/)
-      if (nameMatch) {
-        const name = nameMatch[1]
-        serverAppNames.set(root, name)
-        return name
+    // try app.config.ts / app.config.js - read and regex for name pattern
+    for (const ext of ['ts', 'js']) {
+      const configPath = path.join(root, `app.config.${ext}`)
+      if (fs.existsSync(configPath)) {
+        const content = fs.readFileSync(configPath, 'utf-8')
+        const nameMatch = content.match(/name:\s*['"]([^'"]+)['"]/)
+        if (nameMatch) {
+          const name = nameMatch[1]
+          serverAppNames.set(root, name)
+          return name
+        }
       }
     }
 

package/src/daemon/tui.ts

@@ -52,6 +52,14 @@ interface TUIState {
   popup: { message: string; timeout: NodeJS.Timeout } | null
 }
 
+const CABLE_COLORS = [
+  colors.green,
+  colors.cyan,
+  colors.magenta,
+  colors.blue,
+  colors.yellow,
+]
+
 const ESC = '\x1b'
 const CSI = `${ESC}[`
 
@@ -447,8 +455,6 @@ async function refreshData(): Promise<void> {
   tuiState.simulators = newSims
   tuiState.servers = newServers
 
-  const isDragging = tuiState.draggingSimIndex !== null
-
   // get actual simulator -> server mappings from routing state
   const simMappings = getSimulatorMappings()
 
@@ -558,15 +564,7 @@ function render(): void {
       const isSelected = tuiState.selectedCol === 0 && tuiState.selectedRow === row
       const cable = tuiState.cables.get(row)
       const hasConnection = cable?.serverIndex !== null
-      // unique color per cable
-      const cableColors = [
-        colors.green,
-        colors.cyan,
-        colors.magenta,
-        colors.blue,
-        colors.yellow,
-      ]
-      const cableColor = cableColors[row % cableColors.length]
+      const cableColor = CABLE_COLORS[row % CABLE_COLORS.length]
       const plug = hasConnection ? cableColor('●') : colors.dim('○')
       const name = truncate(sim.name, simEndX - 5)
       simText = `${name} ${plug}`
@@ -591,18 +589,10 @@ function render(): void {
     let srvRight = ''
     if (server) {
       const isSelected = tuiState.selectedCol === 1 && tuiState.selectedRow === row
-      // check which cables are connected to this server and get their colors
-      const cableColors = [
-        colors.green,
-        colors.cyan,
-        colors.magenta,
-        colors.blue,
-        colors.yellow,
-      ]
       let connectedColor: ((s: string) => string) | null = null
       for (const [simIndex, cable] of tuiState.cables) {
         if (cable.serverIndex === row) {
-          connectedColor = cableColors[simIndex % cableColors.length]
+          connectedColor = CABLE_COLORS[simIndex % CABLE_COLORS.length]
           break
         }
       }
@@ -695,15 +685,7 @@ function getCableCharAt(x: number, y: number): string | null {
 
       if (px === x && py === y) {
         const connected = cable.serverIndex !== null
-        // unique color per cable based on sim index
-        const cableColors = [
-          colors.green,
-          colors.cyan,
-          colors.magenta,
-          colors.blue,
-          colors.yellow,
-        ]
-        const baseColor = cableColors[simIndex % cableColors.length]
+        const baseColor = CABLE_COLORS[simIndex % CABLE_COLORS.length]
         const color = connected ? baseColor : colors.dim
 
         // determine character based on curve direction

package/src/router/getRoutes.ts

@@ -536,7 +536,7 @@ function getFileMeta(
   const isLayout = filenameWithoutExtensions.startsWith('_layout')
   const isMiddleware = filenameWithoutExtensions.startsWith('_middleware')
 
-  const [_fullname, renderModeFound] =
+  const [, renderModeFound] =
     filename.match(/\+(api|ssg|ssr|spa)\.(\w+\.)?[jt]sx?$/) || []
   const fileRenderMode = renderModeFound as 'api' | One.RouteRenderMode | undefined
 
@@ -656,6 +656,7 @@ function getFileMeta(
 }
 
 function getMostSpecific(routes: RouteNode[]) {
+  // holey array: .length includes holes, so last element is most specific
   const route = routes[routes.length - 1]
 
   if (!routes[0]) {
@@ -664,9 +665,7 @@ function getMostSpecific(routes: RouteNode[]) {
     )
   }
 
-  // This works even tho routes is holey array (e.g it might have index 0 and 2 but not 1)
-  // `.length` includes the holes in its count
-  return routes[routes.length - 1]
+  return route
 }
 
 export function getIgnoreList(options?: Options) {

package/src/router/interceptRoutes.ts

@@ -27,10 +27,6 @@ export function isHardNavigation(): boolean {
   return navigationMode === 'hard'
 }
 
-export function isSoftNavigation(): boolean {
-  return navigationMode === 'soft'
-}
-
 // ============================================
 // Intercept Route Matching
 // ============================================
@@ -241,8 +237,7 @@ function findMatchingInterceptInSlot(
     const resolvedTargetPath = resolveInterceptTargetPath(
       interceptTargetPath,
       levels,
-      layoutNode,
-      currentPath
+      layoutNode
     )
 
     // Try to match the target path against the resolved intercept path
@@ -273,24 +268,11 @@ function findMatchingInterceptInSlot(
 function resolveInterceptTargetPath(
   interceptTargetPath: string,
   levels: number,
-  layoutNode: RouteNode,
-  currentPath: string
+  layoutNode: RouteNode
 ): string {
-  // Get the base path for resolution
-  // contextKey is like './app/_layout.tsx' or './_layout.tsx'
-  // We need to extract just the route path portion
-  let layoutPath = layoutNode.contextKey
-    .replace(/^\.\//, '') // Remove leading ./
-    .replace(/\/?_layout.*$/, '') // Remove _layout and extension (with optional leading /)
-    .replace(/^app\/?/, '') // Remove 'app/' prefix since routes are relative to app dir
-
-  // Strip route groups like (app), (tabs) since they don't appear in URLs
-  layoutPath = stripGroupSegmentsFromPath(layoutPath)
-
-  // Normalize: empty string or '/' means root
-  if (!layoutPath || layoutPath === '/') {
-    layoutPath = ''
-  }
+  // reuse getLayoutPath and strip leading slash for internal resolution
+  const fullLayoutPath = getLayoutPath(layoutNode)
+  let layoutPath = fullLayoutPath === '/' ? '' : fullLayoutPath.slice(1)
 
   if (levels === Infinity) {
     // (...) matches from root - target path is absolute
@@ -468,13 +450,6 @@ export function isReturningFromIntercept(): boolean {
   return returningFromIntercept
 }
 
-// Store intercept state info for forward navigation restoration
-interface StoredInterceptState {
-  slotName: string
-  routeContextKey: string
-  params: Record<string, string>
-}
-
 // Callback to set slot state - set from Navigator.tsx to avoid circular deps
 let setSlotStateCallback:
   | ((

package/src/router/router.ts

@@ -475,7 +475,6 @@ export function subscribeToStore(subscriber: () => void) {
   }
 }
 
-// Subscription functions
 export function subscribeToLoadingState(subscriber: OneRouter.LoadingStateListener) {
   loadingStateSubscribers.add(subscriber)
   return () => {
@@ -1163,8 +1162,6 @@ export async function linkTo(
       }, 1000)
     }
   })
-
-  return
 }
 
 const hashes: Record<string, string> = {}

package/src/server/oneServe.ts

@@ -22,6 +22,19 @@ import { getFetchStaticHtml } from './staticHtmlFetcher'
 
 const debugRouter = process.env.ONE_DEBUG_ROUTER
 
+async function readStaticHtml(htmlPath: string): Promise<string | null> {
+  const fetchStaticHtml = getFetchStaticHtml()
+  if (fetchStaticHtml) {
+    const html = await fetchStaticHtml(htmlPath)
+    if (html) return html
+  }
+  try {
+    return await readFile(join('dist/client', htmlPath), 'utf-8')
+  } catch {
+    return null
+  }
+}
+
 /**
  * Lazy import functions for route modules.
  * Modules are loaded on-demand when a route is matched, not all upfront.
@@ -102,6 +115,43 @@ export async function oneServe(
 
   const apiCJS = oneOptions.build?.api?.outputFormat === 'cjs'
 
+  // shared helper to import a route module and run its loader
+  async function importAndRunLoader(
+    routeId: string,
+    serverPath: string | undefined,
+    lazyKey: string | undefined,
+    loaderProps: any
+  ): Promise<{ loaderData: unknown; routeId: string; isEnoent?: boolean }> {
+    if (!serverPath && !lazyKey) {
+      return { loaderData: undefined, routeId }
+    }
+
+    try {
+      const pathToResolve = serverPath || lazyKey || ''
+      const resolvedPath = pathToResolve.includes('dist/server')
+        ? pathToResolve
+        : join('./', 'dist/server', pathToResolve)
+
+      const routeExported = lazyKey
+        ? options?.lazyRoutes?.pages?.[lazyKey]
+          ? await options.lazyRoutes.pages[lazyKey]()
+          : await import(toAbsolute(resolvedPath))
+        : await import(toAbsolute(serverPath!))
+
+      const loaderData = await routeExported?.loader?.(loaderProps)
+      return { loaderData, routeId }
+    } catch (err) {
+      if (isResponse(err)) {
+        throw err
+      }
+      if ((err as any)?.code === 'ENOENT') {
+        return { loaderData: undefined, routeId, isEnoent: true }
+      }
+      console.error(`[one] Error running loader for ${routeId}:`, err)
+      return { loaderData: undefined, routeId }
+    }
+  }
+
   // Lazy load server entry only when needed for SSR
   let render: ((props: RenderAppProps) => any) | null = null
   async function getRender() {
@@ -211,57 +261,24 @@ export async function oneServe(
         }
 
         try {
-          // helper to import and run a single loader
-          async function runLoader(
-            routeId: string,
-            serverPath: string | undefined,
-            lazyKey?: string
-          ): Promise<{ loaderData: unknown; routeId: string; isEnoent?: boolean }> {
-            if (!serverPath && !lazyKey) {
-              return { loaderData: undefined, routeId }
-            }
-
-            try {
-              // serverPath may already include dist/server if it came from buildInfo.serverJsPath
-              const pathToResolve = serverPath || lazyKey || ''
-              const resolvedPath = pathToResolve.includes('dist/server')
-                ? pathToResolve
-                : join('./', 'dist/server', pathToResolve)
-
-              const routeExported = lazyKey
-                ? options?.lazyRoutes?.pages?.[lazyKey]
-                  ? await options.lazyRoutes.pages[lazyKey]()
-                  : await import(toAbsolute(resolvedPath))
-                : await import(toAbsolute(serverPath!))
-
-              const loaderData = await routeExported?.loader?.(loaderProps)
-              return { loaderData, routeId }
-            } catch (err) {
-              // if a loader throws a Response (redirect), re-throw it
-              if (isResponse(err)) {
-                throw err
-              }
-              if ((err as any)?.code === 'ENOENT') {
-                return { loaderData: undefined, routeId, isEnoent: true }
-              }
-              console.error(`[one] Error running loader for ${routeId}:`, err)
-              return { loaderData: undefined, routeId }
-            }
-          }
-
           // collect layout loaders to run in parallel
           const layoutRoutes = route.layouts || []
           const layoutLoaderPromises = layoutRoutes.map((layout: any) => {
-            // layouts may have loaderServerPath set from build, or we can try contextKey
             const serverPath = layout.loaderServerPath || layout.contextKey
-            return runLoader(layout.contextKey, serverPath, layout.contextKey)
+            return importAndRunLoader(
+              layout.contextKey,
+              serverPath,
+              layout.contextKey,
+              loaderProps
+            )
           })
 
           // run page loader
-          const pageLoaderPromise = runLoader(
+          const pageLoaderPromise = importAndRunLoader(
             route.file,
             buildInfo.serverJsPath,
-            route.file
+            route.file,
+            loaderProps
           )
 
           // wait for all loaders in parallel
@@ -375,43 +392,16 @@ url: ${url}`)
 
         if (needsSpaShell) {
           try {
-            // helper to import and run a single loader
-            async function runShellLoader(
-              routeId: string,
-              serverPath: string | undefined,
-              lazyKey?: string
-            ): Promise<{ loaderData: unknown; routeId: string }> {
-              if (!serverPath && !lazyKey) {
-                return { loaderData: undefined, routeId }
-              }
-              try {
-                const pathToResolve = serverPath || lazyKey || ''
-                const resolvedPath = pathToResolve.includes('dist/server')
-                  ? pathToResolve
-                  : join('./', 'dist/server', pathToResolve)
-
-                const routeExported = lazyKey
-                  ? options?.lazyRoutes?.pages?.[lazyKey]
-                    ? await options.lazyRoutes.pages[lazyKey]()
-                    : await import(toAbsolute(resolvedPath))
-                  : await import(toAbsolute(serverPath!))
-
-                const loaderData = await routeExported?.loader?.(loaderProps)
-                return { loaderData, routeId }
-              } catch (err) {
-                if (isResponse(err)) {
-                  throw err
-                }
-                console.error(`[one] Error running shell loader for ${routeId}:`, err)
-                return { loaderData: undefined, routeId }
-              }
-            }
-
             // run layout loaders only (page content is client-rendered)
             const layoutResults = await Promise.all(
               layoutRoutes.map((layout: any) => {
                 const serverPath = layout.loaderServerPath || layout.contextKey
-                return runShellLoader(layout.contextKey, serverPath, layout.contextKey)
+                return importAndRunLoader(
+                  layout.contextKey,
+                  serverPath,
+                  layout.contextKey,
+                  loaderProps
+                )
               })
             )
 
@@ -477,22 +467,7 @@ url: ${url}`)
             : routeMap[url.pathname] || routeMap[buildInfo?.cleanPath]
 
         if (htmlPath) {
-          // Try Worker ASSETS binding first (for Cloudflare Workers), fall back to filesystem
-          const fetchStaticHtml = getFetchStaticHtml()
-          let html: string | null = null
-
-          if (fetchStaticHtml) {
-            html = await fetchStaticHtml(htmlPath)
-          }
-
-          if (!html) {
-            // Fall back to filesystem (Node.js)
-            try {
-              html = await readFile(join('dist/client', htmlPath), 'utf-8')
-            } catch {
-              // File not found
-            }
-          }
+          const html = await readStaticHtml(htmlPath)
 
           if (html) {
             const headers = new Headers()
@@ -511,23 +486,7 @@ url: ${url}`)
           const notFoundHtmlPath = routeMap[notFoundRoute]
 
           if (notFoundHtmlPath) {
-            const fetchStaticHtml = getFetchStaticHtml()
-            let notFoundHtml: string | null = null
-
-            if (fetchStaticHtml) {
-              notFoundHtml = await fetchStaticHtml(notFoundHtmlPath)
-            }
-
-            if (!notFoundHtml) {
-              try {
-                notFoundHtml = await readFile(
-                  join('dist/client', notFoundHtmlPath),
-                  'utf-8'
-                )
-              } catch {
-                // File not found
-              }
-            }
+            const notFoundHtml = await readStaticHtml(notFoundHtmlPath)
 
             if (notFoundHtml) {
               // inject 404 marker so client knows this is a 404 response