@tanstack/react-start 1.167.20 → 1.167.21

package/dist/esm/index.rsc.d.ts

@@ -0,0 +1 @@
+export * from '@tanstack/start-client-core';

package/dist/esm/index.rsc.js

@@ -0,0 +1 @@
+export * from "@tanstack/start-client-core";

package/dist/esm/plugin/shared.d.ts

@@ -0,0 +1,7 @@
+export declare const reactStartPluginDir: string;
+export declare const reactStartDefaultEntryPaths: {
+    client: string;
+    server: string;
+    start: string;
+};
+export declare function resolvePackageEntryPath(packageName: string): string;

package/dist/esm/plugin/shared.js

@@ -0,0 +1,15 @@
+import path from "pathe";
+import { fileURLToPath } from "node:url";
+//#region src/plugin/shared.ts
+var currentDir = path.dirname(fileURLToPath(import.meta.url));
+var reactStartPluginDir = currentDir;
+var defaultEntryDir = path.resolve(currentDir, "..", "..", "plugin", "default-entry");
+var reactStartDefaultEntryPaths = {
+	client: path.resolve(defaultEntryDir, "client.tsx"),
+	server: path.resolve(defaultEntryDir, "server.ts"),
+	start: path.resolve(defaultEntryDir, "start.ts")
+};
+//#endregion
+export { reactStartDefaultEntryPaths, reactStartPluginDir };
+
+//# sourceMappingURL=shared.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"shared.js","names":[],"sources":["../../../src/plugin/shared.ts"],"sourcesContent":["import { fileURLToPath } from 'node:url'\nimport path from 'pathe'\n\nconst currentDir = path.dirname(fileURLToPath(import.meta.url))\nexport const reactStartPluginDir = currentDir\nconst defaultEntryDir = path.resolve(\n  currentDir,\n  '..',\n  '..',\n  'plugin',\n  'default-entry',\n)\n\nexport const reactStartDefaultEntryPaths = {\n  client: path.resolve(defaultEntryDir, 'client.tsx'),\n  server: path.resolve(defaultEntryDir, 'server.ts'),\n  start: path.resolve(defaultEntryDir, 'start.ts'),\n}\n\nexport function resolvePackageEntryPath(packageName: string): string {\n  return fileURLToPath(import.meta.resolve(packageName))\n}\n"],"mappings":";;;AAGA,IAAM,aAAa,KAAK,QAAQ,cAAc,OAAO,KAAK,IAAI,CAAC;AAC/D,IAAa,sBAAsB;AACnC,IAAM,kBAAkB,KAAK,QAC3B,YACA,MACA,MACA,UACA,gBACD;AAED,IAAa,8BAA8B;CACzC,QAAQ,KAAK,QAAQ,iBAAiB,aAAa;CACnD,QAAQ,KAAK,QAAQ,iBAAiB,YAAY;CAClD,OAAO,KAAK,QAAQ,iBAAiB,WAAW;CACjD"}

package/dist/esm/plugin/vite.d.ts

@@ -1,3 +1,7 @@
-import { TanStackStartInputConfig } from '@tanstack/start-plugin-core';
+import { TanStackStartViteInputConfig } from '@tanstack/start-plugin-core';
 import { PluginOption } from 'vite';
-export declare function tanstackStart(options?: TanStackStartInputConfig): Array<PluginOption>;
+export declare function tanstackStart(options?: TanStackStartViteInputConfig & {
+    rsc?: {
+        enabled?: boolean;
+    };
+}): Array<PluginOption>;

package/dist/esm/plugin/vite.js

@@ -1,52 +1,65 @@
-import { fileURLToPath } from "node:url";
-import { TanStackStartVitePluginCore, VITE_ENVIRONMENT_NAMES } from "@tanstack/start-plugin-core";
+import { reactStartDefaultEntryPaths, reactStartPluginDir } from "./shared.js";
+import { START_ENVIRONMENT_NAMES, tanStackStartVite } from "@tanstack/start-plugin-core";
+import { configureRsc, reactStartRscVitePlugin } from "@tanstack/react-start-rsc/plugin/vite";
 import path from "pathe";
 //#region src/plugin/vite.ts
-var currentDir = path.dirname(fileURLToPath(import.meta.url));
-var defaultEntryDir = path.resolve(currentDir, "..", "..", "plugin", "default-entry");
-var defaultEntryPaths = {
-	client: path.resolve(defaultEntryDir, "client.tsx"),
-	server: path.resolve(defaultEntryDir, "server.ts"),
-	start: path.resolve(defaultEntryDir, "start.ts")
-};
-var isInsideRouterMonoRepo = path.basename(path.resolve(currentDir, "../../../../")) === "packages";
+var isInsideRouterMonoRepo = path.basename(path.resolve(reactStartPluginDir, "../../../../")) === "packages";
 function tanstackStart(options) {
-	return [{
-		name: "tanstack-react-start:config",
-		configEnvironment(environmentName, options) {
-			return {
-				resolve: {
-					dedupe: [
-						"react",
-						"react-dom",
-						"@tanstack/react-start",
-						"@tanstack/react-router"
-					],
-					external: options.resolve?.noExternal === true || !isInsideRouterMonoRepo ? void 0 : ["@tanstack/react-router", "@tanstack/react-router-devtools"]
-				},
-				optimizeDeps: environmentName === VITE_ENVIRONMENT_NAMES.client || environmentName === VITE_ENVIRONMENT_NAMES.server && options.optimizeDeps?.noDiscovery === false ? {
-					exclude: [
-						"@tanstack/react-start",
-						"@tanstack/react-router",
-						"@tanstack/react-router-devtools",
-						"@tanstack/start-static-server-functions"
-					],
-					include: [
-						"react",
-						"react/jsx-runtime",
-						"react/jsx-dev-runtime",
-						"react-dom",
-						...environmentName === VITE_ENVIRONMENT_NAMES.client ? ["react-dom/client"] : ["react-dom/server"],
-						"@tanstack/react-router > @tanstack/react-store",
-						...options.optimizeDeps?.exclude?.find((x) => x === "@tanstack/react-form") ? ["@tanstack/react-form > @tanstack/react-store"] : []
-					]
-				} : void 0
-			};
-		}
-	}, TanStackStartVitePluginCore({
+	const rscConfig = options?.rsc?.enabled ?? false ? configureRsc() : void 0;
+	let corePluginOpts = {
 		framework: "react",
-		defaultEntryPaths
-	}, options)];
+		defaultEntryPaths: reactStartDefaultEntryPaths,
+		providerEnvironmentName: START_ENVIRONMENT_NAMES.server,
+		ssrIsProvider: true,
+		ssrResolverStrategy: { type: "default" }
+	};
+	const serverEnvironments = [START_ENVIRONMENT_NAMES.server, ...rscConfig ? [rscConfig.envName] : []];
+	if (rscConfig) corePluginOpts = {
+		...corePluginOpts,
+		providerEnvironmentName: rscConfig.providerEnvironmentName,
+		ssrIsProvider: false,
+		ssrResolverStrategy: rscConfig.ssrResolverStrategy,
+		serializationAdapters: rscConfig.serializationAdapters
+	};
+	return [
+		{
+			name: "tanstack-react-start:config",
+			configEnvironment(environmentName, options) {
+				const needsOptimizeDeps = environmentName === START_ENVIRONMENT_NAMES.client || serverEnvironments.includes(environmentName) && options.optimizeDeps?.noDiscovery === false;
+				const reactRouterInNoExternal = Array.isArray(options.resolve?.noExternal) && options.resolve.noExternal.some((pattern) => pattern === "@tanstack/react-router" || typeof pattern === "string" && pattern.includes("react-router"));
+				return {
+					resolve: {
+						dedupe: [
+							"react",
+							"react-dom",
+							"@tanstack/react-start",
+							"@tanstack/react-router"
+						],
+						external: options.resolve?.noExternal === true || !isInsideRouterMonoRepo || reactRouterInNoExternal ? void 0 : ["@tanstack/react-router", "@tanstack/react-router-devtools"]
+					},
+					optimizeDeps: needsOptimizeDeps ? {
+						exclude: [
+							"@tanstack/react-start",
+							"@tanstack/react-router",
+							"@tanstack/react-router-devtools",
+							"@tanstack/start-static-server-functions"
+						],
+						include: [
+							"react",
+							"react/jsx-runtime",
+							"react/jsx-dev-runtime",
+							"react-dom",
+							...environmentName === START_ENVIRONMENT_NAMES.client ? ["react-dom/client"] : ["react-dom/server"],
+							"@tanstack/react-router > @tanstack/react-store",
+							...options.optimizeDeps?.exclude?.find((x) => x === "@tanstack/react-form") ? ["@tanstack/react-form > @tanstack/react-store"] : []
+						]
+					} : void 0
+				};
+			}
+		},
+		rscConfig ? reactStartRscVitePlugin() : null,
+		tanStackStartVite(corePluginOpts, options)
+	];
 }
 //#endregion
 export { tanstackStart };

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

@@ -1 +1 @@
-{"version":3,"file":"vite.js","names":[],"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.tsx'),\n  server: path.resolve(defaultEntryDir, 'server.ts'),\n  start: path.resolve(defaultEntryDir, 'start.ts'),\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                    '@tanstack/start-static-server-functions',\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 be included so that it is converted to ESM.\n                    '@tanstack/react-router > @tanstack/react-store',\n                    ...(options.optimizeDeps?.exclude?.find(\n                      (x) => x === '@tanstack/react-form',\n                    )\n                      ? ['@tanstack/react-form > @tanstack/react-store']\n                      : []),\n                  ],\n                }\n              : undefined,\n        }\n      },\n    },\n    TanStackStartVitePluginCore(\n      {\n        framework: 'react',\n        defaultEntryPaths,\n      },\n      options,\n    ),\n  ]\n}\n"],"mappings":";;;;AASA,IAAM,aAAa,KAAK,QAAQ,cAAc,OAAO,KAAK,IAAI,CAAC;AAC/D,IAAM,kBAAkB,KAAK,QAC3B,YACA,MACA,MACA,UACA,gBACD;AACD,IAAM,oBAAoB;CACxB,QAAQ,KAAK,QAAQ,iBAAiB,aAAa;CACnD,QAAQ,KAAK,QAAQ,iBAAiB,YAAY;CAClD,OAAO,KAAK,QAAQ,iBAAiB,WAAW;CACjD;AAED,IAAM,yBACJ,KAAK,SAAS,KAAK,QAAQ,YAAY,eAAe,CAAC,KAAK;AAE9D,SAAgB,cACd,SACqB;AACrB,QAAO,CACL;EACE,MAAM;EACN,kBAAkB,iBAAiB,SAAS;AAC1C,UAAO;IACL,SAAS;KACP,QAAQ;MACN;MACA;MACA;MACA;MACD;KACD,UACE,QAAQ,SAAS,eAAe,QAAQ,CAAC,yBACrC,KAAA,IACA,CAAC,0BAA0B,kCAAkC;KACpE;IACD,cACE,oBAAoB,uBAAuB,UAC1C,oBAAoB,uBAAuB,UAE1C,QAAQ,cAAc,gBAAgB,QACpC;KAEE,SAAS;MACP;MACA;MACA;MACA;MACD;KACD,SAAS;MACP;MACA;MACA;MACA;MACA,GAAI,oBAAoB,uBAAuB,SAC3C,CAAC,mBAAmB,GACpB,CAAC,mBAAmB;MAGxB;MACA,GAAI,QAAQ,cAAc,SAAS,MAChC,MAAM,MAAM,uBACd,GACG,CAAC,+CAA+C,GAChD,EAAE;MACP;KACF,GACD,KAAA;IACP;;EAEJ,EACD,4BACE;EACE,WAAW;EACX;EACD,EACD,QACD,CACF"}
+{"version":3,"file":"vite.js","names":[],"sources":["../../../src/plugin/vite.ts"],"sourcesContent":["import {\n  START_ENVIRONMENT_NAMES,\n  tanStackStartVite,\n} from '@tanstack/start-plugin-core'\nimport {\n  configureRsc,\n  reactStartRscVitePlugin,\n} from '@tanstack/react-start-rsc/plugin/vite'\nimport path from 'pathe'\nimport { reactStartDefaultEntryPaths, reactStartPluginDir } from './shared'\nimport type { TanStackStartVitePluginCoreOptions } from '@tanstack/start-plugin-core/vite/types'\nimport type { TanStackStartViteInputConfig } from '@tanstack/start-plugin-core'\nimport type { PluginOption } from 'vite'\n\nconst isInsideRouterMonoRepo =\n  path.basename(path.resolve(reactStartPluginDir, '../../../../')) ===\n  'packages'\n\nexport function tanstackStart(\n  options?: TanStackStartViteInputConfig & { rsc?: { enabled?: boolean } },\n): Array<PluginOption> {\n  const rscEnabled = options?.rsc?.enabled ?? false\n  const rscConfig = rscEnabled ? configureRsc() : undefined\n  let corePluginOpts: TanStackStartVitePluginCoreOptions = {\n    framework: 'react',\n    defaultEntryPaths: reactStartDefaultEntryPaths,\n    providerEnvironmentName: START_ENVIRONMENT_NAMES.server,\n    ssrIsProvider: true,\n    ssrResolverStrategy: {\n      type: 'default',\n    },\n  }\n\n  const serverEnvironments: Array<string> = [\n    START_ENVIRONMENT_NAMES.server,\n    ...(rscConfig ? [rscConfig.envName] : []),\n  ]\n\n  if (rscConfig) {\n    corePluginOpts = {\n      ...corePluginOpts,\n      providerEnvironmentName: rscConfig.providerEnvironmentName,\n      ssrIsProvider: false,\n      ssrResolverStrategy: rscConfig.ssrResolverStrategy,\n      serializationAdapters: rscConfig.serializationAdapters,\n    }\n  }\n  return [\n    {\n      name: 'tanstack-react-start:config',\n      configEnvironment(environmentName, options) {\n        const needsOptimizeDeps =\n          environmentName === START_ENVIRONMENT_NAMES.client ||\n          (serverEnvironments.includes(environmentName) &&\n            // This indicates that the server environment has opted in to dependency optimization\n            options.optimizeDeps?.noDiscovery === false)\n\n        // Check if @tanstack/react-router is in noExternal (as array)\n        const reactRouterInNoExternal =\n          Array.isArray(options.resolve?.noExternal) &&\n          options.resolve.noExternal.some(\n            (pattern) =>\n              pattern === '@tanstack/react-router' ||\n              (typeof pattern === 'string' && pattern.includes('react-router')),\n          )\n\n        return {\n          resolve: {\n            dedupe: [\n              'react',\n              'react-dom',\n              '@tanstack/react-start',\n              '@tanstack/react-router',\n            ],\n            // Don't mark react-router as external if:\n            // 1. noExternal is true (bundle everything)\n            // 2. We're not in the router monorepo\n            // 3. react-router is explicitly in noExternal for this environment\n            external:\n              options.resolve?.noExternal === true ||\n              !isInsideRouterMonoRepo ||\n              reactRouterInNoExternal\n                ? undefined\n                : ['@tanstack/react-router', '@tanstack/react-router-devtools'],\n          },\n          optimizeDeps: needsOptimizeDeps\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                  '@tanstack/start-static-server-functions',\n                ],\n                include: [\n                  'react',\n                  'react/jsx-runtime',\n                  'react/jsx-dev-runtime',\n                  'react-dom',\n                  ...(environmentName === START_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 be included so that it is converted to ESM.\n                  '@tanstack/react-router > @tanstack/react-store',\n                  ...(options.optimizeDeps?.exclude?.find(\n                    (x) => x === '@tanstack/react-form',\n                  )\n                    ? ['@tanstack/react-form > @tanstack/react-store']\n                    : []),\n                ],\n              }\n            : undefined,\n        }\n      },\n    },\n    rscConfig ? reactStartRscVitePlugin() : null,\n    tanStackStartVite(corePluginOpts, options),\n  ]\n}\n"],"mappings":";;;;;AAcA,IAAM,yBACJ,KAAK,SAAS,KAAK,QAAQ,qBAAqB,eAAe,CAAC,KAChE;AAEF,SAAgB,cACd,SACqB;CAErB,MAAM,YADa,SAAS,KAAK,WAAW,QACb,cAAc,GAAG,KAAA;CAChD,IAAI,iBAAqD;EACvD,WAAW;EACX,mBAAmB;EACnB,yBAAyB,wBAAwB;EACjD,eAAe;EACf,qBAAqB,EACnB,MAAM,WACP;EACF;CAED,MAAM,qBAAoC,CACxC,wBAAwB,QACxB,GAAI,YAAY,CAAC,UAAU,QAAQ,GAAG,EAAE,CACzC;AAED,KAAI,UACF,kBAAiB;EACf,GAAG;EACH,yBAAyB,UAAU;EACnC,eAAe;EACf,qBAAqB,UAAU;EAC/B,uBAAuB,UAAU;EAClC;AAEH,QAAO;EACL;GACE,MAAM;GACN,kBAAkB,iBAAiB,SAAS;IAC1C,MAAM,oBACJ,oBAAoB,wBAAwB,UAC3C,mBAAmB,SAAS,gBAAgB,IAE3C,QAAQ,cAAc,gBAAgB;IAG1C,MAAM,0BACJ,MAAM,QAAQ,QAAQ,SAAS,WAAW,IAC1C,QAAQ,QAAQ,WAAW,MACxB,YACC,YAAY,4BACX,OAAO,YAAY,YAAY,QAAQ,SAAS,eAAe,CACnE;AAEH,WAAO;KACL,SAAS;MACP,QAAQ;OACN;OACA;OACA;OACA;OACD;MAKD,UACE,QAAQ,SAAS,eAAe,QAChC,CAAC,0BACD,0BACI,KAAA,IACA,CAAC,0BAA0B,kCAAkC;MACpE;KACD,cAAc,oBACV;MAEE,SAAS;OACP;OACA;OACA;OACA;OACD;MACD,SAAS;OACP;OACA;OACA;OACA;OACA,GAAI,oBAAoB,wBAAwB,SAC5C,CAAC,mBAAmB,GACpB,CAAC,mBAAmB;OAGxB;OACA,GAAI,QAAQ,cAAc,SAAS,MAChC,MAAM,MAAM,uBACd,GACG,CAAC,+CAA+C,GAChD,EAAE;OACP;MACF,GACD,KAAA;KACL;;GAEJ;EACD,YAAY,yBAAyB,GAAG;EACxC,kBAAkB,gBAAgB,QAAQ;EAC3C"}

package/dist/esm/rsc/serialization/client.d.ts

@@ -0,0 +1 @@
+export { rscSerializationAdapter } from '@tanstack/react-start-rsc/serialization.client';

package/dist/esm/rsc/serialization/client.js

@@ -0,0 +1,2 @@
+import { rscSerializationAdapter } from "@tanstack/react-start-rsc/serialization.client";
+export { rscSerializationAdapter };

package/dist/esm/rsc/serialization/server.d.ts

@@ -0,0 +1 @@
+export { rscSerializationAdapter } from '@tanstack/react-start-rsc/serialization.server';

package/dist/esm/rsc/serialization/server.js

@@ -0,0 +1,2 @@
+import { rscSerializationAdapter } from "@tanstack/react-start-rsc/serialization.server";
+export { rscSerializationAdapter };

package/dist/esm/rsc.d.ts

@@ -0,0 +1 @@
+export * from '@tanstack/react-start-rsc';

package/dist/esm/rsc.js

@@ -0,0 +1 @@
+export * from "@tanstack/react-start-rsc";

package/dist/esm/rsc.rsc.d.ts

@@ -0,0 +1 @@
+export * from '@tanstack/react-start-rsc';

package/dist/esm/rsc.rsc.js

@@ -0,0 +1 @@
+export * from "@tanstack/react-start-rsc";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-start",
-  "version": "1.167.20",
+  "version": "1.167.21",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -27,6 +27,10 @@
   "types": "dist/esm/index.d.ts",
   "exports": {
     ".": {
+      "react-server": {
+        "types": "./dist/esm/index.rsc.d.ts",
+        "default": "./dist/esm/index.rsc.js"
+      },
       "import": {
         "types": "./dist/esm/index.d.ts",
         "default": "./dist/esm/index.js"
@@ -74,6 +78,28 @@
         "default": "./dist/default-entry/esm/server.js"
       }
     },
+    "./rsc": {
+      "react-server": {
+        "types": "./dist/esm/rsc.rsc.d.ts",
+        "default": "./dist/esm/rsc.rsc.js"
+      },
+      "import": {
+        "types": "./dist/esm/rsc.d.ts",
+        "default": "./dist/esm/rsc.js"
+      }
+    },
+    "./rsc/serialization/server": {
+      "import": {
+        "types": "./dist/esm/rsc/serialization/server.d.ts",
+        "default": "./dist/esm/rsc/serialization/server.js"
+      }
+    },
+    "./rsc/serialization/client": {
+      "import": {
+        "types": "./dist/esm/rsc/serialization/client.d.ts",
+        "default": "./dist/esm/rsc/serialization/client.js"
+      }
+    },
     "./server-only": {
       "import": {
         "types": "./dist/esm/server-only.d.ts",
@@ -104,6 +130,7 @@
     "@tanstack/react-start-client": "1.166.29",
     "@tanstack/react-start-server": "1.166.29",
     "@tanstack/router-utils": "^1.161.6",
+    "@tanstack/react-start-rsc": "0.0.1",
     "@tanstack/start-plugin-core": "1.167.18",
     "@tanstack/react-router": "1.168.13",
     "@tanstack/start-client-core": "1.167.10",
@@ -114,6 +141,11 @@
     "react-dom": ">=18.0.0 || >=19.0.0",
     "vite": ">=7.0.0"
   },
+  "peerDependenciesMeta": {
+    "@vitejs/plugin-rsc": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@tanstack/intent": "^0.0.14",
     "@types/node": ">=20"

package/src/index.rsc.ts

@@ -0,0 +1 @@
+export * from '@tanstack/start-client-core'

package/src/plugin/shared.ts

@@ -0,0 +1,22 @@
+import { fileURLToPath } from 'node:url'
+import path from 'pathe'
+
+const currentDir = path.dirname(fileURLToPath(import.meta.url))
+export const reactStartPluginDir = currentDir
+const defaultEntryDir = path.resolve(
+  currentDir,
+  '..',
+  '..',
+  'plugin',
+  'default-entry',
+)
+
+export const reactStartDefaultEntryPaths = {
+  client: path.resolve(defaultEntryDir, 'client.tsx'),
+  server: path.resolve(defaultEntryDir, 'server.ts'),
+  start: path.resolve(defaultEntryDir, 'start.ts'),
+}
+
+export function resolvePackageEntryPath(packageName: string): string {
+  return fileURLToPath(import.meta.resolve(packageName))
+}

package/src/plugin/vite.ts

@@ -1,36 +1,69 @@
-import { fileURLToPath } from 'node:url'
 import {
-  TanStackStartVitePluginCore,
-  VITE_ENVIRONMENT_NAMES,
+  START_ENVIRONMENT_NAMES,
+  tanStackStartVite,
 } from '@tanstack/start-plugin-core'
+import {
+  configureRsc,
+  reactStartRscVitePlugin,
+} from '@tanstack/react-start-rsc/plugin/vite'
 import path from 'pathe'
-import type { TanStackStartInputConfig } from '@tanstack/start-plugin-core'
+import { reactStartDefaultEntryPaths, reactStartPluginDir } from './shared'
+import type { TanStackStartVitePluginCoreOptions } from '@tanstack/start-plugin-core/vite/types'
+import type { TanStackStartViteInputConfig } from '@tanstack/start-plugin-core'
 import type { PluginOption } from 'vite'
 
-const currentDir = path.dirname(fileURLToPath(import.meta.url))
-const defaultEntryDir = path.resolve(
-  currentDir,
-  '..',
-  '..',
-  'plugin',
-  'default-entry',
-)
-const defaultEntryPaths = {
-  client: path.resolve(defaultEntryDir, 'client.tsx'),
-  server: path.resolve(defaultEntryDir, 'server.ts'),
-  start: path.resolve(defaultEntryDir, 'start.ts'),
-}
-
 const isInsideRouterMonoRepo =
-  path.basename(path.resolve(currentDir, '../../../../')) === 'packages'
+  path.basename(path.resolve(reactStartPluginDir, '../../../../')) ===
+  'packages'
 
 export function tanstackStart(
-  options?: TanStackStartInputConfig,
+  options?: TanStackStartViteInputConfig & { rsc?: { enabled?: boolean } },
 ): Array<PluginOption> {
+  const rscEnabled = options?.rsc?.enabled ?? false
+  const rscConfig = rscEnabled ? configureRsc() : undefined
+  let corePluginOpts: TanStackStartVitePluginCoreOptions = {
+    framework: 'react',
+    defaultEntryPaths: reactStartDefaultEntryPaths,
+    providerEnvironmentName: START_ENVIRONMENT_NAMES.server,
+    ssrIsProvider: true,
+    ssrResolverStrategy: {
+      type: 'default',
+    },
+  }
+
+  const serverEnvironments: Array<string> = [
+    START_ENVIRONMENT_NAMES.server,
+    ...(rscConfig ? [rscConfig.envName] : []),
+  ]
+
+  if (rscConfig) {
+    corePluginOpts = {
+      ...corePluginOpts,
+      providerEnvironmentName: rscConfig.providerEnvironmentName,
+      ssrIsProvider: false,
+      ssrResolverStrategy: rscConfig.ssrResolverStrategy,
+      serializationAdapters: rscConfig.serializationAdapters,
+    }
+  }
   return [
     {
       name: 'tanstack-react-start:config',
       configEnvironment(environmentName, options) {
+        const needsOptimizeDeps =
+          environmentName === START_ENVIRONMENT_NAMES.client ||
+          (serverEnvironments.includes(environmentName) &&
+            // This indicates that the server environment has opted in to dependency optimization
+            options.optimizeDeps?.noDiscovery === false)
+
+        // Check if @tanstack/react-router is in noExternal (as array)
+        const reactRouterInNoExternal =
+          Array.isArray(options.resolve?.noExternal) &&
+          options.resolve.noExternal.some(
+            (pattern) =>
+              pattern === '@tanstack/react-router' ||
+              (typeof pattern === 'string' && pattern.includes('react-router')),
+          )
+
         return {
           resolve: {
             dedupe: [
@@ -39,52 +72,49 @@ export function tanstackStart(
               '@tanstack/react-start',
               '@tanstack/react-router',
             ],
+            // Don't mark react-router as external if:
+            // 1. noExternal is true (bundle everything)
+            // 2. We're not in the router monorepo
+            // 3. react-router is explicitly in noExternal for this environment
             external:
-              options.resolve?.noExternal === true || !isInsideRouterMonoRepo
+              options.resolve?.noExternal === true ||
+              !isInsideRouterMonoRepo ||
+              reactRouterInNoExternal
                 ? 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',
-                    '@tanstack/start-static-server-functions',
-                  ],
-                  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 be included so that it is converted to ESM.
-                    '@tanstack/react-router > @tanstack/react-store',
-                    ...(options.optimizeDeps?.exclude?.find(
-                      (x) => x === '@tanstack/react-form',
-                    )
-                      ? ['@tanstack/react-form > @tanstack/react-store']
-                      : []),
-                  ],
-                }
-              : undefined,
+          optimizeDeps: needsOptimizeDeps
+            ? {
+                // As `@tanstack/react-start` depends on `@tanstack/react-router`, we should exclude both.
+                exclude: [
+                  '@tanstack/react-start',
+                  '@tanstack/react-router',
+                  '@tanstack/react-router-devtools',
+                  '@tanstack/start-static-server-functions',
+                ],
+                include: [
+                  'react',
+                  'react/jsx-runtime',
+                  'react/jsx-dev-runtime',
+                  'react-dom',
+                  ...(environmentName === START_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 be included so that it is converted to ESM.
+                  '@tanstack/react-router > @tanstack/react-store',
+                  ...(options.optimizeDeps?.exclude?.find(
+                    (x) => x === '@tanstack/react-form',
+                  )
+                    ? ['@tanstack/react-form > @tanstack/react-store']
+                    : []),
+                ],
+              }
+            : undefined,
         }
       },
     },
-    TanStackStartVitePluginCore(
-      {
-        framework: 'react',
-        defaultEntryPaths,
-      },
-      options,
-    ),
+    rscConfig ? reactStartRscVitePlugin() : null,
+    tanStackStartVite(corePluginOpts, options),
   ]
 }

package/src/rsc/serialization/client.ts

@@ -0,0 +1 @@
+export { rscSerializationAdapter } from '@tanstack/react-start-rsc/serialization.client'

package/src/rsc/serialization/server.ts

@@ -0,0 +1 @@
+export { rscSerializationAdapter } from '@tanstack/react-start-rsc/serialization.server'

package/src/rsc.rsc.ts

@@ -0,0 +1,2 @@
+// Re-export from react-start-rsc for react-server condition
+export * from '@tanstack/react-start-rsc'

package/src/rsc.tsx

@@ -0,0 +1,3 @@
+// Re-export from react-start-rsc
+// The package's export conditions handle server vs client differentiation
+export * from '@tanstack/react-start-rsc'