@unocss/vite 66.6.6-beta.1 → 66.6.7

package/dist/client.mjs

@@ -41,6 +41,5 @@ new MutationObserver((mutations) => {
 	subtree: true,
 	attributes: true
 });
-
 //#endregion
-export {  };
+export {};

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { UnocssPluginContext, UserConfig, UserConfigDefaults } from "@unocss/core";
-import * as vite0 from "vite";
+import * as vite from "vite";
 import { Plugin } from "vite";
 
 //#region src/types.d.ts
@@ -73,7 +73,7 @@ declare function GlobalModeBuildPlugin(ctx: UnocssPluginContext<VitePluginConfig
 declare function GlobalModeDevPlugin(ctx: UnocssPluginContext): Plugin[];
 //#endregion
 //#region src/modes/global/index.d.ts
-declare function GlobalModePlugin(ctx: UnocssPluginContext): vite0.Plugin<any>[];
+declare function GlobalModePlugin(ctx: UnocssPluginContext): vite.Plugin<any>[];
 //#endregion
 //#region src/modes/per-module.d.ts
 declare function PerModuleModePlugin(ctx: UnocssPluginContext): Plugin[];

package/dist/index.mjs

@@ -13,26 +13,15 @@ import MagicString from "magic-string";
 import { resolve as resolve$1 } from "pathe";
 import crypto from "node:crypto";
 import { Buffer } from "node:buffer";
-
-//#region ../../virtual-shared/integration/src/constants.ts
-const INCLUDE_COMMENT = "@unocss-include";
-const IGNORE_COMMENT = "@unocss-ignore";
 const CSS_PLACEHOLDER = "@unocss-placeholder";
 const SKIP_START_COMMENT = "@unocss-skip-start";
 const SKIP_END_COMMENT = "@unocss-skip-end";
 const SKIP_COMMENT_RE = new RegExp(`(\/\/\\s*?${SKIP_START_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_START_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_START_COMMENT}\\s*?-->)[\\s\\S]*?(\/\/\\s*?${SKIP_END_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_END_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_END_COMMENT}\\s*?-->)`, "g");
 const VIRTUAL_ENTRY_ALIAS = [/^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/];
-const LAYER_MARK_ALL = "__ALL__";
-
 //#endregion
 //#region ../../virtual-shared/integration/src/defaults.ts
 const defaultPipelineExclude = [cssIdRE];
 const defaultPipelineInclude = [/\.(vue|svelte|[jt]sx|vine.ts|mdx?|astro|elm|php|phtml|marko|html)($|\?)/];
-
-//#endregion
-//#region ../../virtual-shared/integration/src/deprecation.ts
-function deprecationCheck(config) {}
-
 //#endregion
 //#region ../../virtual-shared/integration/src/context.ts
 function createContext(configOrPath, defaults = {}, extraConfigSources = [], resolveConfigResult = () => {}) {
@@ -57,7 +46,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
 		await _uno;
 		const result = await loadConfig(root, configOrPath, extraConfigSources, defaults);
 		resolveConfigResult(result);
-		/* @__PURE__ */ deprecationCheck(result.config);
+		result.config;
 		rawConfig = result.config;
 		configFileList = result.sources;
 		await uno.setConfig(rawConfig);
@@ -83,15 +72,15 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
 		reloadListeners.forEach((cb) => cb());
 	}
 	async function extract(code, id) {
-		const uno$1 = await _uno;
+		const uno = await _uno;
 		if (id) modules.set(id, code);
 		const len = tokens.size;
-		await uno$1.applyExtractors(code.replace(SKIP_COMMENT_RE, ""), id, tokens);
+		await uno.applyExtractors(code.replace(SKIP_COMMENT_RE, ""), id, tokens);
 		if (tokens.size > len) invalidate();
 	}
 	function filter(code, id) {
-		if (code.includes(IGNORE_COMMENT)) return false;
-		return code.includes(INCLUDE_COMMENT) || code.includes(CSS_PLACEHOLDER) || rollupFilter(id.replace(/\?v=\w+$/, ""));
+		if (code.includes("@unocss-ignore")) return false;
+		return code.includes("@unocss-include") || code.includes("@unocss-placeholder") || rollupFilter(id.replace(/\?v=\w+$/, ""));
 	}
 	async function getConfig() {
 		await ready;
@@ -111,8 +100,8 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
 		if (vmpCache.has(prefix)) return vmpCache.get(prefix);
 		const regexes = {
 			prefix,
-			RESOLVED_ID_WITH_QUERY_RE: /* @__PURE__ */ new RegExp(`[/\\\\]${prefix}(_.*?)?\\.css(\\?.*)?$`),
-			RESOLVED_ID_RE: /* @__PURE__ */ new RegExp(`[/\\\\]${prefix}(?:_(.*?))?\.css$`)
+			RESOLVED_ID_WITH_QUERY_RE: new RegExp(`[/\\\\]${prefix}(_.*?)?\\.css(\\?.*)?$`),
+			RESOLVED_ID_RE: new RegExp(`[/\\\\]${prefix}(?:_(.*?))?\.css$`)
 		};
 		vmpCache.set(prefix, regexes);
 		return regexes;
@@ -149,7 +138,6 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
 		getVMPRegexes
 	};
 }
-
 //#endregion
 //#region src/config-hmr.ts
 function ConfigHMRPlugin(ctx) {
@@ -175,7 +163,6 @@ function ConfigHMRPlugin(ctx) {
 		}
 	};
 }
-
 //#endregion
 //#region src/devtool.ts
 const _dirname = typeof __dirname !== "undefined" ? __dirname : dirname(fileURLToPath(import.meta.url));
@@ -191,13 +178,13 @@ const MODULES_MAP = {
 };
 const BASE_POST_PATH = "/@unocss-devtools-update";
 function getBodyJson(req) {
-	return new Promise((resolve$2, reject) => {
+	return new Promise((resolve, reject) => {
 		let body = "";
 		req.on("data", (chunk) => body += chunk);
 		req.on("error", reject);
 		req.on("end", () => {
 			try {
-				resolve$2(JSON.parse(body) || {});
+				resolve(JSON.parse(body) || {});
 			} catch (e) {
 				reject(e);
 			}
@@ -296,7 +283,6 @@ function createDevtoolsPlugin(ctx, pluginConfig) {
 		}
 	}];
 }
-
 //#endregion
 //#region src/modes/chunk-build.ts
 function ChunkModeBuildPlugin(ctx) {
@@ -341,7 +327,6 @@ function ChunkModeBuildPlugin(ctx) {
 		}
 	};
 }
-
 //#endregion
 //#region ../../virtual-shared/integration/src/utils.ts
 function getPath(id) {
@@ -370,11 +355,10 @@ function restoreSkipCode(code, map) {
 	for (const [withHashKey, matched] of map.entries()) code = code.replaceAll(withHashKey, matched);
 	return code;
 }
-
 //#endregion
 //#region ../../virtual-shared/integration/src/transformers.ts
 async function applyTransformers(ctx, original, id, enforce = "default") {
-	if (original.includes(IGNORE_COMMENT)) return;
+	if (original.includes("@unocss-ignore")) return;
 	const transformers = (ctx.uno.config.transformers || []).filter((i) => (i.enforce || "default") === enforce);
 	if (!transformers.length) return;
 	const skipMap = /* @__PURE__ */ new Map();
@@ -397,13 +381,12 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
 	}
 	if (code !== original) return {
 		code,
-		map: remapping(maps, (_, ctx$1) => {
-			ctx$1.content = code;
+		map: remapping(maps, (_, ctx) => {
+			ctx.content = code;
 			return null;
 		})
 	};
 }
-
 //#endregion
 //#region ../../virtual-shared/integration/src/content.ts
 async function setupContentExtractor(ctx, shouldWatch = false) {
@@ -444,7 +427,6 @@ async function setupContentExtractor(ctx, shouldWatch = false) {
 		await Promise.all(files.map(extractFile));
 	}
 }
-
 //#endregion
 //#region ../../virtual-shared/integration/src/layers.ts
 async function resolveId(ctx, id, importer) {
@@ -464,16 +446,14 @@ async function resolveId(ctx, id, importer) {
 async function resolveLayer(ctx, id) {
 	const { RESOLVED_ID_RE } = await ctx.getVMPRegexes();
 	const match = id.match(RESOLVED_ID_RE);
-	if (match) return match[1] || LAYER_MARK_ALL;
+	if (match) return match[1] || "__ALL__";
 }
 function getLayerPlaceholder(layer) {
 	return `#--unocss--{layer:${layer};escape-view:\\"\\'\\\`\\\\}`;
 }
-
 //#endregion
 //#region src/modes/global/shared.ts
 const MESSAGE_UNOCSS_ENTRY_NOT_FOUND = "[unocss] Entry module not found. Did you add `import 'uno.css'` in your main entry?";
-
 //#endregion
 //#region src/modes/global/build.ts
 function GlobalModeBuildPlugin(ctx) {
@@ -484,11 +464,11 @@ function GlobalModeBuildPlugin(ctx) {
 	let viteConfig;
 	const cssPostPlugins = /* @__PURE__ */ new Map();
 	const cssPlugins = /* @__PURE__ */ new Map();
-	async function applyCssTransform(css, id, dir, ctx$1) {
+	async function applyCssTransform(css, id, dir, ctx) {
 		const { postcss = true } = await getConfig();
 		if (!cssPlugins.get(dir) || !postcss) return css;
 		const cssPlugin = cssPlugins.get(dir);
-		const result = await ("handler" in cssPlugin.transform ? cssPlugin.transform.handler : cssPlugin.transform).call(ctx$1, css, id);
+		const result = await ("handler" in cssPlugin.transform ? cssPlugin.transform.handler : cssPlugin.transform).call(ctx, css, id);
 		if (!result) return css;
 		if (typeof result === "string") css = result;
 		else if (result.code) css = result.code;
@@ -609,8 +589,8 @@ function GlobalModeBuildPlugin(ctx) {
 					return (await applyTransformers(ctx, defaultTransform?.code || preTransform?.code || layerContent, fakeCssId, "post"))?.code || defaultTransform?.code || preTransform?.code || layerContent;
 				})));
 				for (const mod of entryModules) {
-					const layer = RESOLVED_ID_RE.exec(mod)?.[1] || LAYER_MARK_ALL;
-					const css = await applyCssTransform(layer === LAYER_MARK_ALL ? result.getLayers(void 0, [LAYER_IMPORTS, ...vfsLayers.keys()]) : result.getLayer(layer) || "", mod, options.dir, resolveContexts.get(layer) || this);
+					const layer = RESOLVED_ID_RE.exec(mod)?.[1] || "__ALL__";
+					const css = await applyCssTransform(layer === "__ALL__" ? result.getLayers(void 0, [LAYER_IMPORTS, ...vfsLayers.keys()]) : result.getLayer(layer) || "", mod, options.dir, resolveContexts.get(layer) || this);
 					await cssPostTransformHandler.call(this, css, mod);
 				}
 			},
@@ -622,14 +602,12 @@ function GlobalModeBuildPlugin(ctx) {
 		}
 	];
 }
-
 //#endregion
 //#region ../../virtual-shared/integration/src/hash.ts
 const hash = crypto.hash ?? ((algorithm, data, outputEncoding) => crypto.createHash(algorithm).update(data).digest(outputEncoding));
 function getHash(input, length = 8) {
 	return hash("sha256", input, "hex").substring(0, length);
 }
-
 //#endregion
 //#region src/modes/global/dev.ts
 const WARN_TIMEOUT = 2e4;
@@ -653,12 +631,12 @@ function GlobalModeDevPlugin(ctx) {
 			if (tokensSize === tokens.size) break;
 			tokensSize = tokens.size;
 		} while (true);
-		const css = layer === LAYER_MARK_ALL ? result.getLayers(void 0, await Promise.all(Array.from(entries).map((i) => resolveLayer(ctx, i))).then((layers) => layers.filter((i) => !!i))) : result.getLayer(layer);
-		const hash$2 = getHash(css || "", HASH_LENGTH);
-		lastServedHash.set(layer, hash$2);
+		const css = layer === "__ALL__" ? result.getLayers(void 0, await Promise.all(Array.from(entries).map((i) => resolveLayer(ctx, i))).then((layers) => layers.filter((i) => !!i))) : result.getLayer(layer);
+		const hash = getHash(css || "", HASH_LENGTH);
+		lastServedHash.set(layer, hash);
 		lastServedTime = Date.now();
 		return {
-			hash: hash$2,
+			hash,
 			css
 		};
 	}
@@ -756,9 +734,9 @@ function GlobalModeDevPlugin(ctx) {
 		async load(id) {
 			const layer = await resolveLayer(ctx, getPath(id));
 			if (!layer) return null;
-			const { hash: hash$2, css } = await generateCSS(layer);
+			const { hash, css } = await generateCSS(layer);
 			return {
-				code: `${css}__uno_hash_${hash$2}{--:'';}`,
+				code: `${css}__uno_hash_${hash}{--:'';}`,
 				map: { mappings: "" }
 			};
 		},
@@ -799,13 +777,11 @@ if (!import.meta.url.includes('?'))
 		}
 	}];
 }
-
 //#endregion
 //#region src/modes/global/index.ts
 function GlobalModePlugin(ctx) {
 	return [...GlobalModeBuildPlugin(ctx), ...GlobalModeDevPlugin(ctx)];
 }
-
 //#endregion
 //#region src/modes/per-module.ts
 const VIRTUAL_PREFIX = "/@unocss/";
@@ -813,9 +789,9 @@ const SCOPE_IMPORT_RE = / from (['"])(@unocss\/scope)\1/;
 function PerModuleModePlugin(ctx) {
 	const moduleMap = /* @__PURE__ */ new Map();
 	let server;
-	const invalidate = (hash$2) => {
+	const invalidate = (hash) => {
 		if (!server) return;
-		const id = `${VIRTUAL_PREFIX}${hash$2}.css`;
+		const id = `${VIRTUAL_PREFIX}${hash}.css`;
 		const mod = server.moduleGraph.getModuleById(id);
 		if (!mod) return;
 		server.moduleGraph.invalidateModule(mod);
@@ -849,17 +825,17 @@ function PerModuleModePlugin(ctx) {
 		async transform(code, id) {
 			await ctx.ready;
 			if (!ctx.filter(code, id)) return;
-			const hash$2 = getHash(id);
+			const hash = getHash(id);
 			const hasScope = SCOPE_IMPORT_RE.test(code);
 			const { css } = await ctx.uno.generate(code, {
 				id,
-				scope: hasScope ? `.${hash$2}` : void 0,
+				scope: hasScope ? `.${hash}` : void 0,
 				preflights: false
 			});
 			if (!css && !hasScope) return null;
-			if (hasScope) code = code.replace(SCOPE_IMPORT_RE, ` from 'data:text/javascript;base64,${Buffer.from(`export default () => "${hash$2}"`).toString("base64")}'`);
-			moduleMap.set(hash$2, [id, css]);
-			invalidate(hash$2);
+			if (hasScope) code = code.replace(SCOPE_IMPORT_RE, ` from 'data:text/javascript;base64,${Buffer.from(`export default () => "${hash}"`).toString("base64")}'`);
+			moduleMap.set(hash, [id, css]);
+			invalidate(hash);
 			return null;
 		}
 	}, {
@@ -871,10 +847,10 @@ function PerModuleModePlugin(ctx) {
 		async transform(code, id) {
 			await ctx.ready;
 			if (!ctx.filter(code, id)) return;
-			const hash$2 = getHash(id);
-			invalidate(hash$2);
-			if ((moduleMap.get(hash$2) || []).length) return {
-				code: `import "${VIRTUAL_PREFIX}${hash$2}.css";${code}`,
+			const hash = getHash(id);
+			invalidate(hash);
+			if ((moduleMap.get(hash) || []).length) return {
+				code: `import "${VIRTUAL_PREFIX}${hash}.css";${code}`,
 				map: null
 			};
 		},
@@ -883,14 +859,13 @@ function PerModuleModePlugin(ctx) {
 		},
 		load(id) {
 			if (!id.startsWith(VIRTUAL_PREFIX)) return null;
-			const hash$2 = id.slice(9, -4);
-			const [source, css] = moduleMap.get(hash$2) || [];
+			const hash = id.slice(9, -4);
+			const [source, css] = moduleMap.get(hash) || [];
 			if (source) this.addWatchFile(source);
 			return `\n/* unocss ${source} */\n${css}`;
 		}
 	}];
 }
-
 //#endregion
 //#region src/modes/shadow-dom.ts
 function ShadowDomModuleModePlugin(ctx) {
@@ -925,7 +900,7 @@ function ShadowDomModuleModePlugin(ctx) {
 		};
 	};
 	const transformWebComponent = async (code, id) => {
-		if (!code.match(CSS_PLACEHOLDER)) return code;
+		if (!code.match("@unocss-placeholder")) return code;
 		await ctx.ready;
 		let { css, matched } = await ctx.uno.generate(code, {
 			preflights: true,
@@ -965,7 +940,7 @@ function ShadowDomModuleModePlugin(ctx) {
 				}, css);
 			}
 		}
-		if (id.includes("?vue&type=style") || id.endsWith(".vue") && vueSFCStyleRE.test(code)) return code.replace(/* @__PURE__ */ new RegExp(`(\\/\\*\\s*)?${CSS_PLACEHOLDER}(\\s*\\*\\/)?`), css || "");
+		if (id.includes("?vue&type=style") || id.endsWith(".vue") && vueSFCStyleRE.test(code)) return code.replace(new RegExp(`(\\/\\*\\s*)?${CSS_PLACEHOLDER}(\\s*\\*\\/)?`), css || "");
 		return code.replace(CSS_PLACEHOLDER, css?.replace(/\\/g, "\\\\")?.replace(/`/g, "\\`") ?? "");
 	};
 	return {
@@ -977,15 +952,14 @@ function ShadowDomModuleModePlugin(ctx) {
 				map: null
 			};
 		},
-		handleHotUpdate(ctx$1) {
-			const read = ctx$1.read;
-			ctx$1.read = async () => {
-				return await transformWebComponent(await read(), ctx$1.file);
+		handleHotUpdate(ctx) {
+			const read = ctx.read;
+			ctx.read = async () => {
+				return await transformWebComponent(await read(), ctx.file);
 			};
 		}
 	};
 }
-
 //#endregion
 //#region src/modes/vue-scoped.ts
 function VueScopedPlugin(ctx) {
@@ -1011,16 +985,15 @@ function VueScopedPlugin(ctx) {
 				map: null
 			};
 		},
-		handleHotUpdate(ctx$1) {
-			const read = ctx$1.read;
-			if (filter(ctx$1.file)) ctx$1.read = async () => {
+		handleHotUpdate(ctx) {
+			const read = ctx.read;
+			if (filter(ctx.file)) ctx.read = async () => {
 				const code = await read();
 				return await transformSFC(code) || code;
 			};
 		}
 	};
 }
-
 //#endregion
 //#region src/transformers.ts
 function createTransformerPlugins(ctx) {
@@ -1048,7 +1021,6 @@ function createTransformerPlugins(ctx) {
 		};
 	});
 }
-
 //#endregion
 //#region src/index.ts
 function defineConfig(config) {
@@ -1084,6 +1056,5 @@ function UnocssPlugin(configOrPath, defaults = {}) {
 	else throw new Error(`[unocss] unknown mode "${mode}"`);
 	return plugins.filter(Boolean);
 }
-
 //#endregion
-export { ChunkModeBuildPlugin, GlobalModeBuildPlugin, GlobalModeDevPlugin, GlobalModePlugin, PerModuleModePlugin, VueScopedPlugin, UnocssPlugin as default, defineConfig };
+export { ChunkModeBuildPlugin, GlobalModeBuildPlugin, GlobalModeDevPlugin, GlobalModePlugin, PerModuleModePlugin, VueScopedPlugin, UnocssPlugin as default, defineConfig };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/vite",
   "type": "module",
-  "version": "66.6.6-beta.1",
+  "version": "66.6.7",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -48,9 +48,9 @@
     "pathe": "^2.0.3",
     "tinyglobby": "^0.2.15",
     "unplugin-utils": "^0.3.1",
-    "@unocss/config": "66.6.6-beta.1",
-    "@unocss/core": "66.6.6-beta.1",
-    "@unocss/inspector": "66.6.6-beta.1"
+    "@unocss/config": "66.6.7",
+    "@unocss/core": "66.6.7",
+    "@unocss/inspector": "66.6.7"
   },
   "devDependencies": {
     "vite": "^7.3.1"