support vite build.outDir for custom output directories

Author: natew

packages/one/src/cli.ts

@@ -180,6 +180,10 @@ const serveCommand = defineCommand({
     loadEnv: {
       type: 'boolean',
     },
+    outDir: {
+      type: 'string',
+      description: 'Build output directory (default: dist)',
+    },
   },
   async run({ args }) {
     const { serve } = await import('./serve')
@@ -190,6 +194,7 @@ const serveCommand = defineCommand({
       host,
       compress: args.compress,
       loadEnv: !!args.loadEnv,
+      outDir: lastValue(args.outDir),
     })
   },
 })

packages/one/src/cli/build.ts

@@ -75,14 +75,17 @@ export async function build(args: {
   checkNodeVersion()
   setServerGlobals()
 
-  const { oneOptions } = await loadUserOneOptions('build')
+  const { oneOptions, config: viteLoadedConfig } = await loadUserOneOptions('build')
   const routerRoot = getRouterRootFromOneOptions(oneOptions)
 
   // Set defaultRenderMode env var so getManifest knows the correct route types
   if (oneOptions.web?.defaultRenderMode) {
     process.env.ONE_DEFAULT_RENDER_MODE = oneOptions.web.defaultRenderMode
   }
 
+  // respect vite's build.outDir config, default to 'dist'
+  const outDir = viteLoadedConfig?.config?.build?.outDir ?? 'dist'
+
   const manifest = getManifest({ routerRoot })!
 
   const serverOutputFormat =
@@ -173,7 +176,7 @@ export async function build(args: {
       build: {
         ssr: true,
         emptyOutDir: false,
-        outDir: `dist/${subFolder}`,
+        outDir: `${outDir}/${subFolder}`,
         copyPublicDir: false,
         minify: false,
         rolldownOptions: {
@@ -269,7 +272,7 @@ export async function build(args: {
       const outChunks = middlewareBuildInfo.output.filter((x) => x.type === 'chunk')
       const chunk = outChunks.find((x) => x.facadeModuleId === fullPath)
       if (!chunk) throw new Error(`internal err finding middleware`)
-      builtMiddlewares[middleware.file] = join('dist', 'middlewares', chunk.fileName)
+      builtMiddlewares[middleware.file] = join(outDir, 'middlewares', chunk.fileName)
     }
   }
 
@@ -301,8 +304,8 @@ export async function build(args: {
     : `concurrency: ${BUILD_CONCURRENCY}`
   console.info(`\n 🔨 build static routes (${modeLabel})\n`)
 
-  const staticDir = join(`dist/static`)
-  const clientDir = join(`dist/client`)
+  const staticDir = join(`${outDir}/static`)
+  const clientDir = join(`${outDir}/client`)
   await ensureDir(staticDir)
 
   if (!vxrnOutput.serverOutput) {
@@ -643,7 +646,7 @@ export async function build(args: {
       })
     }
 
-    const serverJsPath = join('dist/server', serverFileName)
+    const serverJsPath = join(`${outDir}/server`, serverFileName)
 
     let exported
     try {
@@ -866,6 +869,7 @@ export async function build(args: {
   }
 
   const buildInfoForWriting: One.BuildInfo = {
+    outDir,
     oneOptions,
     routeToBuildInfo,
     pathToRoute,
@@ -882,7 +886,7 @@ export async function build(args: {
     useRolldown: await isRolldown(),
   }
 
-  await writeJSON(toAbsolute(`dist/buildInfo.json`), buildInfoForWriting)
+  await writeJSON(toAbsolute(`${outDir}/buildInfo.json`), buildInfoForWriting)
 
   // emit version.json for skew protection polling
   await FSExtra.writeFile(
@@ -951,7 +955,7 @@ export async function build(args: {
         buildInfoForWriting.routeToBuildInfo
       )) {
         if (info.serverJsPath) {
-          const importPath = './' + info.serverJsPath.replace(/^dist\//, '')
+          const importPath = './' + info.serverJsPath.replace(new RegExp(`^${outDir}/`), '')
           pageRouteMap.push(`  '${routeFile}': () => import('${importPath}')`)
         }
       }
@@ -971,11 +975,11 @@ 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 [, builtPath] of Object.entries(builtMiddlewares)) {
-        const importPath = './' + builtPath.replace(/^dist\//, '')
+        const importPath = './' + builtPath.replace(new RegExp(`^${outDir}/`), '')
         middlewareRouteMap.push(`  '${builtPath}': () => import('${importPath}')`)
       }
 
-      const workerSrcPath = join(options.root, 'dist', '_worker-src.js')
+      const workerSrcPath = join(options.root, outDir, '_worker-src.js')
       const workerCode = `// Polyfill MessageChannel for React SSR (not available in Cloudflare Workers by default)
 if (typeof MessageChannel === 'undefined') {
   globalThis.MessageChannel = class MessageChannel {
@@ -1066,7 +1070,7 @@ export default {
         mode: 'production',
         logLevel: 'warn',
         build: {
-          outDir: 'dist',
+          outDir,
           emptyOutDir: false,
           // Use SSR mode with node target for proper Node.js module resolution
           ssr: workerSrcPath,
@@ -1143,12 +1147,12 @@ export default {
 }
 `
       await FSExtra.writeFile(
-        join(options.root, 'dist', 'wrangler.jsonc'),
+        join(options.root, outDir, 'wrangler.jsonc'),
         wranglerConfig
       )
 
-      postBuildLogs.push(`Cloudflare worker bundled at dist/worker.js`)
-      postBuildLogs.push(`To deploy: cd dist && wrangler deploy`)
+      postBuildLogs.push(`Cloudflare worker bundled at ${outDir}/worker.js`)
+      postBuildLogs.push(`To deploy: cd ${outDir} && wrangler deploy`)
 
       break
     }

packages/one/src/cli/buildPage.ts

@@ -63,7 +63,7 @@ export async function buildPage(
 
   const htmlPath = `${path.endsWith('/') ? `${removeTrailingSlash(path)}/index` : path}.html`
   const clientJsPath = clientManifestEntry
-    ? join(`dist/client`, clientManifestEntry.file)
+    ? join(clientDir, clientManifestEntry.file)
     : ''
   const htmlOutPath = toAbsolute(join(staticDir, htmlPath))
   const preloadPath = getPreloadPath(path)
@@ -190,8 +190,10 @@ prefetchCSS()
             if (!layoutServerPath) {
               return { contextKey: layout.contextKey, loaderData: undefined }
             }
+            // derive server dir from clientDir (e.g. dist/client -> dist/server)
+            const serverDir = join(clientDir, '..', 'server')
             const layoutExported = await import(
-              toAbsolute(join('./', 'dist/server', layoutServerPath))
+              toAbsolute(join(serverDir, layoutServerPath))
             )
             const layoutLoaderData = await layoutExported?.loader?.(loaderProps)
             return { contextKey: layout.contextKey, loaderData: layoutLoaderData }

packages/one/src/serve.ts

@@ -12,8 +12,12 @@ process.on('uncaughtException', (err) => {
   console.error(`[one] Uncaught exception`, err?.stack || err)
 })
 
-export async function serve(args: VXRNOptions['server'] & { app?: Hono } = {}) {
-  const buildInfo = (await FSExtra.readJSON(`dist/buildInfo.json`)) as One.BuildInfo
+export async function serve(args: VXRNOptions['server'] & { app?: Hono; outDir?: string } = {}) {
+  // resolve outDir: explicit arg > buildInfo.json in cwd (serving from within outDir) > default 'dist'
+  const outDir = args.outDir
+    || (FSExtra.existsSync('buildInfo.json') ? '.' : null)
+    || 'dist'
+  const buildInfo = (await FSExtra.readJSON(`${outDir}/buildInfo.json`)) as One.BuildInfo
   const { oneOptions } = buildInfo
 
   setServerGlobals()
@@ -33,6 +37,7 @@ export async function serve(args: VXRNOptions['server'] & { app?: Hono } = {}) {
   }
 
   return await vxrnServe({
+    outDir: buildInfo.outDir || outDir,
     app: args.app,
     // fallback to one plugin
     ...oneOptions.server,

packages/one/src/server/oneServe.ts

@@ -22,14 +22,14 @@ import { getFetchStaticHtml } from './staticHtmlFetcher'
 
 const debugRouter = process.env.ONE_DEBUG_ROUTER
 
-async function readStaticHtml(htmlPath: string): Promise<string | null> {
+async function readStaticHtml(htmlPath: string, outDir = 'dist'): 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')
+    return await readFile(join(`${outDir}/client`, htmlPath), 'utf-8')
   } catch {
     return null
   }
@@ -55,6 +55,7 @@ export async function oneServe(
     lazyRoutes?: LazyRoutes
   }
 ) {
+  const outDir = buildInfo.outDir || 'dist'
   const { resolveAPIRoute, resolveLoaderRoute, resolvePageRoute } =
     await import('../createHandleRequest')
   const { isResponse } = await import('../utils/isResponse')
@@ -128,9 +129,9 @@ export async function oneServe(
 
     try {
       const pathToResolve = serverPath || lazyKey || ''
-      const resolvedPath = pathToResolve.includes('dist/server')
+      const resolvedPath = pathToResolve.includes(`${outDir}/server`)
         ? pathToResolve
-        : join('./', 'dist/server', pathToResolve)
+        : join('./', `${outDir}/server`, pathToResolve)
 
       const routeExported = lazyKey
         ? options?.lazyRoutes?.pages?.[lazyKey]
@@ -162,7 +163,7 @@ export async function oneServe(
         : await import(
             resolve(
               process.cwd(),
-              `${serverOptions.root}/dist/server/_virtual_one-entry.${typeof oneOptions.build?.server === 'object' && oneOptions.build.server.outputFormat === 'cjs' ? 'c' : ''}js`
+              `${serverOptions.root}/${outDir}/server/_virtual_one-entry.${typeof oneOptions.build?.server === 'object' && oneOptions.build.server.outputFormat === 'cjs' ? 'c' : ''}js`
             )
           )
       render = entry.default.render as (props: RenderAppProps) => any
@@ -180,7 +181,7 @@ export async function oneServe(
       const fileName = route.page.slice(1).replace(/\[/g, '_').replace(/\]/g, '_')
       const apiFile = join(
         process.cwd(),
-        'dist',
+        outDir,
         'api',
         fileName + (apiCJS ? '.cjs' : '.js')
       )
@@ -200,10 +201,10 @@ export async function oneServe(
       // For workers, look up by routeFile (original file path like "./dynamic/[id]+ssr.tsx")
       // For Node.js, use route.file which may be loaderServerPath (already includes dist/server)
       const routeFile = (route as any).routeFile || route.file
-      // route.file may already include dist/server if it came from loaderServerPath
-      const serverPath = route.file.includes('dist/server')
+      // route.file may already include outDir/server if it came from loaderServerPath
+      const serverPath = route.file.includes(`${outDir}/server`)
         ? route.file
-        : join('./', 'dist/server', route.file)
+        : join('./', `${outDir}/server`, route.file)
 
       let exports
       try {
@@ -309,7 +310,7 @@ export async function oneServe(
             if (nfHtml) {
               try {
                 const html = await readFile(
-                  join(process.cwd(), 'dist/client', nfHtml),
+                  join(process.cwd(), `${outDir}/client`, nfHtml),
                   'utf-8'
                 )
                 return new Response(html, {
@@ -467,7 +468,7 @@ url: ${url}`)
             : routeMap[url.pathname] || routeMap[buildInfo?.cleanPath]
 
         if (htmlPath) {
-          const html = await readStaticHtml(htmlPath)
+          const html = await readStaticHtml(htmlPath, outDir)
 
           if (html) {
             const headers = new Headers()
@@ -486,7 +487,7 @@ url: ${url}`)
           const notFoundHtmlPath = routeMap[notFoundRoute]
 
           if (notFoundHtmlPath) {
-            const notFoundHtml = await readStaticHtml(notFoundHtmlPath)
+            const notFoundHtml = await readStaticHtml(notFoundHtmlPath, outDir)
 
             if (notFoundHtml) {
               // inject 404 marker so client knows this is a 404 response

packages/one/src/vercel/build/buildVercelOutputDirectory.ts

@@ -22,13 +22,15 @@ async function moveAllFiles(src: string, dest: string) {
 }
 
 function getMiddlewaresByNamedRegex(buildInfoForWriting: One.BuildInfo) {
+  const outDir = buildInfoForWriting.outDir || 'dist'
+  const prefix = `${outDir}/middlewares/`
   return buildInfoForWriting.manifest.allRoutes
     .filter((r) => r.middlewares && r.middlewares.length > 0)
     .map((r) => [
       r.namedRegex,
       r.middlewares!.map((m) =>
-        m.contextKey.startsWith('dist/middlewares/')
-          ? m.contextKey.substring('dist/middlewares/'.length)
+        m.contextKey.startsWith(prefix)
+          ? m.contextKey.substring(prefix.length)
           : m.contextKey
       ),
     ])
@@ -48,6 +50,8 @@ export const buildVercelOutputDirectory = async ({
   oneOptionsRoot: string
   postBuildLogs: string[]
 }) => {
+  const outDir = buildInfoForWriting.outDir || 'dist'
+
   // clean the vercel output directory to avoid stale files from previous builds
   const vercelOutputDir = resolve(join(oneOptionsRoot, '.vercel/output'))
   if (existsSync(vercelOutputDir)) {
@@ -73,7 +77,8 @@ export const buildVercelOutputDirectory = async ({
           route,
           compiledRoute.code,
           oneOptionsRoot,
-          postBuildLogs
+          postBuildLogs,
+          outDir
         )
       } else {
         console.warn(
@@ -112,7 +117,7 @@ export const buildVercelOutputDirectory = async ({
     }
   }
 
-  const distMiddlewareDir = resolve(join(oneOptionsRoot, 'dist', 'middlewares'))
+  const distMiddlewareDir = resolve(join(oneOptionsRoot, outDir, 'middlewares'))
   if (existsSync(distMiddlewareDir)) {
     const vercelMiddlewareDir = resolve(
       join(oneOptionsRoot, '.vercel/output/functions/_middleware.func')
@@ -122,7 +127,7 @@ export const buildVercelOutputDirectory = async ({
       `[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`
     )
     await moveAllFiles(
-      resolve(join(oneOptionsRoot, 'dist', 'middlewares')),
+      resolve(join(oneOptionsRoot, outDir, 'middlewares')),
       vercelMiddlewareDir
     )
     const vercelMiddlewarePackageJsonFilePath = resolve(

packages/one/src/vercel/build/generate/createApiServerlessFunction.ts

@@ -18,7 +18,8 @@ export async function createApiServerlessFunction(
   route: RouteInfo<string>,
   code: string,
   oneOptionsRoot: string,
-  postBuildLogs: string[]
+  postBuildLogs: string[],
+  outDir = 'dist'
 ) {
   try {
     const path = getPathFromRoute(route, { includeIndex: true })
@@ -45,7 +46,7 @@ export async function createApiServerlessFunction(
     postBuildLogs.push(
       `[one.build][vercel.createSsrServerlessFunction] copy shared assets to ${distAssetsFolder}`
     )
-    const sourceAssetsFolder = resolve(join(oneOptionsRoot, 'dist', 'api', 'assets'))
+    const sourceAssetsFolder = resolve(join(oneOptionsRoot, outDir, 'api', 'assets'))
     if (await FSExtra.pathExists(sourceAssetsFolder)) {
       await fs.copy(sourceAssetsFolder, distAssetsFolder)
     }

packages/one/src/vercel/build/generate/createSsrServerlessFunction.ts

@@ -23,7 +23,8 @@ export async function createSsrServerlessFunction(
     )
     await fs.ensureDir(funcFolder)
 
-    const distServerFrom = resolve(join(oneOptionsRoot, 'dist', 'server'))
+    const outDir = buildInfo.outDir || 'dist'
+    const distServerFrom = resolve(join(oneOptionsRoot, outDir, 'server'))
     const distServerTo = resolve(join(funcFolder, 'server'))
     await fs.ensureDir(distServerTo)
     postBuildLogs.push(
@@ -118,7 +119,7 @@ export async function createSsrServerlessFunction(
       route = buildInfoConfig.default.routeToBuildInfo[routeName];
     }
 
-    const exported = await import(route.serverJsPath.replace('dist/','../'))
+    const exported = await import(route.serverJsPath.replace('${outDir}/','../'))
     const loaderData = await exported.loader?.(loaderProps)
 
     // For loader requests, return the loader data as a JavaScript module

packages/one/src/vite/types.ts

@@ -549,6 +549,7 @@ export namespace One {
   }
 
   export type BuildInfo = {
+    outDir?: string
     constants: {
       CACHE_KEY: string
     }