@octanejs/tanstack-start 0.1.27 → 0.1.29

package/README.md

@@ -2,7 +2,7 @@
 
 TanStack Start for Octane. This package owns the renderer integration needed
 for file-route generation, route code splitting, server functions, streaming
-SSR, hydration, and Vite development and production builds.
+SSR, hydration, and Vite or Rsbuild development and production builds.
 
 It uses [`@octanejs/tanstack-router`](../tanstack-router) for the public router
 binding and published renderer-neutral TanStack core packages for shared Start
@@ -25,6 +25,23 @@ The plugin installs Octane compilation before route analysis, generates TSRX
 file routes with imports from `@octanejs/tanstack-router`, compiles Start's
 environment-specific APIs, and configures the client and SSR Vite environments.
 
+## Rsbuild setup
+
+```ts
+import { defineConfig } from '@rsbuild/core';
+import { tanstackStart } from '@octanejs/tanstack-start/plugin/rsbuild';
+
+export default defineConfig({
+	plugins: [tanstackStart()],
+});
+```
+
+The Rsbuild plugin installs the Octane Rspack compiler and Start's native
+Rsbuild adapter together. It creates separate `client` and `ssr` environments,
+emits production assets to `dist/client` and the fetch-style server entry to
+`dist/server`, and provides the same route generation, server functions,
+streaming SSR, import protection, and prerendering behavior as the Vite entry.
+
 Application code imports Start APIs from this package and router APIs from the
 Octane router binding:
 
@@ -39,6 +56,7 @@ import { createFileRoute } from '@octanejs/tanstack-router';
 - `@octanejs/tanstack-start/client`
 - `@octanejs/tanstack-start/server`
 - `@octanejs/tanstack-start/plugin/vite`
+- `@octanejs/tanstack-start/plugin/rsbuild`
 - RPC and environment-marker entries used by the Start compiler
 - `@octanejs/tanstack-start/server-entry`
 

package/THIRD_PARTY_NOTICES.md

@@ -1,10 +1,11 @@
 # Third-party notices
 
-The Start compiler, route generator, router plugin, client runtime, and server
-runtime in this package are derived from TanStack Router pull request #7847,
-snapshot `753f919e`, and later Octane-specific fixes maintained in this
-repository. That work is copyright Tanner Linsley and TanStack contributors and
-is used under the MIT License shipped with this package.
+The Start compiler, route generator, router plugin, Vite and Rsbuild adapters,
+client runtime, and server runtime in this package are derived from TanStack
+Router pull request #7847, snapshot `753f919e`, and later Octane-specific fixes
+maintained in this repository. That work is copyright Tanner Linsley and
+TanStack contributors and is used under the MIT License shipped with this
+package.
 
 The native streaming path is adapted to Octane's `StreamOptions.injection` API
 so streamed router HTML is merged by the renderer rather than by a byte-level

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@octanejs/tanstack-start",
-  "version": "0.1.27",
-  "description": "TanStack Start for Octane, including file-route generation, server functions, SSR streaming, hydration, and Vite integration.",
+  "version": "0.1.29",
+  "description": "TanStack Start for Octane, including file-route generation, server functions, SSR streaming, hydration, and Vite or Rsbuild integration.",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -43,6 +43,7 @@
     "#tanstack-start/router-plugin/*": "./src/internal/router-plugin/*.js",
     "#tanstack-start/plugin-core": "./src/internal/start-plugin-core/index.js",
     "#tanstack-start/plugin-core/vite": "./src/internal/start-plugin-core/vite/index.js",
+    "#tanstack-start/plugin-core/rsbuild": "./src/internal/start-plugin-core/rsbuild/index.js",
     "#tanstack-start/plugin-core/*": "./src/internal/start-plugin-core/*.js"
   },
   "exports": {
@@ -96,6 +97,11 @@
       "import": "./src/plugin-vite.js",
       "default": "./src/plugin-vite.js"
     },
+    "./plugin/rsbuild": {
+      "types": "./src/plugin-rsbuild.d.ts",
+      "import": "./src/plugin-rsbuild.js",
+      "default": "./src/plugin-rsbuild.js"
+    },
     "./server-entry": {
       "types": "./src/server-entry.d.ts",
       "import": "./src/server-entry.js",
@@ -133,24 +139,30 @@
     "vitefu": "^1.1.1",
     "xmlbuilder2": "^4.0.3",
     "zod": "^4.4.3",
-    "@octanejs/tanstack-router": "0.1.37"
+    "@octanejs/rspack-plugin": "0.1.35",
+    "@octanejs/tanstack-router": "0.1.39"
   },
   "peerDependencies": {
+    "@rsbuild/core": "^2.0.0",
     "vite": ">=7.0.0",
-    "octane": "0.1.38"
+    "octane": "0.1.40"
   },
   "peerDependenciesMeta": {
+    "@rsbuild/core": {
+      "optional": true
+    },
     "vite": {
       "optional": true
     }
   },
   "devDependencies": {
+    "@rsbuild/core": "^2.1.6",
     "@types/node": "^24.13.3",
     "vite": "^8.1.5",
     "vitest": "^4.1.10",
-    "octane": "0.1.38"
+    "octane": "0.1.40"
   },
   "scripts": {
-    "test": "cd ../.. && vitest run --project tanstack-start"
+    "test": "cd ../.. && vitest run --project tanstack-start --project tanstack-start-rsbuild"
   }
 }

package/src/client-only-server-strip-loader.js

@@ -0,0 +1,7 @@
+import { clientOnlyServerStripTransform } from './client-only-server-strip.js';
+
+export default function clientOnlyServerStripLoader(source) {
+	const result = clientOnlyServerStripTransform(source, this.resourcePath);
+	if (!result) return source;
+	this.callback(null, result.code, result.map);
+}

package/src/client-only-server-strip.js

@@ -2,6 +2,39 @@ import MagicString from 'magic-string';
 import { compileToVolarMappings } from 'octane/compiler/volar';
 import { START_ENVIRONMENT_NAMES } from '#tanstack-start/plugin-core/vite';
 
+/**
+ * Strip children of `<ClientOnly>` from server TSRX source. Returns
+ * `{ code, map }` when a rewrite was applied, or `undefined` when the source
+ * needs no changes. Shared by the Vite and Rsbuild integrations.
+ */
+export function clientOnlyServerStripTransform(code, id) {
+	if (!code.includes('ClientOnly')) return undefined;
+
+	const filename = id.split('?', 1)[0];
+	const { sourceAst } = compileToVolarMappings(code, filename);
+	const childReplacements = stripClientOnlyChildren(sourceAst);
+	if (childReplacements.length === 0) return undefined;
+
+	const prunedImportSpecifiers = findImportsUsedOnlyInRanges(sourceAst, childReplacements);
+	const replacements = [
+		...rewritePrunedImports(code, sourceAst, prunedImportSpecifiers),
+		...childReplacements,
+	];
+	const output = new MagicString(code);
+	for (const replacement of replacements.sort((a, b) => b.start - a.start)) {
+		output.overwrite(replacement.start, replacement.end, replacement.content);
+	}
+
+	return {
+		code: output.toString(),
+		map: output.generateMap({
+			source: filename,
+			includeContent: true,
+			hires: true,
+		}),
+	};
+}
+
 /**
  * Remove the children of the Router ClientOnly binding before Octane compiles
  * server TSRX. This keeps client-only imports out of the server module graph,
@@ -20,31 +53,7 @@ export function octaneClientOnlyServerStrip() {
 				code: { include: ['ClientOnly'] },
 			},
 			handler(code, id) {
-				if (!code.includes('ClientOnly')) return undefined;
-
-				const filename = id.split('?', 1)[0];
-				const { sourceAst } = compileToVolarMappings(code, filename);
-				const childReplacements = stripClientOnlyChildren(sourceAst);
-				if (childReplacements.length === 0) return undefined;
-
-				const prunedImportSpecifiers = findImportsUsedOnlyInRanges(sourceAst, childReplacements);
-				const replacements = [
-					...rewritePrunedImports(code, sourceAst, prunedImportSpecifiers),
-					...childReplacements,
-				];
-				const output = new MagicString(code);
-				for (const replacement of replacements.sort((a, b) => b.start - a.start)) {
-					output.overwrite(replacement.start, replacement.end, replacement.content);
-				}
-
-				return {
-					code: output.toString(),
-					map: output.generateMap({
-						source: filename,
-						includeContent: true,
-						hires: true,
-					}),
-				};
+				return clientOnlyServerStripTransform(code, id);
 			},
 		},
 	};

package/src/internal/README.md

@@ -1,14 +1,14 @@
 # Start integration internals
 
-These modules are the package-owned Router generator, Router Vite plugin, and
-Start compiler/Vite core used by the Octane adapter. They are derived from the
-TanStack framework-adapter snapshot identified in the package notice, with
-Octane package-name mapping and repository fixes applied.
+These modules are the package-owned Router generator, Router build-tool
+plugins, and Start compiler cores used by the Octane Vite and Rsbuild adapters.
+They are derived from the TanStack framework-adapter snapshot identified in the
+package notice, with Octane package-name mapping and repository fixes applied.
 
-They are committed as executable ESM because `plugin/vite` must load from a
+They are committed as executable ESM because the build plugins must load from a
 published package in plain Node before an application build exists. Internal
-package-import aliases keep the three implementation layers private while
-allowing their original module boundaries to remain reviewable.
+package-import aliases keep the implementation layers private while allowing
+their original module boundaries to remain reviewable.
 
 When updating the upstream basis, preserve the local package-name helpers,
 TSRX source masking, compiler-before-router plugin order, native streaming

package/src/internal/start-plugin-core/rsbuild/import-protection.d.ts

@@ -0,0 +1,27 @@
+import { FileMatchers } from '../import-protection/utils.js';
+import { CompileStartFrameworkOptions, GetConfigFn } from '../types.js';
+import { RsbuildPluginAPI } from '@rsbuild/core';
+type ResolvedImportProtectionCheck =
+	| {
+			type: 'file';
+			fileMatch: FileMatchers['files'][number];
+	  }
+	| {
+			type: 'marker';
+	  };
+export declare function getRsbuildResolvedImportProtectionCheck(
+	relativeResolved: string,
+	matchers: FileMatchers,
+): ResolvedImportProtectionCheck | undefined;
+export declare function registerImportProtection(
+	api: RsbuildPluginAPI,
+	opts: {
+		getConfig: GetConfigFn;
+		framework: CompileStartFrameworkOptions;
+		environments: Array<{
+			name: string;
+			type: 'client' | 'server';
+		}>;
+	},
+): void;
+export {};