vinext 1.2.0 → 1.2.1

package/dist/plugins/ignore-dynamic-requests.js

@@ -1,12 +1,11 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { DYNAMIC_IMPORT_PRESCAN, SCRIPT_MODULE_ID_RE, collectBindingNames, forEachAstChild, isIdentifierNamed, mayContainDynamicImport, scriptParserLanguage, stringLiteralValue, unwrapExpression } from "./ast-utils.js";
+import { DYNAMIC_IMPORT_PRESCAN, SCRIPT_MODULE_ID_RE, collectBindingNames, forEachAstChild, isIdentifierNamed, mayContainDynamicImport, parseProgram, scriptParserLanguage, stringLiteralValue, unwrapExpression } from "./ast-utils.js";
 import { magicStringTransformResult, omitUnusedBuildSourcemap } from "./transform-result.js";
 import { stripViteModuleQuery } from "../utils/path.js";
 import { isForeignNodeModule } from "../utils/package-name.js";
 import { collectDirectScopeBindings, collectLoopScopeBindings, collectSwitchScopeBindings, collectVarScopeBindings, hasAstBinding, isFunctionNode } from "./ast-scope.js";
 import { createTransformCache } from "./transform-cache.js";
 import { fileURLToPath } from "node:url";
-import { parseAst } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/ignore-dynamic-requests.ts
 const DYNAMIC_REQUEST_ERROR = "Cannot find module as expression is too dynamic";
@@ -411,7 +410,7 @@ function transformVeryDynamicRequests(code, id) {
 	const lang = scriptParserLanguage(id) ?? "js";
 	let ast;
 	try {
-		ast = parseAst(code, { lang });
+		ast = parseProgram(code, { lang });
 	} catch {
 		return null;
 	}

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

@@ -1,11 +1,10 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { SCRIPT_MODULE_ID_RE, collectBindingNames, forEachAstChild, isIdentifierNamed, scriptParserLanguage } from "./ast-utils.js";
+import { SCRIPT_MODULE_ID_RE, collectBindingNames, forEachAstChild, isIdentifierNamed, parseProgram, scriptParserLanguage } from "./ast-utils.js";
 import { magicStringTransformResult, omitUnusedBuildSourcemap } from "./transform-result.js";
 import { canonicalizeFilePath, isPathInsideOrEqual, stripViteModuleQuery } from "../utils/path.js";
 import { VIRTUAL_MODULE_ID_RE } from "../utils/virtual-module.js";
 import fs from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { parseAst } from "vite";
 import { randomUUID } from "node:crypto";
 import MagicString from "magic-string";
 //#region src/plugins/import-meta-url.ts
@@ -254,14 +253,14 @@ function finalizeEmittedModuleIdentity(code, emittedIdentitySentinels, fileName)
 function rewriteModuleIdentity(code, options) {
 	let ast;
 	try {
-		ast = parseAst(code, {
+		ast = parseProgram(code, {
 			lang: scriptParserLanguage(options.id) ?? "jsx",
 			sourceType: options.cjsGlobalInitializers ? "commonjs" : void 0
 		});
 	} catch {
 		if (!options.cjsGlobalInitializers) return null;
 		try {
-			ast = parseAst(code, { lang: scriptParserLanguage(options.id) ?? "jsx" });
+			ast = parseProgram(code, { lang: scriptParserLanguage(options.id) ?? "jsx" });
 		} catch {
 			return null;
 		}

package/dist/plugins/instrumentation-client.js

@@ -1,10 +1,11 @@
+import { parseProgram } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
 import { stripViteModuleQuery } from "../utils/path.js";
-import { normalizePath, parseAst } from "vite";
+import { normalizePath } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/instrumentation-client.ts
 function insertionPositionAfterDirectives(code) {
-	const ast = parseAst(code);
+	const ast = parseProgram(code);
 	let insertPos = 0;
 	for (const node of ast.body) {
 		if (node.type !== "ExpressionStatement" || node.directive === void 0) break;

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

@@ -1,9 +1,8 @@
-import { getAstName, scriptParserLanguage } from "./ast-utils.js";
+import { getAstName, parseProgram, scriptParserLanguage } from "./ast-utils.js";
 import { createMiddlewareMissingExportError } from "../server/middleware-runtime.js";
-import { parseAst } from "vite";
 //#region src/plugins/middleware-export-validation.ts
 function hasValidMiddlewareModuleExport(source, id, isProxy) {
-	const ast = parseAst(source, { lang: scriptParserLanguage(id) ?? "jsx" });
+	const ast = parseProgram(source, { lang: scriptParserLanguage(id) ?? "jsx" });
 	const expectedExport = isProxy ? "proxy" : "middleware";
 	for (const statement of ast.body) {
 		if (statement.type === "ExportDefaultDeclaration") return true;

package/dist/plugins/og-harfbuzz.js

@@ -1,11 +1,10 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { forEachAstChild, getAstName, staticStringValue } from "./ast-utils.js";
+import { forEachAstChild, getAstName, parseProgram, staticStringValue } from "./ast-utils.js";
 import { magicStringTransformResult, omitUnusedBuildSourcemap } from "./transform-result.js";
 import { isFunctionNode } from "./ast-scope.js";
 import { createTransformCache } from "./transform-cache.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
-import { parseAst } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/og-harfbuzz.ts
 /**
@@ -220,7 +219,7 @@ function patchHarfbuzzBundle(code, id, isBuild, callbackModuleDir, error) {
 	const ogEntry = toSlash(id.split("?", 1)[0]);
 	const isWorkerd = ogEntry.endsWith("/index.edge.js");
 	const fail = (reason) => error(`[vinext] Unsupported @vercel/og HarfBuzz bundle in ${ogEntry}: ${reason}. vinext must be updated to support this @vercel/og version.`);
-	const sites = findHarfbuzzPatchSites(parseAst(code, { lang: "js" }));
+	const sites = findHarfbuzzPatchSites(parseProgram(code, { lang: "js" }));
 	if (typeof sites === "string") return fail(sites);
 	const output = new MagicString(code);
 	for (const flag of sites.environmentFlags) output.overwrite(flag.start, flag.end, "false");

package/dist/plugins/optimize-imports.js

@@ -1,11 +1,10 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { escapeRegExp } from "../utils/regex.js";
-import { collectBindingNames, getAstName } from "./ast-utils.js";
+import { collectBindingNames, getAstName, parseProgram } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
 import { VIRTUAL_MODULE_ID_RE } from "../utils/virtual-module.js";
 import { createRequire } from "node:module";
 import fsp from "node:fs/promises";
-import { parseAst } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/optimize-imports.ts
 /**
@@ -234,7 +233,7 @@ async function buildExportMapFromFile(filePath, readFile, cache, visited, initia
 	if (!content) return /* @__PURE__ */ new Map();
 	let ast;
 	try {
-		ast = parseAst(content);
+		ast = parseProgram(content);
 	} catch {
 		return /* @__PURE__ */ new Map();
 	}
@@ -456,7 +455,7 @@ function createOptimizeImportsPlugin(getNextConfig, getRoot) {
 				if (!hasOptimizedImportSource(code)) return null;
 				let ast;
 				try {
-					ast = parseAst(code);
+					ast = parseProgram(code);
 				} catch {
 					return null;
 				}

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

@@ -1,10 +1,9 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { SCRIPT_MODULE_ID_RE, mayContainDynamicImport, scriptParserLanguage, staticStringValue, walkAst } from "./ast-utils.js";
+import { SCRIPT_MODULE_ID_RE, mayContainDynamicImport, parseProgram, scriptParserLanguage, staticStringValue, walkAst } from "./ast-utils.js";
 import { canonicalizeFilePath, isPathInsideOrEqual, stripViteModuleQuery } from "../utils/path.js";
 import { isServerEnvironment } from "./environment.js";
 import { packageNameFromSpecifier } from "../utils/package-name.js";
 import fs from "node:fs";
-import { parseAst } from "vite";
 //#region src/plugins/pages-node-externals.ts
 const FRAMEWORK_PACKAGES = /* @__PURE__ */ new Set([
 	"@vitejs/plugin-react",
@@ -47,7 +46,7 @@ function matchesAlias(id, aliases) {
 function moduleDependencySpecifiers(code, id) {
 	let ast;
 	try {
-		ast = parseAst(code, { lang: scriptParserLanguage(id) ?? "jsx" });
+		ast = parseProgram(code, { lang: scriptParserLanguage(id) ?? "jsx" });
 	} catch {
 		return [];
 	}

package/dist/plugins/remove-console.js

@@ -1,23 +1,7 @@
+import { parseProgram } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
-import { parseAst } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/remove-console.ts
-/**
-* Strip `console.*` calls from client bundle code.
-*
-* Mirrors Next.js's SWC `remove_console` transform:
-*   - Strips all `console.<method>()` calls regardless of context (top-level,
-*     JSX expressions, function arguments, return values, ternary branches)
-*   - Replaces removed calls with `void 0` to keep the AST valid in every
-*     position a CallExpression can appear
-*   - Respects `exclude: ["error"]` to preserve certain methods (case-insensitive)
-*   - Preserves calls when `console` is shadowed (local variable, function
-*     parameter, or destructured binding)
-*   - Preserves computed property access `console[prop]()`
-*
-* Uses Vite's `parseAst` (OXC/acorn) for parsing and `MagicString` for
-* surgical source replacement. Returns `null` when no changes are made.
-*/
 const SCOPE_ENTERING_TYPES = /* @__PURE__ */ new Set([
 	"FunctionDeclaration",
 	"FunctionExpression",
@@ -36,7 +20,7 @@ function removeConsoleCalls(code, config) {
 	if (!code.match(/\bconsole\b/)) return null;
 	let ast;
 	try {
-		ast = parseAst(code);
+		ast = parseProgram(code);
 	} catch {
 		return null;
 	}

package/dist/plugins/require-condition-resolution.js

@@ -1,10 +1,10 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { SCRIPT_MODULE_ID_RE, collectBindingNames, forEachAstChild, isIdentifierNamed, scriptParserLanguage, staticStringValue, unwrapExpression } from "./ast-utils.js";
+import { SCRIPT_MODULE_ID_RE, collectBindingNames, forEachAstChild, isIdentifierNamed, parseProgram, scriptParserLanguage, staticStringValue, unwrapExpression } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
 import { stripViteModuleQuery } from "../utils/path.js";
 import { collectDirectScopeBindings, collectLoopScopeBindings, collectSwitchScopeBindings, collectVarScopeBindings, createAstScope, hasAstBinding, isFunctionNode } from "./ast-scope.js";
 import { readFile } from "node:fs/promises";
-import { createIdResolver, parseAst } from "vite";
+import { createIdResolver } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/require-condition-resolution.ts
 const LITERAL_REQUIRE_RE = /\brequire\s*\(/;
@@ -30,7 +30,7 @@ function isPackageSpecifier(specifier) {
 function collectLiteralRequires(code, id) {
 	let ast;
 	try {
-		ast = parseAst(code, { lang: scriptParserLanguage(id) ?? "jsx" });
+		ast = parseProgram(code, { lang: scriptParserLanguage(id) ?? "jsx" });
 	} catch {
 		return [];
 	}

package/dist/plugins/require-context.js

@@ -1,9 +1,8 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { SCRIPT_MODULE_ID_RE, booleanLiteralValue, scriptParserLanguage, stringLiteralValue, walkAst } from "./ast-utils.js";
+import { SCRIPT_MODULE_ID_RE, booleanLiteralValue, parseProgram, scriptParserLanguage, stringLiteralValue, walkAst } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
 import { stripViteModuleQuery } from "../utils/path.js";
 import { readdir, realpath, stat } from "node:fs/promises";
-import { parseAst } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/require-context.ts
 function createRequireContextPlugin() {
@@ -82,7 +81,7 @@ async function transformRequireContext(code, id) {
 	const lang = scriptParserLanguage(id);
 	let ast;
 	try {
-		ast = parseAst(code, { lang });
+		ast = parseProgram(code, { lang });
 	} catch {
 		return null;
 	}

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

@@ -1,7 +1,6 @@
-import { getAstName } from "./ast-utils.js";
+import { getAstName, parseProgram } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
 import { findAstBindingScope, walkAstScopes } from "./ast-scope.js";
-import { parseAst } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/strip-server-exports.ts
 const SERVER_EXPORTS = /* @__PURE__ */ new Set([
@@ -225,7 +224,7 @@ function validatePageExports(code) {
 	if (!hasExportAllCandidate(code)) return;
 	let ast;
 	try {
-		ast = parseAst(code);
+		ast = parseProgram(code);
 	} catch {
 		return;
 	}
@@ -243,7 +242,7 @@ function stripServerExports(code) {
 	if (!hasServerExportCandidate(code) && !hasExportAllCandidate(code)) return null;
 	let ast;
 	try {
-		ast = parseAst(code);
+		ast = parseProgram(code);
 	} catch {
 		return null;
 	}

package/dist/plugins/styled-jsx.js

@@ -1,9 +1,8 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { SCRIPT_MODULE_ID_RE, walkAst } from "./ast-utils.js";
+import { SCRIPT_MODULE_ID_RE, parseProgram, walkAst } from "./ast-utils.js";
 import { NODE_MODULES_PATH_RE, stripViteModuleQuery } from "../utils/path.js";
 import { createRequire } from "node:module";
 import { pathToFileURL } from "node:url";
-import { parseAst } from "vite";
 //#region src/plugins/styled-jsx.ts
 const STYLED_JSX_IMPORT_RE = /^styled-jsx(?:\/.*)?$/;
 const STYLED_JSX_SOURCE_RE = /(?:<style\b|from\s+["']styled-jsx\/css["']|require\s*\(\s*["']styled-jsx\/css["']\s*\))/;
@@ -14,7 +13,7 @@ function hasStyledJsxTag(source, id) {
 	const lang = extension === ".ts" || extension === ".mts" || extension === ".cts" ? "ts" : "tsx";
 	let ast;
 	try {
-		ast = parseAst(source, { lang });
+		ast = parseProgram(source, { lang });
 	} catch {
 		return false;
 	}

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

@@ -1,9 +1,28 @@
 import { Plugin } from "vite";
 //#region src/plugins/use-cache-callable.d.ts
+type RscTransforms = typeof import("@vitejs/plugin-rsc/transforms");
 type Options = {
   projectRoot: string;
   cacheRuntime: string;
   allowMissingRsc?: boolean;
 };
-export declare function createUseCacheCallablePlugin(options: Options): Promise<Plugin>;
-//#endregion
+type BrowserTransformOptions = {
+  environmentName: string;
+  reference: {
+    referenceKey: string;
+  };
+  secureExportName: (name: string) => string;
+  createReference: (referenceId: string, name: string) => string;
+};
+type BrowserTransformOutput = NonNullable<ReturnType<RscTransforms["transformDirectiveProxyExport"]>>;
+export type UseCacheCallableApi = {
+  /**
+   * Compile a browser Web Worker module like the client environment does,
+   * with the same reference ids, without claiming references.
+   */
+  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>>;
+//#endregion
+export { PLUGIN_NAME as USE_CACHE_PLUGIN_NAME };

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

@@ -1,9 +1,9 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { parseProgramAsync } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
 import { NODE_MODULES_PATH_RE } from "../utils/path.js";
 import { createRequire } from "node:module";
 import { pathToFileURL } from "node:url";
-import { parseAstAsync } from "vite";
 import { createHmac, randomBytes } from "node:crypto";
 //#region src/plugins/use-cache-callable.ts
 const PLUGIN_NAME = "vinext:server-function-directives";
@@ -79,6 +79,41 @@ function getCacheWrapperOptions(meta) {
 		...captureCount === 0 ? {} : { captureCount }
 	};
 }
+/**
+* Compile a module for a browser graph: module-level cache functions become
+* server references, and inline ones are rejected as in Next.js Client
+* Components. Returns undefined when the module is unchanged.
+*/
+function transformBrowserModule(transforms, code, ast, id, moduleDirective, options) {
+	if (!moduleDirective) {
+		transforms.transformHoistInlineDirective(code, ast, {
+			directive: USE_CACHE_DIRECTIVE_CANDIDATE,
+			rejectNonAsyncFunction: true,
+			runtime: (_value, _name, meta) => {
+				matchUseCacheDirective(meta.directiveMatch[0]);
+				throw new Error(`It is not allowed to define inline "use cache" annotated functions in Client Components. Export them from a separate file with a module-level "use cache" or "use server" directive, or pass them down through props from a Server Component. (${options.environmentName}: ${id})`);
+			}
+		});
+		return;
+	}
+	const useServerExportNames = getFunctionDirectiveExportNames(transforms, ast, "use server");
+	const referenceName = (name) => useServerExportNames.has(name) ? name : options.secureExportName(name);
+	const result = transforms.transformDirectiveProxyExport(ast, {
+		code,
+		directive: moduleDirective,
+		filter: (name, meta) => {
+			if (!shouldTransformModuleExport(name, id, meta)) return false;
+			validateModuleExport(transforms, meta);
+			return true;
+		},
+		runtime: (name) => options.createReference(`${options.reference.referenceKey}#${referenceName(name)}`, name)
+	});
+	if (!result?.output.hasChanged()) return;
+	return {
+		output: result.output,
+		referenceNames: result.exportNames.map(referenceName)
+	};
+}
 async function createUseCacheCallablePlugin(options) {
 	const rscModulePath = resolvePluginRscModule(options.projectRoot, "@vitejs/plugin-rsc");
 	const transformsPath = resolvePluginRscModule(options.projectRoot, "@vitejs/plugin-rsc/transforms");
@@ -86,8 +121,39 @@ async function createUseCacheCallablePlugin(options) {
 	const transforms = await import(pathToFileURL(transformsPath).href);
 	const referenceSecret = randomBytes(32);
 	let manager;
+	async function analyzeModule(manager, code, id) {
+		const ast = await parseProgramAsync(code);
+		const moduleDirective = findModuleUseCacheDirective(ast);
+		const useServerBoundary = transforms.hasDirective(ast.body, "use server");
+		if (moduleDirective && useServerBoundary) throw new Error(`A module cannot contain both ${JSON.stringify(moduleDirective)} and "use server" directives.`);
+		const reference = manager.serverReferences.resolve(id, "rsc");
+		const relativeImportId = manager.toRelativeId(reference.importId);
+		const secureExportName = (name) => `$$vinext_cache_${createHmac("sha256", referenceSecret).update(relativeImportId).update("\0").update(name).digest("hex")}`;
+		return {
+			ast,
+			moduleDirective,
+			useServerBoundary,
+			reference,
+			secureExportName
+		};
+	}
 	return {
 		name: PLUGIN_NAME,
+		api: { async transformWorkerModule(code, id, createReference) {
+			if (!code.includes("use cache")) return;
+			if (!manager) {
+				if (findModuleUseCacheDirective(await parseProgramAsync(code))) throw new Error("vinext: cannot compile a \"use cache\" module in a Web Worker without @vitejs/plugin-rsc.");
+				return;
+			}
+			const { ast, moduleDirective, useServerBoundary, reference, secureExportName } = await analyzeModule(manager, code, id);
+			if (useServerBoundary) return;
+			return transformBrowserModule(transforms, code, ast, id, moduleDirective, {
+				environmentName: "worker",
+				reference,
+				secureExportName,
+				createReference
+			})?.output;
+		} },
 		configResolved(config) {
 			const pluginApi = rscModule.getPluginApi(config);
 			const hasRscPlugin = config.plugins.some((plugin) => plugin.name === "rsc");
@@ -111,48 +177,25 @@ async function createUseCacheCallablePlugin(options) {
 					manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
 					return;
 				}
-				const ast = await parseAstAsync(code);
-				const moduleDirective = findModuleUseCacheDirective(ast);
-				const useServerBoundary = transforms.hasDirective(ast.body, "use server");
-				if (moduleDirective && useServerBoundary) throw new Error(`A module cannot contain both ${JSON.stringify(moduleDirective)} and "use server" directives.`);
-				const reference = manager.serverReferences.resolve(id, "rsc");
-				const relativeImportId = manager.toRelativeId(reference.importId);
-				const secureExportName = (name) => `$$vinext_cache_${createHmac("sha256", referenceSecret).update(relativeImportId).update("\0").update(name).digest("hex")}`;
+				const { ast, moduleDirective, useServerBoundary, reference, secureExportName } = await analyzeModule(manager, code, id);
 				if (!(this.environment.name === "rsc")) {
 					if (useServerBoundary) {
 						manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
 						return;
 					}
-					if (!moduleDirective) {
-						transforms.transformHoistInlineDirective(code, ast, {
-							directive: USE_CACHE_DIRECTIVE_CANDIDATE,
-							rejectNonAsyncFunction: true,
-							runtime: (_value, _name, meta) => {
-								matchUseCacheDirective(meta.directiveMatch[0]);
-								throw new Error(`It is not allowed to define inline "use cache" annotated functions in Client Components. Export them from a separate file with a module-level "use cache" or "use server" directive, or pass them down through props from a Server Component. (${this.environment.name}: ${id})`);
-							}
-						});
-						manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
-						return;
-					}
-					const useServerExportNames = getFunctionDirectiveExportNames(transforms, ast, "use server");
-					const result = transforms.transformDirectiveProxyExport(ast, {
-						code,
-						directive: moduleDirective,
-						filter: (name, meta) => {
-							if (!shouldTransformModuleExport(name, id, meta)) return false;
-							validateModuleExport(transforms, meta);
-							return true;
-						},
-						runtime: (name) => `$$ReactClient.createServerReference(${JSON.stringify(`${reference.referenceKey}#${useServerExportNames.has(name) ? name : secureExportName(name)}`)},$$ReactClient.callServer,undefined,${this.environment.mode === "dev" ? "$$ReactClient.findSourceMapURL" : "undefined"},${JSON.stringify(name)})`
+					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?.output.hasChanged()) {
+					if (!result) {
 						manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
 						return;
 					}
 					manager.serverReferences.replaceClaim(PLUGIN_NAME, id, {
 						...reference,
-						exportNames: result.exportNames.map((name) => useServerExportNames.has(name) ? name : secureExportName(name))
+						exportNames: result.referenceNames
 					});
 					const runtimeEnvironment = this.environment.name === "client" ? "browser" : "ssr";
 					result.output.prepend(`import * as $$ReactClient from "@vitejs/plugin-rsc/react/${runtimeEnvironment}";\n`);
@@ -223,4 +266,4 @@ async function createUseCacheCallablePlugin(options) {
 	};
 }
 //#endregion
-export { createUseCacheCallablePlugin };
+export { PLUGIN_NAME as USE_CACHE_PLUGIN_NAME, createUseCacheCallablePlugin };

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

@@ -1,10 +1,9 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { staticStringValue, walkAst } from "./ast-utils.js";
+import { parseModuleRecord, quotedStringAt } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
 import { appendDeploymentIdQuery } from "../utils/deployment-id.js";
 import { NODE_MODULES_PATH_RE, stripViteModuleQuery } from "../utils/path.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:";
@@ -70,24 +69,19 @@ function createWorkerImageImportsPlugin(options = {}) {
 			},
 			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 record = parseModuleRecord(code, /\.(?:[cm]?ts)$/.test(sourceId) ? "ts" : "tsx");
+				if (!record) return null;
 				const output = new MagicString(code);
 				const imageImports = [];
-				walkAst(ast, (node) => {
-					if (node.type === "ImportExpression" && 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;
-					}
-				});
+				for (const dynamicImport of record.dynamicImports) {
+					const importPath = quotedStringAt(code, dynamicImport.moduleRequest);
+					if (importPath === null || !WORKER_IMAGE_EXTENSION_RE.test(importPath)) continue;
+					imageImports.push({
+						end: dynamicImport.end,
+						importPath,
+						start: dynamicImport.start
+					});
+				}
 				let changed = false;
 				for (const imageImport of imageImports) {
 					const resolved = await this.resolve(imageImport.importPath, sourceId, { skipSelf: true });
@@ -107,23 +101,26 @@ function createWorkerImageImportsPlugin(options = {}) {
 				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 record = parseModuleRecord(code, "js");
+				if (!record) return null;
+				const sources = [
+					...record.staticImports.map((statement) => statement.moduleRequest),
+					...record.staticExports.flatMap((statement) => statement.entries[0]?.moduleRequest ?? []),
+					...record.dynamicImports.map((dynamicImport) => {
+						const value = quotedStringAt(code, dynamicImport.moduleRequest);
+						return value === null ? [] : {
+							...dynamicImport.moduleRequest,
+							value
+						};
+					})
+				].flat();
 				const output = new MagicString(code);
 				let changed = false;
-				walkAst(ast, (node) => {
-					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) && source) {
-						output.overwrite(source.start, source.end, JSON.stringify(appendDeploymentIdQuery(specifier, options.deploymentId)));
-						changed = true;
-						return false;
-					}
-				});
+				for (const source of sources) {
+					if (!chunkSpecifiers.has(source.value)) continue;
+					output.overwrite(source.start, source.end, JSON.stringify(appendDeploymentIdQuery(source.value, options.deploymentId)));
+					changed = true;
+				}
 				if (!changed) return null;
 				return magicStringTransformResult(output);
 			}