@octanejs/vite-plugin 0.2.0 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/vite-plugin",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -46,19 +46,19 @@
     }
   },
   "dependencies": {
-    "@ripple-ts/adapter": "^0.4.0",
-    "@octanejs/app-core": "0.1.0"
+    "@octanejs/app-core": "0.1.2",
+    "@ripple-ts/adapter": "^0.4.0"
   },
   "peerDependencies": {
-    "vite": "^8.0.16",
-    "octane": "^0.8.0"
+    "octane": "^0.10.0",
+    "vite": "^8.0.16"
   },
   "devDependencies": {
     "@types/jsdom": "30.0.0",
     "@types/node": "^24.13.3",
+    "octane": "0.10.0",
     "playwright": "^1.61.1",
     "playwright-webkit": "1.63.0",
-    "vite": "^8.1.5",
-    "octane": "0.8.0"
+    "vite": "^8.1.5"
   }
 }

package/src/index.js

@@ -26,7 +26,7 @@ import { handleRenderRoute } from './server/render-route.js';
 import { handleServerRoute } from './server/server-route.js';
 import { HYDRATION_NONCE_PLACEHOLDER, injectHydrationEntry } from './server/html-template.js';
 import { generateServerEntry } from './server/virtual-entry.js';
-import { nodeRequestToWebRequest, sendWebResponse } from './server/node-http.js';
+import { nodeRequestToWebRequest, nodeRequestUrl, sendWebResponse } from './server/node-http.js';
 import { ENTRY_FILENAME } from './constants.js';
 import {
 	getOctaneConfigPath,
@@ -233,6 +233,16 @@ function has_islands_route(config) {
 	);
 }
 
+/**
+ * Every rendered document of this app is an islands-only page.
+ * @param {ResolvedOctaneConfig | null} config
+ * @returns {boolean}
+ */
+function has_only_islands_routes(config) {
+	const routes = config?.router.routes.filter((route) => route.type === 'render') ?? [];
+	return routes.length > 0 && routes.every((route) => route.hydrate === 'islands');
+}
+
 /**
  * Check every islands-only route's shell for client work. The shell's modules
  * never load in the browser, so every component it renders outside its
@@ -419,7 +429,7 @@ function collect_hydrate_module_paths(config) {
  * it). An explicit `profile` (true or false) always takes precedence over
  * `devtools`.
  *
- * @param {{ hmr?: boolean, profile?: boolean, devtools?: boolean, strong?: boolean, textTypes?: import('octane/compiler/vite').OctaneVitePluginOptions['textTypes'], knownAttributeSpreads?: import('octane/compiler/vite').OctaneVitePluginOptions['knownAttributeSpreads'], domBindingFixedProps?: import('octane/compiler/vite').OctaneVitePluginOptions['domBindingFixedProps'], exclude?: string[], requireDirective?: boolean, renderers?: import('@octanejs/app-core').ExperimentalRendererConfigOptions, cssModuleConstants?: import('octane/compiler/vite').OctaneVitePluginOptions['cssModuleConstants'] }} [inlineOptions]
+ * @param {{ hmr?: boolean, profile?: boolean, devtools?: boolean, strong?: boolean, textTypes?: import('octane/compiler/vite').OctaneVitePluginOptions['textTypes'], knownAttributeSpreads?: import('octane/compiler/vite').OctaneVitePluginOptions['knownAttributeSpreads'], domBindingFixedProps?: import('octane/compiler/vite').OctaneVitePluginOptions['domBindingFixedProps'], opaqueSignalHandles?: boolean, exclude?: string[], requireDirective?: boolean, renderers?: import('@octanejs/app-core').ExperimentalRendererConfigOptions, cssModuleConstants?: import('octane/compiler/vite').OctaneVitePluginOptions['cssModuleConstants'] }} [inlineOptions]
  * @returns {Plugin[]}
  */
 export function octane(inlineOptions = {}) {
@@ -595,8 +605,27 @@ export function octane(inlineOptions = {}) {
 								return { relative: true };
 							}
 						};
+						// Only the renderer consumes the signal Action frame. Islands-only
+						// documents load signals without it, so this condition moves the
+						// frame and its candidate producers from the signal modules into the
+						// renderer (octane's action-capability.ts). Either placement is
+						// complete; it chooses which pages pay, so mixed apps keep the default.
+						/** @type {UserConfig['resolve']} */
+						let resolve;
+						if (has_only_islands_routes(buildOctaneConfig)) {
+							const { defaultClientConditions } = await import('vite');
+							// Vite concatenates plugin conditions onto the user's own, and
+							// replaces its defaults only when none were configured.
+							resolve = {
+								conditions: [
+									...(userConfig.resolve?.conditions ? [] : defaultClientConditions),
+									'octane-islands',
+								],
+							};
+						}
 						return {
 							...base,
+							...(resolve ? { resolve } : null),
 							build: buildConfig,
 							experimental: {
 								...userConfig.experimental,
@@ -937,7 +966,7 @@ export function octane(inlineOptions = {}) {
 						return;
 					}
 
-					const url = new URL(req.url || '/', `http://${req.headers.host || 'localhost'}`);
+					const url = nodeRequestUrl(req);
 					const method = req.method || 'GET';
 
 					// RPC requests for `module server` declarations.
@@ -990,7 +1019,9 @@ export function octane(inlineOptions = {}) {
 							await warnIslandsShells(octaneConfig).catch(() => {});
 						}
 
-						const request = nodeRequestToWebRequest(req, res);
+						const request = nodeRequestToWebRequest(req, res, {
+							trustProxy: octaneConfig.server.trustProxy,
+						});
 						const context = createContext(request, freshMatch.params);
 						Object.defineProperty(context, 'clientBuild', { get: () => clientBuild.metadata() });
 						const globalMiddlewares = octaneConfig.middlewares;
@@ -1359,6 +1390,7 @@ export function octane(inlineOptions = {}) {
 	 *   textTypes?: import('octane/compiler/vite').OctaneVitePluginOptions['textTypes'],
 	 *   knownAttributeSpreads?: import('octane/compiler/vite').OctaneVitePluginOptions['knownAttributeSpreads'],
 	 *   domBindingFixedProps?: import('octane/compiler/vite').OctaneVitePluginOptions['domBindingFixedProps'],
+	 *   opaqueSignalHandles?: boolean,
 	 *   exclude?: string[],
 	 *   requireDirective?: boolean,
 	 *   renderers?: import('@octanejs/app-core').ExperimentalRendererConfigOptions,
@@ -1384,6 +1416,9 @@ export function octane(inlineOptions = {}) {
 	if (inlineOptions.domBindingFixedProps !== undefined) {
 		compilerOptions.domBindingFixedProps = inlineOptions.domBindingFixedProps;
 	}
+	if (inlineOptions.opaqueSignalHandles !== undefined) {
+		compilerOptions.opaqueSignalHandles = inlineOptions.opaqueSignalHandles;
+	}
 	if (inlineOptions.exclude !== undefined) compilerOptions.exclude = inlineOptions.exclude;
 	if (inlineOptions.requireDirective !== undefined) {
 		compilerOptions.requireDirective = inlineOptions.requireDirective;
@@ -1455,7 +1490,7 @@ export function defineConfig(/** @type {OctaneConfigOptions} */ options) {
  */
 async function handleRpcRequest(req, res, vite, trustProxy, config) {
 	try {
-		const webRequest = nodeRequestToWebRequest(req, res);
+		const webRequest = nodeRequestToWebRequest(req, res, { trustProxy });
 		const asyncContext = getDevAsyncContext(config);
 		const signalOwners = await loadDevSignalRequestHooks(vite);
 

package/types/index.d.ts

@@ -23,6 +23,8 @@ export interface OctanePluginOptions {
 	knownAttributeSpreads?: OctaneVitePluginOptions['knownAttributeSpreads'];
 	/** Opt in to fixed primitive child props by name; keep text and IDs live for sharing. */
 	domBindingFixedProps?: OctaneVitePluginOptions['domBindingFixedProps'];
+	/** Bind signal handles in opaque holes of modules that do not import `octane/signals`. */
+	opaqueSignalHandles?: OctaneVitePluginOptions['opaqueSignalHandles'];
 	/**
 	 * Path fragments the compiler's plain `.ts`/`.js` hook-slotting pass must
 	 * skip. Prefer package manifest `octane.hookSlots.manual` declarations.