@vizejs/vite-plugin 0.100.0 → 0.101.0

package/dist/index.d.mts

@@ -620,6 +620,13 @@ interface DynamicImportAliasRule {
 }
 //#endregion
 //#region src/transform.d.ts
+/**
+ * Rewrite static asset URLs in compiled template output.
+ *
+ * Transforms property values like `src: "@/assets/logo.svg"` into import
+ * statements hoisted to the top of the module, so Vite's module resolution
+ * pipeline handles alias expansion and asset hashing in both dev and build.
+ */
 declare function rewriteStaticAssetUrls(code: string, aliasRules: DynamicImportAliasRule[]): string;
 //#endregion
 //#region src/plugin/index.d.ts

package/dist/index.mjs

@@ -1,20 +1,16 @@
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import { createHash } from "node:crypto";
-import path from "node:path";
 import * as native from "@vizejs/native";
-import { classifyVitePluginRequest } from "@vizejs/native";
+import { applyViteDefineReplacements, classifyVitePluginRequest, createViteBareImportBases, createViteBareImportCandidates, createViteVirtualId, detectViteHmrUpdateType, generateViteHmrCode, hasViteHmrChanges, isViteBareSpecifier, normalizeViteRequireBase, normalizeViteResolvedVuePath, resolveViteAliasRequest, resolveViteCssImports, resolveViteRelativeImport, resolveViteVuePath, rewriteViteDynamicTemplateImports, rewriteViteStaticAssetUrls, scopeViteCssForPipeline, shouldApplyViteDefineInVirtualModule, splitViteIdQuery, toViteBrowserImportPrefix } from "@vizejs/native";
 import { CONFIG_FILE_NAMES, defineConfig, loadConfig } from "vize";
 import { glob } from "tinyglobby";
+import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { transformWithOxc } from "vite";
 //#region src/hmr.ts
-function didHashChange(prevHash, nextHash) {
-	return prevHash !== nextHash;
-}
 function hasHmrChanges(prev, next) {
-	if (!prev) return true;
-	return didHashChange(prev.scriptHash, next.scriptHash) || didHashChange(prev.templateHash, next.templateHash) || didHashChange(prev.styleHash, next.styleHash);
+	return hasViteHmrChanges(toHmrHashes(prev), toHmrHashes(next));
 }
 /**
 * Detect the type of HMR update needed based on content hash changes.
@@ -24,362 +20,44 @@ function hasHmrChanges(prev, next) {
 * @returns The type of HMR update needed
 */
 function detectHmrUpdateType(prev, next) {
-	if (!prev) return "full-reload";
-	if (didHashChange(prev.scriptHash, next.scriptHash)) return "full-reload";
-	const templateChanged = didHashChange(prev.templateHash, next.templateHash);
-	if (didHashChange(prev.styleHash, next.styleHash) && !templateChanged) return "style-only";
-	if (templateChanged) return "template-only";
-	return "full-reload";
+	return detectViteHmrUpdateType(toHmrHashes(prev), toHmrHashes(next));
 }
 /**
 * Generate HMR-aware code output based on update type.
 */
 function generateHmrCode(scopeId, updateType) {
-	return `
-if (import.meta.hot) {
-  _sfc_main.__hmrId = ${JSON.stringify(scopeId)};
-  _sfc_main.__hmrUpdateType = ${JSON.stringify(updateType)};
-
-  import.meta.hot.accept((mod) => {
-    if (!mod) return;
-    const { default: updated } = mod;
-    if (typeof __VUE_HMR_RUNTIME__ !== 'undefined') {
-      const updateType = updated.__hmrUpdateType || 'full-reload';
-      if (updateType === 'template-only') {
-        __VUE_HMR_RUNTIME__.rerender(updated.__hmrId, updated.render);
-      } else {
-        __VUE_HMR_RUNTIME__.reload(updated.__hmrId, updated);
-      }
-    }
-  });
-
-  import.meta.hot.on('vize:update', (data) => {
-    if (data.id !== _sfc_main.__hmrId) return;
-
-    if (data.type === 'style-only') {
-      // Update styles without remounting component
-      const styleId = 'vize-style-' + _sfc_main.__hmrId;
-      const styleEl = document.getElementById(styleId);
-      if (styleEl && data.css) {
-        styleEl.textContent = data.css;
-      }
-    }
-  });
-
-  if (typeof __VUE_HMR_RUNTIME__ !== 'undefined') {
-    __VUE_HMR_RUNTIME__.createRecord(_sfc_main.__hmrId, _sfc_main);
-  }
-}`;
+	return generateViteHmrCode(scopeId, updateType);
+}
+function toHmrHashes(module) {
+	return module ? {
+		scriptHash: module.scriptHash,
+		templateHash: module.templateHash,
+		styleHash: module.styleHash
+	} : void 0;
 }
 //#endregion
 //#region src/utils/css.ts
-const deepSelectorPattern = /:deep\(([^()]*(?:\([^()]*\))*[^()]*)\)/;
-const globalSelectorPattern = /:global\(([^()]*(?:\([^()]*\))*[^()]*)\)/g;
-const recursiveAtRules = new Set([
-	"@container",
-	"@layer",
-	"@media",
-	"@supports"
-]);
 function scopeCssForPipeline(css, scopeId) {
-	return transformCssBlock(css, scopeId);
+	return scopeViteCssForPipeline(css, scopeId);
 }
 /**
 * Resolve CSS @import statements by inlining the imported files,
 * then resolve @custom-media definitions within the combined CSS.
-*
-* This is necessary because Vize embeds CSS as a JS string via
-* document.createElement('style'), bypassing Vite's CSS pipeline.
 */
 function resolveCssImports(css, importer, aliasRules, isDev, devUrlBase) {
-	const customMedia = /* @__PURE__ */ new Map();
-	const importRegex = /^@import\s+(?:"([^"]+)"|'([^']+)');?\s*$/gm;
-	let result = css;
-	result = result.replace(importRegex, (_match, dqPath, sqPath) => {
-		const importPath = dqPath || sqPath;
-		if (!importPath) return _match;
-		const resolved = resolveCssPath(importPath, importer, aliasRules);
-		if (!resolved || !fs.existsSync(resolved)) return _match;
-		try {
-			const content = fs.readFileSync(resolved, "utf-8");
-			parseCustomMedia(content, customMedia);
-			return content;
-		} catch {
-			return _match;
-		}
-	});
-	parseCustomMedia(result, customMedia);
-	result = result.replace(/^@custom-media\s+[^;]+;\s*$/gm, "");
-	if (customMedia.size > 0) for (const [name, query] of customMedia) {
-		const escaped = name.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
-		result = result.replace(new RegExp(`\\(${escaped}\\)`, "g"), query);
-	}
-	if (isDev) result = result.replace(/url\(\s*(["']?)([^"')]+)\1\s*\)/g, (_match, quote, urlPath) => {
-		const trimmed = urlPath.trim();
-		if (trimmed.startsWith("data:") || trimmed.startsWith("http://") || trimmed.startsWith("https://") || trimmed.startsWith("/@fs/")) return _match;
-		const resolved = resolveCssPath(trimmed, importer, aliasRules);
-		if (resolved && fs.existsSync(resolved)) {
-			const normalized = resolved.replace(/\\/g, "/");
-			const base = devUrlBase ?? "/";
-			return `url("${base.endsWith("/") ? base : base + "/"}@fs${normalized}")`;
-		}
-		return _match;
-	});
-	result = result.replace(new RegExp(deepSelectorPattern.source, "g"), "$1");
-	result = result.replace(/\n{3,}/g, "\n\n");
-	return result;
-}
-function transformCssBlock(css, scopeId) {
-	let output = "";
-	let cursor = 0;
-	while (cursor < css.length) {
-		const brace = findNextTopLevelBrace(css, cursor);
-		if (brace === -1) {
-			output += css.slice(cursor);
-			break;
-		}
-		const end = findMatchingBrace(css, brace);
-		if (end === -1) {
-			output += css.slice(cursor);
-			break;
-		}
-		const header = css.slice(cursor, brace);
-		const body = css.slice(brace + 1, end);
-		const leadingLength = header.search(/\S/);
-		const leading = leadingLength === -1 ? header : header.slice(0, leadingLength);
-		const statement = leadingLength === -1 ? "" : header.slice(leadingLength);
-		output += leading;
-		if (statement.trimStart().startsWith("@")) {
-			output += statement;
-			output += "{";
-			output += shouldRecurseAtRule(statement) ? transformCssBlock(body, scopeId) : body;
-			output += "}";
-		} else {
-			output += scopeSelectorList(statement, scopeId);
-			output += "{";
-			output += body;
-			output += "}";
-		}
-		cursor = end + 1;
-	}
-	return output;
-}
-function shouldRecurseAtRule(statement) {
-	const name = statement.trimStart().split(/\s+/, 1)[0];
-	return name !== void 0 && recursiveAtRules.has(name);
-}
-function findNextTopLevelBrace(css, start) {
-	let parenDepth = 0;
-	let bracketDepth = 0;
-	let quote = null;
-	let inComment = false;
-	for (let index = start; index < css.length; index += 1) {
-		const char = css[index];
-		const next = css[index + 1];
-		if (inComment) {
-			if (char === "*" && next === "/") {
-				inComment = false;
-				index += 1;
-			}
-			continue;
-		}
-		if (quote !== null) {
-			if (char === "\\") index += 1;
-			else if (char === quote) quote = null;
-			continue;
-		}
-		if (char === "/" && next === "*") {
-			inComment = true;
-			index += 1;
-			continue;
-		}
-		if (char === "'" || char === "\"") {
-			quote = char;
-			continue;
-		}
-		if (char === "(") parenDepth += 1;
-		else if (char === ")" && parenDepth > 0) parenDepth -= 1;
-		else if (char === "[") bracketDepth += 1;
-		else if (char === "]" && bracketDepth > 0) bracketDepth -= 1;
-		else if (char === "{" && parenDepth === 0 && bracketDepth === 0) return index;
-	}
-	return -1;
-}
-function findMatchingBrace(css, start) {
-	let depth = 0;
-	let quote = null;
-	let inComment = false;
-	for (let index = start; index < css.length; index += 1) {
-		const char = css[index];
-		const next = css[index + 1];
-		if (inComment) {
-			if (char === "*" && next === "/") {
-				inComment = false;
-				index += 1;
-			}
-			continue;
-		}
-		if (quote !== null) {
-			if (char === "\\") index += 1;
-			else if (char === quote) quote = null;
-			continue;
-		}
-		if (char === "/" && next === "*") {
-			inComment = true;
-			index += 1;
-			continue;
-		}
-		if (char === "'" || char === "\"") {
-			quote = char;
-			continue;
-		}
-		if (char === "{") depth += 1;
-		else if (char === "}") {
-			depth -= 1;
-			if (depth === 0) return index;
-		}
-	}
-	return -1;
-}
-function scopeSelectorList(selectorList, scopeId) {
-	return splitSelectorList(selectorList).map((selector) => scopeSelector(selector, scopeId)).join(",");
-}
-function splitSelectorList(selectorList) {
-	const selectors = [];
-	let start = 0;
-	let parenDepth = 0;
-	let bracketDepth = 0;
-	let quote = null;
-	for (let index = 0; index < selectorList.length; index += 1) {
-		const char = selectorList[index];
-		if (quote !== null) {
-			if (char === "\\") index += 1;
-			else if (char === quote) quote = null;
-			continue;
-		}
-		if (char === "'" || char === "\"") {
-			quote = char;
-			continue;
-		}
-		if (char === "(") parenDepth += 1;
-		else if (char === ")" && parenDepth > 0) parenDepth -= 1;
-		else if (char === "[") bracketDepth += 1;
-		else if (char === "]" && bracketDepth > 0) bracketDepth -= 1;
-		else if (char === "," && parenDepth === 0 && bracketDepth === 0) {
-			selectors.push(selectorList.slice(start, index));
-			start = index + 1;
-		}
-	}
-	selectors.push(selectorList.slice(start));
-	return selectors;
-}
-function scopeSelector(selector, scopeId) {
-	const leadingLength = selector.search(/\S/);
-	if (leadingLength === -1) return selector;
-	const leading = selector.slice(0, leadingLength);
-	const trailingLength = selector.match(/\s*$/)?.[0].length ?? 0;
-	const bodyEnd = trailingLength === 0 ? selector.length : selector.length - trailingLength;
-	const trailing = selector.slice(bodyEnd);
-	let body = selector.slice(leadingLength, bodyEnd).replace(globalSelectorPattern, "$1");
-	const deep = body.match(deepSelectorPattern);
-	if (deep?.index !== void 0) {
-		const before = body.slice(0, deep.index).trimEnd();
-		const inner = deep[1] ?? "";
-		const after = body.slice(deep.index + deep[0].length);
-		body = `${before.length === 0 ? `[${scopeId}]` : addScopeToSelectorEnd(before, scopeId)} ${inner}${after}`;
-	} else body = addScopeToSelectorEnd(body, scopeId);
-	return leading + body + trailing;
-}
-function addScopeToSelectorEnd(selector, scopeId) {
-	const targetStart = findLastCompoundStart(selector);
-	const beforeTarget = selector.slice(0, targetStart);
-	const target = selector.slice(targetStart);
-	const insertAt = findScopeInsertPosition(target);
-	return `${beforeTarget}${target.slice(0, insertAt)}[${scopeId}]${target.slice(insertAt)}`;
-}
-function findLastCompoundStart(selector) {
-	let parenDepth = 0;
-	let bracketDepth = 0;
-	let quote = null;
-	for (let index = selector.length - 1; index >= 0; index -= 1) {
-		const char = selector[index];
-		if (quote !== null) {
-			if (char === quote) quote = null;
-			continue;
-		}
-		if (char === "'" || char === "\"") {
-			quote = char;
-			continue;
-		}
-		if (char === ")") parenDepth += 1;
-		else if (char === "(" && parenDepth > 0) parenDepth -= 1;
-		else if (char === "]") bracketDepth += 1;
-		else if (char === "[" && bracketDepth > 0) bracketDepth -= 1;
-		else if (parenDepth === 0 && bracketDepth === 0 && (char === ">" || char === "+" || char === "~")) return index + 1;
-		else if (parenDepth === 0 && bracketDepth === 0 && /\s/.test(char)) {
-			while (index > 0 && /\s/.test(selector[index - 1])) index -= 1;
-			return index + 1;
-		}
-	}
-	return 0;
-}
-function findScopeInsertPosition(target) {
-	let parenDepth = 0;
-	let bracketDepth = 0;
-	let quote = null;
-	for (let index = 0; index < target.length; index += 1) {
-		const char = target[index];
-		if (quote !== null) {
-			if (char === "\\") index += 1;
-			else if (char === quote) quote = null;
-			continue;
-		}
-		if (char === "'" || char === "\"") {
-			quote = char;
-			continue;
-		}
-		if (char === "(") parenDepth += 1;
-		else if (char === ")" && parenDepth > 0) parenDepth -= 1;
-		else if (char === "[") bracketDepth += 1;
-		else if (char === "]" && bracketDepth > 0) bracketDepth -= 1;
-		else if (char === ":" && parenDepth === 0 && bracketDepth === 0) return index;
-	}
-	return target.length;
-}
-function parseCustomMedia(css, map) {
-	const re = /@custom-media\s+(--[\w-]+)\s+(.+?)\s*;/g;
-	let m;
-	while ((m = re.exec(css)) !== null) map.set(m[1], m[2]);
-}
-function resolveCssPath(importPath, importer, aliasRules) {
-	for (const rule of aliasRules) {
-		const resolved = resolveAliasPath(importPath, rule);
-		if (resolved !== null) return path.resolve(resolved);
-	}
-	if (importPath.startsWith(".")) {
-		const dir = path.dirname(importer);
-		return path.resolve(dir, importPath);
-	}
-	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}/`;
-	if (!importPath.startsWith(prefix)) return null;
-	return importPath.slice(prefix.length);
+	return resolveViteCssImports(css, importer, aliasRules.map(toNativeCssAliasRule), isDev, devUrlBase);
+}
+function toNativeCssAliasRule(rule) {
+	return typeof rule.find === "string" ? {
+		find: rule.find,
+		replacement: rule.replacement,
+		isRegex: false
+	} : {
+		find: rule.find.source,
+		replacement: rule.replacement,
+		isRegex: true,
+		flags: rule.find.flags.replace(/[gy]/g, "")
+	};
 }
 //#endregion
 //#region src/utils/index.ts
@@ -508,29 +186,16 @@ ${output}`;
 	}
 	return output;
 }
-const VIZE_SSR_PREFIX$1 = "\0vize-ssr:";
 const RESOLVED_CSS_MODULE = "\0vize:all-styles.css";
 /** Create a virtual module ID from a real .vue file path */
 function toVirtualId(realPath, ssr = false) {
-	return ssr ? `${VIZE_SSR_PREFIX$1}${realPath}.ts` : "\0" + realPath + ".ts";
-}
-function escapeRegExp(value) {
-	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	return createViteVirtualId(realPath, ssr);
 }
 function toBrowserImportPrefix(replacement) {
-	const normalized = replacement.replace(/\\/g, "/");
-	if (normalized.startsWith("/@fs/")) return normalized;
-	if (path.isAbsolute(replacement) && fs.existsSync(replacement)) return `/@fs${normalized}`;
-	return normalized;
+	return toViteBrowserImportPrefix(replacement);
 }
 function rewriteDynamicTemplateImports(code, aliasRules) {
-	let rewritten = code;
-	for (const rule of aliasRules) {
-		const pattern = new RegExp(`\\bimport\\s*\\(\\s*\`${escapeRegExp(rule.fromPrefix)}`, "g");
-		rewritten = rewritten.replace(pattern, `import(/* @vite-ignore */ \`${rule.toPrefix}`);
-	}
-	rewritten = rewritten.replace(/\bimport\s*\(\s*`/g, "import(/* @vite-ignore */ `");
-	return rewritten;
+	return rewriteViteDynamicTemplateImports(code, aliasRules);
 }
 //#endregion
 //#region src/transform.ts
@@ -547,53 +212,11 @@ function rewriteDynamicTemplateImports(code, aliasRules) {
 * statements hoisted to the top of the module, so Vite's module resolution
 * pipeline handles alias expansion and asset hashing in both dev and build.
 */
-const SCRIPT_EXTENSIONS = /\.(js|mjs|cjs|ts|mts|cts|jsx|tsx)$/i;
 function rewriteStaticAssetUrls(code, aliasRules) {
-	let rewritten = code;
-	const imports = [];
-	let counter = 0;
-	for (const rule of aliasRules) {
-		const pattern = new RegExp(`("?src"?\\s*:\\s*)(?:"(${escapeRegExp(rule.fromPrefix)}[^"]+)"|'(${escapeRegExp(rule.fromPrefix)}[^']+)')`, "g");
-		rewritten = rewritten.replace(pattern, (match, prefix, dqPath, sqPath) => {
-			const fullPath = dqPath || sqPath;
-			if (fullPath && SCRIPT_EXTENSIONS.test(fullPath)) return match;
-			const varName = `__vize_static_${counter++}`;
-			imports.push(`import ${varName} from ${JSON.stringify(fullPath)};`);
-			return `${prefix}${varName}`;
-		});
-	}
-	if (imports.length > 0) rewritten = imports.join("\n") + "\n" + rewritten;
-	return rewritten;
-}
-/**
-* Built-in Vite/Vue/Nuxt define keys that are normally handled by Vite's own
-* transform pipeline.
-*/
-const BUILTIN_DEFINE_PREFIXES = [
-	"import.meta.server",
-	"import.meta.client",
-	"import.meta.dev",
-	"import.meta.test",
-	"import.meta.prerender",
-	"import.meta.env",
-	"import.meta.hot",
-	"__VUE_",
-	"__NUXT_",
-	"process.env"
-];
-const VIRTUAL_MODULE_DEFINE_KEYS = new Set([
-	"import.meta.server",
-	"import.meta.client",
-	"import.meta.dev",
-	"import.meta.test",
-	"import.meta.prerender"
-]);
-function isBuiltinDefine(key) {
-	return BUILTIN_DEFINE_PREFIXES.some((prefix) => key === prefix || key.startsWith(prefix + ".") || key.startsWith(prefix + "_"));
+	return rewriteViteStaticAssetUrls(code, aliasRules);
 }
 function shouldApplyDefineInVirtualModule(key) {
-	if (VIRTUAL_MODULE_DEFINE_KEYS.has(key)) return true;
-	return !isBuiltinDefine(key);
+	return shouldApplyViteDefineInVirtualModule(key);
 }
 /**
 * Apply Vite define replacements to code.
@@ -601,15 +224,10 @@ function shouldApplyDefineInVirtualModule(key) {
 * Uses word-boundary-aware matching to avoid replacing inside strings or partial matches.
 */
 function applyDefineReplacements(code, defines) {
-	const sortedKeys = Object.keys(defines).sort((a, b) => b.length - a.length);
-	let result = code;
-	for (const key of sortedKeys) {
-		if (!result.includes(key)) continue;
-		const escaped = key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-		const re = new RegExp(escaped + "(?![\\w$.])", "g");
-		result = result.replace(re, defines[key]);
-	}
-	return result;
+	return applyViteDefineReplacements(code, Object.entries(defines).map(([key, value]) => ({
+		key,
+		value
+	})));
 }
 function createLogger(debug) {
 	return {
@@ -859,104 +477,35 @@ async function compileAll(state) {
 //#endregion
 //#region src/plugin/resolve.ts
 function resolveVuePath(state, id, importer) {
-	let resolved;
-	if (id.startsWith("/@fs/")) resolved = id.slice(4);
-	else if (id.startsWith("/") && !fs.existsSync(id)) resolved = path.resolve(state.root, id.slice(1));
-	else if (path.isAbsolute(id)) resolved = id;
-	else if (importer) {
-		const importerRequest = classifyVitePluginRequest(importer);
-		const realImporter = importerRequest.vizeVirtualPath ?? importerRequest.strippedVirtualPath ?? importer;
-		resolved = path.resolve(path.dirname(realImporter), id);
-	} else resolved = path.resolve(state.root, id);
-	if (!path.isAbsolute(resolved)) resolved = path.resolve(state.root, resolved);
-	return path.normalize(resolved);
-}
-function normalizeRequireBase(importer) {
-	if (!importer) return null;
-	let normalized = importer;
-	const request = classifyVitePluginRequest(normalized);
-	if (request.vizeVirtualPath) normalized = request.vizeVirtualPath;
-	else if (request.isMacroVirtualId) normalized = request.strippedVirtualPath ?? "";
-	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(":");
+	return resolveViteVuePath(state.root, id, importer);
 }
+const EMPTY_NATIVE_ALIAS_RULES = [];
 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;
-	}
+	return resolveViteAliasRequest(id, nativeCssAliasRules(state));
 }
 function resolveBareImportWithNode(state, id, importer) {
-	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;
-		seen.add(candidate);
-		try {
-			return `${createRequire(candidate).resolve(request)}${querySuffix}`;
-		} catch {}
-	}
+	const { request, querySuffix } = splitViteIdQuery(id);
+	for (const candidate of createViteBareImportBases(state.root, importer)) try {
+		return `${createRequire(candidate).resolve(request)}${querySuffix}`;
+	} catch {}
 	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);
+	for (const candidate of createViteBareImportCandidates(id, nativeCssAliasRules(state), resolvedId)) {
 		const resolved = resolveBareImportWithNode(state, candidate, importer);
 		if (resolved) return resolved;
 	}
 	return null;
 }
 function normalizeResolvedVuePath(id) {
-	const [pathPart] = splitIdQuery(id);
-	if (!pathPart?.endsWith(".vue")) return null;
-	return pathPart.startsWith("/@fs/") ? pathPart.slice(4) : pathPart;
+	return normalizeViteResolvedVuePath(id);
+}
+function nativeCssAliasRules(state) {
+	return state.cssAliasRules.length === 0 ? EMPTY_NATIVE_ALIAS_RULES : state.cssAliasRules.map(toNativeCssAliasRule);
 }
 async function resolveAliasedVueImport(ctx, state, id, importer, isSsrRequest, handleNodeModules) {
 	if (path.isAbsolute(id)) return null;
-	const viteImporter = normalizeRequireBase(importer) ?? importer;
+	const viteImporter = normalizeViteRequireBase(importer) ?? importer;
 	const viteResolved = await ctx.resolve(id, viteImporter, { skipSelf: true });
 	const realPath = viteResolved ? normalizeResolvedVuePath(viteResolved.id) : null;
 	if (!realPath) return null;
@@ -995,8 +544,7 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 		}
 		const cleanPath = id.slice(1);
 		if (cleanPath.startsWith("/") && !cleanPath.endsWith(".vue.ts")) {
-			const [pathPart, queryPart] = cleanPath.split("?");
-			const querySuffix = queryPart ? `?${queryPart}` : "";
+			const { request: pathPart, querySuffix } = splitViteIdQuery(cleanPath);
 			state.logger.log(`resolveId: redirecting \0-prefixed non-vue ID to ${pathPart}${querySuffix}`);
 			const redirected = pathPart + querySuffix;
 			return isBuild ? classifyVitePluginRequest(redirected).normalizedFsId ?? redirected : redirected;
@@ -1035,7 +583,7 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 		if (!id.endsWith(".vue")) {
 			if (!id.startsWith("./") && !id.startsWith("../") && !id.startsWith("/")) {
 				const aliasRequest = resolveAliasRequest(state, id);
-				if (aliasRequest && isBareSpecifier(aliasRequest)) {
+				if (aliasRequest && isViteBareSpecifier(aliasRequest)) {
 					const nodeResolved = resolveBareImportCandidatesWithNode(state, id, cleanImporter);
 					if (nodeResolved) {
 						state.logger.log(`resolveId: resolved aliased bare ${id} to ${nodeResolved} via Node fallback`);
@@ -1056,7 +604,7 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 							state.logger.log(`resolveId: normalized bare ${id} to ${nodeResolved} via Node fallback`);
 							return nodeResolved;
 						}
-						if (isBareSpecifier(resolved.id)) return null;
+						if (isViteBareSpecifier(resolved.id)) return null;
 						return resolved;
 					}
 				} catch {}
@@ -1065,7 +613,7 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 					state.logger.log(`resolveId: resolved bare ${id} to ${nodeResolved} via Node fallback`);
 					return nodeResolved;
 				}
-				if (aliasRequest && aliasRequest !== id && !isBareSpecifier(aliasRequest)) {
+				if (aliasRequest && aliasRequest !== id && !isViteBareSpecifier(aliasRequest)) {
 					try {
 						const resolved = await ctx.resolve(aliasRequest, cleanImporter, { skipSelf: true });
 						if (resolved) {
@@ -1080,7 +628,7 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 								state.logger.log(`resolveId: normalized aliased bare ${id} to ${nodeResolved} via Node fallback`);
 								return nodeResolved;
 							}
-							if (isBareSpecifier(resolved.id)) return null;
+							if (isViteBareSpecifier(resolved.id)) return null;
 							return resolved;
 						}
 					} catch {}
@@ -1105,36 +653,10 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 				}
 			} catch {}
 			if (id.startsWith("./") || id.startsWith("../")) {
-				const [pathPart, queryPart] = id.split("?");
-				const querySuffix = queryPart ? `?${queryPart}` : "";
-				const resolved = path.resolve(path.dirname(cleanImporter), pathPart);
-				for (const ext of [
-					"",
-					".ts",
-					".tsx",
-					".js",
-					".jsx",
-					".json"
-				]) {
-					const candidate = resolved + ext;
-					if (fs.existsSync(candidate) && fs.statSync(candidate).isFile()) {
-						const finalPath = candidate + querySuffix;
-						state.logger.log(`resolveId: resolved relative ${id} to ${finalPath}`);
-						return finalPath;
-					}
-				}
-				if (fs.existsSync(resolved) && fs.statSync(resolved).isDirectory()) for (const indexFile of [
-					"/index.ts",
-					"/index.tsx",
-					"/index.js",
-					"/index.jsx"
-				]) {
-					const candidate = resolved + indexFile;
-					if (fs.existsSync(candidate)) {
-						const finalPath = candidate + querySuffix;
-						state.logger.log(`resolveId: resolved directory ${id} to ${finalPath}`);
-						return finalPath;
-					}
+				const resolved = resolveViteRelativeImport(id, cleanImporter);
+				if (resolved) {
+					state.logger.log(`resolveId: resolved relative ${id} to ${resolved}`);
+					return resolved;
 				}
 			}
 			return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizejs/vite-plugin",
-  "version": "0.100.0",
+  "version": "0.101.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.100.0",
+    "@vizejs/native": "0.101.0",
     "tinyglobby": "0.2.16",
-    "vize": "0.100.0"
+    "vize": "0.101.0"
   },
   "devDependencies": {
     "@types/node": "25.7.0",