vinext 1.3.1 → 1.4.1

package/dist/init-cloudflare.js

@@ -32,14 +32,15 @@ const CACHE_METADATA_EXPORT = {
 const CTX_EXPORTS_DEFAULT_DATE = "2025-11-17";
 function validateCloudflarePlatformSetup(context, cloudflare) {
 	if (cloudflare.name !== void 0) validateWorkerName(cloudflare.name);
+	if (cloudflare.legacyWrangler && cloudflare.ignoreWranglerConfig) throw new Error("--ignore-wrangler-config cannot be combined with --legacy-wrangler-cloudflare-init.");
 	if (!cloudflare.legacyWrangler) {
-		const existingWrangler = [
+		const existingWrangler = cloudflare.ignoreWranglerConfig ? void 0 : [
 			"wrangler.toml",
 			"wrangler.json",
 			"wrangler.jsonc",
 			RESPONSE_STORE_WRANGLER_CONFIG
 		].find((name) => fs.existsSync(path.join(context.root, name)));
-		if (existingWrangler) throw new Error(`Cloudflare init cannot replace an existing Wrangler config (${existingWrangler}). Migrate its bindings to cloudflare.config.ts first, or use --legacy-wrangler-cloudflare-init to keep the Wrangler setup.`);
+		if (existingWrangler) throw new Error(`Cloudflare init cannot replace an existing Wrangler config (${existingWrangler}). Migrate its bindings to cloudflare.config.ts first, use --ignore-wrangler-config if it belongs to another Worker, or use --legacy-wrangler-cloudflare-init to keep the Wrangler setup.`);
 		const typedConfigPath = path.join(context.root, "cloudflare.config.ts");
 		if (cloudflare.cdnCache === "static-assets" && fs.existsSync(typedConfigPath)) throw new Error("Static Assets cache setup for an existing cloudflare.config.ts must be configured manually. Keep its assets binding aligned with staticAssetsAdapter({ binding }) and include \"/_vinext/static-cache/*\" in assets.runWorkerFirst to protect private cache files.");
 		if (cloudflare.cdnCache === "response-store" && (cloudflare.responseStoreMode ?? "service-binding") === "service-binding" && fs.existsSync(typedConfigPath) && !fs.readFileSync(typedConfigPath, "utf-8").includes("export const responseStoreServiceBinding")) throw new Error("The existing cloudflare.config.ts must export responseStoreServiceBinding for the Response Store auxiliary Worker. Configure it before rerunning init.");
@@ -47,7 +48,6 @@ function validateCloudflarePlatformSetup(context, cloudflare) {
 		if (context.existingViteConfigPath) {
 			const updatedConfig = updateViteConfigForCloudflare(context.existingViteConfigPath, fs.readFileSync(context.existingViteConfigPath, "utf-8"), {
 				isAppRouter: context.isAppRouter,
-				nativeModulesToStub: detectProject(context.root).nativeModulesToStub,
 				cache: cloudflare
 			});
 			if (context.hasCssModules) updateViteConfigForCssModules(context.existingViteConfigPath, updatedConfig);
@@ -56,7 +56,6 @@ function validateCloudflarePlatformSetup(context, cloudflare) {
 	}
 	const tomlPath = path.join(context.root, "wrangler.toml");
 	if (fs.existsSync(tomlPath)) throw new Error("wrangler.toml is not supported by vinext init. Convert it to wrangler.jsonc and rerun.");
-	const projectInfo = detectProject(context.root);
 	const wranglerPath = ["wrangler.jsonc", "wrangler.json"].map((fileName) => path.join(context.root, fileName)).find((candidate) => fs.existsSync(candidate));
 	const wranglerCode = wranglerPath ? fs.readFileSync(wranglerPath, "utf-8") : void 0;
 	if (!wranglerCode && cloudflare.cdnCache === "response-store" && (cloudflare.responseStoreMode ?? "service-binding") === "service-binding" && fs.existsSync(path.join(context.root, RESPONSE_STORE_WRANGLER_CONFIG))) readResponseStoreServiceName(context.root, {});
@@ -71,7 +70,6 @@ function validateCloudflarePlatformSetup(context, cloudflare) {
 	if (context.existingViteConfigPath) {
 		const updatedConfig = updateViteConfigForCloudflare(context.existingViteConfigPath, fs.readFileSync(context.existingViteConfigPath, "utf-8"), {
 			isAppRouter: context.isAppRouter,
-			nativeModulesToStub: projectInfo.nativeModulesToStub,
 			cache: cloudflare,
 			assetsBinding,
 			assetsDirectory,
@@ -101,7 +99,6 @@ function setupCloudflarePlatform(context, cloudflare) {
 		const currentConfig = fs.readFileSync(context.existingViteConfigPath, "utf-8");
 		let updatedConfig = updateViteConfigForCloudflare(context.existingViteConfigPath, currentConfig, {
 			isAppRouter: context.isAppRouter,
-			nativeModulesToStub: projectInfo.nativeModulesToStub,
 			cache: cloudflare,
 			assetsBinding,
 			assetsDirectory,
@@ -118,7 +115,7 @@ function setupCloudflarePlatform(context, cloudflare) {
 			generatedViteConfig = true;
 		} else skippedViteConfig = true;
 	} else {
-		const configContent = context.isAppRouter ? generateAppRouterViteConfig(projectInfo, cloudflare, imagesBinding, versionMetadataBinding, false, assetsBinding, assetsDirectory, context.hasCssModules) : generatePagesRouterViteConfig(projectInfo, cloudflare, imagesBinding, versionMetadataBinding, false, context.hasCssModules, assetsBinding, assetsDirectory);
+		const configContent = context.isAppRouter ? generateAppRouterViteConfig(projectInfo, cloudflare, imagesBinding, versionMetadataBinding, false, assetsBinding, assetsDirectory, context.hasCssModules) : generatePagesRouterViteConfig(cloudflare, imagesBinding, versionMetadataBinding, false, context.hasCssModules, assetsBinding, assetsDirectory);
 		fs.writeFileSync(path.join(context.root, "vite.config.ts"), configContent, "utf-8");
 		generatedViteConfig = true;
 	}
@@ -178,7 +175,6 @@ function setupCfPlatform(context, cloudflare) {
 		const current = fs.readFileSync(context.existingViteConfigPath, "utf-8");
 		let updated = updateViteConfigForCloudflare(context.existingViteConfigPath, current, {
 			isAppRouter: context.isAppRouter,
-			nativeModulesToStub: projectInfo.nativeModulesToStub,
 			cache: cloudflare
 		});
 		if (context.hasCssModules) {
@@ -191,7 +187,7 @@ function setupCfPlatform(context, cloudflare) {
 			generatedViteConfig = true;
 		}
 	} else {
-		const viteConfig = context.isAppRouter ? generateAppRouterViteConfig(projectInfo, cloudflare, "IMAGES", DEFAULT_VERSION_METADATA_BINDING, serviceBinding, "ASSETS", "dist/client", context.hasCssModules) : generatePagesRouterViteConfig(projectInfo, cloudflare, "IMAGES", DEFAULT_VERSION_METADATA_BINDING, serviceBinding, context.hasCssModules);
+		const viteConfig = context.isAppRouter ? generateAppRouterViteConfig(projectInfo, cloudflare, "IMAGES", DEFAULT_VERSION_METADATA_BINDING, serviceBinding, "ASSETS", "dist/client", context.hasCssModules) : generatePagesRouterViteConfig(cloudflare, "IMAGES", DEFAULT_VERSION_METADATA_BINDING, serviceBinding, context.hasCssModules);
 		fs.writeFileSync(path.join(context.root, "vite.config.ts"), viteConfig, "utf-8");
 		generatedViteConfig = true;
 	}
@@ -849,7 +845,7 @@ function generateAppRouterViteConfig(info, options = DEFAULT_CLOUDFLARE_INIT_OPT
 		...cacheImports(options),
 		...hasCssModules ? ["import { createHash } from \"node:crypto\";", "import { patchCssModules } from \"vite-css-modules\";"] : []
 	];
-	if (hasCssModules || info?.nativeModulesToStub && info.nativeModulesToStub.length > 0) imports.push(`import path from "node:path";`);
+	if (hasCssModules) imports.push(`import path from "node:path";`);
 	const plugins = [];
 	if (hasCssModules) plugins.push("    patchCssModules({ exportMode: \"default\" }),");
 	if (info?.hasMDX) plugins.push(`    // vinext auto-injects @mdx-js/rollup with plugins from next.config`);
@@ -860,21 +856,17 @@ function generateAppRouterViteConfig(info, options = DEFAULT_CLOUDFLARE_INIT_OPT
         childEnvironments: ["ssr"],
       },
     }),`);
-	let resolveBlock = "";
-	const aliases = [];
-	if (info?.nativeModulesToStub && info.nativeModulesToStub.length > 0) for (const mod of info.nativeModulesToStub) aliases.push(`      "${mod}": path.resolve(__dirname, "empty-stub.js"),`);
-	if (aliases.length > 0) resolveBlock = `\n  resolve: {\n    alias: {\n${aliases.join("\n")}\n    },\n  },`;
 	return `${imports.join("\n")}
 
 export default defineConfig({
   plugins: [
 ${plugins.join("\n")}
-  ],${resolveBlock}${hasCssModules ? cssModulesConfigSource() : ""}
+  ],${hasCssModules ? cssModulesConfigSource() : ""}
 });
 `;
 }
 /** Generate vite.config.ts for Pages Router */
-function generatePagesRouterViteConfig(info, options = DEFAULT_CLOUDFLARE_INIT_OPTIONS, imagesBinding = "IMAGES", versionMetadataBinding = DEFAULT_VERSION_METADATA_BINDING, serviceBinding = false, hasCssModules = false, assetsBinding = "ASSETS", assetsDirectory = "dist/client") {
+function generatePagesRouterViteConfig(options = DEFAULT_CLOUDFLARE_INIT_OPTIONS, imagesBinding = "IMAGES", versionMetadataBinding = DEFAULT_VERSION_METADATA_BINDING, serviceBinding = false, hasCssModules = false, assetsBinding = "ASSETS", assetsDirectory = "dist/client") {
 	const legacyStaticAssets = options.legacyWrangler && options.cdnCache === "static-assets";
 	const imports = [
 		`import { defineConfig } from "vite";`,
@@ -884,18 +876,14 @@ function generatePagesRouterViteConfig(info, options = DEFAULT_CLOUDFLARE_INIT_O
 		...cacheImports(options),
 		...hasCssModules ? ["import { createHash } from \"node:crypto\";", "import { patchCssModules } from \"vite-css-modules\";"] : []
 	];
-	if (hasCssModules || info?.nativeModulesToStub && info.nativeModulesToStub.length > 0) imports.push(`import path from "node:path";`);
-	let resolveBlock = "";
-	const aliases = [];
-	if (info?.nativeModulesToStub && info.nativeModulesToStub.length > 0) for (const mod of info.nativeModulesToStub) aliases.push(`      "${mod}": path.resolve(__dirname, "empty-stub.js"),`);
-	if (aliases.length > 0) resolveBlock = `\n  resolve: {\n    alias: {\n${aliases.join("\n")}\n    },\n  },`;
+	if (hasCssModules) imports.push(`import path from "node:path";`);
 	return `${imports.join("\n")}
 
 export default defineConfig({
 ${legacyStaticAssets ? `  environments: { client: { build: { outDir: ${JSON.stringify(assetsDirectory)} } }, ssr: { build: { outDir: "dist/server" } } },\n` : ""}  plugins: [
 ${hasCssModules ? "    patchCssModules({ exportMode: \"default\" }),\n" : ""}    ${vinextExpression(options, "vinext", "imagesOptimizer", imagesBinding, versionMetadataBinding, "responseStoreAdapter", assetsBinding, assetsDirectory).replace(/\n/g, "\n    ")},
     cloudflare(${legacyStaticAssets ? "{ viteEnvironment: { name: \"ssr\" } }" : serviceBinding ? "{ auxiliaryWorkers: [{ config: responseStoreServiceBinding }] }" : ""}),
-  ],${resolveBlock}${hasCssModules ? cssModulesConfigSource() : ""}
+  ],${hasCssModules ? cssModulesConfigSource() : ""}
 });
 `;
 }
@@ -1447,27 +1435,6 @@ function updateViteConfigForCssModules(filePath, code) {
 		preservedExistingGenerateScopedName: Boolean(existingName)
 	};
 }
-function ensureNativeAliases(output, config, modules, pathBinding, code) {
-	if (modules.length === 0) return;
-	const resolve = findProperty(config, "resolve");
-	if (resolve && resolve.value.type !== "ObjectExpression") throw new Error("The Vite config's resolve option must be an object for vinext init to update it.");
-	const resolveObject = resolve?.value;
-	const alias = resolveObject ? findProperty(resolveObject, "alias") : void 0;
-	if (alias && alias.value.type !== "ObjectExpression") throw new Error("The Vite config's resolve.alias option must be an object for vinext init to update it.");
-	const aliasLines = modules.map((moduleName) => `      ${JSON.stringify(moduleName)}: ${pathBinding}.resolve(__dirname, "empty-stub.js"),`);
-	if (!resolveObject) {
-		insertObjectProperty(output, config, `  resolve: {\n    alias: {\n${aliasLines.join("\n")}\n    },\n  },`, code);
-		return;
-	}
-	if (!alias) {
-		insertObjectProperty(output, resolveObject, `    alias: {\n${aliasLines.join("\n")}\n    },`, code);
-		return;
-	}
-	const aliasObject = alias.value;
-	const existingAliases = new Set(aliasObject.properties.flatMap((property) => property.type === "Property" && propertyName(property) ? [propertyName(property)] : []));
-	const missingLines = aliasLines.filter((_, index) => !existingAliases.has(modules[index]));
-	if (missingLines.length > 0) insertObjectProperty(output, aliasObject, missingLines.join("\n"), code);
-}
 function updateViteConfigForCloudflare(filePath, code, options) {
 	const program = parseViteConfig(filePath, code);
 	const cacheOptions = options.cache ?? DEFAULT_CLOUDFLARE_INIT_OPTIONS;
@@ -1604,11 +1571,6 @@ function updateViteConfigForCloudflare(filePath, code, options) {
 			if (cacheOptions.cdnCache === "static-assets" || cacheOptions.prerender) ensureVinextPrerenderOptions(output, config, vinextBinding, cacheOptions.cdnCache === "static-assets" ? options.assetsDirectory ?? "dist/client" : void 0, code);
 		}
 	}
-	if (options.nativeModulesToStub.length > 0) {
-		const pathLocal = (commonJs ? findRequiredBinding(program, "node:path", "default") : program.body.filter((statement) => statement.type === "ImportDeclaration").find((statement) => statement.source.value === "node:path")?.specifiers.find((specifier) => specifier.type === "ImportDefaultSpecifier")?.local.name) ?? allocateBinding(bindings, "path");
-		const pathBinding = commonJs ? ensureDefaultRequire(program, output, "node:path", pathLocal) : ensureDefaultImport(program, output, "node:path", pathLocal);
-		ensureNativeAliases(output, config, options.nativeModulesToStub, pathBinding, code);
-	}
 	return formatInlineConfig(filePath, output.toString(), code);
 }
 function usesCommonJsViteConfig(filePath, code) {

package/dist/init-platform.d.ts

@@ -12,6 +12,8 @@ export type CloudflareInitOptions = {
   responseStoreMode?: InitResponseStoreMode;
   warmCdnCache?: boolean;
   legacyWrangler?: boolean;
+  /** Proceed even though the root Wrangler config belongs to another Worker. */
+  ignoreWranglerConfig?: boolean;
   prerender?: boolean;
   /** Worker name for generated config, instead of one derived from package.json. */
   name?: string;

package/dist/init-platform.js

@@ -137,11 +137,14 @@ async function resolveInitPlatform(args, options = {}) {
 }
 async function resolveInitOptions(args, options = {}) {
 	const legacyWrangler = parseBooleanArg(args, "--legacy-wrangler-cloudflare-init", void 0, "--legacy-wrangler-cloudflare-init expects true or false when using the \"--legacy-wrangler-cloudflare-init=value\" form.");
+	const ignoreWranglerConfig = parseBooleanArg(args, "--ignore-wrangler-config", void 0, "--ignore-wrangler-config expects true or false when using the \"--ignore-wrangler-config=value\" form.");
 	const name = parseNameArg(args);
 	const platform = legacyWrangler && !parsePlatformArg(args) ? "cloudflare" : await resolveInitPlatform(args, options);
 	const platformOptions = await INIT_PLATFORMS[platform].options(args, options);
 	const explicitWarmCdnCache = parseWarmCdnCacheArg(args);
 	if (legacyWrangler && platform !== "cloudflare") throw new Error("--legacy-wrangler-cloudflare-init requires --platform=cloudflare.");
+	if (ignoreWranglerConfig && platform !== "cloudflare") throw new Error("--ignore-wrangler-config requires --platform=cloudflare.");
+	if (ignoreWranglerConfig && legacyWrangler) throw new Error("--ignore-wrangler-config cannot be combined with --legacy-wrangler-cloudflare-init.");
 	if (name && platform !== "cloudflare") throw new Error("--name requires --platform=cloudflare.");
 	const explicitPrerender = parsePrerenderArg(args);
 	if (platform === "cloudflare" && platformOptions?.cdnCache === "static-assets" && explicitPrerender === false) throw new Error("--no-prerender cannot be used with --cdn-cache=static-assets, which requires build-time prerendering.");
@@ -158,6 +161,7 @@ async function resolveInitOptions(args, options = {}) {
 			...platformOptions,
 			warmCdnCache,
 			...legacyWrangler ? { legacyWrangler } : {},
+			...ignoreWranglerConfig ? { ignoreWranglerConfig } : {},
 			...prerender ? { prerender: true } : {},
 			...name ? { name } : {}
 		} : void 0

package/dist/plugins/extensionless-dynamic-import.js

@@ -1,5 +1,5 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { escapeRegExp } from "../utils/regex.js";
+import { escapeRegExp, exactRegExpLiteral } from "../utils/regex.js";
 import { DYNAMIC_IMPORT_PRESCAN, SCRIPT_MODULE_ID_RE, parseProgram, scriptParserLanguage, walkAst } from "./ast-utils.js";
 import { isUnknownRecord } from "../utils/record.js";
 import { magicStringTransformResult } from "./transform-result.js";
@@ -219,7 +219,11 @@ function aliasesMayMatch(aliases, requestPattern) {
 	const requestPrefix = requestPattern.slice(0, requestPattern.indexOf("*"));
 	return aliases.some((alias) => {
 		const { find } = alias;
-		if (find instanceof RegExp) return !isViteInternalAlias(alias);
+		if (find instanceof RegExp) {
+			const literal = exactRegExpLiteral(find);
+			if (literal !== null) return matchesTemplatePattern(requestPattern, literal);
+			return !isViteInternalAlias(alias);
+		}
 		if (matchesTemplatePattern(requestPattern, find)) return true;
 		const aliasPrefix = `${find}/`;
 		return requestPrefix.startsWith(aliasPrefix) || aliasPrefix.startsWith(requestPrefix);

package/dist/plugins/next-intl-catalog.d.ts

@@ -0,0 +1,12 @@
+import { NextIntlCatalogLoader } from "../config/next-config.js";
+import { Plugin } from "vite";
+//#region src/plugins/next-intl-catalog.d.ts
+/**
+ * Runs next-intl's catalog loader on its `experimental.messages` catalogs, as
+ * Next.js does through the webpack/Turbopack rule `createNextIntlPlugin` adds.
+ * With `precompile: true` the plugin also aliases use-intl's formatter to one
+ * that only formats precompiled messages, so raw catalogs would render their
+ * ICU placeholders literally.
+ */
+export declare function createNextIntlCatalogPlugin(getRoot: () => string, getCatalogLoader: () => NextIntlCatalogLoader | null): Plugin;
+//#endregion

package/dist/plugins/next-intl-catalog.js

@@ -0,0 +1,85 @@
+import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { escapeRegExp } from "../utils/regex.js";
+import { canonicalizeFilePath, stripViteModuleQuery } from "../utils/path.js";
+import { createRequire } from "node:module";
+import fsp from "node:fs/promises";
+import { pathToFileURL } from "node:url";
+//#region src/plugins/next-intl-catalog.ts
+const SPECIAL_QUERY_RE = /[?&](?:worker|sharedworker|raw|url)\b/;
+/**
+* Runs next-intl's catalog loader on its `experimental.messages` catalogs, as
+* Next.js does through the webpack/Turbopack rule `createNextIntlPlugin` adds.
+* With `precompile: true` the plugin also aliases use-intl's formatter to one
+* that only formats precompiled messages, so raw catalogs would render their
+* ICU placeholders literally.
+*/
+function createNextIntlCatalogPlugin(getRoot, getCatalogLoader) {
+	return {
+		name: "vinext:next-intl-catalog",
+		enforce: "pre",
+		applyToEnvironment() {
+			const catalogLoader = getCatalogLoader();
+			if (!catalogLoader) return false;
+			return createCatalogLoadPlugin(getRoot(), catalogLoader);
+		}
+	};
+}
+function createCatalogLoadPlugin(root, catalogLoader) {
+	const catalogDirs = [...new Set(catalogLoader.include.flatMap((dir) => [toSlash(dir), canonicalizeFilePath(dir)]))].map((dir) => `${escapeRegExp(dir)}/`);
+	let loaderPromise;
+	return {
+		name: "vinext:next-intl-catalog",
+		load: {
+			filter: { id: new RegExp(`^(?:${catalogDirs.join("|")})`) },
+			async handler(id) {
+				if (SPECIAL_QUERY_RE.test(id)) return null;
+				const file = stripViteModuleQuery(id);
+				catalogLoader.test.lastIndex = 0;
+				if (!catalogLoader.test.test(file)) return null;
+				loaderPromise ??= importCatalogLoader(root, catalogLoader.options);
+				return {
+					code: await runLoader(await loaderPromise, await fsp.readFile(file, "utf8"), {
+						resourcePath: file,
+						rootContext: root,
+						options: catalogLoader.options
+					}),
+					moduleType: "js"
+				};
+			}
+		}
+	};
+}
+async function importCatalogLoader(root, options) {
+	const loaderPath = createRequire(path.join(root, "package.json")).resolve("next-intl/extractor/catalogLoader");
+	const url = pathToFileURL(loaderPath);
+	url.searchParams.set("vinext-config", JSON.stringify([root, options]));
+	const loaderModule = await import(url.href);
+	if (typeof loaderModule.default !== "function") throw new Error(`[vinext] ${loaderPath} does not export a webpack loader`);
+	return loaderModule.default;
+}
+function runLoader(loader, source, context) {
+	return new Promise((resolve, reject) => {
+		let isAsync = false;
+		const callback = (error, result) => {
+			if (error) reject(error);
+			else resolve(String(result));
+		};
+		try {
+			const result = loader.call({
+				resourcePath: context.resourcePath,
+				rootContext: context.rootContext,
+				getOptions: () => context.options,
+				async: () => {
+					isAsync = true;
+					return callback;
+				},
+				callback
+			}, source);
+			if (!isAsync) callback(null, result);
+		} catch (error) {
+			reject(error);
+		}
+	});
+}
+//#endregion
+export { createNextIntlCatalogPlugin };

package/dist/plugins/pages-node-externals.d.ts

@@ -5,6 +5,7 @@ type PagesNodeExternalsOptions = {
   getPagesDir: () => string | null;
   getAliases: () => Readonly<Record<string, string>>;
   getTsconfigAliases: () => Readonly<Record<string, string>>;
+  getTsconfigExactAliases: () => Readonly<Record<string, string>>;
   getBundledPackages: () => ReadonlySet<string>;
   isEnabled: () => boolean;
 };

package/dist/plugins/pages-node-externals.js

@@ -141,7 +141,7 @@ function createPagesNodeExternalsPlugin(options) {
 				}
 				const packageName = packageNameFromSpecifier(id);
 				if (!packageName || FRAMEWORK_PACKAGES.has(packageName) || id === "next" || id.startsWith("next/") || id.startsWith("vinext/") || id.startsWith("@vinext/") || options.getBundledPackages().has(packageName)) return null;
-				if (matchesAlias(id, options.getAliases()) || matchesAlias(id, options.getTsconfigAliases())) {
+				if (matchesAlias(id, options.getAliases()) || matchesAlias(id, options.getTsconfigAliases()) || Object.hasOwn(options.getTsconfigExactAliases(), id)) {
 					const aliased = await this.resolve(id, importer, { skipSelf: true });
 					if (aliased && !aliased.external) {
 						const aliasedFile = canonicalFile(aliased.id);

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

@@ -89,7 +89,8 @@ function isReferenceIdentifier(node, parent) {
 	if (parent.type === "ImportSpecifier" || parent.type === "ImportDefaultSpecifier" || parent.type === "ImportNamespaceSpecifier") return false;
 	if (parent.type === "ExportSpecifier") return false;
 	if (parent.type === "MemberExpression" && parent.property === node && !parent.computed) return false;
-	if ((parent.type === "Property" || parent.type === "MethodDefinition") && parent.key === node && !parent.computed && !(parent.type === "Property" && parent.shorthand)) return false;
+	if ((parent.type === "Property" || parent.type === "MethodDefinition" || parent.type === "PropertyDefinition" || parent.type === "AccessorProperty" || parent.type === "ImportAttribute") && parent.key === node && !parent.computed && !(parent.type === "Property" && parent.shorthand)) return false;
+	if (parent.type === "MetaProperty") return false;
 	if ((parent.type === "LabeledStatement" || parent.type === "BreakStatement" || parent.type === "ContinueStatement") && parent.label === node) return false;
 	const parameters = "params" in parent ? parent.params : void 0;
 	if (Array.isArray(parameters) && parameters.includes(node)) return false;

package/dist/plugins/use-cache-callable.d.ts

@@ -28,6 +28,6 @@ export type UseCacheCallableApi = {
   transformWorkerModule(code: string, id: string, createReference: BrowserTransformOptions["createReference"]): Promise<BrowserTransformOutput["output"] | undefined>;
 };
 declare const PLUGIN_NAME = "vinext:server-function-directives";
-export declare function createUseCacheCallablePlugin(options: Options): Promise<Plugin<UseCacheCallableApi>>;
+export declare function createUseCacheCallablePlugin(options: Options): Promise<[Plugin<UseCacheCallableApi>, Plugin]>;
 //#endregion
 export { PLUGIN_NAME as USE_CACHE_PLUGIN_NAME };

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

@@ -9,6 +9,7 @@ import { createHmac } from "node:crypto";
 //#region src/plugins/use-cache-callable.ts
 const PLUGIN_NAME = "vinext:server-function-directives";
 const SOURCE_MODULE_ID_RE = /\.(?:tsx?|jsx?|mjs)(?:\?.*)?$/;
+const NODE_MODULES_SOURCE_MODULE_ID_RE = /[\\/]node_modules[\\/].*\.(?:tsx?|jsx?|mjs)(?:\?.*)?$/;
 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.*$/;
@@ -40,6 +41,30 @@ function getArgumentCount(meta) {
 	if (node?.type !== "FunctionDeclaration" && node?.type !== "FunctionExpression" && node?.type !== "ArrowFunctionExpression") return;
 	return node.params.at(-1)?.type === "RestElement" ? void 0 : node.params.length;
 }
+/**
+* `export { fn }` carries no value node, so find the exported binding's
+* `const` initializer, which records the function's parameters. Other
+* bindings, function declarations included, can be reassigned before the
+* module finishes evaluating, so their arity stays unknown.
+*/
+function getSpecifierExportValueNodes(ast) {
+	const locals = /* @__PURE__ */ new Map();
+	for (const statement of ast.body) {
+		const declaration = statement.type === "ExportNamedDeclaration" ? statement.declaration : statement;
+		if (declaration?.type !== "VariableDeclaration" || declaration.kind !== "const") continue;
+		for (const declarator of declaration.declarations) if (declarator.id.type === "Identifier" && declarator.init) locals.set(declarator.id.name, declarator.init);
+	}
+	const values = /* @__PURE__ */ new Map();
+	for (const statement of ast.body) {
+		if (statement.type !== "ExportNamedDeclaration" || statement.declaration || statement.source) continue;
+		for (const specifier of statement.specifiers) {
+			if (specifier.local.type !== "Identifier" || specifier.exported.type !== "Identifier") continue;
+			const value = locals.get(specifier.local.name);
+			if (value) values.set(specifier.exported.name, value);
+		}
+	}
+	return values;
+}
 function acceptsSecondArgument(meta) {
 	const node = meta.valueNode;
 	if (node?.type !== "FunctionDeclaration" && node?.type !== "FunctionExpression" && node?.type !== "ArrowFunctionExpression") return true;
@@ -150,7 +175,103 @@ async function createUseCacheCallablePlugin(options) {
 			secureExportName
 		};
 	}
-	return {
+	async function transformDirectives(code, id) {
+		const secret = referenceSecret;
+		if (!manager || !secret) return;
+		if (!code.includes("use cache")) {
+			manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
+			return;
+		}
+		const { ast, moduleDirective, useServerBoundary, reference, secureExportName } = await analyzeModule(manager, secret, code, id);
+		if (!(this.environment.name === "rsc")) {
+			if (useServerBoundary) {
+				manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
+				return;
+			}
+			const result = transformBrowserModule(transforms, code, ast, id, moduleDirective, {
+				environmentName: this.environment.name,
+				reference,
+				secureExportName,
+				createReference: (referenceId, name) => `$$ReactClient.createServerReference(${JSON.stringify(referenceId)},$$ReactClient.callServer,undefined,${this.environment.mode === "dev" ? "$$ReactClient.findSourceMapURL" : "undefined"},${JSON.stringify(name)})`
+			});
+			if (!result) {
+				manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
+				return;
+			}
+			manager.serverReferences.replaceClaim(PLUGIN_NAME, id, {
+				...reference,
+				exportNames: result.referenceNames
+			});
+			const runtimeEnvironment = this.environment.name === "client" ? "browser" : "ssr";
+			result.output.prepend(`import * as $$ReactClient from "@vitejs/plugin-rsc/react/${runtimeEnvironment}";\n`);
+			return magicStringTransformResult(result.output, {
+				hires: "boundary",
+				source: id
+			});
+		}
+		const secureExports = /* @__PURE__ */ new Set();
+		const wrap = (value, name, directiveMatch, meta) => {
+			const variant = directiveMatch[1] ?? "";
+			const secureName = secureExportName(name);
+			secureExports.add(secureName);
+			const wrapperOptions = {
+				...getCacheWrapperOptions(meta),
+				serverReferenceId: `${reference.referenceKey}#${secureName}`
+			};
+			return `$$cacheRuntime.registerCachedFunction(${value}, ${JSON.stringify(`${id}:${name}`)}, ${JSON.stringify(variant)}, ${JSON.stringify(wrapperOptions)})`;
+		};
+		let needsReactServer = false;
+		const runtime = (value, name, directiveMatch, meta) => {
+			const cached = wrap(value, name, directiveMatch, meta);
+			const secureName = secureExportName(name);
+			needsReactServer = true;
+			return `(${secureName} = $$VinextReactServer.registerServerReference(${cached}, ${JSON.stringify(reference.referenceKey)}, ${JSON.stringify(secureName)}))`;
+		};
+		const specifierValueNodes = moduleDirective ? getSpecifierExportValueNodes(ast) : void 0;
+		const result = moduleDirective ? transforms.transformWrapExport(code, ast, {
+			filter: (name, meta) => {
+				if (hasFunctionDirective(meta, "use server") || !shouldTransformModuleExport(name, id, meta)) return false;
+				validateModuleExport(transforms, meta);
+				return true;
+			},
+			runtime: (value, name, meta) => runtime(value, name, matchUseCacheDirective(moduleDirective), {
+				...meta,
+				valueNode: meta.valueNode ?? specifierValueNodes?.get(name)
+			})
+		}) : transforms.transformHoistInlineDirective(code, ast, {
+			directive: USE_CACHE_DIRECTIVE_CANDIDATE,
+			rejectNonAsyncFunction: true,
+			hoistRuntime: true,
+			noExport: true,
+			runtime: (value, name, meta) => runtime(value, name, matchUseCacheDirective(meta.directiveMatch[0]), meta),
+			encode: (value, name) => {
+				if (name === void 0) throw new Error("vinext: inline \"use cache\" functions require @vitejs/plugin-rsc 0.5.37 or newer.");
+				const referenceId = `${reference.referenceKey}#${secureExportName(name)}`;
+				return `$$cacheRuntime.encryptCacheCaptures(${JSON.stringify(referenceId)}, ${value})`;
+			},
+			decode: (value) => value
+		});
+		if (!result.output.hasChanged()) {
+			manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
+			return;
+		}
+		manager.serverReferences.replaceClaim(PLUGIN_NAME, id, {
+			...reference,
+			exportNames: [...secureExports]
+		});
+		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";`,
+			secureExports.size > 0 && `let ${[...secureExports].join(",")};`
+		].filter(Boolean).join("\n") + "\n");
+		if (secureExports.size > 0) result.output.append(`\nexport { ${[...secureExports].join(",")} };\n`);
+		return magicStringTransformResult(result.output, {
+			hires: "boundary",
+			source: id
+		});
+	}
+	return [{
 		name: PLUGIN_NAME,
 		api: { async transformWorkerModule(code, id, createReference) {
 			if (!code.includes("use cache")) return;
@@ -192,100 +313,21 @@ async function createUseCacheCallablePlugin(options) {
 				include: SOURCE_MODULE_ID_RE,
 				exclude: [NODE_MODULES_PATH_RE, RESOLVED_VIRTUAL_MODULE_ID_RE]
 			} },
-			async handler(code, id) {
-				const secret = referenceSecret;
-				if (!manager || !secret) return;
-				if (!code.includes("use cache")) {
-					manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
-					return;
-				}
-				const { ast, moduleDirective, useServerBoundary, reference, secureExportName } = await analyzeModule(manager, secret, code, id);
-				if (!(this.environment.name === "rsc")) {
-					if (useServerBoundary) {
-						manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
-						return;
-					}
-					const result = transformBrowserModule(transforms, code, ast, id, moduleDirective, {
-						environmentName: this.environment.name,
-						reference,
-						secureExportName,
-						createReference: (referenceId, name) => `$$ReactClient.createServerReference(${JSON.stringify(referenceId)},$$ReactClient.callServer,undefined,${this.environment.mode === "dev" ? "$$ReactClient.findSourceMapURL" : "undefined"},${JSON.stringify(name)})`
-					});
-					if (!result) {
-						manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
-						return;
-					}
-					manager.serverReferences.replaceClaim(PLUGIN_NAME, id, {
-						...reference,
-						exportNames: result.referenceNames
-					});
-					const runtimeEnvironment = this.environment.name === "client" ? "browser" : "ssr";
-					result.output.prepend(`import * as $$ReactClient from "@vitejs/plugin-rsc/react/${runtimeEnvironment}";\n`);
-					return magicStringTransformResult(result.output, {
-						hires: "boundary",
-						source: id
-					});
-				}
-				const secureExports = /* @__PURE__ */ new Set();
-				const wrap = (value, name, directiveMatch, meta) => {
-					const variant = directiveMatch[1] ?? "";
-					const secureName = secureExportName(name);
-					secureExports.add(secureName);
-					const wrapperOptions = {
-						...getCacheWrapperOptions(meta),
-						serverReferenceId: `${reference.referenceKey}#${secureName}`
-					};
-					return `$$cacheRuntime.registerCachedFunction(${value}, ${JSON.stringify(`${id}:${name}`)}, ${JSON.stringify(variant)}, ${JSON.stringify(wrapperOptions)})`;
-				};
-				let needsReactServer = false;
-				const runtime = (value, name, directiveMatch, meta) => {
-					const cached = wrap(value, name, directiveMatch, meta);
-					const secureName = secureExportName(name);
-					needsReactServer = true;
-					return `(${secureName} = $$VinextReactServer.registerServerReference(${cached}, ${JSON.stringify(reference.referenceKey)}, ${JSON.stringify(secureName)}))`;
-				};
-				const result = moduleDirective ? transforms.transformWrapExport(code, ast, {
-					filter: (name, meta) => {
-						if (hasFunctionDirective(meta, "use server") || !shouldTransformModuleExport(name, id, meta)) return false;
-						validateModuleExport(transforms, meta);
-						return true;
-					},
-					runtime: (value, name, meta) => runtime(value, name, matchUseCacheDirective(moduleDirective), meta)
-				}) : transforms.transformHoistInlineDirective(code, ast, {
-					directive: USE_CACHE_DIRECTIVE_CANDIDATE,
-					rejectNonAsyncFunction: true,
-					hoistRuntime: true,
-					noExport: true,
-					runtime: (value, name, meta) => runtime(value, name, matchUseCacheDirective(meta.directiveMatch[0]), meta),
-					encode: (value, name) => {
-						if (name === void 0) throw new Error("vinext: inline \"use cache\" functions require @vitejs/plugin-rsc 0.5.37 or newer.");
-						const referenceId = `${reference.referenceKey}#${secureExportName(name)}`;
-						return `$$cacheRuntime.encryptCacheCaptures(${JSON.stringify(referenceId)}, ${value})`;
-					},
-					decode: (value) => value
-				});
-				if (!result.output.hasChanged()) {
-					manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
-					return;
-				}
-				manager.serverReferences.replaceClaim(PLUGIN_NAME, id, {
-					...reference,
-					exportNames: [...secureExports]
-				});
-				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";`,
-					secureExports.size > 0 && `let ${[...secureExports].join(",")};`
-				].filter(Boolean).join("\n") + "\n");
-				if (secureExports.size > 0) result.output.append(`\nexport { ${[...secureExports].join(",")} };\n`);
-				return magicStringTransformResult(result.output, {
-					hires: "boundary",
-					source: id
-				});
-			}
+			handler: transformDirectives
 		}
-	};
+	}, {
+		name: `${PLUGIN_NAME}:node-modules`,
+		transform: {
+			filter: {
+				id: {
+					include: NODE_MODULES_SOURCE_MODULE_ID_RE,
+					exclude: RESOLVED_VIRTUAL_MODULE_ID_RE
+				},
+				code: "use cache"
+			},
+			handler: transformDirectives
+		}
+	}];
 }
 //#endregion
 export { PLUGIN_NAME as USE_CACHE_PLUGIN_NAME, createUseCacheCallablePlugin };

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

@@ -411,6 +411,12 @@ export declare function buildAppRouteGraph(appDir: string, matcher: ValidFileMat
   routes: AppRouteGraphRoute[];
   routeManifest: RouteManifest;
 }>;
+/**
+ * The tree position of a slot's active page relative to the slot root, in the
+ * coordinates of configLayoutTreePositions. Route groups count, unlike in
+ * `routeSegments`, since each is its own loader-tree segment.
+ */
+export declare function findSlotPageTreePosition(slot: Pick<ParallelSlot, "ownerDir" | "pagePath">): number | null;
 export declare function computeRootParamNames(routeSegments: readonly string[], layoutTreePositions: readonly number[]): string[];
 export declare function patternsStructurallyEquivalent(a: readonly string[], b: readonly string[]): boolean;
 /**