vinext 0.1.2 → 0.1.4

package/dist/plugins/dynamic-preload-metadata.js

@@ -1,4 +1,5 @@
 import { isUnknownRecord } from "../utils/record.js";
+import { hasTrailingComma } from "../utils/has-trailing-comma.js";
 import { relativeWithinRoot, tryRealpathSync } from "../build/ssr-manifest.js";
 import path from "node:path";
 import { parseAst } from "vite";
@@ -281,15 +282,12 @@ function appendObjectProperty(output, objectNode, property) {
 	output.appendLeft(propertyEnd, `, ${property}`);
 	return true;
 }
-function stripComments(source) {
-	return source.replace(/\/\*[\s\S]*?\*\//g, "").replace(/\/\/[^\n]*/g, "");
-}
 function insertSecondOptionsArgument(output, code, callNode, firstArg, optionsLiteral) {
 	const callEnd = getNumber(callNode, "end");
 	const firstArgEnd = getNumber(firstArg, "end");
 	if (callEnd === null || firstArgEnd === null) return false;
 	const closeParen = callEnd - 1;
-	const separator = stripComments(code.slice(firstArgEnd, closeParen)).trimEnd().endsWith(",") ? " " : ", ";
+	const separator = hasTrailingComma(code.slice(firstArgEnd, closeParen)) ? " " : ", ";
 	output.appendLeft(closeParen, `${separator}${optionsLiteral}`);
 	return true;
 }

package/dist/plugins/extensionless-dynamic-import.d.ts

@@ -0,0 +1,6 @@
+import { Plugin } from "vite";
+
+//#region src/plugins/extensionless-dynamic-import.d.ts
+declare function createExtensionlessDynamicImportPlugin(): Plugin;
+//#endregion
+export { createExtensionlessDynamicImportPlugin };

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

@@ -0,0 +1,152 @@
+import { forEachAstChild, hasRange, isAstRecord, nodeArray } from "./ast-utils.js";
+import { parseAst } from "vite";
+import MagicString from "magic-string";
+//#region src/plugins/extensionless-dynamic-import.ts
+const MODULE_EXTENSIONS = [
+	".mjs",
+	".js",
+	".mts",
+	".ts",
+	".jsx",
+	".tsx",
+	".json"
+];
+const TRANSFORMABLE_EXTENSIONS = new Set([
+	".mjs",
+	".js",
+	".mts",
+	".ts",
+	".jsx",
+	".tsx",
+	".cjs",
+	".cts"
+]);
+function createExtensionlessDynamicImportPlugin() {
+	let moduleExtensions = MODULE_EXTENSIONS;
+	return {
+		name: "vinext:extensionless-dynamic-import",
+		enforce: "pre",
+		configResolved(config) {
+			moduleExtensions = getModuleExtensions(config);
+		},
+		transform(code, id) {
+			if (!/\bimport\s*\(/.test(code)) return null;
+			if (isDependencyId(id)) return null;
+			const lang = langForId(id);
+			if (!lang) return null;
+			let ast;
+			try {
+				ast = parseAst(code, { lang });
+			} catch {
+				return null;
+			}
+			const imports = collectExtensionlessImports(ast, code, moduleExtensions);
+			if (imports.length === 0) return null;
+			const output = new MagicString(code);
+			for (const dynamicImport of imports) {
+				const source = code.slice(dynamicImport.sourceStart, dynamicImport.sourceEnd);
+				output.overwrite(dynamicImport.start, dynamicImport.end, buildReplacement(source, dynamicImport.globPattern, dynamicImport.moduleExtensions));
+			}
+			return {
+				code: output.toString(),
+				map: output.generateMap({ hires: "boundary" })
+			};
+		}
+	};
+}
+function langForId(id) {
+	const clean = id.split("?", 1)[0];
+	const dot = clean.lastIndexOf(".");
+	if (dot < 0) return null;
+	const ext = clean.slice(dot).toLowerCase();
+	if (!TRANSFORMABLE_EXTENSIONS.has(ext)) return null;
+	if (ext === ".ts" || ext === ".mts" || ext === ".cts") return "ts";
+	if (ext === ".tsx") return "tsx";
+	return "jsx";
+}
+function isDependencyId(id) {
+	return id.split("?", 1)[0].replaceAll("\\", "/").includes("/node_modules/");
+}
+function collectExtensionlessImports(ast, code, moduleExtensions) {
+	const imports = [];
+	function visit(value) {
+		if (!isAstRecord(value)) return;
+		const parsed = parseExtensionlessImport(value, code, moduleExtensions);
+		if (parsed) {
+			imports.push(parsed);
+			return;
+		}
+		forEachAstChild(value, visit);
+	}
+	visit(ast);
+	return imports;
+}
+function parseExtensionlessImport(node, code, moduleExtensions) {
+	if (node.type !== "ImportExpression" || !hasRange(node)) return null;
+	if (node.options != null) return null;
+	const source = node.source;
+	if (!isAstRecord(source) || source.type !== "TemplateLiteral" || !hasRange(source)) return null;
+	if (nodeArray(source.expressions).length === 0) return null;
+	const quasiTexts = nodeArray(source.quasis).map(templateElementText);
+	if (quasiTexts.some((text) => text == null)) return null;
+	const texts = quasiTexts;
+	const first = texts[0];
+	if (!isImportPrefix(code.slice(node.start, source.start))) return null;
+	if (!(first.startsWith("./") || first.startsWith("../"))) return null;
+	if (texts.some((text) => /[*?[\]{}()!?#]/.test(text))) return null;
+	if (texts.slice(1).some((text) => text.includes("."))) return null;
+	const directoryEnd = first.lastIndexOf("/") + 1;
+	const directory = first.slice(0, directoryEnd);
+	const filenamePrefix = first.slice(directoryEnd);
+	if (filenamePrefix.includes(".")) return null;
+	return {
+		start: node.start,
+		end: node.end,
+		sourceStart: source.start,
+		sourceEnd: source.end,
+		globPattern: filenamePrefix.length > 0 ? [`${first}*`, `${first}*/**/*`] : `${directory}**/*`,
+		moduleExtensions
+	};
+}
+function isImportPrefix(value) {
+	const prefix = value.match(/^import\s*\(/)?.[0];
+	if (!prefix) return false;
+	let index = prefix.length;
+	while (index < value.length) {
+		const char = value[index];
+		if (/\s/.test(char)) {
+			index += 1;
+			continue;
+		}
+		if (value.startsWith("/*", index)) {
+			const commentEnd = value.indexOf("*/", index + 2);
+			if (commentEnd < 0) return false;
+			index = commentEnd + 2;
+			continue;
+		}
+		if (value.startsWith("//", index)) {
+			const lineEnd = value.indexOf("\n", index + 2);
+			if (lineEnd < 0) return true;
+			index = lineEnd + 1;
+			continue;
+		}
+		return false;
+	}
+	return true;
+}
+function templateElementText(value) {
+	if (!isAstRecord(value) || value.type !== "TemplateElement") return null;
+	const templateValue = value.value;
+	if (typeof templateValue !== "object" || templateValue === null) return null;
+	const cooked = Reflect.get(templateValue, "cooked");
+	return typeof cooked === "string" ? cooked : null;
+}
+function getModuleExtensions(config) {
+	return config.resolve.extensions.filter((extension) => extension !== ".node");
+}
+function buildReplacement(source, globPattern, moduleExtensions) {
+	const extensions = JSON.stringify(moduleExtensions);
+	return `((__vinextPath, __vinextModules = import.meta.glob(${JSON.stringify(globPattern)}), __vinextExtensions = ${extensions}) => { const __vinextLoader = __vinextModules[__vinextPath] ?? __vinextExtensions.map((__vinextExtension) => __vinextModules[__vinextPath + __vinextExtension]).find(Boolean) ?? __vinextExtensions.map((__vinextExtension) => __vinextModules[__vinextPath + "/index" + __vinextExtension]).find(Boolean); return __vinextLoader ? __vinextLoader() : Promise.reject(new Error("Cannot find module '" + __vinextPath + "'")); })(${source})`;
+}
+//#endregion
+export { createExtensionlessDynamicImportPlugin };

package/dist/plugins/fonts.js

@@ -1,4 +1,5 @@
 import { escapeRegExp } from "../utils/regex.js";
+import { lastSignificantChar } from "../utils/has-trailing-comma.js";
 import { buildFallbackFontFace, getFallbackFontOverrideMetrics } from "../build/google-fonts/fallback-metrics.js";
 import { validateGoogleFontOptions } from "../build/google-fonts/validate.js";
 import { getFontAxes } from "../build/google-fonts/get-axes.js";
@@ -552,8 +553,8 @@ function createGoogleFontsPlugin(fontGoogleShimPath, shimsDir) {
 					if (validatedFontStyle) internalFontProperties.push(`fontStyle: ${JSON.stringify(validatedFontStyle)}`);
 					const injectedProperties = [`_vinext: { font: { ${internalFontProperties.join(", ")} } }`];
 					const closingBrace = optionsStr.lastIndexOf("}");
-					const beforeBrace = optionsStr.slice(0, closingBrace).trim();
-					const separator = beforeBrace.endsWith("{") || beforeBrace.endsWith(",") ? "" : ", ";
+					const lastChar = lastSignificantChar(optionsStr.slice(0, closingBrace));
+					const separator = lastChar === "{" || lastChar === "," ? "" : ", ";
 					const replacement = `${calleeSource}(${optionsStr.slice(0, closingBrace) + separator + injectedProperties.join(", ") + optionsStr.slice(closingBrace)})`;
 					s.overwrite(callStart, callEnd, replacement);
 					overwrittenRanges.push([callStart, callEnd]);
@@ -688,8 +689,8 @@ function createLocalFontsPlugin(shimsDir) {
 					if (familyPayloadInsertions.has(insertAt)) continue;
 					const optionsStr = code.slice(objRange[0], objRange[1]);
 					if (/(?:^|[,{])\s*_vinext\s*:/.test(optionsStr)) continue;
-					const beforeClosingBrace = optionsStr.slice(0, -1).trim();
-					const separator = beforeClosingBrace.endsWith("{") || beforeClosingBrace.endsWith(",") ? "" : ", ";
+					const lastChar = lastSignificantChar(optionsStr.slice(0, -1));
+					const separator = lastChar === "{" || lastChar === "," ? "" : ", ";
 					s.appendLeft(insertAt, `${separator}_vinext: { font: { family: ${JSON.stringify(bindingName)} } }`);
 					familyPayloadInsertions.add(insertAt);
 					hasChanges = true;

package/dist/plugins/optimize-imports.d.ts

@@ -14,6 +14,7 @@ type BarrelExportMap = Map<string, BarrelExportEntry>;
  * @see https://github.com/vercel/next.js/blob/9c31bbdaa/packages/next/src/server/config.ts#L1301
  */
 declare const DEFAULT_OPTIMIZE_PACKAGES: string[];
+declare function createOptimizedImportSourceMatcher(packages: Iterable<string>): (code: string) => boolean;
 /**
  * Build a map of exported names → source sub-module for a barrel package.
  *
@@ -38,4 +39,4 @@ declare function buildBarrelExportMap(entryPath: string | null, readFile: (filep
  */
 declare function createOptimizeImportsPlugin(getNextConfig: () => ResolvedNextConfig | undefined, getRoot: () => string): Plugin;
 //#endregion
-export { DEFAULT_OPTIMIZE_PACKAGES, buildBarrelExportMap, createOptimizeImportsPlugin };
+export { DEFAULT_OPTIMIZE_PACKAGES, buildBarrelExportMap, createOptimizeImportsPlugin, createOptimizedImportSourceMatcher };

package/dist/plugins/optimize-imports.js

@@ -1,4 +1,5 @@
 import { normalizePathSeparators } from "../utils/path.js";
+import { escapeRegExp } from "../utils/regex.js";
 import { getAstName } from "./ast-utils.js";
 import { createRequire } from "node:module";
 import path from "node:path";
@@ -100,6 +101,12 @@ const DEFAULT_OPTIMIZE_PACKAGES = [
 	"react-icons/wi",
 	"radix-ui"
 ];
+function createOptimizedImportSourceMatcher(packages) {
+	const pattern = [...packages].map(escapeRegExp).join("|");
+	if (!pattern) return () => false;
+	const importFromPattern = new RegExp(String.raw`(?:^|[;}\n\r])\s*import(?!\s*\()(?:(?!\bfrom\b)[\s\S])*?\bfrom\s*["'](?:${pattern})["']`, "m");
+	return (code) => code.includes("import") && code.includes("from") && importFromPattern.test(code);
+}
 /**
 * Resolve a package.json exports value to a string entry path.
 * Prefers node → import → module → default conditions, recursing into nested objects.
@@ -417,14 +424,14 @@ function createOptimizeImportsPlugin(getNextConfig, getRoot) {
 	};
 	const entryPathCache = /* @__PURE__ */ new Map();
 	let optimizedPackages = /* @__PURE__ */ new Set();
-	let quotedPackages = [];
+	let hasOptimizedImportSource = () => false;
 	const registeredBarrels = /* @__PURE__ */ new Set();
 	return {
 		name: "vinext:optimize-imports",
 		buildStart() {
 			const nextConfig = getNextConfig();
 			optimizedPackages = new Set([...DEFAULT_OPTIMIZE_PACKAGES, ...nextConfig?.optimizePackageImports ?? []]);
-			quotedPackages = [...optimizedPackages].flatMap((pkg) => [`"${pkg}"`, `'${pkg}'`]);
+			hasOptimizedImportSource = createOptimizedImportSourceMatcher(optimizedPackages);
 			entryPathCache.clear();
 			barrelCaches.exportMapCache.clear();
 			barrelCaches.subpkgOrigin.clear();
@@ -445,12 +452,7 @@ function createOptimizeImportsPlugin(getNextConfig, getRoot) {
 				const preferReactServer = env?.name === "rsc";
 				if (id.startsWith("\0")) return null;
 				const packages = optimizedPackages;
-				let hasBarrelImport = false;
-				for (const quoted of quotedPackages) if (code.includes(quoted)) {
-					hasBarrelImport = true;
-					break;
-				}
-				if (!hasBarrelImport) return null;
+				if (!hasOptimizedImportSource(code)) return null;
 				let ast;
 				try {
 					ast = parseAst(code);
@@ -576,4 +578,4 @@ function createOptimizeImportsPlugin(getNextConfig, getRoot) {
 	};
 }
 //#endregion
-export { DEFAULT_OPTIMIZE_PACKAGES, buildBarrelExportMap, createOptimizeImportsPlugin };
+export { DEFAULT_OPTIMIZE_PACKAGES, buildBarrelExportMap, createOptimizeImportsPlugin, createOptimizedImportSourceMatcher };

package/dist/plugins/postcss.js

@@ -1,8 +1,11 @@
+import { importExportWithCommonJsFallback } from "../utils/commonjs-loader.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
-import { pathToFileURL } from "node:url";
 //#region src/plugins/postcss.ts
+async function loadPluginExport(resolvedPath) {
+	return importExportWithCommonJsFallback(resolvedPath);
+}
 /**
 * PostCSS config file names to search for, in priority order.
 * Matches the same search order as postcss-load-config / lilconfig.
@@ -65,8 +68,7 @@ async function resolvePostcssStringPluginsUncached(projectRoot) {
 		if (configPath.endsWith(".postcssrc")) {
 			if (fs.readFileSync(configPath, "utf-8").trim().startsWith("{")) return;
 		}
-		const mod = await import(pathToFileURL(configPath).href);
-		config = mod.default ?? mod;
+		config = await importExportWithCommonJsFallback(configPath);
 	} catch {
 		return;
 	}
@@ -76,14 +78,12 @@ async function resolvePostcssStringPluginsUncached(projectRoot) {
 	try {
 		return { plugins: await Promise.all(config.plugins.filter(Boolean).map(async (plugin) => {
 			if (typeof plugin === "string") {
-				const mod = await import(pathToFileURL(req.resolve(plugin)).href);
-				const fn = mod.default ?? mod;
+				const fn = await loadPluginExport(req.resolve(plugin));
 				return typeof fn === "function" ? fn() : fn;
 			}
 			if (Array.isArray(plugin) && typeof plugin[0] === "string") {
 				const [name, options] = plugin;
-				const mod = await import(pathToFileURL(req.resolve(name)).href);
-				const fn = mod.default ?? mod;
+				const fn = await loadPluginExport(req.resolve(name));
 				return typeof fn === "function" ? fn(options) : fn;
 			}
 			return plugin;

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

@@ -1,13 +1,15 @@
 //#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;
 /**
- * Strip server-only data-fetching exports (getServerSideProps,
- * getStaticProps, getStaticPaths) from page modules for the client
- * bundle. Uses Vite's parseAst (Rollup/acorn) for correct handling
- * of all export patterns including function expressions, arrow
- * functions with TS return types, and re-exports.
+ * Strip server-only Pages Router data-fetching exports and their unique
+ * dependency graph from browser bundles.
  *
- * Modeled after Next.js's SWC `next-ssg-transform`.
+ * Ported from Next.js:
+ * - test/unit/babel-plugin-next-ssg-transform.test.ts
+ * - crates/next-custom-transforms/src/transforms/strip_page_exports.rs
  */
 declare function stripServerExports(code: string): string | null;
 //#endregion
-export { stripServerExports };
+export { hasExportAllCandidate, hasServerExportCandidate, stripServerExports, validatePageExports };