vinext 1.1.0 → 1.2.1

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 { packageNameFromSpecifier } from "../utils/package-name.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/rsc-scan-glob-imports.d.ts

@@ -0,0 +1,19 @@
+import { Plugin, ResolvedConfig } from "vite";
+import { RscPluginManager } from "@vitejs/plugin-rsc";
+//#region src/plugins/rsc-scan-glob-imports.d.ts
+/**
+ * @vitejs/plugin-rsc 0.5.36 and 0.5.37 reduce scan-build modules to their
+ * import specifiers with es-module-lexer v3, which reports template-literal
+ * dynamic imports as glob patterns (``import(`file://${p}`)`` becomes
+ * `"file://*"`). The scan then emits them as plain imports, which fail to
+ * resolve (e.g. in @module-federation/vite). Other versions skip these
+ * specifiers (0.5.38 via vitejs/vite-plugin-react#1506), so for the affected
+ * ones keep the specifiers that don't resolve external during the scan. A real
+ * module whose specifier contains `*` still resolves and stays in the scan
+ * graph. The scan's output is discarded, so nothing else changes.
+ */
+export declare function isRscScanGlobImportsAffected(version: string): boolean;
+export declare function createRscScanGlobImportsPlugin(options: {
+  getManager: (config: ResolvedConfig) => Promise<RscPluginManager | undefined>;
+}): Plugin;
+//#endregion

package/dist/plugins/rsc-scan-glob-imports.js

@@ -0,0 +1,50 @@
+import { isVersionBelow } from "../utils/react-version.js";
+//#region src/plugins/rsc-scan-glob-imports.ts
+/**
+* @vitejs/plugin-rsc 0.5.36 and 0.5.37 reduce scan-build modules to their
+* import specifiers with es-module-lexer v3, which reports template-literal
+* dynamic imports as glob patterns (``import(`file://${p}`)`` becomes
+* `"file://*"`). The scan then emits them as plain imports, which fail to
+* resolve (e.g. in @module-federation/vite). Other versions skip these
+* specifiers (0.5.38 via vitejs/vite-plugin-react#1506), so for the affected
+* ones keep the specifiers that don't resolve external during the scan. A real
+* module whose specifier contains `*` still resolves and stays in the scan
+* graph. The scan's output is discarded, so nothing else changes.
+*/
+function isRscScanGlobImportsAffected(version) {
+	return !isVersionBelow(version, [
+		0,
+		5,
+		36
+	]) && isVersionBelow(version, [
+		0,
+		5,
+		38
+	]);
+}
+function createRscScanGlobImportsPlugin(options) {
+	return {
+		name: "vinext:rsc-scan-glob-imports",
+		apply: "build",
+		enforce: "pre",
+		resolveId: {
+			filter: { id: /\*/ },
+			async handler(source, importer, resolveOptions) {
+				if (!(await options.getManager(this.environment.config))?.isScanBuild) return;
+				try {
+					const resolved = await this.resolve(source, importer, {
+						...resolveOptions,
+						skipSelf: true
+					});
+					if (resolved) return resolved;
+				} catch {}
+				return {
+					id: source,
+					external: true
+				};
+			}
+		}
+	};
+}
+//#endregion
+export { createRscScanGlobImportsPlugin, isRscScanGlobImportsAffected };