@tanstack/react-start 1.132.0-alpha.8 → 1.132.0

package/dist/default-entry/esm/server.d.ts

@@ -0,0 +1,6 @@
+import { Register } from '@tanstack/react-start';
+import { RequestHandler } from '@tanstack/react-start/server';
+declare const _default: {
+    fetch: RequestHandler<Register>;
+};
+export default _default;

package/dist/default-entry/esm/server.js

@@ -0,0 +1,11 @@
+import { createStartHandler, defaultStreamHandler } from "@tanstack/react-start/server";
+const fetch = createStartHandler(defaultStreamHandler);
+const server = {
+  // Providing `RequestHandler` from `@tanstack/react-start/server` is required so that the output types don't import it from `@tanstack/start-server-core`
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+  fetch
+};
+export {
+  server as default
+};
+//# sourceMappingURL=server.js.map

package/dist/default-entry/esm/server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.js","sources":["../../../src/default-entry/server.ts"],"sourcesContent":["import {\n  createStartHandler,\n  defaultStreamHandler,\n} from '@tanstack/react-start/server'\nimport type { Register } from '@tanstack/react-start'\nimport type { RequestHandler } from '@tanstack/react-start/server'\n\nconst fetch = createStartHandler(defaultStreamHandler)\n\nexport default {\n  // Providing `RequestHandler` from `@tanstack/react-start/server` is required so that the output types don't import it from `@tanstack/start-server-core`\n\n  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion\n  fetch: fetch as RequestHandler<Register>,\n}\n"],"names":[],"mappings":";AAOA,MAAM,QAAQ,mBAAmB,oBAAoB;AAErD,MAAA,SAAe;AAAA;AAAA;AAAA,EAIb;AACF;"}

package/dist/default-entry/esm/start.d.ts

@@ -0,0 +1,2 @@
+declare const _default: {};
+export default _default;

package/dist/esm/index.d.ts

@@ -0,0 +1,2 @@
+export { useServerFn } from './useServerFn.js';
+export * from '@tanstack/start-client-core';

package/dist/esm/index.js

@@ -0,0 +1,6 @@
+import { useServerFn } from "./useServerFn.js";
+export * from "@tanstack/start-client-core";
+export {
+  useServerFn
+};
+//# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;"}

package/dist/esm/plugin/vite.js

@@ -11,57 +11,51 @@ const defaultEntryDir = path.resolve(
 );
 const defaultEntryPaths = {
   client: path.resolve(defaultEntryDir, "client"),
-  server: path.resolve(defaultEntryDir, "server")
+  server: path.resolve(defaultEntryDir, "server"),
+  start: path.resolve(defaultEntryDir, "start")
 };
 const isInsideRouterMonoRepo = path.basename(path.resolve(currentDir, "../../../../")) === "packages";
-function hasRootExport(exportsField) {
-  if (!exportsField) return false;
-  if (typeof exportsField === "string") {
-    return true;
-  }
-  if (typeof exportsField === "object") {
-    return "." in exportsField;
-  }
-  return false;
-}
 function tanstackStart(options) {
   return [
     {
       name: "tanstack-react-start:config",
-      configEnvironment(env, userConfig) {
+      configEnvironment(environmentName, options2) {
         return {
           resolve: {
-            dedupe: ["react", "react-dom", "@tanstack/react-router"],
-            external: userConfig.resolve?.noExternal === true || !isInsideRouterMonoRepo ? void 0 : ["@tanstack/react-router", "@tanstack/react-router-devtools"]
+            dedupe: [
+              "react",
+              "react-dom",
+              "@tanstack/react-start",
+              "@tanstack/react-router"
+            ],
+            external: options2.resolve?.noExternal === true || !isInsideRouterMonoRepo ? void 0 : ["@tanstack/react-router", "@tanstack/react-router-devtools"]
           },
-          optimizeDeps: {
-            exclude: ["@tanstack/react-router-devtools"],
+          optimizeDeps: environmentName === VITE_ENVIRONMENT_NAMES.client || environmentName === VITE_ENVIRONMENT_NAMES.server && // This indicates that the server environment has opted in to dependency optimization
+          options2.optimizeDeps?.noDiscovery === false ? {
+            // As `@tanstack/react-start` depends on `@tanstack/react-router`, we should exclude both.
+            exclude: [
+              "@tanstack/react-start",
+              "@tanstack/react-router",
+              "@tanstack/react-router-devtools"
+            ],
             include: [
               "react",
               "react/jsx-runtime",
               "react/jsx-dev-runtime",
               "react-dom",
-              "react-dom/client",
-              "@tanstack/react-router",
-              ...env === VITE_ENVIRONMENT_NAMES.server ? ["react-dom/server"] : []
+              ...environmentName === VITE_ENVIRONMENT_NAMES.client ? ["react-dom/client"] : ["react-dom/server"],
+              // `@tanstack/react-store` has a dependency on `use-sync-external-store`, which is CJS.
+              // It therefore needs to included so that it is converted to ESM.
+              "@tanstack/react-router > @tanstack/react-store"
             ]
-          }
+          } : void 0
         };
       }
     },
     TanStackStartVitePluginCore(
       {
         framework: "react",
-        defaultEntryPaths,
-        crawlPackages(opts) {
-          if (opts.name === "@tanstack/react-router-devtools") {
-            return "exclude";
-          }
-          if (hasRootExport(opts.exports) && "react" in opts.peerDependencies) {
-            return "include";
-          }
-          return void 0;
-        }
+        defaultEntryPaths
       },
       options
     )

package/dist/esm/plugin/vite.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite.js","sources":["../../../src/plugin/vite.ts"],"sourcesContent":["import { fileURLToPath } from 'node:url'\nimport {\n  TanStackStartVitePluginCore,\n  VITE_ENVIRONMENT_NAMES,\n} from '@tanstack/start-plugin-core'\nimport path from 'pathe'\nimport type { TanStackStartInputConfig } from '@tanstack/start-plugin-core'\nimport type { PluginOption } from 'vite'\n\nconst currentDir = path.dirname(fileURLToPath(import.meta.url))\nconst defaultEntryDir = path.resolve(\n  currentDir,\n  '..',\n  '..',\n  'plugin',\n  'default-entry',\n)\nconst defaultEntryPaths = {\n  client: path.resolve(defaultEntryDir, 'client'),\n  server: path.resolve(defaultEntryDir, 'server'),\n}\n\nconst isInsideRouterMonoRepo =\n  path.basename(path.resolve(currentDir, '../../../../')) === 'packages'\n\nfunction hasRootExport(\n  exportsField?: Record<string, unknown> | string,\n): boolean {\n  if (!exportsField) return false\n\n  if (typeof exportsField === 'string') {\n    // shorthand form: \"exports\": \"./index.js\"\n    return true\n  }\n\n  if (typeof exportsField === 'object') {\n    return '.' in exportsField\n  }\n\n  return false\n}\n\nexport function tanstackStart(\n  options?: TanStackStartInputConfig,\n): Array<PluginOption> {\n  return [\n    {\n      name: 'tanstack-react-start:config',\n      configEnvironment(env, userConfig) {\n        return {\n          resolve: {\n            dedupe: ['react', 'react-dom', '@tanstack/react-router'],\n\n            external:\n              userConfig.resolve?.noExternal === true || !isInsideRouterMonoRepo\n                ? undefined\n                : ['@tanstack/react-router', '@tanstack/react-router-devtools'],\n          },\n\n          optimizeDeps: {\n            exclude: ['@tanstack/react-router-devtools'],\n            include: [\n              'react',\n              'react/jsx-runtime',\n              'react/jsx-dev-runtime',\n              'react-dom',\n              'react-dom/client',\n              '@tanstack/react-router',\n              ...(env === VITE_ENVIRONMENT_NAMES.server\n                ? ['react-dom/server']\n                : []),\n            ],\n          },\n        }\n      },\n    },\n    TanStackStartVitePluginCore(\n      {\n        framework: 'react',\n        defaultEntryPaths,\n        crawlPackages(opts) {\n          if (opts.name === '@tanstack/react-router-devtools') {\n            return 'exclude'\n          }\n          if (hasRootExport(opts.exports) && 'react' in opts.peerDependencies) {\n            return 'include'\n          }\n          return undefined\n        },\n      },\n      options,\n    ),\n  ]\n}\n"],"names":[],"mappings":";;;AASA,MAAM,aAAa,KAAK,QAAQ,cAAc,YAAY,GAAG,CAAC;AAC9D,MAAM,kBAAkB,KAAK;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AACA,MAAM,oBAAoB;AAAA,EACxB,QAAQ,KAAK,QAAQ,iBAAiB,QAAQ;AAAA,EAC9C,QAAQ,KAAK,QAAQ,iBAAiB,QAAQ;AAChD;AAEA,MAAM,yBACJ,KAAK,SAAS,KAAK,QAAQ,YAAY,cAAc,CAAC,MAAM;AAE9D,SAAS,cACP,cACS;AACT,MAAI,CAAC,aAAc,QAAO;AAE1B,MAAI,OAAO,iBAAiB,UAAU;AAEpC,WAAO;AAAA,EACT;AAEA,MAAI,OAAO,iBAAiB,UAAU;AACpC,WAAO,OAAO;AAAA,EAChB;AAEA,SAAO;AACT;AAEO,SAAS,cACd,SACqB;AACrB,SAAO;AAAA,IACL;AAAA,MACE,MAAM;AAAA,MACN,kBAAkB,KAAK,YAAY;AACjC,eAAO;AAAA,UACL,SAAS;AAAA,YACP,QAAQ,CAAC,SAAS,aAAa,wBAAwB;AAAA,YAEvD,UACE,WAAW,SAAS,eAAe,QAAQ,CAAC,yBACxC,SACA,CAAC,0BAA0B,iCAAiC;AAAA,UAAA;AAAA,UAGpE,cAAc;AAAA,YACZ,SAAS,CAAC,iCAAiC;AAAA,YAC3C,SAAS;AAAA,cACP;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA,GAAI,QAAQ,uBAAuB,SAC/B,CAAC,kBAAkB,IACnB,CAAA;AAAA,YAAC;AAAA,UACP;AAAA,QACF;AAAA,MAEJ;AAAA,IAAA;AAAA,IAEF;AAAA,MACE;AAAA,QACE,WAAW;AAAA,QACX;AAAA,QACA,cAAc,MAAM;AAClB,cAAI,KAAK,SAAS,mCAAmC;AACnD,mBAAO;AAAA,UACT;AACA,cAAI,cAAc,KAAK,OAAO,KAAK,WAAW,KAAK,kBAAkB;AACnE,mBAAO;AAAA,UACT;AACA,iBAAO;AAAA,QACT;AAAA,MAAA;AAAA,MAEF;AAAA,IAAA;AAAA,EACF;AAEJ;"}
+{"version":3,"file":"vite.js","sources":["../../../src/plugin/vite.ts"],"sourcesContent":["import { fileURLToPath } from 'node:url'\nimport {\n  TanStackStartVitePluginCore,\n  VITE_ENVIRONMENT_NAMES,\n} from '@tanstack/start-plugin-core'\nimport path from 'pathe'\nimport type { TanStackStartInputConfig } from '@tanstack/start-plugin-core'\nimport type { PluginOption } from 'vite'\n\nconst currentDir = path.dirname(fileURLToPath(import.meta.url))\nconst defaultEntryDir = path.resolve(\n  currentDir,\n  '..',\n  '..',\n  'plugin',\n  'default-entry',\n)\nconst defaultEntryPaths = {\n  client: path.resolve(defaultEntryDir, 'client'),\n  server: path.resolve(defaultEntryDir, 'server'),\n  start: path.resolve(defaultEntryDir, 'start'),\n}\n\nconst isInsideRouterMonoRepo =\n  path.basename(path.resolve(currentDir, '../../../../')) === 'packages'\n\nexport function tanstackStart(\n  options?: TanStackStartInputConfig,\n): Array<PluginOption> {\n  return [\n    {\n      name: 'tanstack-react-start:config',\n      configEnvironment(environmentName, options) {\n        return {\n          resolve: {\n            dedupe: [\n              'react',\n              'react-dom',\n              '@tanstack/react-start',\n              '@tanstack/react-router',\n            ],\n            external:\n              options.resolve?.noExternal === true || !isInsideRouterMonoRepo\n                ? undefined\n                : ['@tanstack/react-router', '@tanstack/react-router-devtools'],\n          },\n          optimizeDeps:\n            environmentName === VITE_ENVIRONMENT_NAMES.client ||\n            (environmentName === VITE_ENVIRONMENT_NAMES.server &&\n              // This indicates that the server environment has opted in to dependency optimization\n              options.optimizeDeps?.noDiscovery === false)\n              ? {\n                  // As `@tanstack/react-start` depends on `@tanstack/react-router`, we should exclude both.\n                  exclude: [\n                    '@tanstack/react-start',\n                    '@tanstack/react-router',\n                    '@tanstack/react-router-devtools',\n                  ],\n                  include: [\n                    'react',\n                    'react/jsx-runtime',\n                    'react/jsx-dev-runtime',\n                    'react-dom',\n                    ...(environmentName === VITE_ENVIRONMENT_NAMES.client\n                      ? ['react-dom/client']\n                      : ['react-dom/server']),\n                    // `@tanstack/react-store` has a dependency on `use-sync-external-store`, which is CJS.\n                    // It therefore needs to included so that it is converted to ESM.\n                    '@tanstack/react-router > @tanstack/react-store',\n                  ],\n                }\n              : undefined,\n        }\n      },\n    },\n    TanStackStartVitePluginCore(\n      {\n        framework: 'react',\n        defaultEntryPaths,\n      },\n      options,\n    ),\n  ]\n}\n"],"names":["options"],"mappings":";;;AASA,MAAM,aAAa,KAAK,QAAQ,cAAc,YAAY,GAAG,CAAC;AAC9D,MAAM,kBAAkB,KAAK;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AACA,MAAM,oBAAoB;AAAA,EACxB,QAAQ,KAAK,QAAQ,iBAAiB,QAAQ;AAAA,EAC9C,QAAQ,KAAK,QAAQ,iBAAiB,QAAQ;AAAA,EAC9C,OAAO,KAAK,QAAQ,iBAAiB,OAAO;AAC9C;AAEA,MAAM,yBACJ,KAAK,SAAS,KAAK,QAAQ,YAAY,cAAc,CAAC,MAAM;AAEvD,SAAS,cACd,SACqB;AACrB,SAAO;AAAA,IACL;AAAA,MACE,MAAM;AAAA,MACN,kBAAkB,iBAAiBA,UAAS;AAC1C,eAAO;AAAA,UACL,SAAS;AAAA,YACP,QAAQ;AAAA,cACN;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,YAAA;AAAA,YAEF,UACEA,SAAQ,SAAS,eAAe,QAAQ,CAAC,yBACrC,SACA,CAAC,0BAA0B,iCAAiC;AAAA,UAAA;AAAA,UAEpE,cACE,oBAAoB,uBAAuB,UAC1C,oBAAoB,uBAAuB;AAAA,UAE1CA,SAAQ,cAAc,gBAAgB,QACpC;AAAA;AAAA,YAEE,SAAS;AAAA,cACP;AAAA,cACA;AAAA,cACA;AAAA,YAAA;AAAA,YAEF,SAAS;AAAA,cACP;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA,GAAI,oBAAoB,uBAAuB,SAC3C,CAAC,kBAAkB,IACnB,CAAC,kBAAkB;AAAA;AAAA;AAAA,cAGvB;AAAA,YAAA;AAAA,UACF,IAEF;AAAA,QAAA;AAAA,MAEV;AAAA,IAAA;AAAA,IAEF;AAAA,MACE;AAAA,QACE,WAAW;AAAA,QACX;AAAA,MAAA;AAAA,MAEF;AAAA,IAAA;AAAA,EACF;AAEJ;"}

package/dist/esm/useServerFn.d.ts

@@ -0,0 +1 @@
+export declare function useServerFn<T extends (...deps: Array<any>) => Promise<any>>(serverFn: T): (...args: Parameters<T>) => ReturnType<T>;

package/dist/esm/useServerFn.js

@@ -0,0 +1,27 @@
+import * as React from "react";
+import { useRouter, isRedirect } from "@tanstack/react-router";
+function useServerFn(serverFn) {
+  const router = useRouter();
+  return React.useCallback(
+    async (...args) => {
+      try {
+        const res = await serverFn(...args);
+        if (isRedirect(res)) {
+          throw res;
+        }
+        return res;
+      } catch (err) {
+        if (isRedirect(err)) {
+          err.options._fromLocation = router.state.location;
+          return router.navigate(router.resolveRedirect(err).options);
+        }
+        throw err;
+      }
+    },
+    [router, serverFn]
+  );
+}
+export {
+  useServerFn
+};
+//# sourceMappingURL=useServerFn.js.map

package/dist/esm/useServerFn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useServerFn.js","sources":["../../src/useServerFn.ts"],"sourcesContent":["import * as React from 'react'\nimport { isRedirect, useRouter } from '@tanstack/react-router'\n\nexport function useServerFn<T extends (...deps: Array<any>) => Promise<any>>(\n  serverFn: T,\n): (...args: Parameters<T>) => ReturnType<T> {\n  const router = useRouter()\n\n  return React.useCallback(\n    async (...args: Array<any>) => {\n      try {\n        const res = await serverFn(...args)\n\n        if (isRedirect(res)) {\n          throw res\n        }\n\n        return res\n      } catch (err) {\n        if (isRedirect(err)) {\n          err.options._fromLocation = router.state.location\n          return router.navigate(router.resolveRedirect(err).options)\n        }\n\n        throw err\n      }\n    },\n    [router, serverFn],\n  ) as any\n}\n"],"names":[],"mappings":";;AAGO,SAAS,YACd,UAC2C;AAC3C,QAAM,SAAS,UAAA;AAEf,SAAO,MAAM;AAAA,IACX,UAAU,SAAqB;AAC7B,UAAI;AACF,cAAM,MAAM,MAAM,SAAS,GAAG,IAAI;AAElC,YAAI,WAAW,GAAG,GAAG;AACnB,gBAAM;AAAA,QACR;AAEA,eAAO;AAAA,MACT,SAAS,KAAK;AACZ,YAAI,WAAW,GAAG,GAAG;AACnB,cAAI,QAAQ,gBAAgB,OAAO,MAAM;AACzC,iBAAO,OAAO,SAAS,OAAO,gBAAgB,GAAG,EAAE,OAAO;AAAA,QAC5D;AAEA,cAAM;AAAA,MACR;AAAA,IACF;AAAA,IACA,CAAC,QAAQ,QAAQ;AAAA,EAAA;AAErB;"}

package/dist/plugin/default-entry/client.tsx

@@ -1,15 +1,12 @@
 import { StrictMode, startTransition } from 'react'
 import { hydrateRoot } from 'react-dom/client'
-import { StartClient } from '@tanstack/react-start'
-import { createRouter } from '#tanstack-start-router-entry'
-
-const router = createRouter()
+import { StartClient } from '@tanstack/react-start/client'
 
 startTransition(() => {
   hydrateRoot(
     document,
     <StrictMode>
-      <StartClient router={router} />
+      <StartClient />
     </StrictMode>,
   )
 })

package/dist/plugin/default-entry/server.ts

@@ -2,13 +2,14 @@ import {
   createStartHandler,
   defaultStreamHandler,
 } from '@tanstack/react-start/server'
+import type { Register } from '@tanstack/react-start'
+import type { RequestHandler } from '@tanstack/react-start/server'
 
-import { createRouter } from '#tanstack-start-router-entry'
-
-const fetch = createStartHandler({
-  createRouter,
-})(defaultStreamHandler)
+const fetch = createStartHandler(defaultStreamHandler)
 
 export default {
-  fetch,
+  // Providing `RequestHandler` from `@tanstack/react-start/server` is required so that the output types don't import it from `@tanstack/start-server-core`
+
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+  fetch: fetch as RequestHandler<Register>,
 }

package/dist/plugin/default-entry/start.ts

@@ -0,0 +1 @@
+export default {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-start",
-  "version": "1.132.0-alpha.8",
+  "version": "1.132.0",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -24,12 +24,12 @@
     "typescript"
   ],
   "type": "module",
-  "types": "dist/esm/client.d.ts",
+  "types": "dist/esm/index.d.ts",
   "exports": {
     ".": {
       "import": {
-        "types": "./dist/esm/client.d.ts",
-        "default": "./dist/esm/client.js"
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
       }
     },
     "./client": {
@@ -50,6 +50,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,
@@ -58,14 +64,16 @@
     "src"
   ],
   "engines": {
-    "node": ">=12"
+    "node": ">=22.12.0"
   },
   "dependencies": {
     "pathe": "^2.0.3",
-    "@tanstack/react-start-client": "1.132.0-alpha.8",
-    "@tanstack/react-start-server": "1.132.0-alpha.8",
-    "@tanstack/router-utils": "^1.132.0-alpha.1",
-    "@tanstack/start-plugin-core": "1.132.0-alpha.8"
+    "@tanstack/react-start-client": "1.132.0",
+    "@tanstack/react-start-server": "1.132.0",
+    "@tanstack/start-plugin-core": "1.132.0",
+    "@tanstack/router-utils": "^1.132.0",
+    "@tanstack/react-router": "1.132.0",
+    "@tanstack/start-client-core": "1.132.0"
   },
   "peerDependencies": {
     "react": ">=18.0.0 || >=19.0.0",

package/src/{plugin/default-entry → default-entry}/client.tsx

@@ -1,15 +1,12 @@
 import { StrictMode, startTransition } from 'react'
 import { hydrateRoot } from 'react-dom/client'
-import { StartClient } from '@tanstack/react-start'
-import { createRouter } from '#tanstack-start-router-entry'
-
-const router = createRouter()
+import { StartClient } from '@tanstack/react-start/client'
 
 startTransition(() => {
   hydrateRoot(
     document,
     <StrictMode>
-      <StartClient router={router} />
+      <StartClient />
     </StrictMode>,
   )
 })

package/src/default-entry/server.ts

@@ -0,0 +1,15 @@
+import {
+  createStartHandler,
+  defaultStreamHandler,
+} from '@tanstack/react-start/server'
+import type { Register } from '@tanstack/react-start'
+import type { RequestHandler } from '@tanstack/react-start/server'
+
+const fetch = createStartHandler(defaultStreamHandler)
+
+export default {
+  // Providing `RequestHandler` from `@tanstack/react-start/server` is required so that the output types don't import it from `@tanstack/start-server-core`
+
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+  fetch: fetch as RequestHandler<Register>,
+}

package/src/default-entry/start.ts

@@ -0,0 +1 @@
+export default {}

package/src/index.ts

@@ -0,0 +1,2 @@
+export { useServerFn } from './useServerFn'
+export * from '@tanstack/start-client-core'

package/src/plugin/vite.ts

@@ -18,59 +18,58 @@ const defaultEntryDir = path.resolve(
 const defaultEntryPaths = {
   client: path.resolve(defaultEntryDir, 'client'),
   server: path.resolve(defaultEntryDir, 'server'),
+  start: path.resolve(defaultEntryDir, 'start'),
 }
 
 const isInsideRouterMonoRepo =
   path.basename(path.resolve(currentDir, '../../../../')) === 'packages'
 
-function hasRootExport(
-  exportsField?: Record<string, unknown> | string,
-): boolean {
-  if (!exportsField) return false
-
-  if (typeof exportsField === 'string') {
-    // shorthand form: "exports": "./index.js"
-    return true
-  }
-
-  if (typeof exportsField === 'object') {
-    return '.' in exportsField
-  }
-
-  return false
-}
-
 export function tanstackStart(
   options?: TanStackStartInputConfig,
 ): Array<PluginOption> {
   return [
     {
       name: 'tanstack-react-start:config',
-      configEnvironment(env, userConfig) {
+      configEnvironment(environmentName, options) {
         return {
           resolve: {
-            dedupe: ['react', 'react-dom', '@tanstack/react-router'],
-
-            external:
-              userConfig.resolve?.noExternal === true || !isInsideRouterMonoRepo
-                ? undefined
-                : ['@tanstack/react-router', '@tanstack/react-router-devtools'],
-          },
-
-          optimizeDeps: {
-            exclude: ['@tanstack/react-router-devtools'],
-            include: [
+            dedupe: [
               'react',
-              'react/jsx-runtime',
-              'react/jsx-dev-runtime',
               'react-dom',
-              'react-dom/client',
+              '@tanstack/react-start',
               '@tanstack/react-router',
-              ...(env === VITE_ENVIRONMENT_NAMES.server
-                ? ['react-dom/server']
-                : []),
             ],
+            external:
+              options.resolve?.noExternal === true || !isInsideRouterMonoRepo
+                ? undefined
+                : ['@tanstack/react-router', '@tanstack/react-router-devtools'],
           },
+          optimizeDeps:
+            environmentName === VITE_ENVIRONMENT_NAMES.client ||
+            (environmentName === VITE_ENVIRONMENT_NAMES.server &&
+              // This indicates that the server environment has opted in to dependency optimization
+              options.optimizeDeps?.noDiscovery === false)
+              ? {
+                  // As `@tanstack/react-start` depends on `@tanstack/react-router`, we should exclude both.
+                  exclude: [
+                    '@tanstack/react-start',
+                    '@tanstack/react-router',
+                    '@tanstack/react-router-devtools',
+                  ],
+                  include: [
+                    'react',
+                    'react/jsx-runtime',
+                    'react/jsx-dev-runtime',
+                    'react-dom',
+                    ...(environmentName === VITE_ENVIRONMENT_NAMES.client
+                      ? ['react-dom/client']
+                      : ['react-dom/server']),
+                    // `@tanstack/react-store` has a dependency on `use-sync-external-store`, which is CJS.
+                    // It therefore needs to included so that it is converted to ESM.
+                    '@tanstack/react-router > @tanstack/react-store',
+                  ],
+                }
+              : undefined,
         }
       },
     },
@@ -78,15 +77,6 @@ export function tanstackStart(
       {
         framework: 'react',
         defaultEntryPaths,
-        crawlPackages(opts) {
-          if (opts.name === '@tanstack/react-router-devtools') {
-            return 'exclude'
-          }
-          if (hasRootExport(opts.exports) && 'react' in opts.peerDependencies) {
-            return 'include'
-          }
-          return undefined
-        },
       },
       options,
     ),

package/src/useServerFn.ts

@@ -0,0 +1,30 @@
+import * as React from 'react'
+import { isRedirect, useRouter } from '@tanstack/react-router'
+
+export function useServerFn<T extends (...deps: Array<any>) => Promise<any>>(
+  serverFn: T,
+): (...args: Parameters<T>) => ReturnType<T> {
+  const router = useRouter()
+
+  return React.useCallback(
+    async (...args: Array<any>) => {
+      try {
+        const res = await serverFn(...args)
+
+        if (isRedirect(res)) {
+          throw res
+        }
+
+        return res
+      } catch (err) {
+        if (isRedirect(err)) {
+          err.options._fromLocation = router.state.location
+          return router.navigate(router.resolveRedirect(err).options)
+        }
+
+        throw err
+      }
+    },
+    [router, serverFn],
+  ) as any
+}

package/src/plugin/default-entry/router-entry.d.ts

@@ -1,4 +0,0 @@
-declare module '#tanstack-start-router-entry' {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
-  export const createRouter: () => import('@tanstack/router-core').AnyRouter
-}

package/src/plugin/default-entry/server.ts

@@ -1,14 +0,0 @@
-import {
-  createStartHandler,
-  defaultStreamHandler,
-} from '@tanstack/react-start/server'
-
-import { createRouter } from '#tanstack-start-router-entry'
-
-const fetch = createStartHandler({
-  createRouter,
-})(defaultStreamHandler)
-
-export default {
-  fetch,
-}