vinext 0.1.4 → 0.1.6

package/dist/init.d.ts

@@ -10,7 +10,7 @@
  *   4. Rename CJS config files to .cjs
  *   5. Add vinext scripts to package.json
  *   6. Generate vite.config.ts
- *   7. Update .gitignore to include /dist/
+ *   7. Update .gitignore to include /dist/ and .vinext/
  *   8. Print summary
  *
  * Non-destructive: does NOT modify next.config, tsconfig, or source files.
@@ -32,7 +32,7 @@ type InitResult = {
   renamedConfigs: Array<[string, string]>; /** Whether scripts were added to package.json */
   addedScripts: string[]; /** Whether vite.config.ts was generated */
   generatedViteConfig: boolean; /** Whether vite.config.ts generation was skipped (already exists) */
-  skippedViteConfig: boolean; /** Whether .gitignore was updated to include /dist/ */
+  skippedViteConfig: boolean; /** Whether .gitignore was updated to include vinext-generated output */
   updatedGitignore: boolean;
 };
 declare function generateViteConfig(_isAppRouter: boolean): string;
@@ -59,8 +59,9 @@ declare function isDepInstalled(root: string, dep: string): boolean;
  */
 declare function getReactUpgradeDeps(root: string): string[];
 /**
- * Ensure /dist/ is listed in .gitignore. Creates the file if it doesn't exist.
- * Returns true if the file was modified (or created), false if /dist/ was already present.
+ * Ensure vinext-generated output directories are listed in .gitignore.
+ * Creates the file if it doesn't exist. Returns true if the file was modified
+ * (or created), false if all entries were already present.
  */
 declare function updateGitignore(root: string): boolean;
 declare function init(options: InitOptions): Promise<InitResult>;

package/dist/init.js

@@ -16,7 +16,7 @@ import { execFileSync } from "node:child_process";
 *   4. Rename CJS config files to .cjs
 *   5. Add vinext scripts to package.json
 *   6. Generate vite.config.ts
-*   7. Update .gitignore to include /dist/
+*   7. Update .gitignore to include /dist/ and .vinext/
 *   8. Print summary
 *
 * Non-destructive: does NOT modify next.config, tsconfig, or source files.
@@ -140,20 +140,39 @@ function installDeps(root, deps, exec, { dev = true } = {}) {
 	});
 }
 /**
-* Ensure /dist/ is listed in .gitignore. Creates the file if it doesn't exist.
-* Returns true if the file was modified (or created), false if /dist/ was already present.
+* Ensure vinext-generated output directories are listed in .gitignore.
+* Creates the file if it doesn't exist. Returns true if the file was modified
+* (or created), false if all entries were already present.
 */
 function updateGitignore(root) {
 	const gitignorePath = path.join(root, ".gitignore");
-	const exactEntry = "/dist/";
+	const entries = [{
+		entry: "/dist/",
+		coveredBy: new Set([
+			"/dist/",
+			"/dist",
+			"dist/",
+			"dist"
+		])
+	}, {
+		entry: ".vinext/",
+		coveredBy: new Set([
+			"/.vinext/",
+			"/.vinext",
+			".vinext/",
+			".vinext"
+		])
+	}];
 	let content = "";
+	let lines = [];
 	if (fs.existsSync(gitignorePath)) {
 		content = fs.readFileSync(gitignorePath, "utf-8");
-		const lines = content.split("\n").map((l) => l.trim());
-		if (lines.includes(exactEntry) || lines.includes("dist/") || lines.includes("dist")) return false;
+		lines = content.split("\n").map((l) => l.trim());
 	}
+	const missingEntries = entries.filter(({ coveredBy }) => !lines.some((line) => coveredBy.has(line))).map(({ entry }) => entry);
+	if (missingEntries.length === 0) return false;
 	const separator = content.length > 0 && !content.endsWith("\n") ? "\n" : "";
-	fs.writeFileSync(gitignorePath, content + separator + "/dist/\n", "utf-8");
+	fs.writeFileSync(gitignorePath, content + separator + missingEntries.join("\n") + "\n", "utf-8");
 	return true;
 }
 async function init(options) {
@@ -212,7 +231,7 @@ async function init(options) {
 	for (const script of addedScripts) console.log(`    \u2713 Added ${script} script`);
 	if (generatedViteConfig) console.log(`    \u2713 Generated vite.config.ts`);
 	if (skippedViteConfig) console.log(`    - Skipped vite.config.ts (already exists, use --force to overwrite)`);
-	if (updatedGitignore) console.log(`    \u2713 Added /dist/ to .gitignore`);
+	if (updatedGitignore) console.log(`    \u2713 Added vinext output directories to .gitignore`);
 	console.log(`
   Next steps:
     ${pmName} run dev:vinext    Start the vinext dev server

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/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

@@ -4,6 +4,7 @@ import { buildFallbackFontFace, getFallbackFontOverrideMetrics } from "../build/
 import { validateGoogleFontOptions } from "../build/google-fonts/validate.js";
 import { getFontAxes } from "../build/google-fonts/get-axes.js";
 import { buildGoogleFontsUrl } from "../build/google-fonts/build-url.js";
+import { findFontFilesInCss } from "../build/google-fonts/find-font-files-in-css.js";
 import { ASSET_PREFIX_URL_DIR } from "../utils/asset-prefix.js";
 import { CONTENT_TYPES } from "../server/static-file-cache.js";
 import fs from "node:fs";
@@ -543,11 +544,12 @@ function createGoogleFontsPlugin(fontGoogleShimPath, shimsDir) {
 						return;
 					}
 					const servedCSS = _rewriteCachedFontCssToServedUrls(localCSS, cacheDir, transformAssetsDir);
+					const preloadUrls = findFontFilesInCss(servedCSS, validated.preload ? validated.subsets : void 0).filter((file) => file.preloadFontFile).map((file) => file.googleFontFileUrl);
 					const fallbackMetrics = validated.adjustFontFallback === false ? void 0 : getFallbackFontOverrideMetrics(family);
 					const adjustedFallbackCSS = fallbackMetrics ? buildFallbackFontFace(family, fallbackMetrics) : void 0;
 					const validatedFontWeight = validated.weights.length === 1 && validated.weights[0] !== "variable" ? Number(validated.weights[0]) : void 0;
 					const validatedFontStyle = validated.styles.length === 1 ? validated.styles[0] : void 0;
-					const internalFontProperties = [`selfHostedCSS: ${JSON.stringify(servedCSS)}`];
+					const internalFontProperties = [`selfHostedCSS: ${JSON.stringify(servedCSS)}`, `preloadUrls: ${JSON.stringify(preloadUrls)}`];
 					if (adjustedFallbackCSS) internalFontProperties.push(`adjustedFallbackCSS: ${JSON.stringify(adjustedFallbackCSS)}`);
 					if (Number.isFinite(validatedFontWeight)) internalFontProperties.push(`fontWeight: ${validatedFontWeight}`);
 					if (validatedFontStyle) internalFontProperties.push(`fontStyle: ${JSON.stringify(validatedFontStyle)}`);

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-export-validation.d.ts

@@ -0,0 +1,5 @@
+//#region src/plugins/middleware-export-validation.d.ts
+declare function hasValidMiddlewareModuleExport(source: string, id: string, isProxy: boolean): boolean;
+declare function validateMiddlewareModuleExports(source: string, id: string, filePath: string, isProxy: boolean): void;
+//#endregion
+export { hasValidMiddlewareModuleExport, validateMiddlewareModuleExports };

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

@@ -0,0 +1,36 @@
+import { stripViteModuleQuery } from "../utils/path.js";
+import { createMiddlewareMissingExportError } from "../server/middleware-runtime.js";
+import { parseAst } from "vite";
+//#region src/plugins/middleware-export-validation.ts
+function parserLanguage(id) {
+	const cleanId = stripViteModuleQuery(id).toLowerCase();
+	if (cleanId.endsWith(".tsx")) return "tsx";
+	if (cleanId.endsWith(".ts") || cleanId.endsWith(".mts") || cleanId.endsWith(".cts")) return "ts";
+	return "jsx";
+}
+function astName(value) {
+	if (!value) return null;
+	if (typeof value.name === "string") return value.name;
+	if (typeof value.value === "string") return value.value;
+	return null;
+}
+function hasValidMiddlewareModuleExport(source, id, isProxy) {
+	const ast = parseAst(source, { lang: parserLanguage(id) });
+	const expectedExport = isProxy ? "proxy" : "middleware";
+	for (const statement of ast.body) {
+		if (statement.type === "ExportDefaultDeclaration") return true;
+		if (statement.type !== "ExportNamedDeclaration") continue;
+		const declaration = statement.declaration;
+		if (declaration?.type === "FunctionDeclaration" && astName(declaration.id) === expectedExport) return true;
+		if (declaration?.type === "VariableDeclaration") {
+			for (const declarator of declaration.declarations ?? []) if (astName(declarator.id) === expectedExport) return true;
+		}
+		for (const specifier of statement.specifiers ?? []) if (astName(specifier.exported ?? specifier.local) === expectedExport) return true;
+	}
+	return false;
+}
+function validateMiddlewareModuleExports(source, id, filePath, isProxy) {
+	if (!hasValidMiddlewareModuleExport(source, id, isProxy)) throw createMiddlewareMissingExportError(filePath, isProxy);
+}
+//#endregion
+export { hasValidMiddlewareModuleExport, validateMiddlewareModuleExports };

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-asset-ownership.d.ts

@@ -0,0 +1,27 @@
+import { Alias } from "vite";
+
+//#region src/plugins/og-asset-ownership.d.ts
+type OgAssetModuleBoundary = {
+  assetRoot: string;
+  moduleDir: string;
+};
+declare class OgAssetOwnership {
+  private projectRoot;
+  private readonly linkedPackageRoots;
+  private readonly dependencyPackageNames;
+  private readonly stringAliasesByFirstCharacter;
+  private regularExpressionAliases;
+  private configuredAliases;
+  configure(projectRoot: string, aliases: readonly Alias[]): void;
+  reset(): void;
+  shouldTrackImport(source: string): boolean;
+  recordResolvedImport(source: string, resolvedId: string): Promise<void>;
+  resolveModuleBoundary(moduleId: string): Promise<OgAssetModuleBoundary | null>;
+  resolveContainedAsset(assetRoot: string, assetPath: string): Promise<string | null>;
+  private findAlias;
+  private getExpectedPackageName;
+  private resolveAliasPackageRoot;
+  private resolveConfiguredAliasRoot;
+}
+//#endregion
+export { OgAssetModuleBoundary, OgAssetOwnership };