vinext 1.0.0-beta.6 → 1.0.0-beta.7

package/dist/plugins/strip-server-exports.js

@@ -1,3 +1,5 @@
+import { magicStringTransformResult } from "./transform-result.js";
+import { getAstName } from "./ast-utils.js";
 import { parseAst } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/strip-server-exports.ts
@@ -49,11 +51,6 @@ function hasExportAllCandidate(code) {
 	}
 	return false;
 }
-function nodeName(node) {
-	if (!node || typeof node !== "object") return void 0;
-	const value = node;
-	return value.name ?? value.value;
-}
 function isInsideRanges(position, ranges) {
 	return ranges.some((range) => position >= range.start && position < range.end);
 }
@@ -95,10 +92,10 @@ function isReferenceIdentifier(node, parent) {
 	if (parent.type === "CatchClause" && parent.param === node) return false;
 	return true;
 }
-function walkAst(node, visit, parent, ancestors = []) {
+function walkAstWithAncestors(node, visit, parent, ancestors = []) {
 	if (!node || typeof node !== "object") return;
 	if (Array.isArray(node)) {
-		for (const child of node) walkAst(child, visit, parent, ancestors);
+		for (const child of node) walkAstWithAncestors(child, visit, parent, ancestors);
 		return;
 	}
 	const current = node;
@@ -107,8 +104,8 @@ function walkAst(node, visit, parent, ancestors = []) {
 	const childAncestors = [...ancestors, current];
 	for (const [key, value] of Object.entries(current)) {
 		if (key === "parent" || key === "loc" || key === "start" || key === "end") continue;
-		if (Array.isArray(value)) for (const child of value) walkAst(child, visit, current, childAncestors);
-		else if (value && typeof value === "object") walkAst(value, visit, current, childAncestors);
+		if (Array.isArray(value)) for (const child of value) walkAstWithAncestors(child, visit, current, childAncestors);
+		else if (value && typeof value === "object") walkAstWithAncestors(value, visit, current, childAncestors);
 	}
 }
 function renderImportDeclaration(code, statement, removed) {
@@ -271,7 +268,7 @@ function stripServerExports(code) {
 			});
 		}
 		else if (statement.type === "ImportDeclaration") for (const specifier of statement.specifiers) {
-			const name = nodeName(specifier.local);
+			const name = getAstName(specifier.local);
 			if (!name) continue;
 			bindingPositions.add(specifier.local.start);
 			bindings.set(name, {
@@ -302,7 +299,7 @@ function stripServerExports(code) {
 		ranges.push(range);
 		shadowRanges.set(name, ranges);
 	};
-	walkAst(ast.body, (node, parent, ancestors = []) => {
+	walkAstWithAncestors(ast.body, (node, parent, ancestors = []) => {
 		if (node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression") {
 			for (const parameter of node.params) for (const name of bindingNames(parameter)) addShadowRange(name, node);
 			if (node.type === "FunctionDeclaration" && node.id) addShadowRange(node.id.name, findLexicalScope(ancestors));
@@ -319,7 +316,7 @@ function stripServerExports(code) {
 			for (const name of bindingNames(node.id)) addShadowRange(name, scope);
 		}
 	});
-	walkAst(ast.body, (node, parent, ancestors = []) => {
+	walkAstWithAncestors(ast.body, (node, parent, ancestors = []) => {
 		if (!isReferenceIdentifier(node, parent)) return;
 		if (bindingPositions.has(node.start)) return;
 		if (isInsideRanges(node.start, shadowRanges.get(node.name) ?? [])) return;
@@ -366,16 +363,16 @@ function stripServerExports(code) {
 		}
 		const removed = /* @__PURE__ */ new Set();
 		for (const specifier of statement.specifiers) {
-			const exportedName = nodeName(specifier.exported);
+			const exportedName = getAstName(specifier.exported);
 			if (exportedName && SERVER_EXPORTS.has(exportedName)) {
 				noteDataExport(exportedName);
 				removed.add(specifier);
 				if (!statement.source) {
-					const localName = nodeName(specifier.local);
+					const localName = getAstName(specifier.local);
 					if (localName) candidateBindings.add(localName);
 				}
 			} else if (!statement.source) {
-				const localName = nodeName(specifier.local);
+				const localName = getAstName(specifier.local);
 				if (localName) {
 					const positions = references.get(localName) ?? [];
 					positions.push(specifier.local.start);
@@ -510,10 +507,7 @@ function stripServerExports(code) {
 		string.overwrite(edit.start, edit.end, edit.replacement);
 		lastStart = edit.start;
 	}
-	return {
-		code: string.toString(),
-		map: string.generateMap({ hires: "boundary" })
-	};
+	return magicStringTransformResult(string);
 }
 //#endregion
 export { hasExportAllCandidate, hasServerExportCandidate, stripServerExports, validatePageExports };

package/dist/plugins/styled-jsx.js

@@ -1,14 +1,15 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { NODE_MODULES_PATH_RE, stripViteModuleQuery } from "../utils/path.js";
+import { SCRIPT_MODULE_ID_RE, walkAst } from "./ast-utils.js";
 import { createRequire } from "node:module";
 import { parseAst } from "vite";
 import { pathToFileURL } from "node:url";
 //#region src/plugins/styled-jsx.ts
 const STYLED_JSX_IMPORT_RE = /^styled-jsx(?:\/.*)?$/;
-const NODE_MODULES_RE = /[\\/]node_modules[\\/]/;
 const STYLED_JSX_SOURCE_RE = /(?:<style\b|from\s+["']styled-jsx\/css["']|require\s*\(\s*["']styled-jsx\/css["']\s*\))/;
 const STYLED_JSX_CSS_RE = /(?:from\s+["']styled-jsx\/css["']|require\s*\(\s*["']styled-jsx\/css["']\s*\))/;
 function hasStyledJsxTag(source, id) {
-	const cleanId = id.split("?")[0];
+	const cleanId = stripViteModuleQuery(id);
 	const extension = path.extname(cleanId);
 	const lang = extension === ".ts" || extension === ".mts" || extension === ".cts" ? "ts" : "tsx";
 	let ast;
@@ -17,13 +18,9 @@ function hasStyledJsxTag(source, id) {
 	} catch {
 		return false;
 	}
-	const pending = [ast];
-	const visited = /* @__PURE__ */ new Set();
-	while (pending.length > 0) {
-		const value = pending.pop();
-		if (!value || typeof value !== "object" || visited.has(value)) continue;
-		visited.add(value);
-		const node = value;
+	let found = false;
+	walkAst(ast, (node) => {
+		if (found) return false;
 		if (node.type === "JSXOpeningElement") {
 			const name = node.name;
 			if (name?.type === "JSXIdentifier" && name.name === "style") {
@@ -31,13 +28,14 @@ function hasStyledJsxTag(source, id) {
 					if (attribute.type !== "JSXAttribute") return false;
 					const attributeName = attribute.name;
 					return attributeName?.type === "JSXIdentifier" && attributeName.name === "jsx";
-				})) return true;
+				})) {
+					found = true;
+					return false;
+				}
 			}
 		}
-		for (const child of Object.values(node)) if (Array.isArray(child)) pending.push(...child);
-		else if (child && typeof child === "object") pending.push(child);
-	}
-	return false;
+	});
+	return found;
 }
 function createProjectRequire(projectRoot) {
 	return createRequire(path.join(projectRoot, "package.json"));
@@ -50,7 +48,7 @@ function resolveNextRequire(projectRoot) {
 	}
 }
 function parserOptions(id) {
-	const extension = path.extname(id.split("?")[0]);
+	const extension = path.extname(stripViteModuleQuery(id));
 	if (extension === ".ts" || extension === ".tsx") return {
 		syntax: "typescript",
 		tsx: extension === ".tsx",
@@ -110,19 +108,19 @@ function createStyledJsxPlugin(initialProjectRoot, options = {}) {
 		transform: {
 			filter: {
 				id: {
-					include: /\.[cm]?[jt]sx?(?:\?.*)?$/,
-					exclude: NODE_MODULES_RE
+					include: SCRIPT_MODULE_ID_RE,
+					exclude: NODE_MODULES_PATH_RE
 				},
 				code: STYLED_JSX_SOURCE_RE
 			},
 			async handler(source, id) {
-				if (NODE_MODULES_RE.test(id.split("?")[0])) return null;
+				if (NODE_MODULES_PATH_RE.test(stripViteModuleQuery(id))) return null;
 				const hasStyledJsxCss = STYLED_JSX_CSS_RE.test(source);
 				const hasStyledJsxElement = !hasStyledJsxCss && hasStyledJsxTag(source, id);
 				if (!hasStyledJsxCss && !hasStyledJsxElement) return null;
 				if (!getNextRequire()) throw new Error("[vinext] styled-jsx requires an installed next package so vinext can use its matching compiler.");
 				const result = await (await getCompiler()).transform(source, {
-					filename: id.split("?")[0],
+					filename: stripViteModuleQuery(id),
 					sourceMaps: true,
 					module: { type: "es6" },
 					styledJsx: { useLightningcss: false },

package/dist/plugins/transform-result.d.ts

@@ -0,0 +1,10 @@
+import MagicString from "magic-string";
+//#region src/plugins/transform-result.d.ts
+type MagicStringTransformResult = {
+  code: string;
+  map: ReturnType<MagicString["generateMap"]>;
+};
+/** Build the standard code + sourcemap result returned by source transforms. */
+declare function magicStringTransformResult(output: MagicString, options?: Parameters<MagicString["generateMap"]>[0]): MagicStringTransformResult;
+//#endregion
+export { MagicStringTransformResult, magicStringTransformResult };

package/dist/plugins/transform-result.js

@@ -0,0 +1,10 @@
+//#region src/plugins/transform-result.ts
+/** Build the standard code + sourcemap result returned by source transforms. */
+function magicStringTransformResult(output, options = { hires: "boundary" }) {
+	return {
+		code: output.toString(),
+		map: output.generateMap(options)
+	};
+}
+//#endregion
+export { magicStringTransformResult };

package/dist/plugins/transitive-externals.js

@@ -1,24 +1,10 @@
-import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { stripViteModuleQuery } from "../utils/path.js";
+import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { canonicalizeFilePath, stripViteModuleQuery } from "../utils/path.js";
+import { BARE_PACKAGE_SPECIFIER_RE, packageNameFromSpecifier } from "../utils/package-name.js";
+import { isServerEnvironment } from "./environment.js";
 import { createRequire } from "node:module";
-import fs from "node:fs";
 import { createIdResolver } from "vite";
 //#region src/plugins/transitive-externals.ts
-const BARE_PACKAGE_SPECIFIER_RE = /^(?:@[A-Za-z0-9._~-]+\/[A-Za-z0-9._~-]+|[A-Za-z0-9_~-][A-Za-z0-9._~-]*)(?:\/[^?#]*)?$/;
-function realpath(resolvedPath) {
-	try {
-		return toSlash(fs.realpathSync.native(resolvedPath));
-	} catch {
-		return toSlash(resolvedPath);
-	}
-}
-function packageNameFromSpecifier(specifier) {
-	if (specifier.startsWith("@")) {
-		const parts = specifier.split("/");
-		return parts.length >= 2 ? `${parts[0]}/${parts[1]}` : null;
-	}
-	return specifier.split("/")[0] || null;
-}
 function moduleMode(kind) {
 	return kind === "require-call" ? "require" : "import";
 }
@@ -29,9 +15,9 @@ function moduleMode(kind) {
 * same root-level package.
 */
 function compareTransitiveExternalResolutions(importerResolution, rootResolution) {
-	const importerRealpath = realpath(importerResolution);
+	const importerRealpath = canonicalizeFilePath(importerResolution);
 	if (!rootResolution) return importerRealpath;
-	return importerRealpath === realpath(rootResolution) ? null : importerRealpath;
+	return importerRealpath === canonicalizeFilePath(rootResolution) ? null : importerRealpath;
 }
 /**
 * CommonJS fallback used when Vite cannot resolve a require-call with its
@@ -77,7 +63,7 @@ function createTransitiveExternalsPlugin(options) {
 		apply: "build",
 		enforce: "pre",
 		applyToEnvironment(environment) {
-			return environment.name !== "client" && environment.config.consumer !== "client";
+			return isServerEnvironment(environment);
 		},
 		configResolved(config) {
 			const root = options.getRoot();

package/dist/plugins/typeof-window.d.ts

@@ -1,3 +1,4 @@
+import { MagicStringTransformResult } from "./transform-result.js";
 //#region src/plugins/typeof-window.d.ts
 type WindowType = "object" | "undefined";
 declare const consumerEnvironmentConditionFilter: RegExp;
@@ -12,13 +13,7 @@ type EnvironmentLike = {
   };
 };
 declare function getTypeofWindowReplacement(environment: EnvironmentLike): WindowType;
-declare function replaceTypeofWindow(code: string, replacement: WindowType, id?: string): {
-  code: string;
-  map: import("magic-string").SourceMap;
-} | null;
-declare function replaceConsumerEnvironmentConditions(code: string, replacements: ConsumerEnvironmentReplacements, id?: string): {
-  code: string;
-  map: import("magic-string").SourceMap;
-} | null;
+declare function replaceTypeofWindow(code: string, replacement: WindowType, id?: string): MagicStringTransformResult | null;
+declare function replaceConsumerEnvironmentConditions(code: string, replacements: ConsumerEnvironmentReplacements, id?: string): MagicStringTransformResult | null;
 //#endregion
 export { ConsumerEnvironmentReplacements, consumerEnvironmentConditionFilter, getTypeofWindowReplacement, replaceConsumerEnvironmentConditions, replaceTypeofWindow };

package/dist/plugins/typeof-window.js

@@ -1,5 +1,7 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { collectBindingNames, forEachAstChild, hasRange, isAstRecord, isIdentifierNamed, nodeArray } from "./ast-utils.js";
+import { stripViteModuleQuery } from "../utils/path.js";
+import { magicStringTransformResult } from "./transform-result.js";
+import { booleanLiteralValue, collectBindingNames, forEachAstChild, hasRange, isAstRecord, isIdentifierNamed, nodeArray, stringLiteralValue } from "./ast-utils.js";
 import { collectDirectScopeBindings, collectLoopScopeBindings, collectSwitchScopeBindings, collectVarScopeBindings, createAstScope, hasAstBinding, isFunctionNode } from "./ast-scope.js";
 import { parseAst } from "vite";
 import MagicString from "magic-string";
@@ -19,11 +21,6 @@ function createChildScope(node, parent) {
 function getTypeofWindowReplacement(environment) {
 	return environment.config.consumer === "client" ? "object" : "undefined";
 }
-function stringLiteralValue(node) {
-	if (!isAstRecord(node)) return null;
-	if (node.type === "Literal" && typeof node.value === "string") return node.value;
-	return null;
-}
 function evaluateTypeofWindowComparison(node, replacement, scope) {
 	if (!isAstRecord(node) || node.type !== "BinaryExpression") return null;
 	if (![
@@ -46,10 +43,6 @@ function isProcessBrowserMember(node, scope) {
 	if (!isAstRecord(candidate) || candidate.type !== "MemberExpression") return false;
 	return isIdentifierNamed(candidate.object, "process") && (candidate.computed ? stringLiteralValue(candidate.property) === "browser" : isIdentifierNamed(candidate.property, "browser")) && !hasAstBinding(scope, "process");
 }
-function booleanLiteralValue(node) {
-	if (!isAstRecord(node) || node.type !== "Literal" || typeof node.value !== "boolean") return null;
-	return node.value;
-}
 function evaluateProcessBrowserCondition(node, replacement, scope) {
 	if (isProcessBrowserMember(node, scope)) return replacement;
 	if (isAstRecord(node) && node.type === "UnaryExpression" && node.operator === "!") {
@@ -125,7 +118,7 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 	const mayContainTypeofWindow = replacements.typeofWindow !== void 0 && /typeof\s+window/.test(code);
 	const mayContainProcessBrowser = replacements.processBrowser !== void 0 && (/\bprocess\b/.test(code) && /\bbrowser\b/.test(code) || sourceEscapePattern.test(code));
 	if (!mayContainTypeofWindow && !mayContainProcessBrowser) return null;
-	const extension = path.extname(id.split("?", 1)[0]);
+	const extension = path.extname(stripViteModuleQuery(id));
 	const lang = extension === ".ts" || extension === ".mts" || extension === ".cts" ? "ts" : extension === ".tsx" ? "tsx" : extension === ".jsx" ? "jsx" : "js";
 	let ast;
 	try {
@@ -241,10 +234,7 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 	}
 	for (const node of ast.body) if (isAstRecord(node)) visit(node, rootScope);
 	if (!changed) return null;
-	return {
-		code: output.toString(),
-		map: output.generateMap({ hires: "boundary" })
-	};
+	return magicStringTransformResult(output);
 }
 //#endregion
 export { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, replaceConsumerEnvironmentConditions, replaceTypeofWindow };

package/dist/plugins/use-cache-callable.js

@@ -1,12 +1,12 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { stripViteModuleQuery } from "../utils/path.js";
+import { NODE_MODULES_PATH_RE, isPathInside, stripViteModuleQuery } from "../utils/path.js";
+import { magicStringTransformResult } from "./transform-result.js";
 import { createRequire } from "node:module";
 import { parseAstAsync } from "vite";
 import { pathToFileURL } from "node:url";
 //#region src/plugins/use-cache-callable.ts
 const PLUGIN_NAME = "vinext:server-function-directives";
 const SOURCE_MODULE_ID_RE = /\.(?:tsx?|jsx?|mjs)(?:\?.*)?$/;
-const DEPENDENCY_MODULE_ID_RE = /[\\/]node_modules[\\/]/;
 const RESOLVED_VIRTUAL_MODULE_ID_RE = new RegExp(`^${String.fromCharCode(0)}`);
 const USE_CACHE_DIRECTIVE = /^use cache(?:: ([^\s].*))?$/;
 const USE_CACHE_DIRECTIVE_CANDIDATE = /^use cache.*$/;
@@ -43,16 +43,12 @@ function acceptsSecondArgument(meta) {
 	if (node?.type !== "FunctionDeclaration" && node?.type !== "FunctionExpression" && node?.type !== "ArrowFunctionExpression") return true;
 	return node.params.length >= 2 || node.params.some((parameter) => parameter.type === "RestElement");
 }
-function isInsideDirectory(directory, filePath) {
-	const relativePath = path.relative(directory, filePath);
-	return relativePath !== "" && !relativePath.startsWith("..") && !path.isAbsolute(relativePath);
-}
 function isAppPageDefaultExport(options, id, name, isModuleDirective) {
 	const appDir = options.getAppDir();
 	if (!isModuleDirective || name !== "default" || !appDir) return false;
 	const modulePath = stripViteModuleQuery(id);
 	const moduleFileName = path.basename(modulePath);
-	return isInsideDirectory(appDir, modulePath) && path.parse(moduleFileName).name === "page" && options.matchesPageExtension(moduleFileName);
+	return isPathInside(appDir, modulePath) && path.parse(moduleFileName).name === "page" && options.matchesPageExtension(moduleFileName);
 }
 function shouldTransformModuleExport(name, id, meta) {
 	if (meta.isFunction === false && (name !== "default" && meta.valueNode?.type === "Literal" || meta.valueNode?.type === "ObjectExpression" || meta.valueNode?.type === "ArrayExpression")) return false;
@@ -100,7 +96,7 @@ async function createUseCacheCallablePlugin(options) {
 		transform: {
 			filter: { id: {
 				include: SOURCE_MODULE_ID_RE,
-				exclude: [DEPENDENCY_MODULE_ID_RE, RESOLVED_VIRTUAL_MODULE_ID_RE]
+				exclude: [NODE_MODULES_PATH_RE, RESOLVED_VIRTUAL_MODULE_ID_RE]
 			} },
 			async handler(code, id) {
 				if (!manager) return;
@@ -150,13 +146,10 @@ async function createUseCacheCallablePlugin(options) {
 					});
 					const runtimeEnvironment = this.environment.name === "client" ? "browser" : "ssr";
 					result.output.prepend(`import * as $$ReactClient from "@vitejs/plugin-rsc/react/${runtimeEnvironment}";\n`);
-					return {
-						code: result.output.toString(),
-						map: result.output.generateMap({
-							hires: "boundary",
-							source: id
-						})
-					};
+					return magicStringTransformResult(result.output, {
+						hires: "boundary",
+						source: id
+					});
 				}
 				const wrap = (value, name, directiveMatch, meta, isModuleDirective) => {
 					const variant = directiveMatch[1] ?? "";
@@ -194,13 +187,10 @@ async function createUseCacheCallablePlugin(options) {
 				});
 				const importPosition = ast.body.find((node) => !("directive" in node))?.start ?? code.length;
 				result.output.prependLeft(importPosition, [`import * as $$cacheRuntime from ${JSON.stringify(options.cacheRuntime)};`, needsReactServer && `import * as $$VinextReactServer from "@vitejs/plugin-rsc/react/rsc/server";`].filter(Boolean).join("\n") + "\n");
-				return {
-					code: result.output.toString(),
-					map: result.output.generateMap({
-						hires: "boundary",
-						source: id
-					})
-				};
+				return magicStringTransformResult(result.output, {
+					hires: "boundary",
+					source: id
+				});
 			}
 		}
 	};

package/dist/plugins/wasm-module-import.js

@@ -18,7 +18,7 @@ function createWasmModuleImportPlugin() {
 			filter: { id: /\.wasm\?module$/ },
 			async handler(source, importer) {
 				if (this.environment?.name === "client") return null;
-				if ((importer ? (importer.startsWith("\0") ? importer.slice(1) : importer).split("?")[0] : "").includes("@vercel/og")) return null;
+				if ((importer ? stripViteModuleQuery(importer.startsWith("\0") ? importer.slice(1) : importer) : "").includes("@vercel/og")) return null;
 				const resolved = await this.resolve(source, importer, { skipSelf: true });
 				if (!resolved) return null;
 				if (resolved.external) return resolved;

package/dist/plugins/worker-image-imports.d.ts

@@ -0,0 +1,12 @@
+import { Plugin } from "vite";
+//#region src/plugins/worker-image-imports.d.ts
+/**
+ * Preserve Next.js's StaticImageData shape for dynamic image imports inside
+ * Vite worker graphs. Worker builds use their own plugin container, so the
+ * top-level vinext:image-imports plugin cannot perform this transform.
+ */
+declare function createWorkerImageImportsPlugin(options?: {
+  deploymentId?: string;
+}): Plugin;
+//#endregion
+export { createWorkerImageImportsPlugin };

package/dist/plugins/worker-image-imports.js

@@ -0,0 +1,136 @@
+import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { appendDeploymentIdQuery } from "../utils/deployment-id.js";
+import { NODE_MODULES_PATH_RE, stripViteModuleQuery } from "../utils/path.js";
+import { magicStringTransformResult } from "./transform-result.js";
+import { staticStringValue, walkAst } from "./ast-utils.js";
+import fs from "node:fs";
+import { parseAst } from "vite";
+import MagicString from "magic-string";
+//#region src/plugins/worker-image-imports.ts
+const WORKER_IMAGE_METADATA_PREFIX = "\0vinext-worker-image-meta:";
+const WORKER_IMAGE_METADATA_RE = /^\0vinext-worker-image-meta:/;
+const WORKER_SCRIPT_RE = /\.(?:[cm]?[jt]sx?)$/;
+const WORKER_IMAGE_DYNAMIC_IMPORT_RE = /import\(\s*["'][^"']+\.(?:png|jpe?g|gif|webp|avif|svg|ico|bmp|tiff?)["']\s*\)/;
+const WORKER_IMAGE_EXTENSION_RE = /\.(?:png|jpe?g|gif|webp|avif|svg|ico|bmp|tiff?)$/;
+function workerChunkSpecifier(hostFileName, targetFileName) {
+	const relative = path.relative(path.dirname(hostFileName), targetFileName);
+	return relative.startsWith(".") ? relative : `./${relative}`;
+}
+/**
+* Preserve Next.js's StaticImageData shape for dynamic image imports inside
+* Vite worker graphs. Worker builds use their own plugin container, so the
+* top-level vinext:image-imports plugin cannot perform this transform.
+*/
+function createWorkerImageImportsPlugin(options = {}) {
+	const dimensionCache = /* @__PURE__ */ new Map();
+	return {
+		name: "vinext:worker-image-imports",
+		enforce: "pre",
+		watchChange(id) {
+			dimensionCache.delete(toSlash(id));
+		},
+		resolveId: {
+			filter: { id: WORKER_IMAGE_METADATA_RE },
+			handler(source) {
+				return source;
+			}
+		},
+		load: {
+			filter: { id: WORKER_IMAGE_METADATA_RE },
+			async handler(id) {
+				const imagePath = id.slice(26);
+				this.addWatchFile(imagePath);
+				let dimensions = dimensionCache.get(imagePath);
+				if (!dimensions) {
+					try {
+						const { imageSize } = await import("../deps/.pnpm/image-size@2.0.2/deps/image-size/dist/index.js");
+						const result = imageSize(fs.readFileSync(imagePath));
+						dimensions = {
+							width: result.width ?? 0,
+							height: result.height ?? 0
+						};
+					} catch {
+						dimensions = {
+							width: 0,
+							height: 0
+						};
+					}
+					dimensionCache.set(imagePath, dimensions);
+				}
+				return `export default ${JSON.stringify(dimensions)};`;
+			}
+		},
+		transform: {
+			filter: {
+				id: {
+					include: WORKER_SCRIPT_RE,
+					exclude: NODE_MODULES_PATH_RE
+				},
+				code: WORKER_IMAGE_DYNAMIC_IMPORT_RE
+			},
+			async handler(code, id) {
+				const sourceId = toSlash(stripViteModuleQuery(id));
+				let ast;
+				try {
+					ast = parseAst(code, { lang: /\.(?:[cm]?ts)$/.test(sourceId) ? "ts" : "tsx" });
+				} catch {
+					return null;
+				}
+				const output = new MagicString(code);
+				const imageImports = [];
+				walkAst(ast, (value) => {
+					const node = value;
+					if (node.type === "ImportExpression" && typeof node.start === "number" && typeof node.end === "number" && node.source?.type === "Literal" && typeof node.source.value === "string" && WORKER_IMAGE_EXTENSION_RE.test(node.source.value)) {
+						imageImports.push({
+							end: node.end,
+							importPath: node.source.value,
+							start: node.start
+						});
+						return false;
+					}
+				});
+				let changed = false;
+				for (const imageImport of imageImports) {
+					const resolved = await this.resolve(imageImport.importPath, sourceId, { skipSelf: true });
+					const resolvedId = resolved ? stripViteModuleQuery(resolved.id) : void 0;
+					const imagePath = resolvedId ? toSlash(resolvedId) : imageImport.importPath.startsWith(".") ? path.resolve(path.dirname(sourceId), imageImport.importPath) : null;
+					if (!imagePath || !fs.existsSync(imagePath)) continue;
+					output.overwrite(imageImport.start, imageImport.end, `Promise.all([import(${JSON.stringify(imageImport.importPath)}), import(${JSON.stringify(WORKER_IMAGE_METADATA_PREFIX + imagePath)})]).then(([url, metadata]) => ({ default: { src: url.default, width: metadata.default.width, height: metadata.default.height } }))`);
+					changed = true;
+				}
+				if (!changed) return null;
+				return magicStringTransformResult(output);
+			}
+		},
+		renderChunk: {
+			order: "pre",
+			handler(code, chunk) {
+				if (!options.deploymentId) return null;
+				const chunkSpecifiers = new Set([...chunk.imports, ...chunk.dynamicImports].map((target) => workerChunkSpecifier(chunk.fileName, target)));
+				if (chunkSpecifiers.size === 0) return null;
+				let ast;
+				try {
+					ast = parseAst(code);
+				} catch {
+					return null;
+				}
+				const output = new MagicString(code);
+				let changed = false;
+				walkAst(ast, (value) => {
+					const node = value;
+					const source = node.type === "ImportExpression" || node.type === "ImportDeclaration" || node.type === "ExportNamedDeclaration" || node.type === "ExportAllDeclaration" ? node.source : null;
+					const specifier = staticStringValue(source);
+					if (specifier !== null && chunkSpecifiers.has(specifier) && typeof source?.start === "number" && typeof source.end === "number") {
+						output.overwrite(source.start, source.end, JSON.stringify(appendDeploymentIdQuery(specifier, options.deploymentId)));
+						changed = true;
+						return false;
+					}
+				});
+				if (!changed) return null;
+				return magicStringTransformResult(output);
+			}
+		}
+	};
+}
+//#endregion
+export { createWorkerImageImportsPlugin };

package/dist/routing/app-route-graph.d.ts

@@ -1,5 +1,5 @@
-import { ValidFileMatcher } from "./file-matcher.js";
 import { isInvisibleSegment } from "./utils.js";
+import { ValidFileMatcher } from "./file-matcher.js";
 //#region src/routing/app-route-graph.d.ts
 type InterceptingRoute = {
   /** Graph-owned identity for this interception edge. */
@@ -364,6 +364,7 @@ type RouteManifest = {
   graphVersion: GraphVersion;
   segmentGraph: StaticSegmentGraph;
 };
+declare function createAppRouteGraphInterceptionId(slotId: string, sourcePattern: string, targetPattern: string): string;
 /**
  * Build the App Router route graph by scanning `appDir`.
  */
@@ -426,4 +427,4 @@ declare function computeAppRouteStaticSiblings(allRoutes: readonly {
   patternParts?: readonly string[] | null;
 }): string[];
 //#endregion
-export { AppRoute, AppRouteGraphRoute, AppRouteSemanticIds, GraphVersion, RootBoundaryId, RouteManifest, RouteManifestInterception, RouteManifestRootBoundary, RouteManifestRoute, RouteManifestSlotBinding, StaticSegmentGraph, buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, findOwnerRouteForDir, isInvisibleSegment, patternsStructurallyEquivalent };
+export { AppRoute, AppRouteGraphRoute, AppRouteSemanticIds, GraphVersion, RootBoundaryId, RouteManifest, RouteManifestInterception, RouteManifestRootBoundary, RouteManifestRoute, RouteManifestSlotBinding, StaticSegmentGraph, buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, createAppRouteGraphInterceptionId, findOwnerRouteForDir, isInvisibleSegment, patternsStructurallyEquivalent };

package/dist/routing/app-route-graph.js

@@ -1752,4 +1752,4 @@ function computeAppRouteStaticSiblings(allRoutes, matchedRoute) {
 	return Array.from(siblings);
 }
 //#endregion
-export { buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, findOwnerRouteForDir, isInvisibleSegment, patternsStructurallyEquivalent };
+export { buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, createAppRouteGraphInterceptionId, findOwnerRouteForDir, isInvisibleSegment, patternsStructurallyEquivalent };

package/dist/routing/route-pattern.d.ts

@@ -5,6 +5,13 @@ declare function routePattern(pathname: string): string;
 declare function fillRoutePatternSegments(pathname: string, params: RoutePatternParams): string | null;
 declare function matchRoutePattern(urlParts: readonly string[], patternParts: readonly string[]): RoutePatternParams | null;
 declare function matchRoutePatternRaw(urlParts: readonly string[], patternParts: readonly string[]): RoutePatternParams | null;
+/**
+ * Extract params from the original encoded URL parts after route selection has
+ * already succeeded against normalized parts. Static parts are positional and
+ * intentionally not compared because their raw encoding can differ from the
+ * normalized route spelling (for example `%5Fsites` versus `_sites`).
+ */
+declare function extractRawRoutePatternParams(patternParts: readonly string[], urlParts: readonly string[]): RoutePatternParams;
 declare function matchRoutePatternPrefix(pathParts: readonly string[], patternParts: readonly string[]): boolean;
 declare function matchRoutePatternWithOptionalDynamicSegments(pathParts: readonly string[], patternParts: readonly string[]): boolean;
 /**
@@ -62,4 +69,4 @@ declare function normalizeStaticPathname(pathname: string): string;
  */
 declare function normalizeStaticPathsEntry(entry: StaticPathsEntry, routePattern: string): NormalizedStaticPathsEntry;
 //#endregion
-export { RoutePatternParams, StaticPathsEntry, fillRoutePatternSegments, matchRoutePattern, matchRoutePatternPrefix, matchRoutePatternRaw, matchRoutePatternWithOptionalDynamicSegments, normalizeStaticPathname, normalizeStaticPathsEntry, routePattern, routePatternParts };
+export { RoutePatternParams, StaticPathsEntry, extractRawRoutePatternParams, fillRoutePatternSegments, matchRoutePattern, matchRoutePatternPrefix, matchRoutePatternRaw, matchRoutePatternWithOptionalDynamicSegments, normalizeStaticPathname, normalizeStaticPathsEntry, routePattern, routePatternParts };