@octanejs/tanstack-start 0.1.1 → 0.1.5

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

@@ -0,0 +1,6 @@
+/** Checks for a query parameter without rewriting the opaque module ID. */
+export declare function hasIdQueryFlag(id: string, flag: string): boolean;
+/** Appends an owned query flag without normalizing the existing query. */
+export declare function appendIdQueryFlag(id: string, flag: string): string;
+/** Removes the owned query flag appended by {@link appendIdQueryFlag}. */
+export declare function removeIdQueryFlag(id: string, flag: string): string;

package/src/internal/start-plugin-core/vite/module-id.js

@@ -0,0 +1,23 @@
+//#region src/vite/module-id.ts
+/** Checks for a query parameter without rewriting the opaque module ID. */
+function hasIdQueryFlag(id, flag) {
+	const queryIndex = id.indexOf('?');
+	if (queryIndex === -1) return false;
+	return new URLSearchParams(id.slice(queryIndex + 1)).has(flag);
+}
+/** Appends an owned query flag without normalizing the existing query. */
+function appendIdQueryFlag(id, flag) {
+	if (!id.includes('?')) return `${id}?${flag}`;
+	const separator = id.endsWith('&') ? '' : '&';
+	return `${id}${separator}${flag}`;
+}
+/** Removes the owned query flag appended by {@link appendIdQueryFlag}. */
+function removeIdQueryFlag(id, flag) {
+	for (const separator of ['?', '&']) {
+		const suffix = `${separator}${flag}`;
+		if (id.endsWith(suffix)) return id.slice(0, -suffix.length);
+	}
+	return id;
+}
+//#endregion
+export { appendIdQueryFlag, hasIdQueryFlag, removeIdQueryFlag };

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/internal/start-plugin-core/vite/start-compiler-plugin/plugin.js

@@ -15,6 +15,7 @@ import {
 	MissingHydrateSourceError,
 	createHydrateCompilerPlugin,
 } from '../../hydrate-when-transform.js';
+import { appendIdQueryFlag, removeIdQueryFlag } from '../module-id.js';
 import {
 	createViteDevServerFnModuleSpecifierEncoder,
 	decodeViteDevServerModuleSpecifier,
@@ -184,7 +185,7 @@ function startCompilerPlugin(opts) {
 								const code = await loadViteModuleFromEnvironment(this.environment, id, {
 									load: (options) => this.load(options),
 									error: (message) => this.error(message),
-									devId: `${id}?${SERVER_FN_LOOKUP}`,
+									devId: appendIdQueryFlag(id, SERVER_FN_LOOKUP),
 								});
 								if (code !== void 0)
 									compiler.ingestModule({
@@ -195,7 +196,12 @@ function startCompilerPlugin(opts) {
 							resolveId: async (source, importer) => {
 								const r = await this.resolve(source, importer);
 								if (r) {
-									if (!r.external) return cleanId(r.id);
+									if (!r.external) {
+										// Keep the resolved ID intact because it is passed back to
+										// Vite's load hook. Virtual-module prefixes and queries are
+										// part of that load identity, not compiler-only metadata.
+										return r.id;
+									}
 								}
 								return null;
 							},
@@ -288,7 +294,7 @@ function startCompilerPlugin(opts) {
 				handler(code, id) {
 					compilers.get(this.environment.name)?.ingestModule({
 						code,
-						id: cleanId(id),
+						id: removeIdQueryFlag(id, SERVER_FN_LOOKUP),
 					});
 				},
 			},

package/src/plugin-vite.d.ts

@@ -12,7 +12,15 @@ export type OctaneRendererDescriptor = Exclude<OctaneRendererRegistryEntry, stri
 export type OctaneRendererBoundary = OctaneRendererBoundaryOptions;
 export type OctaneRendererRule = OctaneRendererRuleOptions;
 export type OctaneRendererConfig = OctaneRendererConfigOptions;
-export type OctaneCompilerOptions = Omit<OctaneVitePluginOptions, 'ssr'>;
+export type OctaneCompilerOptions = Omit<OctaneVitePluginOptions, 'ssr'> & {
+	/**
+	 * Shorthand for the compiler's command-aware profiling signal (mirrors
+	 * `@octanejs/vite-plugin`'s `devtools` option): enables profiling in `vite
+	 * dev` only, fully compiled out of `vite build`. An explicit `profile`
+	 * always takes precedence over `devtools`.
+	 */
+	devtools?: boolean;
+};
 
 export type TanStackOctaneStartViteInputConfig = TanStackStartViteInputConfig & {
 	octane?: OctaneCompilerOptions;

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,12 +24,27 @@ 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) {
 	const { octane: octaneOptions, ...startOptions } = options ?? {};
 	validateOctaneCompilerOptions(octaneOptions);
 
+	// `devtools: true` is Start's shorthand for the compiler's command-aware
+	// profiling signal (mirrors `@octanejs/vite-plugin`'s `devtools` option): an
+	// explicit `profile` always wins, otherwise `devtools` maps to `'auto'`
+	// (profiling on in `vite dev`, compiled out of `vite build`). `octane()`
+	// itself only understands `profile`, so this is resolved before the plugin
+	// is created and the `devtools` key never reaches it.
+	const resolvedOctaneOptions = octaneOptions ? { ...octaneOptions } : octaneOptions;
+	if (resolvedOctaneOptions) {
+		if (resolvedOctaneOptions.profile === undefined && resolvedOctaneOptions.devtools === true) {
+			resolvedOctaneOptions.profile = 'auto';
+		}
+		delete resolvedOctaneOptions.devtools;
+	}
+
 	const corePluginOptions = {
 		framework: 'octane',
 		defaultEntryPaths: octaneStartDefaultEntryPaths,
@@ -39,7 +55,10 @@ export function tanstackStart(options) {
 	};
 
 	return [
-		octane(octaneOptions),
+		// Must run before the octane compiler: strips <ClientOnly> children on
+		// the server (the octane analogue of start-compiler handleClientOnlyJSX).
+		octaneClientOnlyServerStrip(),
+		octane(resolvedOctaneOptions),
 		{
 			name: 'octanejs-tanstack-start:workspace-source-deps',
 			configEnvironment(environmentName, environmentOptions) {