vinext 0.1.3 → 0.1.5

package/dist/plugins/css-data-url.js

@@ -36,33 +36,37 @@ function dataUrlCssPlugin() {
 	return {
 		name: "vinext:css-data-url",
 		enforce: "pre",
-		transform(code, id) {
-			if (!code.includes(DATA_URL_HINT)) return null;
-			if (id.startsWith(VIRTUAL_PREFIX)) return null;
-			let mutated = false;
-			const rewritten = code.replace(DATA_URL_IMPORT_RE, (_match, quote, moduleFlag, base64Flag, payload) => {
-				const isModule = moduleFlag === "+module";
-				const isBase64 = base64Flag === ";base64";
-				let css;
-				try {
-					css = decode(payload, isBase64);
-				} catch (err) {
-					throw new Error(`[vinext] Failed to decode CSS data URL import in ${id}: ${err.message}`);
-				}
-				const ext = isModule ? ".module.css" : ".css";
-				const syntheticId = `${VIRTUAL_PREFIX}${hash(css + ext)}${ext}`;
-				entries.set(syntheticId, {
-					css,
-					isModule
+		transform: {
+			filter: {
+				id: { exclude: new RegExp(`^${VIRTUAL_PREFIX}`) },
+				code: DATA_URL_HINT
+			},
+			handler(code, id) {
+				let mutated = false;
+				const rewritten = code.replace(DATA_URL_IMPORT_RE, (_match, quote, moduleFlag, base64Flag, payload) => {
+					const isModule = moduleFlag === "+module";
+					const isBase64 = base64Flag === ";base64";
+					let css;
+					try {
+						css = decode(payload, isBase64);
+					} catch (err) {
+						throw new Error(`[vinext] Failed to decode CSS data URL import in ${id}: ${err.message}`);
+					}
+					const ext = isModule ? ".module.css" : ".css";
+					const syntheticId = `${VIRTUAL_PREFIX}${hash(css + ext)}${ext}`;
+					entries.set(syntheticId, {
+						css,
+						isModule
+					});
+					mutated = true;
+					return `${quote}${syntheticId}${quote}`;
 				});
-				mutated = true;
-				return `${quote}${syntheticId}${quote}`;
-			});
-			if (!mutated) return null;
-			return {
-				code: rewritten,
-				map: null
-			};
+				if (!mutated) return null;
+				return {
+					code: rewritten,
+					map: null
+				};
+			}
 		},
 		resolveId(id) {
 			if (id.startsWith(VIRTUAL_PREFIX)) return id;

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.js

@@ -29,28 +29,34 @@ function createExtensionlessDynamicImportPlugin() {
 		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;
+		transform: {
+			filter: {
+				id: {
+					include: /\.(?:[cm]?[jt]s|[jt]sx)(?:\?.*)?$/i,
+					exclude: /[\\/]node_modules[\\/]/
+				},
+				code: /\bimport\s*\(/
+			},
+			handler(code, id) {
+				const lang = langForId(id);
+				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" })
+				};
 			}
-			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" })
-			};
 		}
 	};
 }
@@ -64,9 +70,6 @@ function langForId(id) {
 	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) {

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/import-meta-url.js

@@ -1,3 +1,4 @@
+import { VIRTUAL_MODULE_ID_RE } from "../utils/virtual-module.js";
 import { collectBindingNames, forEachAstChild, hasRange, isAstRecord, isIdentifierNamed, nodeArray } from "./ast-utils.js";
 import { tryRealpathSync } from "../build/ssr-manifest.js";
 import path from "node:path";
@@ -32,18 +33,26 @@ function createImportMetaUrlPlugin(options) {
 			outputDirs = [config.build.outDir];
 			rootPaths = createRootPaths(root, { outputDirs });
 		},
-		transform(code, id) {
-			if (!mayContainSourceIdentityToken(code)) return null;
-			const paths = getRootPaths();
-			if (!paths) return null;
-			const canonicalId = transformableModuleCanonicalId(cleanModuleId(id), paths);
-			if (!canonicalId) return null;
-			const rewritten = rewriteCanonicalSourceIdentity(code, canonicalId, paths, this.environment?.name === "client" ? "client" : "server");
-			if (!rewritten) return null;
-			return {
-				code: rewritten.code,
-				map: rewritten.map
-			};
+		transform: {
+			filter: {
+				id: {
+					include: /\.(?:[cm]?[jt]s|[jt]sx)(?:\?.*)?$/,
+					exclude: [/[\\/]node_modules[\\/]/, VIRTUAL_MODULE_ID_RE]
+				},
+				code: /import\.meta(?:\.|\?\.)url|__filename|__dirname/
+			},
+			handler(code, id) {
+				const paths = getRootPaths();
+				if (!paths) return null;
+				const canonicalId = transformableModuleCanonicalId(cleanModuleId(id), paths);
+				if (!canonicalId) return null;
+				const rewritten = rewriteCanonicalSourceIdentity(code, canonicalId, paths, this.environment?.name === "client" ? "client" : "server");
+				if (!rewritten) return null;
+				return {
+					code: rewritten.code,
+					map: rewritten.map
+				};
+			}
 		}
 	};
 }
@@ -120,9 +129,6 @@ function mayContainImportMetaUrl(code) {
 function mayContainServerCjsGlobal(code) {
 	return code.includes("__filename") || code.includes("__dirname");
 }
-function mayContainSourceIdentityToken(code) {
-	return mayContainImportMetaUrl(code) || mayContainServerCjsGlobal(code);
-}
 function excludedRelativePrefixes(canonicalRoot, normalizedRoot, options) {
 	const prefixes = new Set([
 		".next",

package/dist/plugins/instrumentation-client.js

@@ -8,7 +8,7 @@ function createInstrumentationClientTransformPlugin(getInstrumentationClientPath
 		transform(code, id) {
 			const instrumentationClientPath = getInstrumentationClientPath();
 			if (!instrumentationClientPath) return null;
-			if (normalizePath(id.split("?", 1)[0]) !== normalizePath(instrumentationClientPath)) return null;
+			if (normalizePath(id.split("?", 1)[0]) !== instrumentationClientPath) return null;
 			if (code.includes("__vinextInstrumentationClientStart")) return null;
 			const ast = parseAst(code);
 			let insertPos = 0;

package/dist/plugins/middleware-server-only.js

@@ -1,3 +1,4 @@
+import { normalizePathSeparators } from "../utils/path.js";
 //#region src/plugins/middleware-server-only.ts
 /**
 * Allow `import 'server-only'` from middleware (and any module reachable
@@ -44,16 +45,16 @@
 */
 function createMiddlewareServerOnlyPlugin(options) {
 	const tainted = /* @__PURE__ */ new Set();
+	function canonicalizeId(id) {
+		const queryIndex = id.indexOf("?");
+		return normalizePathSeparators(queryIndex === -1 ? id : id.slice(0, queryIndex));
+	}
 	function isTainted(id) {
 		if (!id) return false;
-		if (tainted.has(id)) return true;
-		const queryIndex = id.indexOf("?");
-		if (queryIndex !== -1) return tainted.has(id.slice(0, queryIndex));
-		return false;
+		return tainted.has(canonicalizeId(id));
 	}
 	function addTainted(id) {
-		const queryIndex = id.indexOf("?");
-		tainted.add(queryIndex === -1 ? id : id.slice(0, queryIndex));
+		tainted.add(canonicalizeId(id));
 	}
 	return {
 		name: "vinext:middleware-server-only",

package/dist/plugins/og-assets.js

@@ -25,54 +25,56 @@ function createOgInlineFetchAssetsPlugin() {
 		buildStart() {
 			if (isBuild) cache.clear();
 		},
-		async transform(code, id) {
-			if (!code.includes("import.meta.url")) return null;
-			const useCache = isBuild;
-			const moduleDir = path.dirname(id);
-			let newCode = code;
-			let didReplace = false;
-			const readAsBase64 = async (absPath) => {
-				const cached = useCache ? cache.get(absPath) : void 0;
-				if (cached !== void 0) return cached;
-				try {
-					const b64 = (await fs.promises.readFile(absPath)).toString("base64");
-					if (useCache) cache.set(absPath, b64);
-					return b64;
-				} catch {
-					return null;
+		transform: {
+			filter: { code: "import.meta.url" },
+			async handler(code, id) {
+				const useCache = isBuild;
+				const moduleDir = path.dirname(id);
+				let newCode = code;
+				let didReplace = false;
+				const readAsBase64 = async (absPath) => {
+					const cached = useCache ? cache.get(absPath) : void 0;
+					if (cached !== void 0) return cached;
+					try {
+						const b64 = (await fs.promises.readFile(absPath)).toString("base64");
+						if (useCache) cache.set(absPath, b64);
+						return b64;
+					} catch {
+						return null;
+					}
+				};
+				if (code.includes("fetch(")) for (const match of code.matchAll(/fetch\(\s*new URL\(\s*(["'])(\.[^"']+)\1\s*,\s*import\.meta\.url\s*\)\s*\)(?:\.then\(\s*(?:function\s*\([^)]*\)|\([^)]*\)\s*=>)\s*\{?\s*return\s+[^.]+\.arrayBuffer\(\)\s*;?\s*\}?\s*,?\s*\)|\.then\(\s*\([^)]*\)\s*=>\s*[^.]+\.arrayBuffer\(\)\s*,?\s*\))/g)) {
+					const fullMatch = match[0];
+					const relPath = match[2];
+					const fileBase64 = await readAsBase64(path.resolve(moduleDir, relPath));
+					if (fileBase64 === null) continue;
+					const inlined = [
+						`(function(){`,
+						`var b=${JSON.stringify(fileBase64)};`,
+						`var r=atob(b);`,
+						`var a=new Uint8Array(r.length);`,
+						`for(var i=0;i<r.length;i++)a[i]=r.charCodeAt(i);`,
+						`return Promise.resolve(a.buffer);`,
+						`})()`
+					].join("");
+					newCode = newCode.replaceAll(fullMatch, inlined);
+					didReplace = true;
 				}
-			};
-			if (code.includes("fetch(")) for (const match of code.matchAll(/fetch\(\s*new URL\(\s*(["'])(\.[^"']+)\1\s*,\s*import\.meta\.url\s*\)\s*\)(?:\.then\(\s*(?:function\s*\([^)]*\)|\([^)]*\)\s*=>)\s*\{?\s*return\s+[^.]+\.arrayBuffer\(\)\s*;?\s*\}?\s*,?\s*\)|\.then\(\s*\([^)]*\)\s*=>\s*[^.]+\.arrayBuffer\(\)\s*,?\s*\))/g)) {
-				const fullMatch = match[0];
-				const relPath = match[2];
-				const fileBase64 = await readAsBase64(path.resolve(moduleDir, relPath));
-				if (fileBase64 === null) continue;
-				const inlined = [
-					`(function(){`,
-					`var b=${JSON.stringify(fileBase64)};`,
-					`var r=atob(b);`,
-					`var a=new Uint8Array(r.length);`,
-					`for(var i=0;i<r.length;i++)a[i]=r.charCodeAt(i);`,
-					`return Promise.resolve(a.buffer);`,
-					`})()`
-				].join("");
-				newCode = newCode.replaceAll(fullMatch, inlined);
-				didReplace = true;
-			}
-			if (code.includes("readFileSync(")) for (const match of newCode.matchAll(/[a-zA-Z_$][a-zA-Z0-9_$]*\.readFileSync\(\s*(?:[a-zA-Z_$][a-zA-Z0-9_$]*\.)?fileURLToPath\(\s*new URL\(\s*(["'])(\.[^"']+)\1\s*,\s*import\.meta\.url\s*\)\s*\)\s*\)/g)) {
-				const fullMatch = match[0];
-				const relPath = match[2];
-				const fileBase64 = await readAsBase64(path.resolve(moduleDir, relPath));
-				if (fileBase64 === null) continue;
-				const inlined = `Buffer.from(${JSON.stringify(fileBase64)},"base64")`;
-				newCode = newCode.replaceAll(fullMatch, inlined);
-				didReplace = true;
+				if (code.includes("readFileSync(")) for (const match of newCode.matchAll(/[a-zA-Z_$][a-zA-Z0-9_$]*\.readFileSync\(\s*(?:[a-zA-Z_$][a-zA-Z0-9_$]*\.)?fileURLToPath\(\s*new URL\(\s*(["'])(\.[^"']+)\1\s*,\s*import\.meta\.url\s*\)\s*\)\s*\)/g)) {
+					const fullMatch = match[0];
+					const relPath = match[2];
+					const fileBase64 = await readAsBase64(path.resolve(moduleDir, relPath));
+					if (fileBase64 === null) continue;
+					const inlined = `Buffer.from(${JSON.stringify(fileBase64)},"base64")`;
+					newCode = newCode.replaceAll(fullMatch, inlined);
+					didReplace = true;
+				}
+				if (!didReplace) return null;
+				return {
+					code: newCode,
+					map: null
+				};
 			}
-			if (!didReplace) return null;
-			return {
-				code: newCode,
-				map: null
-			};
 		}
 	};
 }

package/dist/plugins/optimize-imports.js

@@ -1,5 +1,6 @@
 import { normalizePathSeparators } from "../utils/path.js";
 import { escapeRegExp } from "../utils/regex.js";
+import { VIRTUAL_MODULE_ID_RE } from "../utils/virtual-module.js";
 import { getAstName } from "./ast-utils.js";
 import { createRequire } from "node:module";
 import path from "node:path";
@@ -445,12 +446,17 @@ function createOptimizeImportsPlugin(getNextConfig, getRoot) {
 			return await this.resolve(source, barrelEntry, { skipSelf: true }) ?? void 0;
 		},
 		transform: {
-			filter: { id: { include: /\.(tsx?|jsx?|mjs)$/ } },
-			async handler(code, id) {
+			filter: {
+				id: {
+					include: /\.(tsx?|jsx?|mjs)$/,
+					exclude: VIRTUAL_MODULE_ID_RE
+				},
+				code: /\bimport\b[\s\S]*\bfrom\b/
+			},
+			async handler(code) {
 				const env = this.environment;
 				if (env?.name === "client") return null;
 				const preferReactServer = env?.name === "rsc";
-				if (id.startsWith("\0")) return null;
 				const packages = optimizedPackages;
 				if (!hasOptimizedImportSource(code)) return null;
 				let ast;

package/dist/plugins/remove-console.d.ts

@@ -1,7 +1,13 @@
+import MagicString from "magic-string";
+
 //#region src/plugins/remove-console.d.ts
 type RemoveConsoleConfig = boolean | {
   exclude: string[];
 };
+type RemoveConsoleResult = {
+  code: string;
+  map: ReturnType<MagicString["generateMap"]>;
+};
 /**
  * Walk the AST body looking for expression statements whose expression is a
  * CallExpression with a callee of `console.<identifier>`. When found, check
@@ -10,6 +16,6 @@ type RemoveConsoleConfig = boolean | {
  *
  * Returns `null` if no console calls are removed.
  */
-declare function removeConsoleCalls(code: string, config: RemoveConsoleConfig): string | null;
+declare function removeConsoleCalls(code: string, config: RemoveConsoleConfig): RemoveConsoleResult | null;
 //#endregion
 export { removeConsoleCalls };

package/dist/plugins/remove-console.js

@@ -168,7 +168,10 @@ function removeConsoleCalls(code, config) {
 	}
 	for (const node of ast.body) walk(node);
 	if (!changed) return null;
-	return s.toString();
+	return {
+		code: s.toString(),
+		map: s.generateMap({ hires: "boundary" })
+	};
 }
 //#endregion
 export { removeConsoleCalls };

package/dist/plugins/require-context.js

@@ -16,30 +16,31 @@ function createRequireContextPlugin() {
 	return {
 		name: "vinext:require-context",
 		enforce: "pre",
-		transform(code, id) {
-			if (!mayContainRequireContext(code)) return null;
-			const lang = langForId(id);
-			if (!lang) return null;
-			let ast;
-			try {
-				ast = parseAst(code, { lang });
-			} catch {
-				return null;
+		transform: {
+			filter: {
+				id: /\.(?:[cm]?[jt]s|[jt]sx)(?:\?.*)?$/i,
+				code: /\brequire\b[\s\S]*\.context/
+			},
+			handler(code, id) {
+				const lang = langForId(id);
+				let ast;
+				try {
+					ast = parseAst(code, { lang });
+				} catch {
+					return null;
+				}
+				const calls = collectRequireContextCalls(ast);
+				if (calls.length === 0) return null;
+				const output = new MagicString(code);
+				for (const call of calls) output.overwrite(call.range.start, call.range.end, buildReplacement(call));
+				return {
+					code: output.toString(),
+					map: output.generateMap({ hires: "boundary" })
+				};
 			}
-			const calls = collectRequireContextCalls(ast);
-			if (calls.length === 0) return null;
-			const output = new MagicString(code);
-			for (const call of calls) output.overwrite(call.range.start, call.range.end, buildReplacement(call));
-			return {
-				code: output.toString(),
-				map: output.generateMap({ hires: "boundary" })
-			};
 		}
 	};
 }
-function mayContainRequireContext(code) {
-	return code.includes("require") && code.includes(".context");
-}
 function langForId(id) {
 	const clean = id.split("?", 1)[0];
 	const dot = clean.lastIndexOf(".");

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

@@ -1,13 +1,21 @@
+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;
+type StripServerExportsResult = {
+  code: string;
+  map: ReturnType<MagicString["generateMap"]>;
+};
 /**
- * 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;
+declare function stripServerExports(code: string): StripServerExportsResult | null;
 //#endregion
-export { stripServerExports };
+export { hasExportAllCandidate, hasServerExportCandidate, stripServerExports, validatePageExports };