fix: use separate output directories for client and server (#5000)

jamesopstad · schiller-manuel · web-flow · commit 191e442648c2 · 2025-08-22T06:33:34.000+02:00
Co-authored-by: Manuel Schiller &lt;manuel.schiller@caligano.de&gt;
diff --git a/e2e/react-start/basic-react-query/package.json b/e2e/react-start/basic-react-query/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/react-start/basic-tsr-config/package.json b/e2e/react-start/basic-tsr-config/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "rimraf ./count.txt && vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/react-start/basic/package.json b/e2e/react-start/basic/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod  dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/react-start/custom-basepath/express-server.ts b/e2e/react-start/custom-basepath/express-server.ts
@@ -27,9 +27,9 @@ if (DEVELOPMENT) {
     }
   })
 } else {
-  const { default: handler } = await import('./dist/server.js')
+  const { default: handler } = await import('./dist/server/server.js')
   const nodeHandler = toNodeHandler(handler.fetch)
-  app.use('/custom/basepath', express.static('dist/public'))
+  app.use('/custom/basepath', express.static('dist/client'))
   app.use(async (req, res, next) => {
     try {
       await nodeHandler(req, res)
diff --git a/e2e/react-start/query-integration/package.json b/e2e/react-start/query-integration/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/react-start/scroll-restoration/package.json b/e2e/react-start/scroll-restoration/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/react-start/selective-ssr/package.json b/e2e/react-start/selective-ssr/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/react-start/serialization-adapters/package.json b/e2e/react-start/serialization-adapters/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/react-start/server-functions/package.json b/e2e/react-start/server-functions/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/react-start/server-routes/package.json b/e2e/react-start/server-routes/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/react-start/spa-mode/package.json b/e2e/react-start/spa-mode/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "npx serve dist/public",
+    "start": "npx serve dist/client",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/react-start/virtual-routes/package.json b/e2e/react-start/virtual-routes/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/react-start/website/package.json b/e2e/react-start/website/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/solid-start/basic-tsr-config/package.json b/e2e/solid-start/basic-tsr-config/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "rimraf ./count.txt && vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/solid-start/basic/package.json b/e2e/solid-start/basic/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/solid-start/custom-basepath/express-server.ts b/e2e/solid-start/custom-basepath/express-server.ts
@@ -27,9 +27,9 @@ if (DEVELOPMENT) {
     }
   })
 } else {
-  const { default: handler } = await import('./dist/server.js')
+  const { default: handler } = await import('./dist/server/server.js')
   const nodeHandler = toNodeHandler(handler.fetch)
-  app.use('/custom/basepath', express.static('dist/public'))
+  app.use('/custom/basepath', express.static('dist/client'))
   app.use(async (req, res, next) => {
     try {
       await nodeHandler(req, res)
diff --git a/e2e/solid-start/scroll-restoration/package.json b/e2e/solid-start/scroll-restoration/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/solid-start/selective-ssr/package.json b/e2e/solid-start/selective-ssr/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/solid-start/server-functions/package.json b/e2e/solid-start/server-functions/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/solid-start/server-routes/package.json b/e2e/solid-start/server-routes/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/solid-start/spa-mode/package.json b/e2e/solid-start/spa-mode/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "npx serve dist/public",
+    "start": "npx serve dist/client",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/e2e/solid-start/website/package.json b/e2e/solid-start/website/package.json
@@ -7,7 +7,7 @@
     "dev": "vite dev --port 3000",
     "dev:e2e": "vite dev",
     "build": "vite build && tsc --noEmit",
-    "start": "pnpx srvx --prod dist/server.js",
+    "start": "pnpx srvx --prod -s ../client  dist/server/server.js",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
   "dependencies": {
diff --git a/packages/start-plugin-core/src/output-directory.ts b/packages/start-plugin-core/src/output-directory.ts
@@ -1,18 +1,25 @@
 import { join } from 'pathe'
 import { VITE_ENVIRONMENT_NAMES } from './constants'
+import type { ViteEnvironmentNames } from './constants'
 import type * as vite from 'vite'
 
 export function getClientOutputDirectory(userConfig: vite.UserConfig) {
-  return (
-    userConfig.environments?.[VITE_ENVIRONMENT_NAMES.client]?.build?.outDir ??
-    join(getServerOutputDirectory(userConfig), 'public')
-  )
+  return getOutputDirectory(userConfig, VITE_ENVIRONMENT_NAMES.client, 'client')
 }
 
 export function getServerOutputDirectory(userConfig: vite.UserConfig) {
+  return getOutputDirectory(userConfig, VITE_ENVIRONMENT_NAMES.server, 'server')
+}
+
+function getOutputDirectory(
+  userConfig: vite.UserConfig,
+  environmentName: ViteEnvironmentNames,
+  directoryName: string,
+) {
   const rootOutputDirectory = userConfig.build?.outDir ?? 'dist'
+
   return (
-    userConfig.environments?.[VITE_ENVIRONMENT_NAMES.server]?.build?.outDir ??
-    rootOutputDirectory
+    userConfig.environments?.[environmentName]?.build?.outDir ??
+    join(rootOutputDirectory, directoryName)
   )
 }
diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts
@@ -187,9 +187,6 @@ export function TanStackStartVitePluginCore(
             [VITE_ENVIRONMENT_NAMES.client]: {
               consumer: 'client',
               build: {
-                emptyOutDir:
-                  viteConfig.environments?.[VITE_ENVIRONMENT_NAMES.client]
-                    ?.build?.emptyOutDir ?? true,
                 rollupOptions: {
                   input: {
                     main: ENTRY_POINTS.client,
@@ -201,9 +198,6 @@ export function TanStackStartVitePluginCore(
             [VITE_ENVIRONMENT_NAMES.server]: {
               consumer: 'server',
               build: {
-                emptyOutDir:
-                  viteConfig.environments?.[VITE_ENVIRONMENT_NAMES.server]
-                    ?.build?.emptyOutDir ?? false,
                 ssr: true,
                 rollupOptions: {
                   input:
@@ -261,7 +255,7 @@ export function TanStackStartVitePluginCore(
             // This is not the same as injecting environment variables.
 
             ...defineReplaceEnv('TSS_SERVER_FN_BASE', startConfig.serverFns.base),
-            ...defineReplaceEnv('TSS_OUTPUT_PUBLIC_DIR', getClientOutputDirectory(viteConfig)),
+            ...defineReplaceEnv('TSS_CLIENT_OUTPUT_DIR', getClientOutputDirectory(viteConfig)),
             ...defineReplaceEnv('TSS_APP_BASE', viteAppBase),
             ...(command === 'serve' ? defineReplaceEnv('TSS_SHELL', startConfig.spa?.enabled ? 'true' : 'false') : {}),
             ...defineReplaceEnv('TSS_DEV_SERVER', command === 'serve' ? 'true' : 'false'),
diff --git a/packages/start-server-core/src/global.d.ts b/packages/start-server-core/src/global.d.ts
@@ -3,7 +3,7 @@ declare global {
     interface ProcessEnv {
       TSS_APP_BASE?: string
       TSS_SERVER_FN_BASE?: string
-      TSS_OUTPUT_PUBLIC_DIR?: string
+      TSS_CLIENT_OUTPUT_DIR?: string
       TSS_SHELL?: 'true' | 'false'
       TSS_PRERENDERING?: 'true' | 'false'
       TSS_DEV_SERVER?: 'true' | 'false'
diff --git a/packages/start-static-server-functions/src/staticFunctionMiddleware.ts b/packages/start-static-server-functions/src/staticFunctionMiddleware.ts
@@ -84,8 +84,8 @@ async function addItemToCache({
   {
     const hash = jsonToFilenameSafeString(data)
     const url = await getStaticCacheUrl({ functionId, hash })
-    const publicUrl = process.env.TSS_OUTPUT_PUBLIC_DIR!
-    const filePath = path.join(publicUrl, url)
+    const clientUrl = process.env.TSS_CLIENT_OUTPUT_DIR!
+    const filePath = path.join(clientUrl, url)
 
     // Ensure the directory exists
     await fs.mkdir(path.dirname(filePath), { recursive: true })
