nitro-nightly 3.0.1-20251217-223946-1ee0b5b8 → 3.0.1-20251217-233031-5973b3df

package/dist/_build/shared3.mjs

@@ -115,14 +115,14 @@ function resolveAliases(_aliases) {
 
 //#endregion
 //#region src/build/chunks.ts
-const virtualRe = /^\0|^virtual:/;
+const virtualRe = /^(?:\0|#|virtual:)/;
 const NODE_MODULES_RE$1 = /node_modules[/\\][^.]/;
 function libChunkName(id) {
 	return `_libs/${id.match(/.*(?:[/\\])node_modules(?:[/\\])(?<package>@[^/\\]+[/\\][^/\\]+|[^/\\.][^/\\]*)/)?.groups?.package || "common"}`;
 }
 function getChunkName(chunk, nitro) {
 	if (chunk.name.startsWith("_libs/")) return `${chunk.name}.mjs`;
-	if (chunk.name === "rolldown-runtime") return "_runtime/rolldown.mjs";
+	if (chunk.name === "rolldown-runtime") return "_rolldown.mjs";
 	if (chunk.moduleIds.length === 0) return `_chunks/${chunk.name}.mjs`;
 	const ids = chunk.moduleIds.filter((id) => !virtualRe.test(id));
 	if (ids.length === 0) {
@@ -132,7 +132,7 @@ function getChunkName(chunk, nitro) {
 	if (ids.every((id) => id.endsWith(".wasm"))) return `_wasm/[name].mjs`;
 	if (ids.every((id) => id.includes("vite/services"))) return `_ssr/[name].mjs`;
 	if (ids.every((id) => id.startsWith(nitro.options.buildDir))) return `_build/[name].mjs`;
-	if (ids.every((id) => id.startsWith(runtimeDir) || id.startsWith(presetsDir))) return `_runtime/[name].mjs`;
+	if (ids.every((id) => id.startsWith(runtimeDir) || id.startsWith(presetsDir))) return `_nitro/[name].mjs`;
 	const mainId = ids.at(-1);
 	if (mainId) {
 		const routeHandler = nitro.routing.routes.routes.flatMap((h) => h.data).find((h) => h.handler === mainId);

package/dist/_libs/@hiogawa/vite-plugin-fullstack.mjs

@@ -1536,7 +1536,7 @@ function stripLiteral(code, options) {
 }
 
 //#endregion
-//#region node_modules/.pnpm/@hiogawa+vite-plugin-fullstack@0.0.8_vite@8.0.0-beta.2_@types+node@25.0.3_jiti@2.6.1_tsx@4.21.0_yaml@2.8.2_/node_modules/@hiogawa/vite-plugin-fullstack/dist/index.js
+//#region node_modules/.pnpm/@hiogawa+vite-plugin-fullstack@0.0.8_patch_hash=aef5693ec569067da78c3402c9b2884429e322a_ccdea5f53e47d0c803c48383e7777859/node_modules/@hiogawa/vite-plugin-fullstack/dist/index.js
 function parseIdQuery(id) {
 	if (!id.includes("?")) return {
 		filename: id,
@@ -1554,16 +1554,25 @@ function toAssetsVirtual(options) {
 function parseAssetsVirtual(id) {
 	if (id.startsWith("\0virtual:fullstack/assets?")) return parseIdQuery(id).query;
 }
+function escapeRegExp(string) {
+	return string.replace(/[-\\^$*+?.()|[\]{}]/g, String.raw`\$&`);
+}
 function createVirtualPlugin(name, load) {
 	name = "virtual:" + name;
 	return {
 		name: `rsc:virtual-${name}`,
-		resolveId: { handler(source, _importer, _options) {
-			return source === name ? "\0" + name : void 0;
-		} },
-		load: { handler(id, options) {
-			if (id === "\0" + name) return load.apply(this, [id, options]);
-		} }
+		resolveId: {
+			filter: { id: /* @__PURE__ */ new RegExp("^" + escapeRegExp(name) + "$") },
+			handler(source, _importer, _options) {
+				return source === name ? "\0" + name : void 0;
+			}
+		},
+		load: {
+			filter: { id: /* @__PURE__ */ new RegExp("^\\0" + escapeRegExp(name) + "$") },
+			handler(id, options) {
+				if (id === "\0" + name) return load.apply(this, [id, options]);
+			}
+		}
 	};
 }
 function normalizeRelativePath(s) {
@@ -1719,71 +1728,78 @@ function assetsPlugin(pluginOpts) {
 			configEnvironment(name) {
 				if ((pluginOpts?.serverEnvironments ?? ["ssr"]).includes(name)) return { build: { emitAssets: true } };
 			},
-			transform: { async handler(code, id, _options) {
-				if (!code.includes("import.meta.vite.assets")) return;
-				const output = new MagicString(code);
-				const strippedCode = stripLiteral(code);
-				const newImports = /* @__PURE__ */ new Set();
-				for (const match of code.matchAll(/import\.meta\.vite\.assets\(([\s\S]*?)\)/dg)) {
-					const [start, end] = match.indices[0];
-					if (!strippedCode.slice(start, end).includes("import.meta.vite.assets")) continue;
-					if (this.environment.name === "client") {
-						const replacement$1 = `(${JSON.stringify(EMPTY_ASSETS)})`;
-						output.update(start, end, replacement$1);
-						continue;
-					}
-					const argCode = match[1].trim();
-					const options = {
-						import: id,
-						environment: void 0,
-						asEntry: false
-					};
-					if (argCode) {
-						const argValue = evalValue(argCode);
-						Object.assign(options, argValue);
-					}
-					const environments = options.environment ? [options.environment] : ["client", this.environment.name];
-					const importedNames = [];
-					for (const environment of environments) {
-						const importSource = toAssetsVirtual({
-							import: options.import,
-							importer: id,
-							environment,
-							entry: options.asEntry ? "1" : ""
-						});
-						const importedName = `__assets_${hashString(importSource)}`;
-						newImports.add(`;import ${importedName} from ${JSON.stringify(importSource)};\n`);
-						importedNames.push(importedName);
+			transform: {
+				filter: { code: /import\.meta\.vite\.assets\(/ },
+				async handler(code, id, _options) {
+					const output = new MagicString(code);
+					const strippedCode = stripLiteral(code);
+					const newImports = /* @__PURE__ */ new Set();
+					for (const match of code.matchAll(/import\.meta\.vite\.assets\(([\s\S]*?)\)/dg)) {
+						const [start, end] = match.indices[0];
+						if (!strippedCode.slice(start, end).includes("import.meta.vite.assets")) continue;
+						if (this.environment.name === "client") {
+							const replacement$1 = `(${JSON.stringify(EMPTY_ASSETS)})`;
+							output.update(start, end, replacement$1);
+							continue;
+						}
+						const argCode = match[1].trim();
+						const options = {
+							import: id,
+							environment: void 0,
+							asEntry: false
+						};
+						if (argCode) {
+							const argValue = evalValue(argCode);
+							Object.assign(options, argValue);
+						}
+						const environments = options.environment ? [options.environment] : ["client", this.environment.name];
+						const importedNames = [];
+						for (const environment of environments) {
+							const importSource = toAssetsVirtual({
+								import: options.import,
+								importer: id,
+								environment,
+								entry: options.asEntry ? "1" : ""
+							});
+							const importedName = `__assets_${hashString(importSource)}`;
+							newImports.add(`;import ${importedName} from ${JSON.stringify(importSource)};\n`);
+							importedNames.push(importedName);
+						}
+						let replacement = importedNames[0];
+						if (importedNames.length > 1) {
+							newImports.add(`;import * as __assets_runtime from "virtual:fullstack/runtime";\n`);
+							replacement = `__assets_runtime.mergeAssets(${importedNames.join(", ")})`;
+						}
+						output.update(start, end, `(${replacement})`);
 					}
-					let replacement = importedNames[0];
-					if (importedNames.length > 1) {
-						newImports.add(`;import * as __assets_runtime from "virtual:fullstack/runtime";\n`);
-						replacement = `__assets_runtime.mergeAssets(${importedNames.join(", ")})`;
+					if (output.hasChanged()) {
+						for (const newImport of newImports) output.append(newImport);
+						return {
+							code: output.toString(),
+							map: output.generateMap({ hires: "boundary" })
+						};
 					}
-					output.update(start, end, `(${replacement})`);
-				}
-				if (output.hasChanged()) {
-					for (const newImport of newImports) output.append(newImport);
-					return {
-						code: output.toString(),
-						map: output.generateMap({ hires: "boundary" })
-					};
 				}
-			} },
-			resolveId: { handler(source) {
-				if (source === "virtual:fullstack/runtime") return "\0" + source;
-				if (source.startsWith("virtual:fullstack/assets?")) return "\0" + source;
-				if (source === "virtual:fullstack/assets-manifest") {
-					assert$1.notEqual(this.environment.name, "client");
-					assert$1.equal(this.environment.mode, "build");
-					return {
-						id: source,
-						external: true
-					};
+			},
+			resolveId: {
+				filter: { id: /^virtual:fullstack\// },
+				handler(source) {
+					if (source === "virtual:fullstack/runtime") return "\0" + source;
+					if (source.startsWith("virtual:fullstack/assets?")) return "\0" + source;
+					if (source === "virtual:fullstack/assets-manifest") {
+						assert$1.notEqual(this.environment.name, "client");
+						assert$1.equal(this.environment.mode, "build");
+						return {
+							id: source,
+							external: true
+						};
+					}
 				}
-			} },
-			load: { async handler(id) {
-				if (id === "\0virtual:fullstack/runtime") return `//#region src/runtime.ts
+			},
+			load: {
+				filter: { id: /^\0virtual:fullstack\// },
+				async handler(id) {
+					if (id === "\0virtual:fullstack/runtime") return `//#region src/runtime.ts
 function mergeAssets(...args) {
 	const js = uniqBy(args.flatMap((h) => h.js), (a) => a.href);
 	const css = uniqBy(args.flatMap((h) => h.css), (a) => a.href);
@@ -1810,20 +1826,21 @@ function uniqBy(array, key) {
 
 //#endregion
 export { mergeAssets };`;
-				const parsed = parseAssetsVirtual(id);
-				if (!parsed) return;
-				assert$1.notEqual(this.environment.name, "client");
-				const resolved = await this.resolve(parsed.import, parsed.importer);
-				assert$1(resolved, `Failed to resolve: ${parsed.import}`);
-				const s = new MagicString("");
-				const code = await processAssetsImport(this, resolved.id, {
-					environment: parsed.environment,
-					isEntry: !!parsed.entry
-				});
-				s.append(`export default ${code};\n`);
-				if (this.environment.mode === "build") s.prepend(`import __assets_manifest from "virtual:fullstack/assets-manifest";\n`);
-				return s.toString();
-			} },
+					const parsed = parseAssetsVirtual(id);
+					if (!parsed) return;
+					assert$1.notEqual(this.environment.name, "client");
+					const resolved = await this.resolve(parsed.import, parsed.importer);
+					assert$1(resolved, `Failed to resolve: ${parsed.import}`);
+					const s = new MagicString("");
+					const code = await processAssetsImport(this, resolved.id, {
+						environment: parsed.environment,
+						isEntry: !!parsed.entry
+					});
+					s.append(`export default ${code};\n`);
+					if (this.environment.mode === "build") s.prepend(`import __assets_manifest from "virtual:fullstack/assets-manifest";\n`);
+					return s.toString();
+				}
+			},
 			renderChunk(code, chunk) {
 				if (code.includes("virtual:fullstack/assets-manifest")) {
 					const replacement = normalizeRelativePath(path.relative(path.join(chunk.fileName, ".."), BUILD_ASSETS_MANIFEST_NAME));
@@ -1868,6 +1885,7 @@ export { mergeAssets };`;
 			sharedDuringBuild: true,
 			resolveId: {
 				order: "pre",
+				filter: { id: /[?&]assets/ },
 				handler(source) {
 					const { query } = parseIdQuery(source);
 					if (typeof query["assets"] !== "undefined") {
@@ -1875,41 +1893,44 @@ export { mergeAssets };`;
 					}
 				}
 			},
-			load: { async handler(id) {
-				if (id === "\0virtual:fullstack/empty-assets") return `export default ${JSON.stringify(EMPTY_ASSETS)}`;
-				const { filename, query } = parseIdQuery(id);
-				const value = query["assets"];
-				if (typeof value !== "undefined") {
-					const s = new MagicString("");
-					const codes = [];
-					if (value) {
-						const code = await processAssetsImport(this, filename, {
-							environment: value,
-							isEntry: value === "client"
-						});
-						codes.push(code);
-					} else {
-						const code1 = await processAssetsImport(this, filename, {
-							environment: "client",
-							isEntry: false
-						});
-						const code2 = await processAssetsImport(this, filename, {
-							environment: this.environment.name,
-							isEntry: false
-						});
-						codes.push(code1, code2);
-					}
-					s.append(`
+			load: {
+				filter: { id: [/^\0virtual:fullstack\/empty-assets$/, /[?&]assets/] },
+				async handler(id) {
+					if (id === "\0virtual:fullstack/empty-assets") return `export default ${JSON.stringify(EMPTY_ASSETS)}`;
+					const { filename, query } = parseIdQuery(id);
+					const value = query["assets"];
+					if (typeof value !== "undefined") {
+						const s = new MagicString("");
+						const codes = [];
+						if (value) {
+							const code = await processAssetsImport(this, filename, {
+								environment: value,
+								isEntry: value === "client"
+							});
+							codes.push(code);
+						} else {
+							const code1 = await processAssetsImport(this, filename, {
+								environment: "client",
+								isEntry: false
+							});
+							const code2 = await processAssetsImport(this, filename, {
+								environment: this.environment.name,
+								isEntry: false
+							});
+							codes.push(code1, code2);
+						}
+						s.append(`
 import * as __assets_runtime from "virtual:fullstack/runtime";\n
 export default __assets_runtime.mergeAssets(${codes.join(", ")});
 `);
-					if (this.environment.mode === "build") s.prepend(`import __assets_manifest from "virtual:fullstack/assets-manifest";\n`);
-					return {
-						code: s.toString(),
-						moduleSideEffects: false
-					};
+						if (this.environment.mode === "build") s.prepend(`import __assets_manifest from "virtual:fullstack/assets-manifest";\n`);
+						return {
+							code: s.toString(),
+							moduleSideEffects: false
+						};
+					}
 				}
-			} },
+			},
 			hotUpdate(ctx) {
 				if (this.environment.name === "rsc") {
 					const mods = collectModuleDependents(ctx.modules);
@@ -2029,11 +2050,13 @@ function patchViteClientPlugin() {
 	}
 	return {
 		name: "fullstack:patch-vite-client",
-		transform: { handler(code, id) {
-			if (id === viteClientPath) {
-				if (code.includes("linkSheetsMap")) return;
-				const s = new MagicString(code);
-				s.prependLeft(code.indexOf("const sheetsMap"), `\
+		transform: {
+			filter: { id: /* @__PURE__ */ new RegExp("^" + escapeRegExp(viteClientPath) + "$") },
+			handler(code, id) {
+				if (id === viteClientPath) {
+					if (code.includes("linkSheetsMap")) return;
+					const s = new MagicString(code);
+					s.prependLeft(code.indexOf("const sheetsMap"), `\
 const linkSheetsMap = new Map();
 document
   .querySelectorAll('link[rel="stylesheet"][data-vite-dev-id]')
@@ -2041,8 +2064,8 @@ document
     linkSheetsMap.set(el.getAttribute('data-vite-dev-id'), el)
   });
 `);
-				s.appendLeft(endIndexOf(code, `function updateStyle(id, content) {`), `if (linkSheetsMap.has(id)) { return }`);
-				s.appendLeft(endIndexOf(code, `function removeStyle(id) {`), `
+					s.appendLeft(endIndexOf(code, `function updateStyle(id, content) {`), `if (linkSheetsMap.has(id)) { return }`);
+					s.appendLeft(endIndexOf(code, `function removeStyle(id) {`), `
 const link = linkSheetsMap.get(id);
 if (link) {
   document
@@ -2057,9 +2080,10 @@ if (link) {
   linkSheetsMap.delete(id)
 }
 `);
-				return s.toString();
+					return s.toString();
+				}
 			}
-		} }
+		}
 	};
 }
 function patchVueScopeCssHmr() {

package/lib/vite.d.mts

@@ -1,10 +1,10 @@
 // Based on https://github.com/hi-ogawa/vite-plugins/blob/main/packages/fullstack/types/query.d.ts
 
-export type ImportAssetsResult = ImportAssetsResultRaw & {
+type ImportAssetsResult = ImportAssetsResultRaw & {
   merge(...args: ImportAssetsResultRaw[]): ImportAssetsResult;
 };
 
-export type ImportAssetsResultRaw = {
+type ImportAssetsResultRaw = {
   entry?: string;
   js: { href: string }[];
   css: { href: string; "data-vite-dev-id"?: string }[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-nightly",
-  "version": "3.0.1-20251217-223946-1ee0b5b8",
+  "version": "3.0.1-20251217-233031-5973b3df",
   "description": "Build and Deploy Universal JavaScript Servers",
   "homepage": "https://nitro.build",
   "repository": "nitrojs/nitro",