@octanejs/vite-plugin 0.1.11 → 0.1.13

package/package.json

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

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';
@@ -210,9 +210,9 @@ function collect_hydrate_module_paths(config) {
  * build is redirected to `{outDir}/client` with a manifest, the hydrate entry
  * is injected into index.html (so Vite bundles + hashes it), and closeBundle
  * runs a second, `ssr: true` build of a generated server entry to
- * `{outDir}/server/entry.js` — a self-contained module (app + octane bundled,
- * node builtins external) exporting `handler`/`nodeHandler` and auto-booting
- * under `node`. See server/virtual-entry.js and server/production.js.
+ * `{outDir}/server/entry.js`. Node-target adapters get the existing bootable
+ * `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]
  * @returns {Plugin[]}
@@ -243,6 +243,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 +330,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 +388,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) {
@@ -670,6 +713,7 @@ export function octane(inlineOptions = {}) {
 		async closeBundle() {
 			if (!isBuild || isSSRBuild || !has_route_config(buildOctaneConfig)) return;
 			const cfg = /** @type {ResolvedOctaneConfig} */ (buildOctaneConfig);
+			const webWorkerServer = cfg.adapter?.serverTarget === 'webworker';
 
 			console.log('[@octanejs/vite-plugin] Client build done. Building the server bundle…');
 
@@ -692,7 +736,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.
@@ -712,9 +756,11 @@ export function octane(inlineOptions = {}) {
 					rootBoundary: cfg.rootBoundary,
 					rpcModulePaths: [...serverModuleModules],
 					clientAssetMap,
+					...(webWorkerServer ? { mode: 'webworker' } : null),
 					// The virtual entry has no filesystem importer, so resolve app-core
 					// from this package before handing source to Vite. This also works
 					// when app-core is nested under the plugin by a package manager.
+					configModuleId: requireFromPlugin.resolve('@octanejs/app-core/config'),
 					productionModuleId: requireFromPlugin.resolve('@octanejs/app-core/production'),
 					nodeModuleId: requireFromPlugin.resolve('@octanejs/app-core/node'),
 				}),
@@ -739,6 +785,10 @@ export function octane(inlineOptions = {}) {
 			await viteBuild({
 				root,
 				appType: 'custom',
+				// Vite deliberately preserves process.env references in SSR/library
+				// output. Pin build intent here so Rollup can remove Octane's complete
+				// development error table even when the server bundle is not minified.
+				define: { 'process.env.NODE_ENV': JSON.stringify('production') },
 				plugins: [virtualEntryPlugin],
 				resolve: {
 					alias: [
@@ -760,6 +810,10 @@ export function octane(inlineOptions = {}) {
 					minify: cfg.build.minify ?? false,
 					rollupOptions: {
 						input: VIRTUAL_SERVER_ENTRY_ID,
+						// Cloudflare's nodejs_compat exposes `node:` modules directly.
+						// Preserve application imports as well as Octane's current runtime
+						// dependencies instead of replacing them with browser shims.
+						...(webWorkerServer ? { external: [/^node:/] } : null),
 						output: {
 							entryFileNames: ENTRY_FILENAME,
 							format: 'esm',
@@ -767,6 +821,7 @@ export function octane(inlineOptions = {}) {
 					},
 				},
 				ssr: {
+					...(webWorkerServer ? { target: 'webworker' } : null),
 					// Self-contained server bundle: everything except node builtins is
 					// bundled, so dist/server deploys without node_modules. 'vite'
 					// stays external as a guard — nothing should reach it (the facade
@@ -784,9 +839,11 @@ export function octane(inlineOptions = {}) {
 			}
 
 			console.log(`[@octanejs/vite-plugin] Server build complete: ${path.join(outDir, 'server')}`);
-			console.log(
-				`[@octanejs/vite-plugin] Start with: node ${outDir}/server/${ENTRY_FILENAME} (or octane-preview)`,
-			);
+			if (!webWorkerServer) {
+				console.log(
+					`[@octanejs/vite-plugin] Start with: node ${outDir}/server/${ENTRY_FILENAME} (or octane-preview)`,
+				);
+			}
 
 			// ------------------------------------------------------------------
 			// Deploy adapter (SvelteKit-style): with both bundles on disk, let the

package/types/index.d.ts

@@ -23,13 +23,15 @@ export interface OctanePluginOptions {
 	 */
 	exclude?: string[];
 	/**
-	 * Mixed-toolchain ownership gate: when `true`, Octane compiles only
-	 * project modules that declare `'use octane'` in their directive prologue.
-	 * Undirected project `.tsx`/`.ts`/`.js` pass through to the host
-	 * framework's own pipeline (e.g. React's JSX transform); an undirected
-	 * project `.tsrx` is a build error. Installed and linked packages keep
-	 * their Octane package-manifest decision. The directive is always
-	 * tolerated and stripped from compiled output, even when this is off.
+	 * Mixed-toolchain ownership gate: when `true`, a project `.tsrx` is
+	 * Octane's by extension, and a project `.tsx` (full compile) or plain
+	 * `.ts`/`.js` (hook slotting) is Octane's only when it opens with a
+	 * leading `@jsxImportSource octane` pragma comment (any registered
+	 * renderer's intrinsics module also counts). A pragma naming a
+	 * foreign source (e.g. `react`) does not claim the file. Unmarked
+	 * project modules pass through to the host framework's own pipeline
+	 * (e.g. React's JSX transform). Installed and linked packages keep
+	 * their Octane package-manifest decision.
 	 * @default false
 	 */
 	requireDirective?: boolean;