@octanejs/vite-plugin 0.1.12 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/vite-plugin",
-  "version": "0.1.12",
+  "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.8"
+    "@ripple-ts/adapter": "^0.3.108",
+    "@octanejs/app-core": "0.0.9"
   },
   "peerDependencies": {
     "vite": "^8.0.16",
-    "octane": "0.1.12"
+    "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.12"
+    "@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';
@@ -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) {
@@ -693,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.