@vizejs/vite-plugin 0.88.0 → 0.90.0

package/dist/index.mjs

@@ -352,11 +352,8 @@ function parseCustomMedia(css, map) {
 }
 function resolveCssPath(importPath, importer, aliasRules) {
 	for (const rule of aliasRules) {
-		const suffix = matchedAliasSuffix(importPath, rule.find);
-		if (suffix !== null) {
-			const resolved = path.join(rule.replacement, suffix);
-			return path.resolve(resolved);
-		}
+		const resolved = resolveAliasPath(importPath, rule);
+		if (resolved !== null) return path.resolve(resolved);
 	}
 	if (importPath.startsWith(".")) {
 		const dir = path.dirname(importer);
@@ -365,6 +362,18 @@ function resolveCssPath(importPath, importer, aliasRules) {
 	if (path.isAbsolute(importPath)) return importPath;
 	return null;
 }
+function resolveAliasPath(importPath, rule) {
+	if (typeof rule.find !== "string") {
+		const pattern = stableAliasPattern$1(rule.find);
+		return pattern.test(importPath) ? importPath.replace(pattern, rule.replacement) : null;
+	}
+	const suffix = matchedAliasSuffix(importPath, rule.find);
+	if (suffix !== null) return path.join(rule.replacement, suffix);
+	return null;
+}
+function stableAliasPattern$1(pattern) {
+	return new RegExp(pattern.source, pattern.flags.replace(/[gy]/g, ""));
+}
 function matchedAliasSuffix(importPath, find) {
 	if (importPath === find) return "";
 	const prefix = find.endsWith("/") ? find : `${find}/`;
@@ -642,15 +651,14 @@ function createLogger(debug) {
 const vizeConfigStore = /* @__PURE__ */ new Map();
 //#endregion
 //#region src/compile-options.ts
-function buildCompileFileOptions(filePath, source, options) {
-	const scopeId = /<style[^>]*\bscoped\b/.test(source) ? `data-v-${generateScopeId(filePath)}` : void 0;
+function buildCompileFileOptions(filePath, options) {
 	return {
 		filename: filePath,
 		sourceMap: options.sourceMap,
 		ssr: options.ssr,
 		vapor: options.vapor,
 		customRenderer: options.customRenderer ?? false,
-		scopeId
+		scopeId: `data-v-${generateScopeId(filePath)}`
 	};
 }
 function buildCompileBatchOptions(options) {
@@ -663,38 +671,20 @@ function buildCompileBatchOptions(options) {
 //#endregion
 //#region src/compiler.ts
 const { compileSfc, compileSfcBatchWithResults } = native;
-/**
-* Extract style block metadata from a Vue SFC source string.
-* Parses `<style>` tags to determine lang, scoped, and module attributes.
-*/
-function extractStyleBlocks(source) {
-	const blocks = [];
-	const styleRegex = /<style([^>]*)>([\s\S]*?)<\/style>/gi;
-	let match;
-	let index = 0;
-	while ((match = styleRegex.exec(source)) !== null) {
-		const attrs = match[1];
-		const content = match[2];
-		const lang = attrs.match(/\blang=["']([^"']+)["']/)?.[1] ?? null;
-		const scoped = /\bscoped\b/.test(attrs);
-		const moduleMatch = attrs.match(/\bmodule(?:=["']([^"']+)["'])?/);
-		const isModule = moduleMatch ? moduleMatch[1] || true : false;
-		blocks.push({
-			content,
-			lang,
-			scoped,
-			module: isModule,
-			index
-		});
-		index++;
-	}
-	return blocks;
+function normalizeStyleBlocks(styles) {
+	if (!styles) return [];
+	return styles.map((block) => ({
+		content: block.content,
+		lang: block.lang ?? null,
+		scoped: block.scoped,
+		module: block.module ? block.moduleName ?? true : false,
+		index: block.index
+	}));
 }
 function compileFile(filePath, cache, options, source) {
 	const content = source ?? fs.readFileSync(filePath, "utf-8");
 	const scopeId = generateScopeId(filePath);
-	const hasScoped = /<style[^>]*\bscoped\b/.test(content);
-	const result = compileSfc(content, buildCompileFileOptions(filePath, content, options));
+	const result = compileSfc(content, buildCompileFileOptions(filePath, options));
 	if (result.errors.length > 0) {
 		const errorMsg = result.errors.join("\n");
 		console.error(`[vize] Compilation error in ${filePath}:\n${errorMsg}`);
@@ -702,17 +692,16 @@ function compileFile(filePath, cache, options, source) {
 	if (result.warnings.length > 0) result.warnings.forEach((warning) => {
 		console.warn(`[vize] Warning in ${filePath}: ${warning}`);
 	});
-	const styles = extractStyleBlocks(content);
 	const compiled = {
 		code: result.code,
 		css: result.css,
 		scopeId,
-		hasScoped,
+		hasScoped: result.hasScoped,
 		templateHash: result.templateHash,
 		styleHash: result.styleHash,
 		scriptHash: result.scriptHash,
 		macroArtifacts: result.macroArtifacts ?? [],
-		styles
+		styles: normalizeStyleBlocks(result.styles)
 	};
 	cache.set(filePath, compiled);
 	return compiled;
@@ -726,24 +715,18 @@ function compileBatch(files, cache, options) {
 		path: f.path,
 		source: f.source
 	})), buildCompileBatchOptions(options));
-	const sourceMap = /* @__PURE__ */ new Map();
-	for (const f of files) sourceMap.set(f.path, f.source);
 	for (const fileResult of result.results) {
-		if (fileResult.errors.length === 0) {
-			const source = sourceMap.get(fileResult.path);
-			const styles = source ? extractStyleBlocks(source) : void 0;
-			cache.set(fileResult.path, {
-				code: fileResult.code,
-				css: fileResult.css,
-				scopeId: fileResult.scopeId,
-				hasScoped: fileResult.hasScoped,
-				templateHash: fileResult.templateHash,
-				styleHash: fileResult.styleHash,
-				scriptHash: fileResult.scriptHash,
-				macroArtifacts: fileResult.macroArtifacts ?? [],
-				styles
-			});
-		}
+		if (fileResult.errors.length === 0) cache.set(fileResult.path, {
+			code: fileResult.code,
+			css: fileResult.css,
+			scopeId: fileResult.scopeId,
+			hasScoped: fileResult.hasScoped,
+			templateHash: fileResult.templateHash,
+			styleHash: fileResult.styleHash,
+			scriptHash: fileResult.scriptHash,
+			macroArtifacts: fileResult.macroArtifacts ?? [],
+			styles: normalizeStyleBlocks(fileResult.styles)
+		});
 		if (fileResult.errors.length > 0) console.error(`[vize] Compilation error in ${fileResult.path}:\n${fileResult.errors.join("\n")}`);
 		if (fileResult.warnings.length > 0) fileResult.warnings.forEach((warning) => {
 			console.warn(`[vize] Warning in ${fileResult.path}: ${warning}`);
@@ -921,10 +904,51 @@ function normalizeRequireBase(importer) {
 	else if (isMacroVirtualId(normalized)) normalized = normalized.slice(1).split("?")[0] ?? "";
 	return normalized.split("?")[0] ?? null;
 }
+function splitIdQuery(id) {
+	const queryStart = id.indexOf("?");
+	if (queryStart === -1) return [id, ""];
+	return [id.slice(0, queryStart), id.slice(queryStart)];
+}
+function isBareSpecifier(id) {
+	const [request] = splitIdQuery(id);
+	return request !== "" && !request.startsWith("./") && !request.startsWith("../") && !request.startsWith("/") && !request.startsWith("\0") && !request.includes(":");
+}
+function resolveAliasRequest(state, id) {
+	const [request, querySuffix] = splitIdQuery(id);
+	for (const rule of state.cssAliasRules) {
+		if (rule.find instanceof RegExp) {
+			const pattern = stableAliasPattern(rule.find);
+			if (pattern.test(request)) return request.replace(pattern, rule.replacement) + querySuffix;
+			continue;
+		}
+		if (request === rule.find) return rule.replacement + querySuffix;
+		const findPrefix = rule.find.endsWith("/") ? rule.find : rule.find + "/";
+		if (request.startsWith(findPrefix)) return (rule.replacement.endsWith("/") ? rule.replacement : rule.replacement + "/") + request.slice(findPrefix.length) + querySuffix;
+	}
+	return null;
+}
+function stableAliasPattern(pattern) {
+	return new RegExp(pattern.source, pattern.flags.replace(/[gy]/g, ""));
+}
+function pushPnpmHoistBases(candidates, start, isDirectory) {
+	if (!start) return;
+	let dir = isDirectory ? start : path.dirname(start);
+	for (;;) {
+		const pnpmHoist = path.join(dir, "node_modules", ".pnpm", "node_modules");
+		if (fs.existsSync(pnpmHoist)) {
+			candidates.push(path.join(pnpmHoist, "package.json"));
+			break;
+		}
+		const parent = path.dirname(dir);
+		if (parent === dir) break;
+		dir = parent;
+	}
+}
 function resolveBareImportWithNode(state, id, importer) {
-	const [request, queryPart] = id.split("?");
-	const querySuffix = queryPart ? `?${queryPart}` : "";
+	const [request, querySuffix] = splitIdQuery(id);
 	const candidates = [normalizeRequireBase(importer), path.join(state.root, "package.json")].filter((candidate) => candidate != null);
+	pushPnpmHoistBases(candidates, importer ?? null, false);
+	pushPnpmHoistBases(candidates, state.root, true);
 	const seen = /* @__PURE__ */ new Set();
 	for (const candidate of candidates) {
 		if (seen.has(candidate)) continue;
@@ -935,8 +959,23 @@ function resolveBareImportWithNode(state, id, importer) {
 	}
 	return null;
 }
+function resolveBareImportCandidatesWithNode(state, id, importer, resolvedId) {
+	const candidates = [
+		resolvedId,
+		resolveAliasRequest(state, id),
+		id
+	].filter((candidate) => candidate != null && isBareSpecifier(candidate));
+	const seen = /* @__PURE__ */ new Set();
+	for (const candidate of candidates) {
+		if (seen.has(candidate)) continue;
+		seen.add(candidate);
+		const resolved = resolveBareImportWithNode(state, candidate, importer);
+		if (resolved) return resolved;
+	}
+	return null;
+}
 function normalizeResolvedVuePath(id) {
-	const pathPart = id.split("?")[0];
+	const [pathPart] = splitIdQuery(id);
 	if (!pathPart?.endsWith(".vue")) return null;
 	return pathPart.startsWith("/@fs/") ? pathPart.slice(4) : pathPart;
 }
@@ -1023,21 +1062,57 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 		}
 		if (!id.endsWith(".vue")) {
 			if (!id.startsWith("./") && !id.startsWith("../") && !id.startsWith("/")) {
-				if (!state.cssAliasRules.some((rule) => id === rule.find || id.startsWith(rule.find + "/"))) {
+				const aliasRequest = resolveAliasRequest(state, id);
+				if (aliasRequest && isBareSpecifier(aliasRequest)) {
+					const nodeResolved = resolveBareImportCandidatesWithNode(state, id, cleanImporter);
+					if (nodeResolved) {
+						state.logger.log(`resolveId: resolved aliased bare ${id} to ${nodeResolved} via Node fallback`);
+						return nodeResolved;
+					}
+				}
+				try {
+					const resolved = await ctx.resolve(id, cleanImporter, { skipSelf: true });
+					if (resolved) {
+						state.logger.log(`resolveId: resolved bare ${id} to ${resolved.id} via Vite resolver`);
+						if (isBuild && resolved.id.startsWith("/@fs/")) return {
+							...resolved,
+							id: normalizeFsIdForBuild(resolved.id)
+						};
+						const nodeResolved = resolveBareImportCandidatesWithNode(state, id, cleanImporter, resolved.id);
+						if (nodeResolved) {
+							state.logger.log(`resolveId: normalized bare ${id} to ${nodeResolved} via Node fallback`);
+							return nodeResolved;
+						}
+						if (isBareSpecifier(resolved.id)) return null;
+						return resolved;
+					}
+				} catch {}
+				const nodeResolved = resolveBareImportCandidatesWithNode(state, id, cleanImporter);
+				if (nodeResolved) {
+					state.logger.log(`resolveId: resolved bare ${id} to ${nodeResolved} via Node fallback`);
+					return nodeResolved;
+				}
+				if (aliasRequest && aliasRequest !== id && !isBareSpecifier(aliasRequest)) {
 					try {
-						const resolved = await ctx.resolve(id, cleanImporter, { skipSelf: true });
+						const resolved = await ctx.resolve(aliasRequest, cleanImporter, { skipSelf: true });
 						if (resolved) {
-							state.logger.log(`resolveId: resolved bare ${id} to ${resolved.id} via Vite resolver`);
+							state.logger.log(`resolveId: resolved aliased bare ${id} to ${resolved.id} via Vite resolver`);
 							if (isBuild && resolved.id.startsWith("/@fs/")) return {
 								...resolved,
 								id: normalizeFsIdForBuild(resolved.id)
 							};
+							const nodeResolved = resolveBareImportCandidatesWithNode(state, id, cleanImporter, resolved.id);
+							if (nodeResolved) {
+								state.logger.log(`resolveId: normalized aliased bare ${id} to ${nodeResolved} via Node fallback`);
+								return nodeResolved;
+							}
+							if (isBareSpecifier(resolved.id)) return null;
 							return resolved;
 						}
 					} catch {}
-					const nodeResolved = resolveBareImportWithNode(state, id, cleanImporter);
+					const nodeResolved = resolveBareImportCandidatesWithNode(state, aliasRequest, cleanImporter);
 					if (nodeResolved) {
-						state.logger.log(`resolveId: resolved bare ${id} to ${nodeResolved} via Node fallback`);
+						state.logger.log(`resolveId: resolved aliased bare ${id} to ${nodeResolved} via Node fallback`);
 						return nodeResolved;
 					}
 				}
@@ -1515,6 +1590,9 @@ function patchUnoCssBridge(plugins) {
 }
 //#endregion
 //#region src/plugin/index.ts
+function aliasSortKey(find) {
+	return typeof find === "string" ? find.length : find.source.length;
+}
 function vize(options = {}) {
 	const state = {
 		cache: /* @__PURE__ */ new Map(),
@@ -1632,13 +1710,13 @@ function vize(options = {}) {
 				state.dynamicImportAliasRules.sort((a, b) => b.fromPrefix.length - a.fromPrefix.length);
 				state.cssAliasRules = [];
 				for (const alias of resolvedConfig.resolve.alias) {
-					if (typeof alias.find !== "string" || typeof alias.replacement !== "string") continue;
+					if (!(typeof alias.find === "string" || alias.find instanceof RegExp) || typeof alias.replacement !== "string") continue;
 					state.cssAliasRules.push({
 						find: alias.find,
 						replacement: alias.replacement
 					});
 				}
-				state.cssAliasRules.sort((a, b) => b.find.length - a.find.length);
+				state.cssAliasRules.sort((a, b) => aliasSortKey(b.find) - aliasSortKey(a.find));
 				state.filter = createFilter(state.mergedOptions.include, state.mergedOptions.exclude);
 				state.scanPatterns = state.mergedOptions.scanPatterns ?? ["**/*.vue"];
 				state.precompileBatchSize = normalizePrecompileBatchSize(state.mergedOptions.precompileBatchSize);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizejs/vite-plugin",
-  "version": "0.88.0",
+  "version": "0.90.0",
   "description": "High-performance native Vite plugin for Vue SFC compilation powered by Vize",
   "keywords": [
     "compiler",
@@ -33,9 +33,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@vizejs/native": "0.88.0",
+    "@vizejs/native": "0.90.0",
     "tinyglobby": "0.2.16",
-    "vize": "0.88.0"
+    "vize": "0.90.0"
   },
   "devDependencies": {
     "@types/node": "25.7.0",