@octanejs/vite-plugin 0.1.13 → 0.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/vite-plugin",
-  "version": "0.1.13",
+  "version": "0.1.17",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -46,18 +46,18 @@
     }
   },
   "dependencies": {
-    "@ripple-ts/adapter": "^0.3.108",
-    "@octanejs/app-core": "0.0.9"
+    "@ripple-ts/adapter": "^0.3.112",
+    "@octanejs/app-core": "0.0.13"
   },
   "peerDependencies": {
     "vite": "^8.0.16",
-    "octane": "0.1.13"
+    "octane": "0.1.17"
   },
   "devDependencies": {
     "@types/node": "^24.13.3",
     "playwright": "^1.61.1",
     "type-fest": "^5.8.0",
     "vite": "^8.1.5",
-    "octane": "0.1.13"
+    "octane": "0.1.17"
   }
 }

package/src/index.js

@@ -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 = {}) {
@@ -873,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,
@@ -881,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;
@@ -948,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;
@@ -966,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);
@@ -973,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' }));
 	}
 }
 

package/src/server/render-route.js

@@ -37,8 +37,9 @@ import {
  *
  *   - Scoped CSS rides the STREAM (the shell emits its deduped
  *     `<style data-octane>` tags ahead of the body markup, per-wave styles ride
- *     their segment chunk), so nothing is spliced into `<!--ssr-head-->`
- *     anymore — only the hydration data script goes there. `hydrateRoot()`
+ *     their segment chunk), so styles are not spliced into `<!--ssr-head-->`.
+ *     That marker receives the hydration data script and the shell's hoisted
+ *     `<title>`/`<meta>`/`<link>` (see `headChannel` below). `hydrateRoot()`
  *     skips the shell's leading style tags when adopting.
  *   - A render error BEFORE the shell completes still produces the dev 500
  *     page (`renderToReadableStream` rejects on shell errors). An error AFTER
@@ -148,17 +149,27 @@ export async function handleRenderRoute(route, context, vite, octaneConfig) {
 		// Apply Vite's HTML transforms (HMR client, module resolution, etc.).
 		template = await vite.transformIndexHtml(context.url.pathname, template);
 
-		// Validate the raw SSR template and inject the request-nonced hydrate entry
-		// before consuming the one required head marker with request data.
-		let html = injectHydrationEntry(template, '/@id/virtual:octane-hydrate', nonce);
-		html = html.replace('<!--ssr-head-->', headContent);
+		// Validate the raw SSR template and inject the request-nonced hydrate entry.
+		// The one required head marker is consumed AFTER the render, once the
+		// hoisted metadata is in hand, validation still happens up front here.
+		const html = injectHydrationEntry(template, '/@id/virtual:octane-hydrate', nonce);
 
 		// Start the render. This await resolves at SHELL-ready (so a synchronous
 		// render error still falls into the catch below and produces the dev 500
 		// page); segments keep flushing through the returned stream afterwards.
+		//
+		// `headChannel: 'separate'` matches production (see production.js): the
+		// route renders into the template's `#root`, not a document, so hoisted
+		// `<title>`/`<meta>`/`<link>` must be spliced at `<!--ssr-head-->` rather
+		// than folded into a body that has no `</head>`.
+		let hoistedHead = '';
 		/** @type {ReadableStream<Uint8Array>} */
 		const renderStream = await renderToReadableStream(RootComponent, undefined, {
 			nonce: nonce ?? undefined,
+			headChannel: 'separate',
+			onHeadReady(/** @type {string} */ head) {
+				hoistedHead = head;
+			},
 			signal: context.request.signal,
 			onError(/** @type {unknown} */ error) {
 				if (error instanceof Error) vite.ssrFixStacktrace(error);
@@ -169,7 +180,11 @@ export async function handleRenderRoute(route, context, vite, octaneConfig) {
 		const status = route.status ?? 200;
 		const headers = { 'Content-Type': 'text/html; charset=utf-8' };
 
-		const [prefix, suffix] = splitSsrTemplate(html);
+		// Function replacement, so `$&`/`` $` ``/`$'`/`$1` inside the route data or
+		// author-controlled metadata cannot expand against the match.
+		const [prefix, suffix] = splitSsrTemplate(
+			html.replace('<!--ssr-head-->', () => headContent + hoistedHead),
+		);
 
 		// Template prefix → render stream (shell, then out-of-order segments) →
 		// template suffix. The hydration <script> is in the SUFFIX, so by the time