@octanejs/tanstack-start 0.1.1 → 0.1.2

package/src/internal/start-plugin-core/vite/import-protection-plugin/plugin.js

@@ -1,4 +1,4 @@
-import { VITE_ENVIRONMENT_NAMES } from '../../constants.js';
+import { TRANSFORM_ID_REGEX, VITE_ENVIRONMENT_NAMES } from '../../constants.js';
 import { escapeRegExp, resolveViteId } from '../../utils.js';
 import {
 	IMPORT_PROTECTION_DEBUG,
@@ -415,12 +415,10 @@ function importProtectionPlugin(opts) {
 	) {
 		const normalizedResolvedId = normalizeFilePath(resolvedId);
 		const markerKind = shared.fileMarkerKind.get(normalizedResolvedId);
-		if (
-			!(
-				(envType === 'client' && markerKind === 'server') ||
-				(envType === 'server' && markerKind === 'client')
-			)
-		)
+		if (!(
+			(envType === 'client' && markerKind === 'server') ||
+			(envType === 'server' && markerKind === 'client')
+		))
 			return void 0;
 		return buildViolationInfo(
 			envName,
@@ -1081,14 +1079,12 @@ function importProtectionPlugin(opts) {
 					if (internalVirtualId) return internalVirtualId;
 					if (!importer) {
 						const normalizedSource = normalizeFilePath(source);
-						if (
-							!(
-								config.command === 'serve' &&
-								config.bundledDev &&
-								envType === 'client' &&
-								isInsideDirectory(normalizedSource, config.srcDirectory)
-							)
-						)
+						if (!(
+							config.command === 'serve' &&
+							config.bundledDev &&
+							envType === 'client' &&
+							isInsideDirectory(normalizedSource, config.srcDirectory)
+						))
 							env.graph.addEntry(source);
 						await processPendingViolations(env, this.warn.bind(this));
 						return;
@@ -1389,7 +1385,11 @@ function importProtectionPlugin(opts) {
 				return environmentNames.has(env.name);
 			},
 			transform: {
-				filter: { id: { include: [/\.[cm]?[tj]sx?($|\?)/] } },
+				// TRANSFORM_ID_REGEX includes .tsrx — the hand-rolled react-only
+				// regex here silently skipped octane importers, so denied *.client.*
+				// imports were never edge-rewritten/deferred and hard-errored at
+				// resolve instead of tree-shake-verified like react's do.
+				filter: { id: { include: [...TRANSFORM_ID_REGEX] } },
 				async handler(code, id) {
 					perf?.count('transform.calls');
 					const envName = this.environment.name;

package/src/internal/start-plugin-core/vite/schema.d.ts

@@ -1810,8 +1810,7 @@ export declare function parseStartConfig(
 		base: string;
 		disableCsrfMiddlewareWarning: boolean;
 		generateFunctionId?:
-			| ((opts: { filename: string; functionName: string }) => string | undefined)
-			| undefined;
+			((opts: { filename: string; functionName: string }) => string | undefined) | undefined;
 	};
 	pages: {
 		path: string;
@@ -1820,14 +1819,7 @@ export declare function parseStartConfig(
 					exclude?: boolean | undefined;
 					priority?: number | undefined;
 					changefreq?:
-						| 'never'
-						| 'always'
-						| 'hourly'
-						| 'daily'
-						| 'weekly'
-						| 'monthly'
-						| 'yearly'
-						| undefined;
+						'never' | 'always' | 'hourly' | 'daily' | 'weekly' | 'monthly' | 'yearly' | undefined;
 					lastmod?: string | Date | undefined;
 					alternateRefs?:
 						| {
@@ -2390,8 +2382,7 @@ export declare function parseStartConfig(
 					| undefined;
 				mockAccess?: 'error' | 'warn' | 'off' | undefined;
 				onViolation?:
-					| ((violation: unknown) => boolean | void | Promise<boolean | void>)
-					| undefined;
+					((violation: unknown) => boolean | void | Promise<boolean | void>) | undefined;
 				include?: (string | RegExp)[] | undefined;
 				exclude?: (string | RegExp)[] | undefined;
 				client?:

package/src/plugin-vite.js

@@ -1,6 +1,7 @@
 import { START_ENVIRONMENT_NAMES, tanStackStartVite } from '#tanstack-start/plugin-core/vite';
 import { octaneRouteGeneratorPlugin } from '@octanejs/tanstack-router/generator-plugin';
 import { octane } from 'octane/compiler/vite';
+import { octaneClientOnlyServerStrip } from './client-only-server-strip.js';
 import { octaneStartDefaultEntryPaths } from './default-entry-paths.js';
 import { validateOctaneCompilerOptions } from './validate-options.js';
 
@@ -23,6 +24,7 @@ const WORKSPACE_SOURCE_EXCLUDES = [
 const WORKSPACE_SOURCE_INCLUDES = [
 	'@octanejs/tanstack-router > @tanstack/router-core/isServer',
 	'@octanejs/tanstack-router > @tanstack/router-core/scroll-restoration-script',
+	'@octanejs/tanstack-start > @tanstack/router-core/isServer',
 ];
 
 export function tanstackStart(options) {
@@ -39,6 +41,9 @@ export function tanstackStart(options) {
 	};
 
 	return [
+		// Must run before the octane compiler: strips <ClientOnly> children on
+		// the server (the octane analogue of start-compiler handleClientOnlyJSX).
+		octaneClientOnlyServerStrip(),
 		octane(octaneOptions),
 		{
 			name: 'octanejs-tanstack-start:workspace-source-deps',