one 1.1.345-1734464750388 → 1.1.346

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.1.345-1734464750388",
+  "version": "1.1.346",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "sideEffects": [
@@ -51,6 +51,11 @@
       "import": "./dist/esm/serve.mjs",
       "require": "./dist/cjs/serve.js"
     },
+    "./serve-worker": {
+      "types": "./types/serve-worker.d.ts",
+      "import": "./dist/esm/serve-worker.mjs",
+      "require": "./dist/cjs/serve-worker.js"
+    },
     "./setup": {
       "types": "./types/setup.d.ts",
       "import": "./dist/esm/setup.mjs",
@@ -107,15 +112,15 @@
     "@react-navigation/routers": "~6.1.9",
     "@swc/core": "^1.7.14",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/resolve": "1.1.345-1734464750388",
-    "@vxrn/tslib-lite": "1.1.345-1734464750388",
-    "@vxrn/universal-color-scheme": "1.1.345-1734464750388",
-    "@vxrn/use-isomorphic-layout-effect": "1.1.345-1734464750388",
+    "@vxrn/resolve": "1.1.346",
+    "@vxrn/tslib-lite": "1.1.346",
+    "@vxrn/universal-color-scheme": "1.1.346",
+    "@vxrn/use-isomorphic-layout-effect": "1.1.346",
     "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.345-1734464750388",
+    "create-vxrn": "1.1.346",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~6.3.1",
     "expo-modules-core": "^1.12.24",
@@ -138,7 +143,7 @@
     "url-parse": "^1.5.10",
     "vite": "^6.0.3",
     "vite-tsconfig-paths": "^5.0.1",
-    "vxrn": "1.1.345-1734464750388",
+    "vxrn": "1.1.346",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },
@@ -146,7 +151,7 @@
     "react-native": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.120.1",
+    "@tamagui/build": "^1.120.2",
     "@types/node": "^22.1.0",
     "@types/react-dom": "^18.2.25",
     "@types/url-parse": "^1.4.11",
@@ -155,7 +160,7 @@
     "get-port": "^7.1.0",
     "react-native": "0.74.5",
     "rollup": "^4.21.0",
-    "vitest": "^2.1.1"
+    "vitest": "^2.1.8"
   },
   "publishConfig": {
     "access": "public"

package/src/cli.ts

@@ -118,6 +118,9 @@ const serveCommand = defineCommand({
     cacheHeaders: {
       type: 'boolean',
     },
+    loadEnv: {
+      type: 'boolean',
+    },
   },
   async run({ args }) {
     const { serve } = await import('./serve')
@@ -127,6 +130,7 @@ const serveCommand = defineCommand({
       cacheHeaders: args.cacheHeaders === false ? 'off' : undefined,
       compress: args.compress,
       platform: args.platform === 'vercel' ? 'vercel' : 'node',
+      loadEnv: !!args.loadEnv,
     })
   },
 })

package/src/config.ts

@@ -1,13 +1,12 @@
 import { isWebServer } from './constants'
 import type { One } from './vite/types'
 
-const CLIENT_RENDER_MODE = process.env.ONE_DEFAULT_RENDER_MODE as One.RouteRenderMode | undefined
-
 // works client or server
 export const getDefaultRenderMode = () => {
+  const CLIENT_RENDER_MODE = process.env.ONE_DEFAULT_RENDER_MODE as One.RouteRenderMode | undefined
   const serverConfig = globalThis['__vxrnPluginConfig__'] as One.PluginOptions | undefined
 
-  if (isWebServer && !serverConfig) {
+  if (!CLIENT_RENDER_MODE && isWebServer && !serverConfig) {
     throw new Error(`Internal one error: should call setServerConfig before createManifest`)
   }
 

package/src/serve-worker.ts

@@ -0,0 +1,19 @@
+import { createProdServer } from 'vxrn/serve'
+import { oneServe } from './server/oneServe'
+import type { One } from './vite/types'
+import { setupBuildInfo } from './server/setupBuildOptions'
+import { ensureExists } from './utils/ensureExists'
+
+export async function serve(buildInfo: One.BuildInfo) {
+  setupBuildInfo(buildInfo)
+  ensureExists(buildInfo.oneOptions)
+
+  // TODO make this better, this ensures we get react 19
+  process.env.VXRN_REACT_19 = '1'
+
+  const app = await createProdServer(buildInfo.oneOptions)
+
+  await oneServe(buildInfo.oneOptions, buildInfo.oneOptions, buildInfo, app, false)
+
+  return app
+}

package/src/serve.ts

@@ -1,11 +1,9 @@
 import './polyfills-server'
 
 import FSExtra from 'fs-extra'
-import type { Hono } from 'hono'
-import { join } from 'node:path'
 import type { VXRNOptions } from 'vxrn'
-import { getServerEntry, loadEnv, serve as vxrnServe } from 'vxrn/serve'
-import type { RenderAppProps } from './types'
+import { setupBuildInfo } from './server/setupBuildOptions'
+import { ensureExists } from './utils/ensureExists'
 import type { One } from './vite/types'
 
 process.on('uncaughtException', (err) => {
@@ -14,19 +12,22 @@ process.on('uncaughtException', (err) => {
 
 export async function serve(args: VXRNOptions['server'] = {}) {
   const buildInfo = (await FSExtra.readJSON(`dist/buildInfo.json`)) as One.BuildInfo
+  const { oneOptions } = buildInfo
 
-  // ensure cache key matches build
-  process.env.ONE_CACHE_KEY = buildInfo.constants.CACHE_KEY
+  setupBuildInfo(buildInfo)
+  ensureExists(oneOptions)
 
   // to avoid loading the CACHE_KEY before we set it use async imports:
   const { labelProcess } = await import('./cli/label-process')
   const { removeUndefined } = await import('./utils/removeUndefined')
-  const { loadUserOneOptions } = await import('./vite/one')
+  const { loadEnv, serve: vxrnServe } = await import('vxrn/serve')
+  const { oneServe } = await import('./server/oneServe')
 
   labelProcess('serve')
-  loadEnv('production')
 
-  const oneOptions = await loadUserOneOptions('serve')
+  if (args.loadEnv) {
+    await loadEnv('production')
+  }
 
   // TODO make this better, this ensures we get react 19
   process.env.VXRN_REACT_19 = '1'
@@ -43,215 +44,10 @@ export async function serve(args: VXRNOptions['server'] = {}) {
         platform: args.platform,
         cacheHeaders: args.cacheHeaders,
       }),
-
-      async beforeStart(options, app) {
-        await oneOptions.server?.beforeStart?.(options, app)
-        await oneServe(oneOptions, options, buildInfo, app)
-      },
     },
-  })
-}
-
-async function oneServe(
-  options: One.PluginOptions,
-  vxrnOptions: VXRNOptions,
-  buildInfo: One.BuildInfo,
-  app: Hono
-) {
-  const { createHandleRequest } = await import('./createHandleRequest')
-  const { isResponse } = await import('./utils/isResponse')
-  const { isStatusRedirect } = await import('./utils/isStatus')
-  const { resolveAPIRequest } = await import('./vite/resolveAPIRequest')
-
-  const isAPIRequest = new WeakMap<any, boolean>()
-  const root = vxrnOptions.root || '.'
-
-  // add redirects
-  const redirects = options.web?.redirects
-  if (redirects) {
-    for (const redirect of redirects) {
-      app.get(redirect.source, (context) => {
-        const destinationUrl = redirect.destination.replace(/:\w+/g, (param) => {
-          const paramName = param.substring(1)
-          return context.req.param(paramName) || ''
-        })
-        return context.redirect(destinationUrl, redirect.permanent ? 301 : 302)
-      })
-    }
-  }
-
-  if (!buildInfo) {
-    throw new Error(`No build info found, have you run build?`)
-  }
-
-  const { routeMap, builtRoutes } = buildInfo as One.BuildInfo
-
-  const routeToBuildInfo: Record<string, One.RouteBuildInfo> = {}
-  for (const route of builtRoutes) {
-    routeToBuildInfo[route.cleanPath] = route
-
-    // temp - make it back into brackets style
-    const bracketRoutePath = route.cleanPath
-      .split('/')
-      .map((part) => {
-        return part[0] === ':' ? `[${part.slice(1)}]` : part
-      })
-      .join('/')
-    routeToBuildInfo[bracketRoutePath] = route
-  }
-
-  const serverOptions = {
-    ...options,
-    root,
-  }
-
-  const entryServer = getServerEntry(serverOptions)
-  const entry = await import(entryServer)
-
-  const render = entry.default.render as (props: RenderAppProps) => any
-  const apiCJS = options.build?.api?.outputFormat === 'cjs'
-
-  const handleRequest = createHandleRequest(
-    {},
-    {
-      async handleAPI({ route, request, loaderProps }) {
-        const apiFile = join(
-          process.cwd(),
-          'dist',
-          'api',
-          route.page.replace('[', '_').replace(']', '_') + (apiCJS ? '.cjs' : '.js')
-        )
-
-        isAPIRequest.set(request, true)
-
-        return resolveAPIRequest(
-          async () => {
-            try {
-              return await import(apiFile)
-            } catch (err) {
-              console.error(`\n [one] Error importing API route at ${apiFile}:
 
-  ${err}
-
-  If this is an import error, you can likely fix this by adding this dependency to
-  the "optimizeDeps.include" array in your vite.config.ts.
-
-  🐞 For a better error message run "node" and enter:
-
-  import('${apiFile}')\n\n`)
-              return {}
-            }
-          },
-          request,
-          loaderProps?.params || {}
-        )
-      },
-
-      async handleSSR({ route, url, loaderProps }) {
-        if (route.type === 'ssr') {
-          const buildInfo = routeToBuildInfo[route.page]
-          if (!buildInfo) {
-            throw new Error(
-              `No buildinfo found for ${url}, route: ${route.page}, in keys: ${Object.keys(routeToBuildInfo)}`
-            )
-          }
-
-          try {
-            const exported = await import(buildInfo.serverJsPath)
-            const loaderData = await exported.loader?.(loaderProps)
-            const preloads = buildInfo.preloads
-
-            const headers = new Headers()
-            headers.set('content-type', 'text/html')
-
-            return new Response(
-              await render({
-                loaderData,
-                loaderProps,
-                path: loaderProps?.path || '/',
-                preloads,
-              }),
-              {
-                headers,
-              }
-            )
-          } catch (err) {
-            console.error(`[one] Error rendering SSR route ${route.page}
-
-  ${err?.['stack'] ?? err}
-
-  url: ${url}`)
-          }
-        }
-      },
-    }
-  )
-
-  // preload reading in all the files, for prod performance:
-  const htmlFiles: Record<string, string> = {}
-  for (const key in routeMap) {
-    const info = routeToBuildInfo[key]
-
-    if (info?.type === 'ssr') {
-      // we handle this on each request
-      continue
-    }
-
-    htmlFiles[key] = await FSExtra.readFile(join('dist/client', routeMap[key]), 'utf-8')
-  }
-
-  app.use(async (context, next) => {
-    // serve our generated html files
-    const html = htmlFiles[context.req.path]
-    if (html) {
-      return context.html(html)
-    }
-
-    try {
-      const request = context.req.raw
-      const response = await handleRequest.handler(request)
-
-      if (response) {
-        if (isResponse(response)) {
-          if (isStatusRedirect(response.status)) {
-            const location = `${response.headers.get('location') || ''}`
-            response.headers.forEach((value, key) => {
-              context.header(key, value)
-            })
-            return context.redirect(location, response.status)
-          }
-
-          if (isAPIRequest.get(request)) {
-            try {
-              // don't cache api requests by default
-              response.headers.set('Cache-Control', 'no-store')
-            } catch (err) {
-              console.info(
-                `Error udpating cache header on api route "${
-                  context.req.path
-                }" to no-store, it is ${response.headers.get('cache-control')}, continue`,
-                err
-              )
-            }
-          }
-
-          return response as Response
-        }
-
-        return context.json(
-          response,
-          200,
-          isAPIRequest.get(request)
-            ? {
-                'Cache-Control': 'no-store',
-              }
-            : undefined
-        )
-      }
-    } catch (err) {
-      console.error(` [one] Error handling request: ${(err as any)['stack']}`)
-    }
-
-    await next()
+    async beforeStart(options, app) {
+      await oneServe(oneOptions, options, buildInfo, app)
+    },
   })
 }

package/src/server/oneServe.ts

@@ -0,0 +1,216 @@
+import type { Hono } from 'hono'
+import { join } from 'node:path'
+import type { VXRNOptions } from 'vxrn'
+import { getServerEntry } from 'vxrn/serve'
+import type { RenderAppProps } from '../types'
+import type { One } from '../vite/types'
+
+export async function oneServe(
+  oneOptions: One.PluginOptions,
+  vxrnOptions: VXRNOptions,
+  buildInfo: One.BuildInfo,
+  app: Hono,
+  serveStatic = true
+) {
+  const { createHandleRequest } = await import('../createHandleRequest')
+  const { isResponse } = await import('../utils/isResponse')
+  const { isStatusRedirect } = await import('../utils/isStatus')
+  const { resolveAPIRequest } = await import('../vite/resolveAPIRequest')
+
+  const isAPIRequest = new WeakMap<any, boolean>()
+  const root = vxrnOptions.root || '.'
+
+  // add redirects
+  const redirects = oneOptions.web?.redirects
+  if (redirects) {
+    for (const redirect of redirects) {
+      app.get(redirect.source, (context) => {
+        const destinationUrl = redirect.destination.replace(/:\w+/g, (param) => {
+          const paramName = param.substring(1)
+          return context.req.param(paramName) || ''
+        })
+        return context.redirect(destinationUrl, redirect.permanent ? 301 : 302)
+      })
+    }
+  }
+
+  if (!buildInfo) {
+    throw new Error(`No build info found, have you run build?`)
+  }
+
+  const { routeMap, builtRoutes } = buildInfo as One.BuildInfo
+
+  const routeToBuildInfo: Record<string, One.RouteBuildInfo> = {}
+  for (const route of builtRoutes) {
+    routeToBuildInfo[route.cleanPath] = route
+
+    // temp - make it back into brackets style
+    const bracketRoutePath = route.cleanPath
+      .split('/')
+      .map((part) => {
+        return part[0] === ':' ? `[${part.slice(1)}]` : part
+      })
+      .join('/')
+    routeToBuildInfo[bracketRoutePath] = route
+  }
+
+  const serverOptions = {
+    ...oneOptions,
+    root,
+  }
+
+  const entryServer = getServerEntry(serverOptions)
+  const entry = await import(entryServer)
+
+  const render = entry.default.render as (props: RenderAppProps) => any
+  const apiCJS = oneOptions.build?.api?.outputFormat === 'cjs'
+
+  const handleRequest = createHandleRequest(
+    {},
+    {
+      async handleAPI({ route, request, loaderProps }) {
+        const apiFile = join(
+          process.cwd(),
+          'dist',
+          'api',
+          route.page.replace('[', '_').replace(']', '_') + (apiCJS ? '.cjs' : '.js')
+        )
+
+        isAPIRequest.set(request, true)
+
+        return resolveAPIRequest(
+          async () => {
+            try {
+              return await import(apiFile)
+            } catch (err) {
+              console.error(`\n [one] Error importing API route at ${apiFile}:
+
+  ${err}
+
+  If this is an import error, you can likely fix this by adding this dependency to
+  the "optimizeDeps.include" array in your vite.config.ts.
+
+  🐞 For a better error message run "node" and enter:
+
+  import('${apiFile}')\n\n`)
+              return {}
+            }
+          },
+          request,
+          loaderProps?.params || {}
+        )
+      },
+
+      async handleSSR({ route, url, loaderProps }) {
+        if (route.type === 'ssr') {
+          const buildInfo = routeToBuildInfo[route.page]
+          if (!buildInfo) {
+            throw new Error(
+              `No buildinfo found for ${url}, route: ${route.page}, in keys: ${Object.keys(routeToBuildInfo)}`
+            )
+          }
+
+          try {
+            const exported = await import(buildInfo.serverJsPath)
+            const loaderData = await exported.loader?.(loaderProps)
+            const preloads = buildInfo.preloads
+
+            const headers = new Headers()
+            headers.set('content-type', 'text/html')
+
+            return new Response(
+              await render({
+                loaderData,
+                loaderProps,
+                path: loaderProps?.path || '/',
+                preloads,
+              }),
+              {
+                headers,
+              }
+            )
+          } catch (err) {
+            console.error(`[one] Error rendering SSR route ${route.page}
+
+  ${err?.['stack'] ?? err}
+
+  url: ${url}`)
+          }
+        }
+      },
+    }
+  )
+
+  // preload reading in all the files, for prod performance:
+  const htmlFiles: Record<string, string> = {}
+
+  if (serveStatic) {
+    const { readFile } = await import('node:fs/promises')
+
+    for (const key in routeMap) {
+      const info = routeToBuildInfo[key]
+
+      if (info?.type === 'ssr') {
+        // we handle this on each request
+        continue
+      }
+
+      htmlFiles[key] = await readFile(join('dist/client', routeMap[key]), 'utf-8')
+    }
+  }
+
+  app.use(async (context, next) => {
+    // serve our generated html files
+    const html = htmlFiles[context.req.path]
+    if (html) {
+      return context.html(html)
+    }
+
+    try {
+      const request = context.req.raw
+      const response = await handleRequest.handler(request)
+
+      if (response) {
+        if (isResponse(response)) {
+          if (isStatusRedirect(response.status)) {
+            const location = `${response.headers.get('location') || ''}`
+            response.headers.forEach((value, key) => {
+              context.header(key, value)
+            })
+            return context.redirect(location, response.status)
+          }
+
+          if (isAPIRequest.get(request)) {
+            try {
+              // don't cache api requests by default
+              response.headers.set('Cache-Control', 'no-store')
+            } catch (err) {
+              console.info(
+                `Error udpating cache header on api route "${
+                  context.req.path
+                }" to no-store, it is ${response.headers.get('cache-control')}, continue`,
+                err
+              )
+            }
+          }
+
+          return response as Response
+        }
+
+        return context.json(
+          response,
+          200,
+          isAPIRequest.get(request)
+            ? {
+                'Cache-Control': 'no-store',
+              }
+            : undefined
+        )
+      }
+    } catch (err) {
+      console.error(` [one] Error handling request: ${(err as any)['stack']}`)
+    }
+
+    await next()
+  })
+}

package/src/server/setupBuildOptions.ts

@@ -0,0 +1,7 @@
+import type { One } from '../vite/types'
+
+export function setupBuildInfo(buildInfo: One.BuildInfo) {
+  // ensure cache key matches build
+  process.env.ONE_CACHE_KEY ||= buildInfo.constants.CACHE_KEY
+  process.env.ONE_DEFAULT_RENDER_MODE ||= buildInfo.oneOptions?.web?.defaultRenderMode || 'ssg'
+}

package/src/utils/ensureExists.ts

@@ -0,0 +1,5 @@
+export function ensureExists<T>(value: T | undefined | null): asserts value is T {
+  if (value === undefined || value === null) {
+    throw new Error(`Missing value.`)
+  }
+}