@octanejs/vite-plugin 0.1.12 → 0.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/vite-plugin",
-  "version": "0.1.12",
+  "version": "0.1.16",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -46,18 +46,18 @@
     }
   },
   "dependencies": {
-    "@ripple-ts/adapter": "^0.3.101",
-    "@octanejs/app-core": "0.0.8"
+    "@ripple-ts/adapter": "^0.3.112",
+    "@octanejs/app-core": "0.0.12"
   },
   "peerDependencies": {
     "vite": "^8.0.16",
-    "octane": "0.1.12"
+    "octane": "0.1.16"
   },
   "devDependencies": {
-    "@types/node": "^24.3.0",
-    "playwright": "^1.61.0",
-    "type-fest": "^5.6.0",
-    "vite": "^8.0.16",
-    "octane": "0.1.12"
+    "@types/node": "^24.13.3",
+    "playwright": "^1.61.1",
+    "type-fest": "^5.8.0",
+    "vite": "^8.1.5",
+    "octane": "0.1.16"
   }
 }

package/src/client-assets.js

@@ -32,9 +32,14 @@ function isDeferredHydrationId(id) {
  *
  * @param {Record<string, ViteManifestEntry>} manifest
  * @param {string[]} moduleIds
+ * @param {Record<string, string>} [entryFiles]
  * @returns {Record<string, { js: string, css: string[] }>}
  */
-export function createClientAssetMap(manifest, moduleIds) {
+export function createClientAssetMap(manifest, moduleIds, entryFiles = {}) {
+	const manifestKeysByFile = new Map(
+		Object.entries(manifest).map(([key, entry]) => [entry.file, key]),
+	);
+
 	/**
 	 * @param {string} key
 	 * @param {boolean} deferredHydrationBranch
@@ -69,9 +74,15 @@ export function createClientAssetMap(manifest, moduleIds) {
 	const assets = {};
 	for (const moduleId of moduleIds) {
 		// Vite manifest keys are root-relative without the leading slash.
-		const manifestKey = moduleId.startsWith('/') ? moduleId.slice(1) : moduleId;
+		const sourceKey = moduleId.startsWith('/') ? moduleId.slice(1) : moduleId;
+		// A route module that is also statically imported can become a shared
+		// non-facade chunk. Vite keys that manifest entry by generated chunk name,
+		// so use the Rollup-observed output file to recover the graph root.
+		const manifestKey = manifest[sourceKey]
+			? sourceKey
+			: manifestKeysByFile.get(entryFiles[moduleId]);
+		if (!manifestKey) continue;
 		const entry = manifest[manifestKey];
-		if (!entry) continue;
 		assets[moduleId] = {
 			js: entry.file,
 			css: [...new Set(collectCss(manifestKey, false, new Set()))],

package/src/index.js

@@ -1,5 +1,5 @@
 // @ts-check
-/** @import {Plugin, RenderBuiltAssetUrl, ResolvedConfig, ViteDevServer, UserConfig} from 'vite' */
+/** @import {ModulePreloadOptions, Plugin, RenderBuiltAssetUrl, ResolvedConfig, ViteDevServer, UserConfig} from 'vite' */
 /** @import {LoadedOctaneConfig, OctaneConfigOptions, ResolvedOctaneConfig, RenderRoute} from '@octanejs/vite-plugin' */
 
 import fs from 'node:fs';
@@ -9,6 +9,7 @@ import { AsyncLocalStorage } from 'node:async_hooks';
 import { createRequire } from 'node:module';
 
 import { octane as octaneCompiler } from 'octane/compiler/vite';
+import { handleRpcRequest as handleServerRpcRequest } from '@octanejs/app-core';
 
 import { createRouter } from './server/router.js';
 import { createContext, runMiddlewareChain } from './server/middleware.js';
@@ -35,7 +36,7 @@ import {
 } from './project-codegen.js';
 import { createClientAssetMap } from './client-assets.js';
 
-import { patch_global_fetch, is_rpc_request, handle_rpc_request } from '@ripple-ts/adapter/rpc';
+import { patch_global_fetch, is_rpc_request } from '@ripple-ts/adapter/rpc';
 
 import { get_route_entry_path } from './routes.js';
 
@@ -52,6 +53,7 @@ export {
 	get_route_entry_export_name,
 	get_route_entry_id,
 	get_route_entry_path,
+	handleRpcRequest,
 	handleServerRoute,
 	is_rpc_request,
 	runMiddlewareChain,
@@ -214,7 +216,12 @@ function collect_hydrate_module_paths(config) {
  * `handler`/`nodeHandler` module; webworker-target adapters get an importable
  * `createWebWorkerHandler` factory for their deployment wrapper.
  *
- * @param {{ hmr?: boolean, profile?: boolean, exclude?: string[], requireDirective?: boolean, renderers?: import('@octanejs/app-core').ExperimentalRendererConfigOptions }} [inlineOptions]
+ * `devtools: true` enables the compiler's profile mode in DEV ONLY: profiling
+ * is on in `vite dev` and fully off in `vite build` (so production tree-shakes
+ * it). An explicit `profile` (true or false) always takes precedence over
+ * `devtools`.
+ *
+ * @param {{ hmr?: boolean, profile?: boolean, devtools?: boolean, exclude?: string[], requireDirective?: boolean, renderers?: import('@octanejs/app-core').ExperimentalRendererConfigOptions }} [inlineOptions]
  * @returns {Plugin[]}
  */
 export function octane(inlineOptions = {}) {
@@ -243,6 +250,8 @@ export function octane(inlineOptions = {}) {
 	let buildOctaneConfig = null;
 	/** @type {string[]} Module paths the generated client entry maps statically (build only) */
 	let staticEntries = [];
+	/** @type {Record<string, string>} Static module path → emitted client chunk file */
+	let staticEntryFiles = Object.create(null);
 	/** @type {Set<string>} Vite-root paths of modules containing `module server` */
 	const serverModuleModules = new Set();
 
@@ -328,6 +337,25 @@ export function octane(inlineOptions = {}) {
 						if (buildOctaneConfig.build.target !== undefined) {
 							buildConfig.target = buildOctaneConfig.build.target;
 						}
+						const userModulePreload = userConfig.build?.modulePreload;
+						if (userModulePreload === false) {
+							buildConfig.modulePreload = false;
+						} else {
+							/** @type {ModulePreloadOptions} */
+							const modulePreload =
+								typeof userModulePreload === 'object' ? { ...userModulePreload } : {};
+							const userResolveDependencies = modulePreload.resolveDependencies;
+							modulePreload.resolveDependencies = (filename, dependencies, context) => {
+								// Vite 8.1 emits entry dependency hints after the entry script.
+								// A script that installs <base> in between can redirect those
+								// root-relative requests off-origin. Static imports discover the
+								// same dependencies safely from the entry module URL, so omit only
+								// the redundant HTML hints; retain JS dynamic-import preloading.
+								if (context.hostType === 'html') return [];
+								return userResolveDependencies?.(filename, dependencies, context) ?? dependencies;
+							};
+							buildConfig.modulePreload = modulePreload;
+						}
 						const userRenderBuiltUrl = userConfig.experimental?.renderBuiltUrl;
 						/** @type {RenderBuiltAssetUrl} */
 						const renderBuiltUrl = (filename, context) => {
@@ -367,6 +395,28 @@ export function octane(inlineOptions = {}) {
 			if (!isBuild || isSSRBuild || !has_route_config(buildOctaneConfig)) return;
 			serverModuleModules.clear();
 			staticEntries = collect_hydrate_module_paths(buildOctaneConfig);
+			staticEntryFiles = Object.create(null);
+		},
+
+		/**
+		 * Preserve the source-to-file relation that Vite's manifest cannot express
+		 * when Rolldown promotes a dynamic route entry into a shared chunk.
+		 */
+		generateBundle(_options, bundle) {
+			if (!isBuild || isSSRBuild || !has_route_config(buildOctaneConfig)) return;
+			const entryByModuleId = new Map(
+				staticEntries.map((moduleId) => {
+					const file = path.resolve(root, moduleId.startsWith('/') ? `.${moduleId}` : moduleId);
+					return [file.split(path.sep).join('/'), moduleId];
+				}),
+			);
+			for (const output of Object.values(bundle)) {
+				if (output.type !== 'chunk') continue;
+				for (const moduleId of output.moduleIds) {
+					const entryId = entryByModuleId.get(moduleId.split(path.sep).join('/'));
+					if (entryId !== undefined) staticEntryFiles[entryId] = output.fileName;
+				}
+			}
 		},
 
 		async configResolved(resolvedConfig) {
@@ -693,7 +743,7 @@ export function octane(inlineOptions = {}) {
 				);
 			}
 
-			const clientAssetMap = createClientAssetMap(clientManifest, staticEntries);
+			const clientAssetMap = createClientAssetMap(clientManifest, staticEntries, staticEntryFiles);
 
 			// The manifest was only needed here; leaving .vite/ in dist/client would
 			// publish source file paths through the static server.
@@ -830,7 +880,7 @@ export function octane(inlineOptions = {}) {
 	/**
 	 * @type {{
 	 *   hmr?: boolean,
-	 *   profile?: boolean,
+	 *   profile?: boolean | 'auto',
 	 *   exclude?: string[],
 	 *   requireDirective?: boolean,
 	 *   renderers?: import('@octanejs/app-core').ExperimentalRendererConfigOptions,
@@ -838,7 +888,10 @@ export function octane(inlineOptions = {}) {
 	 */
 	const compilerOptions = {};
 	if (inlineOptions.hmr !== undefined) compilerOptions.hmr = inlineOptions.hmr;
+	// Explicit `profile` wins; otherwise `devtools: true` opts into the
+	// command-aware `'auto'` signal the compiler resolves to DEV-only profiling.
 	if (inlineOptions.profile !== undefined) compilerOptions.profile = inlineOptions.profile;
+	else if (inlineOptions.devtools === true) compilerOptions.profile = 'auto';
 	if (inlineOptions.exclude !== undefined) compilerOptions.exclude = inlineOptions.exclude;
 	if (inlineOptions.requireDirective !== undefined) {
 		compilerOptions.requireDirective = inlineOptions.requireDirective;
@@ -905,7 +958,7 @@ async function handleRpcRequest(req, res, vite, trustProxy, config) {
 		const webRequest = nodeRequestToWebRequest(req);
 		const asyncContext = getDevAsyncContext(config);
 
-		const response = await handle_rpc_request(webRequest, {
+		const response = await handleServerRpcRequest(webRequest, {
 			async resolveFunction(hash) {
 				const rpcModules = /** @type {any} */ (globalThis).rpc_modules;
 				if (!rpcModules) return null;
@@ -923,6 +976,9 @@ async function handleRpcRequest(req, res, vite, trustProxy, config) {
 			},
 			asyncContext,
 			trustProxy,
+			middlewares: config?.middlewares ?? [],
+			allowedOrigins: config?.server?.rpc?.allowedOrigins,
+			maxBodyBytes: config?.server?.rpc?.maxBodyBytes,
 		});
 
 		await sendWebResponse(res, response);
@@ -930,7 +986,7 @@ async function handleRpcRequest(req, res, vite, trustProxy, config) {
 		console.error('[@octanejs/vite-plugin] RPC error:', error);
 		res.statusCode = 500;
 		res.setHeader('Content-Type', 'application/json');
-		res.end(JSON.stringify({ error: error instanceof Error ? error.message : 'RPC failed' }));
+		res.end(JSON.stringify({ error: 'Internal Server Error' }));
 	}
 }