@vizejs/vite-plugin 0.155.0 → 0.156.0

package/dist/index.mjs

@@ -137,7 +137,7 @@ function generateOutput(compiled, options) {
 		output += "\n_sfc_main.ssrRender = ssrRender;";
 		output += "\nexport default _sfc_main;";
 	}
-	if (hasDelegatedStyles(compiled) && filePath) {
+	if (!!filePath && !!compiled.styles?.length && (hasDelegatedStyles(compiled) || !ssr && isProduction && extractCss)) {
 		const styleImports = [];
 		const cssModuleImports = [];
 		for (const block of compiled.styles) {
@@ -395,6 +395,10 @@ function getCompileOptionsForRequest(state, ssr) {
 }
 function syncCollectedCssForFile(state, filePath, compiled) {
 	if (!compiled || !state.extractCss) return;
+	if (compiled.styles?.length) {
+		state.collectedCss.delete(filePath);
+		return;
+	}
 	if (compiled.css && !hasDelegatedStyles(compiled)) state.collectedCss.set(filePath, resolveCssImports(compiled.css, filePath, state.cssAliasRules, false));
 	else state.collectedCss.delete(filePath);
 }
@@ -512,11 +516,37 @@ const EMPTY_NATIVE_ALIAS_RULES = [];
 function resolveAliasRequest(state, id) {
 	return resolveViteAliasRequest(id, nativeCssAliasRules(state));
 }
+function getBarePackageName(id) {
+	if (!isViteBareSpecifier(id)) return null;
+	const segments = id.split("/");
+	if (id.startsWith("@")) return segments.length >= 2 ? `${segments[0]}/${segments[1]}` : null;
+	return segments[0] || null;
+}
+function resolveBareImportFromPnpmHoist(request, base) {
+	const packageName = getBarePackageName(request);
+	if (!packageName) return null;
+	let current = path.dirname(base);
+	while (current !== path.dirname(current)) {
+		const directPackage = path.join(current, "node_modules", packageName);
+		if (fs.existsSync(directPackage)) return null;
+		const hoistRoot = path.join(current, "node_modules", ".pnpm", "node_modules");
+		const hoistedPackage = path.join(hoistRoot, packageName);
+		if (fs.existsSync(hoistedPackage)) try {
+			return createRequire(path.join(hoistRoot, "__vize_probe__.js")).resolve(request);
+		} catch {}
+		current = path.dirname(current);
+	}
+	return null;
+}
 function resolveBareImportWithNode(state, id, importer) {
 	const { request, querySuffix } = splitViteIdQuery(id);
-	for (const candidate of createViteBareImportBases(state.root, importer)) try {
-		return `${createRequire(candidate).resolve(request)}${querySuffix}`;
-	} catch {}
+	for (const candidate of createViteBareImportBases(state.root, importer)) {
+		const hoisted = resolveBareImportFromPnpmHoist(request, candidate);
+		if (hoisted) return `${hoisted}${querySuffix}`;
+		try {
+			return `${createRequire(candidate).resolve(request)}${querySuffix}`;
+		} catch {}
+	}
 	return null;
 }
 function resolveBareImportCandidatesWithNode(state, id, importer, resolvedId) {
@@ -579,9 +609,8 @@ function isVueResolvableFromRoot(root) {
 		const directPackageJson = path.join(rootNodeModules, "vue", "package.json");
 		cached = fs.existsSync(directPackageJson);
 		if (!cached) try {
-			const resolved = createRequire(path.join(root, "__vize_probe__.js")).resolve("vue/package.json");
-			const relative = path.relative(rootNodeModules, resolved);
-			cached = relative !== "" && !relative.startsWith("..") && !path.isAbsolute(relative);
+			createRequire(path.join(root, "__vize_probe__.js")).resolve("vue/package.json");
+			cached = true;
 		} catch {}
 		vueResolvableFromRootCache.set(root, cached);
 	}
@@ -597,7 +626,9 @@ function isPotentialVizeResolveId(id) {
 	return id.startsWith("\0") || id.startsWith("vize:") || id.startsWith("/@fs") || id === "virtual:vize-styles" || id.endsWith(".vue") || id.includes(".vue?") || id.includes("?macro=true") || id.includes("?definePage");
 }
 function isPotentialVizeImporter(importer) {
-	return importer !== void 0 && (importer.startsWith("\0") || importer.startsWith("vize:"));
+	if (importer === void 0) return false;
+	if (importer.startsWith("\0") || importer.startsWith("vize:")) return true;
+	return classifyVitePluginRequest(importer).isVueSfcPath;
 }
 function shouldCompileVueSfcRequest(request) {
 	if (!request.isVueSfcPath || request.isVueStyleQuery || request.hasMacroQuery || request.hasDefinePageQuery) return false;
@@ -610,6 +641,12 @@ function hasNuxtComponentQuery$1(request) {
 	if (!request.querySuffix) return false;
 	return new URLSearchParams(request.querySuffix.slice(1)).has("nuxt_component");
 }
+function cleanVueSfcImporter(importer, request) {
+	let cleanImporter = request?.normalizedFsId ?? importer;
+	if (cleanImporter.startsWith("/@id/__x00__")) cleanImporter = cleanImporter.slice(12);
+	else if (cleanImporter.startsWith("__x00__")) cleanImporter = cleanImporter.slice(7);
+	return cleanImporter.endsWith(".vue.ts") ? cleanImporter.slice(0, -3) : cleanImporter;
+}
 async function resolveAliasedVueImport(ctx, state, id, importer, isSsrRequest, handleNodeModules, querySuffix, preserveQueryAsPath) {
 	if (path.isAbsolute(id)) return null;
 	const viteImporter = normalizeViteRequireBase(importer) ?? importer;
@@ -672,7 +709,6 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 		return resolved;
 	}
 	if (id === "virtual:vize-styles") return RESOLVED_CSS_MODULE;
-	if (isBuild && request.normalizedFsId) return request.normalizedFsId;
 	if ((request.hasMacroQuery || request.hasDefinePageQuery) && request.isVueSfcPath) {
 		const resolved = resolveVuePath(state, request.path, importer);
 		if (resolved && fs.existsSync(resolved)) return `\0${resolved}${request.querySuffix}`;
@@ -686,12 +722,14 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 			state.logger.log(`resolveId: skipping node_modules style import ${id}`);
 			return null;
 		}
-		return `\0${id}${request.styleVirtualSuffix}`;
+		return `${request.normalizedFsId ?? id}${request.styleVirtualSuffix}`;
 	}
+	if (isBuild && request.normalizedFsId) return request.normalizedFsId;
 	const isMacroImporter = importerRequest?.isMacroVirtualId ?? false;
 	const isVizeVirtualImporter = importerRequest?.isVizeVirtual ?? false;
-	if (importer && (isVizeVirtualImporter || isMacroImporter)) {
-		const cleanImporter = isMacroImporter ? importerRequest?.strippedVirtualPath ?? "" : importerRequest?.vizeVirtualPath ?? "";
+	const isVueSfcImporter = importerRequest?.isVueSfcPath ?? false;
+	if (importer && (isVizeVirtualImporter || isMacroImporter || isVueSfcImporter)) {
+		const cleanImporter = isMacroImporter ? importerRequest?.strippedVirtualPath ?? "" : isVizeVirtualImporter ? importerRequest?.vizeVirtualPath ?? "" : cleanVueSfcImporter(importer, importerRequest);
 		state.logger.log(`resolveId from virtual: id=${id}, cleanImporter=${cleanImporter}`);
 		if (id.startsWith("#")) try {
 			return await ctx.resolve(id, cleanImporter, { skipSelf: true });
@@ -706,6 +744,13 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 			};
 			if (!id.startsWith("./") && !id.startsWith("../") && !id.startsWith("/")) {
 				const isVueRuntime = isVueRuntimeRequest(id);
+				if (isVueRuntime && isBuild) {
+					const vueBundlerEntry = resolveVueBundlerEntryWithNode(state, id, cleanImporter);
+					if (vueBundlerEntry) {
+						state.logger.log(`resolveId: resolved Vue runtime to ${vueBundlerEntry}`);
+						return vueBundlerEntry;
+					}
+				}
 				const aliasRequest = resolveAliasRequest(state, id);
 				if (!isVueRuntime && aliasRequest && isViteBareSpecifier(aliasRequest)) {
 					const nodeResolved = resolveBareImportCandidatesWithNode(state, id, cleanImporter);
@@ -910,6 +955,11 @@ function hasNuxtComponentQuery(request) {
 	if (!request.querySuffix) return false;
 	return new URLSearchParams(request.querySuffix.slice(1)).has("nuxt_component");
 }
+function normalizeStyleVirtualId(id) {
+	const withoutPrefix = id.startsWith("\0") ? id.slice(1) : id;
+	if (!withoutPrefix.includes("?vue")) return id;
+	return withoutPrefix.replace(/\.module\.\w+$/, "").replace(/\.\w+$/, "");
+}
 function loadCompiledSfcModule(state, realPath, isSsr, currentBase, loadOptions) {
 	const placeholderCode = getBoundaryPlaceholderCode(realPath, !!loadOptions?.ssr);
 	if (placeholderCode) {
@@ -967,18 +1017,13 @@ function loadDefinePageMetaArtifact(state, realPath, ssr) {
 }
 function loadHook(state, id, loadOptions) {
 	const request = classifyVitePluginRequest(id);
-	if (id !== "\0vize:all-styles.css" && !id.startsWith("\0")) {
-		if (!request.isVueSfcPath || !hasNuxtComponentQuery(request)) return null;
-	}
 	const currentBase = loadOptions?.ssr ? state.serverViteBase : state.clientViteBase;
 	if (id === "\0vize:all-styles.css") {
 		let allCss = "";
 		for (const css of state.collectedCss.values()) allCss += allCss ? `\n\n${css}` : css;
 		return allCss;
 	}
-	let styleId = id;
-	if (id.startsWith("\0") && id.includes("?vue")) styleId = id.slice(1).replace(/\.module\.\w+$/, "").replace(/\.\w+$/, "");
-	const styleRequest = classifyVitePluginRequest(styleId);
+	const styleRequest = classifyVitePluginRequest(normalizeStyleVirtualId(id));
 	if (styleRequest.isVueStyleQuery) {
 		const sourceRequest = classifyVitePluginRequest(styleRequest.path);
 		const realPath = sourceRequest.vizeVirtualPath ?? sourceRequest.normalizedFsId ?? sourceRequest.normalizedVuePath ?? styleRequest.path;
@@ -999,6 +1044,9 @@ function loadHook(state, id, loadOptions) {
 		if (fallbackCompiled?.css) return resolveCssImports(fallbackCompiled.css, realPath, state.cssAliasRules, state.server !== null, currentBase);
 		return "";
 	}
+	if (id !== "\0vize:all-styles.css" && !id.startsWith("\0")) {
+		if (!request.isVueSfcPath || !hasNuxtComponentQuery(request)) return null;
+	}
 	if (id.startsWith("\0") && request.hasDefinePageQuery) {
 		const realPath = request.strippedVirtualPath ?? "";
 		if (request.isVueSfcPath) return loadDefinePageArtifact(state, realPath, !!loadOptions?.ssr);
@@ -1204,8 +1252,9 @@ function createVueCompatPlugin(state) {
 	};
 }
 function normalizeVirtualStyleId(id) {
-	if (!id.startsWith("\0") || !id.includes("?vue")) return id;
-	return id.slice(1).replace(/\.module\.\w+$/, "").replace(/\.\w+$/, "");
+	const withoutPrefix = id.startsWith("\0") ? id.slice(1) : id;
+	if (!withoutPrefix.includes("?vue")) return id;
+	return withoutPrefix.replace(/\.module\.\w+$/, "").replace(/\.\w+$/, "");
 }
 function transformScopedPreprocessorCss(code, id) {
 	const request = classifyVitePluginRequest(normalizeVirtualStyleId(id));

package/package.json

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