vinext 1.0.0-beta.6 → 1.0.0-beta.8

package/dist/plugins/import-meta-url.js

@@ -1,25 +1,49 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { canonicalizeFilePath, isPathInsideOrEqual, stripViteModuleQuery } from "../utils/path.js";
+import { magicStringTransformResult } from "./transform-result.js";
 import { VIRTUAL_MODULE_ID_RE } from "../utils/virtual-module.js";
-import { collectBindingNames, forEachAstChild, hasRange, isAstRecord, isIdentifierNamed, nodeArray } from "./ast-utils.js";
-import { tryRealpathSync } from "../build/ssr-manifest.js";
+import { SCRIPT_MODULE_ID_RE, collectBindingNames, forEachAstChild, hasRange, isAstRecord, isIdentifierNamed, nodeArray, scriptParserLanguage } from "./ast-utils.js";
+import fs from "node:fs";
 import { parseAst } from "vite";
-import { pathToFileURL } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { randomUUID } from "node:crypto";
 import MagicString from "magic-string";
 //#region src/plugins/import-meta-url.ts
-const TRANSFORMABLE_SCRIPT_EXTENSIONS = /* @__PURE__ */ new Set([
-	".cjs",
-	".cts",
-	".js",
-	".jsx",
-	".mjs",
-	".mts",
-	".ts",
-	".tsx"
-]);
+const MAX_DEPENDENCY_FORMAT_CACHE_ENTRIES = 512;
+const MAX_TRANSFORM_CACHE_ENTRIES = 2048;
+const BLOCK_COMMENT_PATTERN = String.raw`\/\*[^*]*\*+(?:[^/*][^*]*\*+)*\/`;
+const JAVASCRIPT_TRIVIA_PATTERN = String.raw`(?:\s|${BLOCK_COMMENT_PATTERN}|\/\/[^\r\n\u2028\u2029]*)*`;
+const UNICODE_IDENTIFIER_ESCAPE_PATTERN = String.raw`\\u(?:[\dA-Fa-f]{4}|\{[\dA-Fa-f]+\})`;
+const IMPORT_META_URL_CANDIDATE_PATTERN = String.raw`\bimport${JAVASCRIPT_TRIVIA_PATTERN}\.${JAVASCRIPT_TRIVIA_PATTERN}meta${JAVASCRIPT_TRIVIA_PATTERN}\??\.${JAVASCRIPT_TRIVIA_PATTERN}(?:u|${UNICODE_IDENTIFIER_ESCAPE_PATTERN})(?:r|${UNICODE_IDENTIFIER_ESCAPE_PATTERN})(?:l|${UNICODE_IDENTIFIER_ESCAPE_PATTERN})`;
+const IMPORT_META_URL_CANDIDATE_RE = new RegExp(IMPORT_META_URL_CANDIDATE_PATTERN, "u");
+const SOURCE_IDENTITY_FILTER_RE = new RegExp(`${IMPORT_META_URL_CANDIDATE_PATTERN}|__filename|__dirname`, "u");
 function createImportMetaUrlPlugin(options) {
 	let rootPaths;
 	let outputDirs = [];
+	let resolveEmittedModuleFileName = (_, fileName) => fileName;
 	const transformCache = /* @__PURE__ */ new Map();
+	const dependencyModuleCache = /* @__PURE__ */ new Map();
+	const emittedModuleIdentity = createEmittedModuleIdentity();
+	function dependencyModule(id) {
+		const cleanId = stripViteModuleQuery(id);
+		const paths = getRootPaths();
+		const cached = dependencyModuleCache.get(cleanId);
+		if (cached && cached.canonicalRoot === paths?.canonicalRoot) return cached.value;
+		const dependency = canonicalDependencyModuleId(cleanId, paths);
+		const result = dependency === null ? null : {
+			canonicalId: dependency.canonicalId,
+			isCommonJs: isCommonJsDependency(dependency.canonicalId, dependency.allowUnpackaged)
+		};
+		setBoundedCacheEntry(dependencyModuleCache, cleanId, {
+			canonicalRoot: paths?.canonicalRoot,
+			value: result
+		}, MAX_DEPENDENCY_FORMAT_CACHE_ENTRIES);
+		return result;
+	}
+	function commonJsDependencyCanonicalId(id) {
+		const dependency = dependencyModule(id);
+		return dependency?.isCommonJs ? dependency.canonicalId : null;
+	}
 	function getRootPaths() {
 		const root = options.getRoot();
 		if (!root) return rootPaths;
@@ -27,49 +51,108 @@ function createImportMetaUrlPlugin(options) {
 		return rootPaths;
 	}
 	return {
-		name: "vinext:import-meta-url",
-		enforce: "post",
-		configResolved(config) {
-			const root = options.getRoot() ?? config.root;
-			outputDirs = [config.build.outDir];
-			rootPaths = createRootPaths(root, { outputDirs });
+		vitePlugin: {
+			name: "vinext:import-meta-url",
+			enforce: "post",
+			configResolved(config) {
+				const root = options.getRoot() ?? config.root;
+				const environments = Object.entries(config.environments ?? {});
+				outputDirs = [config.build.outDir, ...environments.map(([, environment]) => environment.build.outDir)];
+				resolveEmittedModuleFileName = options.createEmittedModuleFileNameResolver?.(config) ?? ((_, fileName) => fileName);
+				rootPaths = createRootPaths(root, { outputDirs });
+			},
+			watchChange() {
+				dependencyModuleCache.clear();
+			},
+			transform: {
+				filter: {
+					id: {
+						include: SCRIPT_MODULE_ID_RE,
+						exclude: VIRTUAL_MODULE_ID_RE
+					},
+					code: SOURCE_IDENTITY_FILTER_RE
+				},
+				handler(code, id) {
+					if (!mayContainSourceIdentityToken(code)) return null;
+					const cleanId = stripViteModuleQuery(id);
+					if (this.environment?.config?.consumer !== "client") {
+						const dependency = dependencyModule(cleanId);
+						if (dependency) {
+							const importMetaUrlReplacement = mayContainImportMetaUrl(code) ? this.environment.mode === "dev" ? JSON.stringify(pathToFileURL(dependency.canonicalId).href) : emittedModuleIdentity.importMetaUrlInitializer : void 0;
+							const cjsGlobalInitializers = dependency.isCommonJs && mayContainServerCjsGlobal(code) ? this.environment.mode === "dev" ? sourcePathCjsGlobalInitializers(dependency.canonicalId) : emittedModuleIdentity.cjsGlobalInitializers : void 0;
+							if (importMetaUrlReplacement !== void 0 || cjsGlobalInitializers) return rewriteModuleIdentity(code, {
+								id: dependency.canonicalId,
+								importMetaUrlReplacement,
+								cjsGlobalInitializers
+							});
+						}
+					}
+					if (isNodeModulesId(cleanId)) return null;
+					const paths = getRootPaths();
+					if (!paths) return null;
+					const canonicalId = transformableModuleCanonicalId(cleanId, paths);
+					if (!canonicalId) return null;
+					const environment = this.environment?.name === "client" ? "client" : "server";
+					const explicitCommonJs = [".cjs", ".cts"].includes(path.extname(canonicalId));
+					const transformKind = environment === "client" ? "client" : explicitCommonJs ? this.environment.mode === "dev" ? "server-cjs-dev" : "server-cjs-build" : this.environment.mode === "dev" ? "server-dev" : "server-build";
+					let entry = transformCache.get(id);
+					if (!entry || entry.source !== code || entry.canonicalRoot !== paths.canonicalRoot || entry.canonicalId !== canonicalId) {
+						entry = {
+							source: code,
+							canonicalRoot: paths.canonicalRoot,
+							canonicalId,
+							results: /* @__PURE__ */ new Map()
+						};
+						setBoundedCacheEntry(transformCache, id, entry, MAX_TRANSFORM_CACHE_ENTRIES);
+					}
+					const cached = entry.results.get(transformKind);
+					if (cached) return cached.value;
+					const value = rewriteCanonicalSourceIdentity(code, canonicalId, paths, environment, this.environment.mode === "build" && mayContainServerCjsGlobal(code) ? emittedModuleIdentity.cjsGlobalInitializers : sourcePathCjsGlobalInitializers(canonicalId));
+					entry.results.set(transformKind, { value });
+					return value;
+				}
+			},
+			renderChunk: {
+				order: "post",
+				handler(code, chunk, outputOptions) {
+					if (this.environment?.config.consumer !== "server" || outputOptions.format !== "es") return null;
+					const emittedFileName = resolveEmittedModuleFileName(this.environment?.name, chunk.fileName);
+					return finalizeEmittedModuleIdentity(code, emittedModuleIdentity.replacements, emittedFileName);
+				}
+			}
 		},
-		transform: {
-			filter: {
-				id: {
-					include: /\.(?:[cm]?[jt]s|[jt]sx)(?:\?.*)?$/,
-					exclude: [/[\\/]node_modules[\\/]/, VIRTUAL_MODULE_ID_RE]
+		optimizeDepsPlugin: {
+			name: "vinext:import-meta-url:optimize-deps",
+			transform: {
+				filter: {
+					id: /\.(?:[cm]?[jt]s|[jt]sx)(?:\?.*)?$/,
+					code: SOURCE_IDENTITY_FILTER_RE
 				},
-				code: /import\.meta(?:\.|\?\.)url|__filename|__dirname/
+				handler(code, id) {
+					if (!mayContainSourceIdentityToken(code)) return null;
+					const dependency = dependencyModule(id);
+					if (!dependency) return null;
+					return rewriteModuleIdentity(code, {
+						id: dependency.canonicalId,
+						importMetaUrlReplacement: mayContainImportMetaUrl(code) ? emittedModuleIdentity.importMetaUrlInitializer : void 0,
+						cjsGlobalInitializers: dependency.isCommonJs && mayContainServerCjsGlobal(code) ? emittedModuleIdentity.cjsGlobalInitializers : void 0
+					});
+				}
 			},
-			handler(code, id) {
-				const paths = getRootPaths();
-				if (!paths) return null;
-				const canonicalId = transformableModuleCanonicalId(cleanModuleId(id), paths);
-				if (!canonicalId) return null;
-				const environment = this.environment?.name === "client" ? "client" : "server";
-				let entry = transformCache.get(id);
-				if (!entry || entry.source !== code || entry.canonicalRoot !== paths.canonicalRoot || entry.canonicalId !== canonicalId) {
-					entry = {
-						source: code,
-						canonicalRoot: paths.canonicalRoot,
-						canonicalId,
-						results: /* @__PURE__ */ new Map()
-					};
-					transformCache.set(id, entry);
+			renderChunk: {
+				order: "post",
+				handler(code, chunk, outputOptions) {
+					if (outputOptions.format !== "es") return null;
+					return finalizeEmittedModuleIdentity(code, emittedModuleIdentity.replacements, chunk.fileName);
 				}
-				const cached = entry.results.get(environment);
-				if (cached) return cached.value;
-				const value = rewriteCanonicalSourceIdentity(code, canonicalId, paths, environment);
-				entry.results.set(environment, { value });
-				return value;
 			}
-		}
+		},
+		isBundledCommonJsDependencyId: (id) => commonJsDependencyCanonicalId(id) !== null
 	};
 }
 function rewriteImportMetaUrl(code, id, root, environment) {
 	if (!mayContainImportMetaUrl(code)) return null;
-	return rewriteCanonicalSourceIdentity(code, canonicalizePath(id), createRootPaths(root), environment);
+	return rewriteCanonicalSourceIdentity(code, canonicalizeFilePath(id), createRootPaths(root), environment);
 }
 function rewriteServerCjsGlobals(code, id, root) {
 	if (!mayContainServerCjsGlobal(code)) return null;
@@ -78,43 +161,182 @@ function rewriteServerCjsGlobals(code, id, root) {
 	if (!canonicalId) return null;
 	return rewriteCanonicalSourceIdentity(code, canonicalId, rootPaths, "server");
 }
-function rewriteCanonicalSourceIdentity(code, canonicalId, rootPaths, environment) {
+function rewriteCanonicalSourceIdentity(code, canonicalId, rootPaths, environment, cjsGlobalInitializers) {
+	return rewriteModuleIdentity(code, {
+		id: canonicalId,
+		importMetaUrlReplacement: mayContainImportMetaUrl(code) ? JSON.stringify(importMetaUrlValue(canonicalId, rootPaths, environment)) : void 0,
+		cjsGlobalInitializers: environment === "server" && mayContainServerCjsGlobal(code) ? cjsGlobalInitializers ?? sourcePathCjsGlobalInitializers(canonicalId) : void 0
+	});
+}
+function createEmittedModuleIdentity() {
+	const nonce = randomUUID().replaceAll("-", "");
+	const filenameMarker = `__VINEXT_EMITTED_MODULE_FILENAME_${nonce}__`;
+	const dirnameMarker = `__VINEXT_EMITTED_MODULE_DIRNAME_${nonce}__`;
+	const urlMarker = `__VINEXT_EMITTED_MODULE_URL_${nonce}__`;
+	const filenameSentinel = JSON.stringify(filenameMarker);
+	const dirnameSentinel = JSON.stringify(dirnameMarker);
+	const urlSentinel = JSON.stringify(urlMarker);
+	return {
+		cjsGlobalInitializers: {
+			__filename: emittedModuleIdentityInitializer(filenameSentinel),
+			__dirname: emittedModuleIdentityInitializer(dirnameSentinel)
+		},
+		importMetaUrlInitializer: emittedModuleIdentityInitializer(urlSentinel),
+		replacements: /* @__PURE__ */ new Map([
+			[filenameSentinel, "__filename"],
+			[dirnameSentinel, "__dirname"],
+			[urlSentinel, "url"]
+		])
+	};
+}
+function emittedModuleIdentityInitializer(sentinel) {
+	return `({ get value() { return ${sentinel}; } }).value`;
+}
+function finalizeEmittedModuleIdentity(code, emittedIdentitySentinels, fileName) {
+	if (!code.includes("__VINEXT_EMITTED_MODULE_")) return null;
+	const runtimeBindings = new Set(code.match(/\b__vinext_module_(?:process|fs|url|identity)_*\b/g) ?? []);
+	function selectRuntimeBinding(base) {
+		let binding = base;
+		while (runtimeBindings.has(binding)) binding += "_";
+		return binding;
+	}
+	const processNamespaceBinding = selectRuntimeBinding("__vinext_module_process");
+	const fsNamespaceBinding = selectRuntimeBinding("__vinext_module_fs");
+	const urlNamespaceBinding = selectRuntimeBinding("__vinext_module_url");
+	const identityBinding = selectRuntimeBinding("__vinext_module_identity");
+	const emittedFileName = toSlash(fileName).replace(/^\.\//, "").replace(/^\/+/, "");
+	const processCwd = `(typeof ${processNamespaceBinding}.cwd === "function" ? ${processNamespaceBinding}.cwd() : "")`;
+	const emittedPathFallback = emittedFileName ? `(${processCwd}.replace(/[\\\\/]$/, "") + ${JSON.stringify(`/${emittedFileName}`)})` : `(${processCwd} || "/")`;
+	const emittedDirName = path.dirname(emittedFileName);
+	const emittedDirFallback = emittedDirName === "." ? `(${processCwd} || "/")` : `(${processCwd}.replace(/[\\\\/]$/, "") + ${JSON.stringify(`/${emittedDirName}`)})`;
+	const absoluteEmittedPath = JSON.stringify(`/${emittedFileName}`.replace(/\/$/, "") || "/");
+	const replacements = {
+		__filename: `${identityBinding}.filename`,
+		__dirname: `${identityBinding}.dirname`,
+		url: `${identityBinding}.url`
+	};
+	const output = new MagicString(code);
+	let changed = false;
+	const usedFields = /* @__PURE__ */ new Set();
+	for (const [sentinel, field] of emittedIdentitySentinels) {
+		let start = code.indexOf(sentinel);
+		while (start !== -1) {
+			output.overwrite(start, start + sentinel.length, replacements[field]);
+			changed = true;
+			usedFields.add(field);
+			start = code.indexOf(sentinel, start + sentinel.length);
+		}
+	}
+	if (!changed) return null;
+	const needsUrl = usedFields.has("url");
+	const needsPath = usedFields.has("__filename") || usedFields.has("__dirname");
+	const runtimePreamble = [
+		...needsPath ? [`import * as ${processNamespaceBinding} from "node:process";`] : [],
+		...needsPath ? [`import * as ${fsNamespaceBinding} from "node:fs";`] : [],
+		...needsUrl ? [`import * as ${urlNamespaceBinding} from "node:url";`] : [],
+		`const ${identityBinding} = (() => {`,
+		...needsPath ? [
+			`  const filename = import.meta.filename;`,
+			`  const native = typeof filename === "string" && ${fsNamespaceBinding}.existsSync(filename);`,
+			`  const resolvedFilename = native ? filename : ${emittedPathFallback};`
+		] : [`  const runtimeUrl = import.meta.url;`, `  const runtimeFilename = import.meta.filename;`],
+		`  return {`,
+		...needsPath ? [`    filename: resolvedFilename,`, `    dirname: native ? import.meta.dirname : ${emittedDirFallback},`] : [],
+		...needsUrl ? [needsPath ? `    url: ${urlNamespaceBinding}.pathToFileURL(resolvedFilename).href,` : `    url: typeof runtimeUrl === "string" && runtimeUrl.startsWith("file:") ? runtimeUrl : ${urlNamespaceBinding}.pathToFileURL(typeof runtimeFilename === "string" ? runtimeFilename : ${absoluteEmittedPath}).href,`] : [],
+		`  };`,
+		`})();`,
+		""
+	].join("\n");
+	if (code.startsWith("#!")) output.appendLeft(code.indexOf("\n") + 1, runtimePreamble);
+	else output.prepend(runtimePreamble);
+	return magicStringTransformResult(output);
+}
+function rewriteModuleIdentity(code, options) {
 	let ast;
 	try {
-		ast = parseAst(code);
+		ast = parseAst(code, {
+			lang: scriptParserLanguage(options.id) ?? "jsx",
+			sourceType: options.cjsGlobalInitializers ? "commonjs" : void 0
+		});
 	} catch {
-		return null;
+		if (!options.cjsGlobalInitializers) return null;
+		try {
+			ast = parseAst(code, { lang: scriptParserLanguage(options.id) ?? "jsx" });
+		} catch {
+			return null;
+		}
 	}
 	const output = new MagicString(code);
 	let changed = false;
-	if (mayContainImportMetaUrl(code)) {
+	if (options.importMetaUrlReplacement !== void 0) {
 		const importMetaRanges = collectImportMetaUrlRanges(ast);
-		if (importMetaRanges.length > 0) {
-			const replacement = JSON.stringify(importMetaUrlValue(canonicalId, rootPaths, environment));
-			for (const range of importMetaRanges) {
-				output.overwrite(range.start, range.end, replacement);
-				changed = true;
-			}
+		if (importMetaRanges.length > 0) for (const range of importMetaRanges) {
+			output.overwrite(range.start, range.end, options.importMetaUrlReplacement);
+			changed = true;
 		}
 	}
-	if (environment === "server" && mayContainServerCjsGlobal(code)) {
-		const injected = injectServerCjsGlobals(ast, canonicalId);
+	if (options.cjsGlobalInitializers) {
+		const injected = injectServerCjsGlobals(ast, options.cjsGlobalInitializers);
 		if (injected) {
 			output.appendLeft(findDirectivePrologueEnd(ast), `\n${injected}`);
 			changed = true;
 		}
 	}
 	if (!changed) return null;
+	return magicStringTransformResult(output);
+}
+function isNodeModulesId(id) {
+	return id.includes("/node_modules/") || id.includes("\\node_modules\\");
+}
+function setBoundedCacheEntry(cache, key, value, limit) {
+	if (!cache.has(key) && cache.size >= limit) {
+		const oldestKey = cache.keys().next().value;
+		if (oldestKey !== void 0) cache.delete(oldestKey);
+	}
+	cache.set(key, value);
+}
+function canonicalDependencyModuleId(id, rootPaths) {
+	const cleanId = stripViteModuleQuery(id);
+	if (!cleanId || cleanId.startsWith("\0")) return null;
+	let filePath;
+	try {
+		filePath = cleanId.startsWith("file:") ? toSlash(fileURLToPath(cleanId)) : toSlash(cleanId);
+	} catch {
+		return null;
+	}
+	if (!path.isAbsolute(filePath)) return null;
+	if (scriptParserLanguage(filePath) === null) return null;
+	const canonicalId = canonicalizeFilePath(filePath);
+	if (isNodeModulesId(filePath)) return {
+		canonicalId,
+		allowUnpackaged: true
+	};
+	if (!rootPaths || isPathInsideOrEqual(rootPaths.canonicalRoot, canonicalId)) return null;
 	return {
-		code: output.toString(),
-		map: output.generateMap({ hires: "boundary" })
+		canonicalId,
+		allowUnpackaged: false
 	};
 }
-function cleanModuleId(id) {
-	return id.split("?", 1)[0];
+function isCommonJsDependency(canonicalId, allowUnpackaged) {
+	const extension = path.extname(canonicalId);
+	if (extension === ".cjs" || extension === ".cts") return true;
+	if (extension === ".mjs" || extension === ".mts") return false;
+	let directory = path.dirname(canonicalId);
+	for (;;) {
+		const packageJsonPath = path.join(directory, "package.json");
+		if (fs.existsSync(packageJsonPath)) try {
+			return JSON.parse(fs.readFileSync(packageJsonPath, "utf8")).type !== "module";
+		} catch {
+			return true;
+		}
+		if (path.basename(directory) === "node_modules") return allowUnpackaged;
+		const parent = path.dirname(directory);
+		if (parent === directory) return allowUnpackaged;
+		directory = parent;
+	}
 }
 function createRootPaths(root, options = {}) {
-	const canonicalRoot = canonicalizePath(root);
+	const canonicalRoot = canonicalizeFilePath(root);
 	return {
 		root,
 		canonicalRoot,
@@ -126,14 +348,17 @@ function transformableModuleCanonicalId(id, rootPaths) {
 	if (!path.isAbsolute(id)) return null;
 	const slashedInputId = toSlash(id);
 	if (slashedInputId.includes("/node_modules/")) return null;
-	if (!TRANSFORMABLE_SCRIPT_EXTENSIONS.has(path.extname(slashedInputId))) return null;
-	const canonicalId = canonicalizePath(id);
-	if (!isPathWithin(canonicalId, rootPaths.canonicalRoot)) return null;
+	if (scriptParserLanguage(slashedInputId) === null) return null;
+	const canonicalId = canonicalizeFilePath(id);
+	if (!isPathInsideOrEqual(rootPaths.canonicalRoot, canonicalId)) return null;
 	if (isExcludedRelativePath(path.relative(rootPaths.canonicalRoot, canonicalId), rootPaths.excludedRelativePrefixes)) return null;
 	return canonicalId;
 }
 function mayContainImportMetaUrl(code) {
-	return code.includes("import.meta.url") || code.includes("import.meta?.url");
+	return IMPORT_META_URL_CANDIDATE_RE.test(code);
+}
+function mayContainSourceIdentityToken(code) {
+	return mayContainImportMetaUrl(code) || mayContainServerCjsGlobal(code);
 }
 function mayContainServerCjsGlobal(code) {
 	return code.includes("__filename") || code.includes("__dirname");
@@ -147,8 +372,8 @@ function excludedRelativePrefixes(canonicalRoot, options) {
 		"out"
 	]);
 	for (const outputDir of options.outputDirs ?? []) {
-		const canonicalOutputDir = canonicalizePath(path.isAbsolute(outputDir) ? outputDir : path.resolve(canonicalRoot, outputDir));
-		if (!isPathWithin(canonicalOutputDir, canonicalRoot)) continue;
+		const canonicalOutputDir = canonicalizeFilePath(path.isAbsolute(outputDir) ? outputDir : path.resolve(canonicalRoot, outputDir));
+		if (!isPathInsideOrEqual(canonicalRoot, canonicalOutputDir)) continue;
 		const relativePath = path.relative(canonicalRoot, canonicalOutputDir);
 		if (relativePath && relativePath !== ".") prefixes.add(relativePath);
 	}
@@ -157,17 +382,10 @@ function excludedRelativePrefixes(canonicalRoot, options) {
 function isExcludedRelativePath(relativePath, prefixes) {
 	return prefixes.some((prefix) => relativePath === prefix || relativePath.startsWith(`${prefix}/`));
 }
-function isPathWithin(candidate, root) {
-	return candidate === root || candidate.startsWith(root.endsWith("/") ? root : `${root}/`);
-}
 function importMetaUrlValue(canonicalId, rootPaths, environment) {
 	if (environment === "client") return `file:///ROOT/${path.relative(rootPaths.canonicalRoot, canonicalId)}`;
 	return pathToFileURL(canonicalId).href;
 }
-function canonicalizePath(value) {
-	const real = tryRealpathSync(value);
-	return real === null ? path.resolve(value) : toSlash(real);
-}
 function collectImportMetaUrlRanges(ast) {
 	const ranges = [];
 	function visit(value) {
@@ -189,7 +407,7 @@ function collectImportMetaUrlRanges(ast) {
 		if (isNewUrlExpression(value)) {
 			const args = nodeArray(value.arguments);
 			for (let index = 0; index < args.length; index += 1) {
-				if (index === 1 && isImportMetaUrlOrChainedNode(args[index])) continue;
+				if (index === 1 && isImportMetaUrlBaseNode(args[index])) continue;
 				visit(args[index]);
 			}
 			return;
@@ -203,13 +421,15 @@ const CJS_GLOBALS = ["__filename", "__dirname"];
 function isCjsGlobalName(name) {
 	return name === "__filename" || name === "__dirname";
 }
-function injectServerCjsGlobals(ast, canonicalId) {
-	const analysis = analyzeServerCjsGlobals(ast);
-	const values = {
-		__filename: canonicalId,
-		__dirname: path.dirname(canonicalId)
+function sourcePathCjsGlobalInitializers(canonicalId) {
+	return {
+		__filename: JSON.stringify(canonicalId),
+		__dirname: JSON.stringify(path.dirname(canonicalId))
 	};
-	const parts = CJS_GLOBALS.filter((name) => analysis.reads.has(name) && !analysis.moduleBindings.has(name)).map((name) => `var ${name} = ${JSON.stringify(values[name])};`);
+}
+function injectServerCjsGlobals(ast, initializers) {
+	const analysis = analyzeServerCjsGlobals(ast);
+	const parts = CJS_GLOBALS.filter((name) => analysis.reads.has(name) && !analysis.moduleBindings.has(name)).map((name) => `var ${name} = ${initializers[name]};`);
 	return parts.length ? parts.join("") : null;
 }
 function analyzeServerCjsGlobals(ast) {
@@ -221,6 +441,7 @@ function analyzeServerCjsGlobals(ast) {
 		for (const name of names) if (isCjsGlobalName(name)) moduleBindings.add(name);
 	}
 	function recordDirectTopLevelBindings(statement) {
+		if (statement.declare === true) return;
 		switch (statement.type) {
 			case "ImportDeclaration":
 				for (const specifier of nodeArray(statement.specifiers)) {
@@ -256,7 +477,7 @@ function analyzeServerCjsGlobals(ast) {
 				}
 				return;
 			case "VariableDeclaration":
-				if (node.kind !== "var") return;
+				if (node.kind !== "var" || node.declare === true) return;
 				for (const declarator of nodeArray(node.declarations)) {
 					if (!isAstRecord(declarator) || declarator.type !== "VariableDeclarator") continue;
 					recordBinding(declarator.id);
@@ -341,6 +562,10 @@ function isImportMetaUrlOrChainedNode(value) {
 	if (isImportMetaUrlNode(value)) return true;
 	return isAstRecord(value) && value.type === "ChainExpression" && isImportMetaUrlNode(value.expression);
 }
+function isImportMetaUrlBaseNode(value) {
+	if (isImportMetaUrlOrChainedNode(value)) return true;
+	return isAstRecord(value) && value.type === "BinaryExpression" && value.operator === "+" && isAstRecord(value.left) && value.left.type === "Literal" && value.left.value === "" && isImportMetaUrlOrChainedNode(value.right);
+}
 function isChainExpressionWrappingImportMetaUrl(value) {
 	return isAstRecord(value) && value.type === "ChainExpression" && hasRange(value) && isImportMetaUrlNode(value.expression);
 }

package/dist/plugins/instrumentation-client.js

@@ -1,3 +1,5 @@
+import { stripViteModuleQuery } from "../utils/path.js";
+import { magicStringTransformResult } from "./transform-result.js";
 import { normalizePath, parseAst } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/instrumentation-client.ts
@@ -8,7 +10,7 @@ function createInstrumentationClientTransformPlugin(getInstrumentationClientPath
 		transform(code, id) {
 			const instrumentationClientPath = getInstrumentationClientPath();
 			if (!instrumentationClientPath) return null;
-			if (normalizePath(id.split("?", 1)[0]) !== instrumentationClientPath) return null;
+			if (normalizePath(stripViteModuleQuery(id)) !== instrumentationClientPath) return null;
 			if (code.includes("__vinextInstrumentationClientStart")) return null;
 			const ast = parseAst(code);
 			let insertPos = 0;
@@ -16,10 +18,7 @@ function createInstrumentationClientTransformPlugin(getInstrumentationClientPath
 			const s = new MagicString(code);
 			s.appendLeft(insertPos, "\nconst __vinextInstrumentationClientStart = performance.now();\n");
 			s.append("\nconst __vinextInstrumentationClientEnd = performance.now();\nconst __vinextInstrumentationClientDuration = __vinextInstrumentationClientEnd - __vinextInstrumentationClientStart;\n// Match Next.js: only report slow client instrumentation during dev.\n// Production should execute the hook without additional timing overhead.\nif (__vinextInstrumentationClientDuration > 16) {\n  console.log(`[Client Instrumentation Hook] Slow execution detected: ${__vinextInstrumentationClientDuration.toFixed(0)}ms (Note: Code download overhead is not included in this measurement)`);\n}\n");
-			return {
-				code: s.toString(),
-				map: s.generateMap({ hires: true })
-			};
+			return magicStringTransformResult(s, { hires: true });
 		}
 	};
 }

package/dist/plugins/middleware-export-validation.js

@@ -1,31 +1,19 @@
 import { createMiddlewareMissingExportError } from "../server/middleware-runtime.js";
-import { stripViteModuleQuery } from "../utils/path.js";
+import { getAstName, scriptParserLanguage } from "./ast-utils.js";
 import { parseAst } from "vite";
 //#region src/plugins/middleware-export-validation.ts
-function parserLanguage(id) {
-	const cleanId = stripViteModuleQuery(id).toLowerCase();
-	if (cleanId.endsWith(".tsx")) return "tsx";
-	if (cleanId.endsWith(".ts") || cleanId.endsWith(".mts") || cleanId.endsWith(".cts")) return "ts";
-	return "jsx";
-}
-function astName(value) {
-	if (!value) return null;
-	if (typeof value.name === "string") return value.name;
-	if (typeof value.value === "string") return value.value;
-	return null;
-}
 function hasValidMiddlewareModuleExport(source, id, isProxy) {
-	const ast = parseAst(source, { lang: parserLanguage(id) });
+	const ast = parseAst(source, { lang: scriptParserLanguage(id) ?? "jsx" });
 	const expectedExport = isProxy ? "proxy" : "middleware";
 	for (const statement of ast.body) {
 		if (statement.type === "ExportDefaultDeclaration") return true;
 		if (statement.type !== "ExportNamedDeclaration") continue;
 		const declaration = statement.declaration;
-		if (declaration?.type === "FunctionDeclaration" && astName(declaration.id) === expectedExport) return true;
+		if (declaration?.type === "FunctionDeclaration" && getAstName(declaration.id) === expectedExport) return true;
 		if (declaration?.type === "VariableDeclaration") {
-			for (const declarator of declaration.declarations ?? []) if (astName(declarator.id) === expectedExport) return true;
+			for (const declarator of declaration.declarations ?? []) if (getAstName(declarator.id) === expectedExport) return true;
 		}
-		for (const specifier of statement.specifiers ?? []) if (astName(specifier.exported ?? specifier.local) === expectedExport) return true;
+		for (const specifier of statement.specifiers ?? []) if (getAstName(specifier.exported ?? specifier.local) === expectedExport) return true;
 	}
 	return false;
 }

package/dist/plugins/middleware-server-only.js

@@ -1,4 +1,5 @@
 import { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { stripViteModuleQuery } from "../utils/path.js";
 //#region src/plugins/middleware-server-only.ts
 /**
 * Allow `import 'server-only'` from neutral server targets (and any module
@@ -47,8 +48,7 @@ import { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index
 function createMiddlewareServerOnlyPlugin(options) {
 	const tainted = /* @__PURE__ */ new Set();
 	function canonicalizeId(id) {
-		const queryIndex = id.indexOf("?");
-		return toSlash(queryIndex === -1 ? id : id.slice(0, queryIndex));
+		return toSlash(stripViteModuleQuery(id));
 	}
 	function isTainted(id) {
 		if (!id) return false;