nitro-nightly 3.0.1-alpha.1 → 3.0.1-alpha.2

package/dist/_libs/{vite-plugin-fullstack.mjs → pluginutils.mjs}

@@ -1,15 +1,44 @@
-import { t as MagicString } from "./magic-string.mjs";
-import { t as stripLiteral } from "./strip-literal.mjs";
-import path from "node:path";
+import { n as __exportAll } from "../_common.mjs";
+import { S as MagicString, x as stripLiteral } from "../_build/common.mjs";
 import fs from "node:fs";
 import { fileURLToPath } from "node:url";
+import path from "node:path";
 import assert from "node:assert";
-import "srvx/node";
 import { createHash } from "node:crypto";
 import { isCSSRequest, normalizePath } from "vite";
 import assert$1 from "node:assert/strict";
 
-//#region node_modules/.pnpm/@pi0+vite-plugin-fullstack@0.0.5-pr-1297_vite@7.2.2_@types+node@24.10.0_jiti@2.6.1_ligh_420de11c17db6dc1bb00fb6cc17e9a42/node_modules/@pi0/vite-plugin-fullstack/dist/index.js
+//#region node_modules/.pnpm/@rolldown+pluginutils@1.0.0-beta.55/node_modules/@rolldown/pluginutils/dist/simple-filters.js
+/**
+* Constructs a RegExp that matches the exact string specified.
+*
+* This is useful for plugin hook filters.
+*
+* @param str the string to match.
+* @param flags flags for the RegExp.
+*
+* @example
+* ```ts
+* import { exactRegex } from '@rolldown/pluginutils';
+* const plugin = {
+*   name: 'plugin',
+*   resolveId: {
+*     filter: { id: exactRegex('foo') },
+*     handler(id) {} // will only be called for `foo`
+*   }
+* }
+* ```
+*/
+function exactRegex(str, flags) {
+	return new RegExp(`^${escapeRegex(str)}$`, flags);
+}
+const escapeRegexRE = /[-/\\^$*+?.()|[\]{}]/g;
+function escapeRegex(str) {
+	return str.replace(escapeRegexRE, "\\$&");
+}
+
+//#endregion
+//#region node_modules/.pnpm/@hiogawa+vite-plugin-fullstack@0.0.11_vite@8.0.0-beta.8_@types+node@25.0.9_esbuild@0.27_577572ae8fc6296e77b8a4205393d7c0/node_modules/@hiogawa/vite-plugin-fullstack/dist/plugin-B4MlD0Bd.js
 function parseIdQuery(id) {
 	if (!id.includes("?")) return {
 		filename: id,
@@ -30,13 +59,19 @@ function parseAssetsVirtual(id) {
 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]);
-		} }
+		name: `fullstack:virtual-${name}`,
+		resolveId: {
+			filter: { id: exactRegex(name) },
+			handler(source, _importer, _options) {
+				return source === name ? "\0" + name : void 0;
+			}
+		},
+		load: {
+			filter: { id: exactRegex("\0" + name) },
+			handler(id, options) {
+				return load.apply(this, [id, options]);
+			}
+		}
 	};
 }
 function normalizeRelativePath(s) {
@@ -114,11 +149,11 @@ function assetsPlugin(pluginOpts) {
 			};
 			const environment = server.environments[options.environment];
 			assert$1(environment, `Unknown environment: ${options.environment}`);
-			if (options.environment === "client") result.entry = normalizeViteImportAnalysisUrl(environment, id);
+			if (options.environment === "client") result.entry = assetsURLDev(normalizeViteImportAnalysisUrl(environment, id).slice(1), resolvedConfig);
 			if (environment.name !== "client") {
 				const collected = await collectCss(environment, id, { eager: pluginOpts?.experimental?.devEagerTransform ?? true });
 				result.css = collected.hrefs.map((href, i) => ({
-					href,
+					href: assetsURLDev(href.slice(1), resolvedConfig),
 					"data-vite-dev-id": collected.ids[i]
 				}));
 			}
@@ -155,13 +190,13 @@ function assetsPlugin(pluginOpts) {
 				};
 				const { chunk, deps } = found;
 				if (environmentName === "client") {
-					result.entry = `/${chunk.fileName}`;
-					result.js = deps.js.map((fileName) => ({ href: `/${fileName}` }));
+					result.entry = assetsURL(chunk.fileName, builder.config);
+					result.js = deps.js.map((fileName) => ({ href: assetsURL(fileName, builder.config) }));
 				}
-				result.css = deps.css.map((fileName) => ({ href: `/${fileName}` }));
+				result.css = deps.css.map((fileName) => ({ href: assetsURL(fileName, builder.config) }));
 				if (!builder.environments[environmentName].config.build.cssCodeSplit) {
 					const singleCss = Object.values(bundle).find((v) => v.type === "asset" && v.originalFileNames.includes("style.css"));
-					if (singleCss) result.css.push({ href: `/${singleCss.fileName}` });
+					if (singleCss) result.css.push({ href: assetsURL(singleCss.fileName, builder.config) });
 				}
 				(manifest[environmentName] ??= {})[meta.key] = result;
 			}
@@ -169,7 +204,7 @@ function assetsPlugin(pluginOpts) {
 		const importerEnvironments = new Set(Object.values(importAssetsMetaMap).flatMap((metas) => Object.values(metas)).flatMap((meta) => meta.importerEnvironment));
 		for (const environmentName of importerEnvironments) {
 			const outDir = builder.environments[environmentName].config.build.outDir;
-			fs.writeFileSync(path.join(outDir, BUILD_ASSETS_MANIFEST_NAME), `export default ${JSON.stringify(manifest, null, 2)};`);
+			fs.writeFileSync(path.join(outDir, BUILD_ASSETS_MANIFEST_NAME), `export default ${serializeValueWithRuntime(manifest)};`);
 			const clientOutDir = builder.environments["client"].config.build.outDir;
 			for (const asset of Object.values(bundleMap[environmentName])) if (asset.type === "asset") {
 				const srcFile = path.join(outDir, asset.fileName);
@@ -192,85 +227,93 @@ 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;
+			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})`);
 					}
-					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);
+					if (output.hasChanged()) {
+						for (const newImport of newImports) output.append(newImport);
+						return {
+							code: output.toString(),
+							map: output.generateMap({ hires: "boundary" })
+						};
 					}
-					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})`);
 				}
-				if (output.hasChanged()) {
-					for (const newImport of newImports) output.append(newImport);
-					return {
-						code: output.toString(),
-						map: output.generateMap({ hires: "boundary" })
-					};
+			},
+			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
+						};
+					}
 				}
-			} },
-			resolveId: { handler(source) {
-				if (source.startsWith("virtual:fullstack/assets?")) return "\0" + source;
-				if (source === "virtual:fullstack/assets-manifest") {
+			},
+			load: {
+				filter: { id: /^\0virtual:fullstack\// },
+				async handler(id) {
+					if (id === "\0virtual:fullstack/runtime") return `export const mergeAssets = ${(await Promise.resolve().then(() => runtime_exports)).mergeAssets.toString()};`;
+					const parsed = parseAssetsVirtual(id);
+					if (!parsed) return;
 					assert$1.notEqual(this.environment.name, "client");
-					assert$1.equal(this.environment.mode, "build");
-					return {
-						id: source,
-						external: true
-					};
+					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();
 				}
-				if (source === "virtual:fullstack/runtime") return { id: source };
-			} },
-			load: { async handler(id) {
-				if (id === "virtual:fullstack/runtime") return runtimeUtils();
-				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));
@@ -315,50 +358,52 @@ function assetsPlugin(pluginOpts) {
 			sharedDuringBuild: true,
 			resolveId: {
 				order: "pre",
+				filter: { id: /[?&]assets/ },
 				handler(source) {
 					const { query } = parseIdQuery(source);
 					if (typeof query["assets"] !== "undefined") {
 						if (this.environment.name === "client") return `\0virtual:fullstack/empty-assets`;
 					}
-					if (source === "virtual:fullstack/runtime") return source;
 				}
 			},
-			load: { async handler(id) {
-				if (id === "\0virtual:fullstack/empty-assets") return `export default ${JSON.stringify(EMPTY_ASSETS)}`;
-				if (id === "virtual:fullstack/runtime") return runtimeUtils();
-				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);
@@ -478,11 +523,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: exactRegex(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]')
@@ -490,8 +537,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
@@ -506,9 +553,10 @@ if (link) {
   linkSheetsMap.delete(id)
 }
 `);
-				return s.toString();
+					return s.toString();
+				}
 			}
-		} }
+		}
 	};
 }
 function patchVueScopeCssHmr() {
@@ -537,25 +585,68 @@ function patchCssLinkSelfAccept() {
 		}
 	};
 }
-function runtimeUtils() {
-	return `
-export 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);
-  const entry = args.filter((arg) => arg.entry)?.[0]?.entry;
-  const raw = { entry, js, css };
-  return { ...raw, merge: (...args$1) => mergeAssets(raw, ...args$1) };
-}
-function uniqBy(array, key) {
-  const seen = new Set();
-  return array.filter((item) => {
-    const k = key(item);
-    if (seen.has(k)) return false;
-    seen.add(k);
-    return true;
-  });
-}`;
+var BuildAssetsURLWithRuntime = class {
+	constructor(runtime) {
+		this.runtime = runtime;
+	}
+};
+function serializeValueWithRuntime(value) {
+	const replacements = [];
+	let result = JSON.stringify(value, (_key, value$1) => {
+		if (value$1 instanceof BuildAssetsURLWithRuntime) {
+			const placeholder = `__runtime_placeholder_${replacements.length}__`;
+			replacements.push([placeholder, value$1.runtime]);
+			return placeholder;
+		}
+		return value$1;
+	}, 2);
+	for (const [placeholder, runtime] of replacements) result = result.replace(`"${placeholder}"`, runtime);
+	return result;
+}
+function assetsURL(url, config) {
+	if (config.command === "build" && typeof config.experimental?.renderBuiltUrl === "function") {
+		const result = config.experimental.renderBuiltUrl(url, {
+			type: "asset",
+			hostType: "js",
+			ssr: true,
+			hostId: ""
+		});
+		if (typeof result === "object") {
+			if (result.runtime) return new BuildAssetsURLWithRuntime(result.runtime);
+			assert$1(!result.relative, "\"result.relative\" not supported on renderBuiltUrl() for fullstack plugin");
+		} else if (result) return result;
+	}
+	return config.base + url;
+}
+function assetsURLDev(url, config) {
+	return config.base + url;
+}
+
+//#endregion
+//#region node_modules/.pnpm/@hiogawa+vite-plugin-fullstack@0.0.11_vite@8.0.0-beta.8_@types+node@25.0.9_esbuild@0.27_577572ae8fc6296e77b8a4205393d7c0/node_modules/@hiogawa/vite-plugin-fullstack/dist/runtime.js
+var runtime_exports = /* @__PURE__ */ __exportAll({ mergeAssets: () => mergeAssets });
+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);
+	const raw = {
+		entry: args.filter((arg) => arg.entry)?.[0]?.entry,
+		js,
+		css
+	};
+	return {
+		...raw,
+		merge: (...args$1) => mergeAssets(raw, ...args$1)
+	};
+	function uniqBy(array, key) {
+		const seen = /* @__PURE__ */ new Set();
+		return array.filter((item) => {
+			const k = key(item);
+			if (seen.has(k)) return false;
+			seen.add(k);
+			return true;
+		});
+	}
 }
 
 //#endregion
-export { assetsPlugin as t };
+export { assetsPlugin as n, runtime_exports as t };