vinext 1.0.0-beta.9 → 1.0.1

package/dist/plugins/sass.js

@@ -3,8 +3,8 @@ import { NODE_MODULES_PATH_RE } from "../utils/path.js";
 import { markCssUrlAssetReferences, rebaseCssUrlAssetReferences } from "../build/css-url-assets.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
-import { preprocessCSS } from "vite";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import { preprocessCSS } from "vite";
 //#region src/plugins/sass.ts
 /**
 * Map a Next.js `sassOptions` object onto Vite's
@@ -133,7 +133,8 @@ function createSassTildeImporter(root) {
 			const pkgJsonPath = req.resolve(`${pkgName}/package.json`);
 			const pkgDir = path.dirname(pkgJsonPath);
 			const afterPkg = stripped.startsWith("@") ? stripped.split("/").slice(2).join("/") : stripped.split("/").slice(1).join("/");
-			return pathToFileURL(afterPkg ? path.join(pkgDir, afterPkg) : pkgDir);
+			const resolvedPath = afterPkg ? path.join(pkgDir, afterPkg) : pkgDir;
+			return pathToFileURL(resolvedPath);
 		} catch {
 			return null;
 		}
@@ -179,7 +180,8 @@ function createSassCssUrlAssetImporter() {
 	const importUrlPrefix = "vinext-css-url-asset:";
 	const prepareStylesheet = (filename, entryDirectory) => {
 		const contents = fs.readFileSync(filename, "utf8");
-		const marked = markCssUrlAssetReferences(rebaseCssUrlAssetReferences(contents, path.dirname(filename), entryDirectory) ?? contents, filename);
+		const rebased = rebaseCssUrlAssetReferences(contents, path.dirname(filename), entryDirectory) ?? contents;
+		const marked = markCssUrlAssetReferences(rebased, filename);
 		if (marked === null) return null;
 		const extension = path.extname(filename).toLowerCase();
 		return {
@@ -344,7 +346,8 @@ var SassAwareFileSystemLoader = class {
 		const rawSource = await fs.promises.readFile(fileRelativePath, "utf-8");
 		if (config) try {
 			const ext = path.extname(fileRelativePath);
-			const result = await preprocessCSS(rawSource, CSS_MODULE_RE.test(fileRelativePath) ? fileRelativePath : ext === "" ? `${fileRelativePath}.module.css` : `${fileRelativePath.slice(0, -ext.length)}.module${ext}`, config);
+			const preprocessFilename = CSS_MODULE_RE.test(fileRelativePath) ? fileRelativePath : ext === "" ? `${fileRelativePath}.module.css` : `${fileRelativePath.slice(0, -ext.length)}.module${ext}`;
+			const result = await preprocessCSS(rawSource, preprocessFilename, config);
 			const exportTokens = result.modules ?? {};
 			this.sources[fileRelativePath] = result.code;
 			this.traces[trace] = fileRelativePath;

package/dist/plugins/scan-build-css.d.ts

@@ -0,0 +1,12 @@
+import { Plugin } from "vite";
+//#region src/plugins/scan-build-css.d.ts
+/**
+ * @vitejs/plugin-rsc discovers client and server references with two
+ * write-less scan builds whose output is discarded, and its `rsc:scan-strip`
+ * plugin reduces every module to its import specifiers. A stylesheet cannot
+ * contribute a JavaScript import, yet without this plugin every stylesheet in
+ * the app still ran through PostCSS/Tailwind/Sass in both scans. Empty their
+ * source during those scans only; real builds and dev are unchanged.
+ */
+export declare function createScanBuildCssPlugin(): Plugin;
+//#endregion

package/dist/plugins/scan-build-css.js

@@ -0,0 +1,39 @@
+//#region src/plugins/scan-build-css.ts
+const CSS_LANGS_RE = /\.(?:css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
+const SPECIAL_QUERY_RE = /[?&](?:worker|sharedworker|raw|url)\b/;
+const VIRTUAL_MODULE_RE = /^\0/;
+/**
+* @vitejs/plugin-rsc discovers client and server references with two
+* write-less scan builds whose output is discarded, and its `rsc:scan-strip`
+* plugin reduces every module to its import specifiers. A stylesheet cannot
+* contribute a JavaScript import, yet without this plugin every stylesheet in
+* the app still ran through PostCSS/Tailwind/Sass in both scans. Empty their
+* source during those scans only; real builds and dev are unchanged.
+*/
+function createScanBuildCssPlugin() {
+	let rscApi;
+	return {
+		name: "vinext:scan-build-css",
+		enforce: "pre",
+		apply: "build",
+		configResolved(config) {
+			rscApi = config.plugins.find((plugin) => plugin.name === "rsc:minimal")?.api;
+		},
+		transform: {
+			order: "pre",
+			filter: { id: {
+				include: CSS_LANGS_RE,
+				exclude: [SPECIAL_QUERY_RE, VIRTUAL_MODULE_RE]
+			} },
+			handler() {
+				if (!rscApi?.manager.isScanBuild || this.environment.config.build.write !== false) return null;
+				return {
+					code: "",
+					map: null
+				};
+			}
+		}
+	};
+}
+//#endregion
+export { createScanBuildCssPlugin };

package/dist/plugins/server-externals-manifest.d.ts

@@ -20,6 +20,5 @@ import { Plugin } from "vite";
  * `emitStandaloneOutput` reads this file and uses it as the seed list for the
  * BFS `node_modules/` copy, replacing the old regex-scan approach.
  */
-declare function createServerExternalsManifestPlugin(): Plugin;
-//#endregion
-export { createServerExternalsManifestPlugin };
+export declare function createServerExternalsManifestPlugin(): Plugin;
+//#endregion

package/dist/plugins/strip-server-exports.d.ts

@@ -1,8 +1,10 @@
 import MagicString from "magic-string";
 //#region src/plugins/strip-server-exports.d.ts
-declare function hasServerExportCandidate(code: string): boolean;
-declare function hasExportAllCandidate(code: string): boolean;
-declare function validatePageExports(code: string): void;
+export declare function hasServerExportCandidate(code: string): boolean;
+/** Transform prefilter; must admit every module `hasExportAllCandidate` accepts */
+export declare const EXPORT_ALL_CANDIDATE_FILTER: RegExp;
+export declare function hasExportAllCandidate(code: string): boolean;
+export declare function validatePageExports(code: string): void;
 type StripServerExportsResult = {
   code: string;
   map: ReturnType<MagicString["generateMap"]>;
@@ -15,6 +17,5 @@ type StripServerExportsResult = {
  * - test/unit/babel-plugin-next-ssg-transform.test.ts
  * - crates/next-custom-transforms/src/transforms/strip_page_exports.rs
  */
-declare function stripServerExports(code: string): StripServerExportsResult | null;
-//#endregion
-export { hasExportAllCandidate, hasServerExportCandidate, stripServerExports, validatePageExports };
+export declare function stripServerExports(code: string): StripServerExportsResult | null;
+//#endregion

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

@@ -1,5 +1,5 @@
-import { magicStringTransformResult } from "./transform-result.js";
 import { getAstName } from "./ast-utils.js";
+import { magicStringTransformResult } from "./transform-result.js";
 import { parseAst } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/strip-server-exports.ts
@@ -18,6 +18,8 @@ function hasServerExportCandidate(code) {
 	for (const name of SERVER_EXPORTS) if (code.includes(name)) return true;
 	return false;
 }
+/** Transform prefilter; must admit every module `hasExportAllCandidate` accepts */
+const EXPORT_ALL_CANDIDATE_FILTER = /\bexport\s*[*/]/;
 function hasExportAllCandidate(code) {
 	let searchFrom = 0;
 	while (searchFrom < code.length) {
@@ -510,4 +512,4 @@ function stripServerExports(code) {
 	return magicStringTransformResult(string);
 }
 //#endregion
-export { hasExportAllCandidate, hasServerExportCandidate, stripServerExports, validatePageExports };
+export { EXPORT_ALL_CANDIDATE_FILTER, hasExportAllCandidate, hasServerExportCandidate, stripServerExports, validatePageExports };

package/dist/plugins/styled-jsx.d.ts

@@ -10,6 +10,5 @@ type NextSwcModule = {
 type StyledJsxPluginOptions = {
   importModule?: (url: string) => Promise<NextSwcModule>;
 };
-declare function createStyledJsxPlugin(initialProjectRoot: string, options?: StyledJsxPluginOptions): Plugin;
-//#endregion
-export { createStyledJsxPlugin };
+export declare function createStyledJsxPlugin(initialProjectRoot: string, options?: StyledJsxPluginOptions): Plugin;
+//#endregion

package/dist/plugins/styled-jsx.js

@@ -1,9 +1,9 @@
 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 { NODE_MODULES_PATH_RE, stripViteModuleQuery } from "../utils/path.js";
 import { createRequire } from "node:module";
-import { parseAst } from "vite";
 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*\))/;
@@ -23,11 +23,10 @@ function hasStyledJsxTag(source, id) {
 		if (found) return false;
 		if (node.type === "JSXOpeningElement") {
 			const name = node.name;
-			if (name?.type === "JSXIdentifier" && name.name === "style") {
-				if (node.attributes?.some((attribute) => {
+			if (name.type === "JSXIdentifier" && name.name === "style") {
+				if (node.attributes.some((attribute) => {
 					if (attribute.type !== "JSXAttribute") return false;
-					const attributeName = attribute.name;
-					return attributeName?.type === "JSXIdentifier" && attributeName.name === "jsx";
+					return attribute.name.type === "JSXIdentifier" && attribute.name.name === "jsx";
 				})) {
 					found = true;
 					return false;
@@ -42,7 +41,8 @@ function createProjectRequire(projectRoot) {
 }
 function resolveNextRequire(projectRoot) {
 	try {
-		return createRequire(createProjectRequire(projectRoot).resolve("next/package.json"));
+		const projectRequire = createProjectRequire(projectRoot);
+		return createRequire(projectRequire.resolve("next/package.json"));
 	} catch {
 		return null;
 	}

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

@@ -14,6 +14,5 @@
  * Only safe for transforms whose result depends solely on (id, source,
  * variant) — no filesystem or plugin-state reads inside `compute`.
  */
-declare function createTransformCache<V, R>(): (id: string, source: string, variant: V, compute: () => R) => R;
-//#endregion
-export { createTransformCache };
+export declare function createTransformCache<V, R>(): (id: string, source: string, variant: V, compute: () => R) => R;
+//#endregion

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

@@ -1,10 +1,27 @@
 import MagicString from "magic-string";
 //#region src/plugins/transform-result.d.ts
-type MagicStringTransformResult = {
+export type MagicStringTransformResult = {
   code: string;
   map: ReturnType<MagicString["generateMap"]>;
 };
+type SourcemapEnvironment = {
+  mode?: string;
+  config?: {
+    build?: {
+      sourcemap?: boolean | "inline" | "hidden";
+    };
+  };
+};
 /** 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 };
+export declare function magicStringTransformResult(output: MagicString, options?: Parameters<MagicString["generateMap"]>[0]): MagicStringTransformResult;
+/**
+ * Drop the sourcemap from a transform result when the build environment
+ * discards it, mirroring Vite's own transforms
+ * (`config.build.sourcemap ? s.generateMap(...) : null`). Dev and builds with
+ * sourcemaps enabled keep the result unchanged.
+ */
+export declare function omitUnusedBuildSourcemap(environment: SourcemapEnvironment | undefined, result: MagicStringTransformResult | null): {
+  code: string;
+  map: MagicStringTransformResult["map"] | null;
+} | null;
+//#endregion

package/dist/plugins/transform-result.js

@@ -1,10 +1,31 @@
 //#region src/plugins/transform-result.ts
 /** Build the standard code + sourcemap result returned by source transforms. */
 function magicStringTransformResult(output, options = { hires: "boundary" }) {
+	let source = output;
+	let map;
 	return {
 		code: output.toString(),
-		map: output.generateMap(options)
+		get map() {
+			if (source) {
+				map = source.generateMap(options);
+				source = void 0;
+			}
+			return map;
+		}
+	};
+}
+/**
+* Drop the sourcemap from a transform result when the build environment
+* discards it, mirroring Vite's own transforms
+* (`config.build.sourcemap ? s.generateMap(...) : null`). Dev and builds with
+* sourcemaps enabled keep the result unchanged.
+*/
+function omitUnusedBuildSourcemap(environment, result) {
+	if (!result || environment?.mode !== "build" || environment.config?.build?.sourcemap !== false) return result;
+	return {
+		code: result.code,
+		map: null
 	};
 }
 //#endregion
-export { magicStringTransformResult };
+export { magicStringTransformResult, omitUnusedBuildSourcemap };

package/dist/plugins/transitive-externals.d.ts

@@ -16,9 +16,8 @@ import { Plugin } from "vite";
  *
  * Reference: packages/next/src/build/handle-externals.ts in Next.js.
  */
-declare function createTransitiveExternalsPlugin(options: {
+export declare function createTransitiveExternalsPlugin(options: {
   getRoot: () => string | undefined;
   getExternalPackages: () => readonly string[];
 }): Plugin;
-//#endregion
-export { createTransitiveExternalsPlugin };
+//#endregion

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

@@ -1,19 +1,28 @@
 import { MagicStringTransformResult } from "./transform-result.js";
 //#region src/plugins/typeof-window.d.ts
 type WindowType = "object" | "undefined";
-declare const consumerEnvironmentConditionFilter: RegExp;
-type ConsumerEnvironmentReplacements = {
+export declare const consumerEnvironmentConditionFilter: RegExp;
+export type ConsumerEnvironmentReplacements = {
   typeofWindow?: WindowType;
   processBrowser?: boolean;
   pruneUnreachableImports?: boolean;
+  /**
+   * Return null without walking the AST when folding cannot change the module's
+   * scanned imports. Only valid for import-scan builds.
+   */
+  onlyIfScannedImportsChange?: boolean;
 };
 type EnvironmentLike = {
   config: {
     consumer: "client" | "server";
   };
 };
-declare function getTypeofWindowReplacement(environment: EnvironmentLike): WindowType;
-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 };
+export declare function getTypeofWindowReplacement(environment: EnvironmentLike): WindowType;
+/**
+ * Cheap pre-parse gate for import-scan builds. Over-inclusive by design; the
+ * parser's module record in {@link moduleRecordHasScannedFoldTargets} is exact.
+ */
+export declare function mayFoldChangeScannedImports(code: string): boolean;
+export declare function replaceTypeofWindow(code: string, replacement: WindowType, id?: string): MagicStringTransformResult | null;
+export declare function replaceConsumerEnvironmentConditions(code: string, replacements: ConsumerEnvironmentReplacements, id?: string): MagicStringTransformResult | null;
+//#endregion

package/dist/plugins/typeof-window.js

@@ -1,13 +1,15 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { stripViteModuleQuery } from "../utils/path.js";
+import { DYNAMIC_IMPORT_PRESCAN, booleanLiteralValue, collectBindingNames, forEachAstChild, isIdentifierNamed, stringLiteralValue } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
-import { booleanLiteralValue, collectBindingNames, forEachAstChild, hasRange, isAstRecord, isIdentifierNamed, nodeArray, stringLiteralValue } from "./ast-utils.js";
+import { stripViteModuleQuery } from "../utils/path.js";
 import { collectDirectScopeBindings, collectLoopScopeBindings, collectSwitchScopeBindings, collectVarScopeBindings, createAstScope, hasAstBinding, isFunctionNode } from "./ast-scope.js";
-import { parseAst } from "vite";
+import { parseSync } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/typeof-window.ts
 const sourceEscapePattern = /\\(?:\r\n|[\n\r\u2028\u2029]|[^\n\r\u2028\u2029])/;
 const consumerEnvironmentConditionFilter = new RegExp(String.raw`\btypeof\s+window\b|${/\\(?:u(?:[\da-fA-F]{4}|\{[\da-fA-F]+\})|x[\da-fA-F]{2})/.source}|\bprocess\b[\s)]*(?:(?:\?\.|\.)\s*(?:browser\b|\/[/*])|(?:\?\.\s*)?\[[\s(]*(?:["']browser["']|["'][^"'\\\n\r]*\\|\/[/*])|\/[/*])`);
+const SCANNED_IMPORT_FOLD_PRESCAN = new RegExp(String.raw`${DYNAMIC_IMPORT_PRESCAN.source}|\bimport\s*\.`);
+const NON_IMPORTING_IMPORT_META_RE = /\s*\.\s*(?:url|env)\b/y;
 function createChildScope(node, parent) {
 	if (node.type !== "Program" && node.type !== "BlockStatement" && node.type !== "StaticBlock" && node.type !== "TSModuleBlock" && node.type !== "CatchClause" && node.type !== "ForStatement" && node.type !== "ForInStatement" && node.type !== "ForOfStatement" && node.type !== "ClassDeclaration" && node.type !== "ClassExpression") return null;
 	const scope = createAstScope(parent);
@@ -22,15 +24,14 @@ function getTypeofWindowReplacement(environment) {
 	return environment.config.consumer === "client" ? "object" : "undefined";
 }
 function evaluateTypeofWindowComparison(node, replacement, scope) {
-	if (!isAstRecord(node) || node.type !== "BinaryExpression") return null;
+	if (node.type !== "BinaryExpression") return null;
 	if (![
 		"==",
 		"===",
 		"!=",
 		"!=="
 	].includes(String(node.operator))) return null;
-	const left = isAstRecord(node.left) ? node.left : null;
-	const right = isAstRecord(node.right) ? node.right : null;
+	const { left, right } = node;
 	const leftIsTypeofWindow = left?.type === "UnaryExpression" && left.operator === "typeof" && isIdentifierNamed(left.argument, "window") && !hasAstBinding(scope, "window");
 	const rightIsTypeofWindow = right?.type === "UnaryExpression" && right.operator === "typeof" && isIdentifierNamed(right.argument, "window") && !hasAstBinding(scope, "window");
 	const comparedValue = leftIsTypeofWindow ? stringLiteralValue(right) : rightIsTypeofWindow ? stringLiteralValue(left) : null;
@@ -39,17 +40,17 @@ function evaluateTypeofWindowComparison(node, replacement, scope) {
 	return node.operator === "==" || node.operator === "===" ? equal : !equal;
 }
 function isProcessBrowserMember(node, scope) {
-	const candidate = isAstRecord(node) && node.type === "ChainExpression" && isAstRecord(node.expression) ? node.expression : node;
-	if (!isAstRecord(candidate) || candidate.type !== "MemberExpression") return false;
+	const candidate = node.type === "ChainExpression" ? node.expression : node;
+	if (candidate.type !== "MemberExpression") return false;
 	return isIdentifierNamed(candidate.object, "process") && (candidate.computed ? stringLiteralValue(candidate.property) === "browser" : isIdentifierNamed(candidate.property, "browser")) && !hasAstBinding(scope, "process");
 }
 function evaluateProcessBrowserCondition(node, replacement, scope) {
 	if (isProcessBrowserMember(node, scope)) return replacement;
-	if (isAstRecord(node) && node.type === "UnaryExpression" && node.operator === "!") {
+	if (node.type === "UnaryExpression" && node.operator === "!") {
 		const value = evaluateProcessBrowserCondition(node.argument, replacement, scope);
 		return value === null ? null : !value;
 	}
-	if (!isAstRecord(node) || node.type !== "BinaryExpression") return null;
+	if (node.type !== "BinaryExpression") return null;
 	if (![
 		"==",
 		"===",
@@ -64,7 +65,7 @@ function evaluateProcessBrowserCondition(node, replacement, scope) {
 	return node.operator === "==" || node.operator === "===" ? equal : !equal;
 }
 function evaluateConsumerCondition(node, replacements, scope) {
-	if (isAstRecord(node) && node.type === "LogicalExpression") {
+	if (node.type === "LogicalExpression") {
 		const left = evaluateConsumerCondition(node.left, replacements, scope);
 		if (node.operator === "&&") {
 			if (left?.value === false) return left;
@@ -76,7 +77,7 @@ function evaluateConsumerCondition(node, replacements, scope) {
 				} : null;
 			}
 			const right = evaluateConsumerCondition(node.right, replacements, scope);
-			if (replacements.pruneUnreachableImports && right?.value === false && right.effects.length === 0 && isAstRecord(node.left)) return {
+			if (replacements.pruneUnreachableImports && right?.value === false && right.effects.length === 0) return {
 				value: false,
 				effects: [node.left]
 			};
@@ -90,7 +91,7 @@ function evaluateConsumerCondition(node, replacements, scope) {
 				} : null;
 			}
 			const right = evaluateConsumerCondition(node.right, replacements, scope);
-			if (replacements.pruneUnreachableImports && right?.value === true && right.effects.length === 0 && isAstRecord(node.left)) return {
+			if (replacements.pruneUnreachableImports && right?.value === true && right.effects.length === 0) return {
 				value: true,
 				effects: [node.left]
 			};
@@ -111,6 +112,27 @@ function evaluateConsumerCondition(node, replacements, scope) {
 		effects: []
 	};
 }
+/**
+* Cheap pre-parse gate for import-scan builds. Over-inclusive by design; the
+* parser's module record in {@link moduleRecordHasScannedFoldTargets} is exact.
+*/
+function mayFoldChangeScannedImports(code) {
+	return SCANNED_IMPORT_FOLD_PRESCAN.test(code);
+}
+/**
+* Whether folding may change a scanned import: any dynamic or phase import, or
+* an `import.meta` expression other than a `.url`/`.env` read. Reads the parser's native module record, so no
+* ESTree is materialized.
+*/
+function moduleRecordHasScannedFoldTargets(code, module, lang) {
+	if ((lang === "ts" || lang === "tsx") && DYNAMIC_IMPORT_PRESCAN.test(code)) return true;
+	if (module.dynamicImports.length > 0) return true;
+	for (const importMeta of module.importMetas) {
+		NON_IMPORTING_IMPORT_META_RE.lastIndex = importMeta.end;
+		if (!NON_IMPORTING_IMPORT_META_RE.test(code)) return true;
+	}
+	return false;
+}
 function replaceTypeofWindow(code, replacement, id = "file.js") {
 	return replaceConsumerEnvironmentConditions(code, { typeofWindow: replacement }, id);
 }
@@ -120,15 +142,15 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 	if (!mayContainTypeofWindow && !mayContainProcessBrowser) return null;
 	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 {
-		ast = parseAst(code, { lang });
-	} catch {
-		return null;
-	}
+	const parsed = parseSync(id, code, {
+		lang,
+		preserveParens: false
+	});
+	if (parsed.errors.length > 0) return null;
+	if (replacements.onlyIfScannedImportsChange && !moduleRecordHasScannedFoldTargets(code, parsed.module, lang)) return null;
+	const ast = parsed.program;
 	const output = new MagicString(code);
 	let changed = false;
-	if (!isAstRecord(ast)) return null;
 	function overwriteGap(start, end, content) {
 		if (start === end) output.appendLeft(start, content);
 		else output.overwrite(start, end, content);
@@ -140,11 +162,12 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 		if (isFunctionNode(node)) {
 			const parameterScope = createAstScope(parentScope);
 			collectBindingNames(node.id, parameterScope.bindings);
-			for (const parameter of nodeArray(node.params)) {
+			for (const parameter of node.params) {
 				collectBindingNames(parameter, parameterScope.bindings);
-				if (isAstRecord(parameter)) visit(parameter, parameterScope);
+				visit(parameter, parameterScope);
 			}
-			if (isAstRecord(node.body)) if (node.body.type === "BlockStatement") {
+			if (!node.body) return;
+			if (node.body.type === "BlockStatement") {
 				const bodyScope = createAstScope(parameterScope);
 				collectDirectScopeBindings(node.body, bodyScope);
 				collectVarScopeBindings(node.body, bodyScope);
@@ -153,29 +176,29 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 			return;
 		}
 		if (node.type === "SwitchStatement") {
-			if (isAstRecord(node.discriminant)) visit(node.discriminant, parentScope);
+			visit(node.discriminant, parentScope);
 			const switchScope = createAstScope(parentScope);
 			collectSwitchScopeBindings(node, switchScope);
-			for (const switchCase of nodeArray(node.cases)) if (isAstRecord(switchCase)) visit(switchCase, switchScope);
+			for (const switchCase of node.cases) visit(switchCase, switchScope);
 			return;
 		}
 		const scope = createChildScope(node, parentScope) ?? parentScope;
-		if (node.type === "IfStatement" && hasRange(node)) {
+		if (node.type === "IfStatement") {
 			const result = evaluateConsumerCondition(node.test, replacements, scope);
 			if (result !== null) {
 				const selected = result.value ? node.consequent : node.alternate;
 				if (result.effects.length > 0) {
-					const effects = result.effects.filter(hasRange);
+					const effects = result.effects;
 					for (const effect of effects) visit(effect, scope);
-					if (isAstRecord(selected) && hasRange(selected)) visit(selected, scope);
+					if (selected) visit(selected, scope);
 					overwriteGap(node.start, effects[0].start, "{ (");
 					for (let index = 1; index < effects.length; index++) overwriteGap(effects[index - 1].end, effects[index].start, "); (");
 					const lastEffect = effects.at(-1);
-					if (isAstRecord(selected) && hasRange(selected)) {
+					if (selected) {
 						overwriteGap(lastEffect.end, selected.start, "); ");
 						overwriteGap(selected.end, node.end, " }");
 					} else overwriteGap(lastEffect.end, node.end, "); }");
-				} else if (isAstRecord(selected) && hasRange(selected)) {
+				} else if (selected) {
 					output.remove(node.start, selected.start);
 					output.remove(selected.end, node.end);
 					visit(selected, scope);
@@ -184,12 +207,12 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 				return;
 			}
 		}
-		if (node.type === "ConditionalExpression" && hasRange(node)) {
+		if (node.type === "ConditionalExpression") {
 			const result = evaluateConsumerCondition(node.test, replacements, scope);
 			const selected = result?.value ? node.consequent : node.alternate;
-			if (result !== null && isAstRecord(selected) && hasRange(selected)) {
+			if (result !== null) {
 				if (result.effects.length > 0) {
-					const effects = result.effects.filter(hasRange);
+					const effects = result.effects;
 					for (const effect of effects) visit(effect, scope);
 					visit(selected, scope);
 					overwriteGap(node.start, effects[0].start, "((");
@@ -206,10 +229,10 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 				return;
 			}
 		}
-		if (node.type === "LogicalExpression" && hasRange(node)) {
+		if (node.type === "LogicalExpression") {
 			const result = evaluateConsumerCondition(node, replacements, scope);
 			if (result !== null) {
-				const effects = result.effects.filter(hasRange);
+				const effects = result.effects;
 				if (effects.length > 0) {
 					for (const effect of effects) visit(effect, scope);
 					overwriteGap(node.start, effects[0].start, "((");
@@ -220,21 +243,21 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 				return;
 			}
 		}
-		if (node.type === "UnaryExpression" && node.operator === "typeof" && isIdentifierNamed(node.argument, "window") && replacements.typeofWindow !== void 0 && !hasAstBinding(scope, "window") && hasRange(node)) {
+		if (node.type === "UnaryExpression" && node.operator === "typeof" && isIdentifierNamed(node.argument, "window") && replacements.typeofWindow !== void 0 && !hasAstBinding(scope, "window")) {
 			output.overwrite(node.start, node.end, JSON.stringify(replacements.typeofWindow));
 			changed = true;
 			return;
 		}
-		if (replacements.processBrowser !== void 0 && isProcessBrowserMember(node, scope) && hasRange(node)) {
+		if (replacements.processBrowser !== void 0 && isProcessBrowserMember(node, scope)) {
 			output.overwrite(node.start, node.end, String(replacements.processBrowser));
 			changed = true;
 			return;
 		}
 		forEachAstChild(node, (child) => visit(child, scope));
 	}
-	for (const node of ast.body) if (isAstRecord(node)) visit(node, rootScope);
+	for (const node of ast.body) visit(node, rootScope);
 	if (!changed) return null;
 	return magicStringTransformResult(output);
 }
 //#endregion
-export { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, replaceConsumerEnvironmentConditions, replaceTypeofWindow };
+export { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, mayFoldChangeScannedImports, replaceConsumerEnvironmentConditions, replaceTypeofWindow };

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

@@ -3,10 +3,7 @@ import { Plugin } from "vite";
 type Options = {
   projectRoot: string;
   cacheRuntime: string;
-  getAppDir: () => string | undefined;
-  matchesPageExtension: (fileName: string) => boolean;
   allowMissingRsc?: boolean;
 };
-declare function createUseCacheCallablePlugin(options: Options): Promise<Plugin>;
-//#endregion
-export { createUseCacheCallablePlugin };
+export declare function createUseCacheCallablePlugin(options: Options): Promise<Plugin>;
+//#endregion