@vizejs/vite-plugin 0.88.0 → 0.89.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(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(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}/`;
@@ -921,10 +930,43 @@ 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 (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 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 +977,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 +1080,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 +1608,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 +1728,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.89.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.89.0",
     "tinyglobby": "0.2.16",
-    "vize": "0.88.0"
+    "vize": "0.89.0"
   },
   "devDependencies": {
     "@types/node": "25.7.0",