Add server-entry export to @tanstack/react-start

e2e/e2e-utils/package.json

@@ -9,7 +9,8 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": "./src/index.ts"
+      "import": "./src/index.ts",
+      "default": "./src/index.ts"
     },
     "./package.json": "./package.json"
   },

e2e/react-start/basic/src/server.ts

@@ -1,17 +1,11 @@
 // DO NOT DELETE THIS FILE!!!
 // This file is a good smoke test to make sure the custom server entry is working
-import {
-  createStartHandler,
-  defaultStreamHandler,
-} from '@tanstack/react-start/server'
-import { createRouter } from './router'
+import handler from '@tanstack/react-start/server-entry'
 
 console.log("[server-entry]: using custom server entry in 'src/server.ts'")
 
-const fetch = createStartHandler({
-  createRouter,
-})(defaultStreamHandler)
-
 export default {
-  fetch,
+  fetch(request: Request) {
+    return handler.fetch(request)
+  },
 }

packages/react-start/package.json

@@ -27,7 +27,7 @@
     "clean": "rimraf ./dist && rimraf ./coverage",
     "test": "pnpm test:build",
     "test:build": "exit 0; vitest",
-    "build": "vite build"
+    "build": "vite build && vite build -c vite.config.server-entry.ts"
   },
   "type": "module",
   "types": "dist/esm/client.d.ts",
@@ -56,6 +56,12 @@
         "default": "./dist/esm/plugin/vite.js"
       }
     },
+    "./server-entry": {
+      "import": {
+        "types": "./dist/default-entry/esm/server.d.ts",
+        "default": "./dist/default-entry/esm/server.js"
+      }
+    },
     "./package.json": "./package.json"
   },
   "sideEffects": false,

packages/react-start/src/default-entry/server.ts

@@ -0,0 +1,16 @@
+import {
+  createStartHandler,
+  defaultStreamHandler,
+} from '@tanstack/react-start/server'
+import type { RequestHandler } from '@tanstack/react-start/server'
+
+import { createRouter } from '#tanstack-start-router-entry'
+
+// Providing `RequestHandler` from `@tanstack/react-start/server` is required so that the output types don't import it from `@tanstack/start-server-core`
+const fetch: RequestHandler = createStartHandler({
+  createRouter,
+})(defaultStreamHandler)
+
+export default {
+  fetch,
+}

packages/react-start/tsconfig.json

@@ -4,5 +4,5 @@
     "jsx": "react-jsx",
     "module": "esnext"
   },
-  "include": ["src", "vite.config.ts"]
+  "include": ["src", "vite.config.ts", "vite.config.server-entry.ts"]
 }

packages/react-start/vite.config.server-entry.ts

@@ -0,0 +1,13 @@
+import { tanstackViteConfig } from '@tanstack/config/vite'
+
+export default tanstackViteConfig({
+  srcDir: './src/default-entry',
+  exclude: ['./src/default-entry/client.tsx'],
+  entry: ['./src/default-entry/server.ts'],
+  externalDeps: [
+    '@tanstack/react-start/server',
+    '#tanstack-start-router-entry',
+  ],
+  outDir: './dist/default-entry',
+  cjs: false,
+})

packages/react-start/vite.config.ts

@@ -12,7 +12,7 @@ const config = defineConfig({
   plugins: [
     copyFilesPlugin({
       pattern: ['*.ts', '*.tsx', '!*.d.ts'],
-      fromDir: 'src/plugin/default-entry',
+      fromDir: 'src/default-entry',
       toDir: 'dist/plugin/default-entry',
     }),
   ],
@@ -22,12 +22,12 @@ export default mergeConfig(
   config,
   tanstackViteConfig({
     srcDir: './src',
+    exclude: ['./src/default-entry'],
     entry: ['./src/client.tsx', './src/server.tsx', './src/plugin/vite.ts'],
     externalDeps: [
       '@tanstack/react-start-client',
       '@tanstack/react-start-server',
     ],
-    exclude: ['./src/plugin/default-entry'],
     cjs: false,
   }),
 )