@unocss/svelte-scoped 66.6.6 → 66.6.8

package/dist/{preprocess-twOgJvD9.d.mts → preprocess-BolxGJ9J.d.mts}

@@ -25,6 +25,13 @@ interface TransformClassesOptions {
    * Used to generate hash for compiled class names
    */
   hashFn?: (str: string) => string;
+  /**
+   * Hash safelist classes (including shortcuts in the safelist) instead of passing them through as-is.
+   * When false (default), safelist classes are left unhashed so they match the globally generated safelist CSS.
+   * Set to true to restore the legacy behavior where shortcut classes in the safelist were still hashed.
+   * @default false
+   */
+  hashSafelistClasses?: boolean;
 }
 interface TransformApplyOptions {
   /**

package/dist/{preprocess-smYe4zo2.mjs → preprocess-CZVi4cj2.mjs}

@@ -6,7 +6,6 @@ import MagicString from "magic-string";
 import * as acorn from "acorn";
 import { walk } from "zimmerframe";
 import { clone, generate, parse, walk as walk$1 } from "css-tree";
-
 //#region src/_preprocess/transformClasses/addGeneratedStyles.ts
 const actualStylesTagWithCapturedDirectivesRE = new RegExp(/(?<!<!--\s*)/.source + /<style([^>]*)>[\s\S]*?<\/style\s*>/.source, "g");
 const captureOpeningStyleTagWithAttributesRE = /(<style[^>]*>)/;
@@ -14,7 +13,6 @@ function addGeneratedStylesIntoStyleBlock(code, styles) {
 	if (code.match(actualStylesTagWithCapturedDirectivesRE)) return code.replace(captureOpeningStyleTagWithAttributesRE, `$1${styles}`);
 	return `${code}\n<style>${styles}</style>`;
 }
-
 //#endregion
 //#region src/_preprocess/transformClasses/findClasses.ts
 const classesRE$1 = /class=(["'`])([\s\S]*?)\1/g;
@@ -105,7 +103,6 @@ function parseMatchesWithAcorn(matches, code) {
 		return classes;
 	}).filter(hasBody);
 }
-
 //#endregion
 //#region src/_preprocess/transformClasses/hash.ts
 function hash(str) {
@@ -118,7 +115,6 @@ function hash(str) {
 	}
 	return `00000${(hval >>> 0).toString(36)}`.slice(-6);
 }
-
 //#endregion
 //#region src/_preprocess/transformClasses/generateClassName.ts
 function generateClassName(body, options, filename) {
@@ -126,29 +122,30 @@ function generateClassName(body, options, filename) {
 	if (combine) return `${classPrefix}${hashFn(body + filename)}`;
 	else return `_${body}_${hashFn(filename)}`;
 }
-
 //#endregion
 //#region src/_preprocess/transformClasses/isShortcut.ts
 function isShortcut(token, shortcuts) {
 	return shortcuts.some((s) => s[0] === token);
 }
-
 //#endregion
 //#region src/_preprocess/transformClasses/needsGenerated.ts
 async function needsGenerated(token, uno) {
 	if (uno.config.safelist.includes(token)) return false;
 	return !!await uno.parseToken(token);
 }
-
 //#endregion
 //#region src/_preprocess/transformClasses/sortClassesIntoCategories.ts
 async function sortClassesIntoCategories(body, options, uno, filename) {
-	const { combine = true } = options;
+	const { combine = true, hashSafelistClasses = false } = options;
 	const rulesToGenerate = {};
 	const ignore = [];
 	const classes = body.trim().split(/\s+/);
 	const knownClassesToCombine = [];
 	for (const token of classes) {
+		if (!hashSafelistClasses && uno.config.safelist.includes(token)) {
+			ignore.push(token);
+			continue;
+		}
 		if (!(isShortcut(token, uno.config.shortcuts) || await needsGenerated(token, uno))) {
 			ignore.push(token);
 			continue;
@@ -168,7 +165,6 @@ async function sortClassesIntoCategories(body, options, uno, filename) {
 		ignore
 	};
 }
-
 //#endregion
 //#region src/_preprocess/transformClasses/processExpressions.ts
 const expressionsRE = /\S*\{[^{}]+\}\S*/g;
@@ -195,7 +191,6 @@ async function processExpressions(body, options, uno, filename) {
 		restOfBody
 	};
 }
-
 //#endregion
 //#region src/_preprocess/transformClasses/processClassBody.ts
 async function processClassBody({ body, start, end }, options, uno, filename) {
@@ -215,7 +210,6 @@ async function processClassBody({ body, start, end }, options, uno, filename) {
 		}
 	};
 }
-
 //#endregion
 //#region src/_preprocess/transformClasses/processDirective.ts
 async function processDirective({ body: token, start, end, type }, options, uno, filename) {
@@ -231,7 +225,6 @@ async function processDirective({ body: token, start, end, type }, options, uno,
 		}
 	};
 }
-
 //#endregion
 //#region src/_preprocess/transformClasses/processClsx.ts
 async function processClsx(cls, options, uno, filename) {
@@ -261,7 +254,6 @@ async function processClsx(cls, options, uno, filename) {
 		}
 	}
 }
-
 //#endregion
 //#region src/_preprocess/transformClasses/processClasses.ts
 async function processClasses(classes, options, uno, filename) {
@@ -281,14 +273,12 @@ async function processClass(foundClass, options, uno, filename) {
 	if (foundClass.type === "clsxObject" || foundClass.type === "clsxObjectShorthand") return await processClsx(foundClass, options, uno, filename) ?? {};
 	return await processDirective(foundClass, options, uno, filename) ?? {};
 }
-
 //#endregion
 //#region src/_preprocess/transformClasses/wrapGlobal.ts
 const EXTRACT_SELECTOR_RE = new RegExp(/(?<![\d(])/.source + /([[.][\s\S]+?)/.source + /(\{[\s\S]+?\})/.source, "g");
 function wrapSelectorsWithGlobal(css) {
 	return css.replace(EXTRACT_SELECTOR_RE, ":global($1)$2");
 }
-
 //#endregion
 //#region src/_preprocess/transformClasses/index.ts
 async function transformClasses({ content, filename, uno, options }) {
@@ -329,14 +319,13 @@ async function generateStyles(rulesToGenerate, uno) {
 	});
 	return wrapSelectorsWithGlobal(css);
 }
-
 //#endregion
 //#region src/_preprocess/transformApply/getUtils.ts
 async function getUtils(body, uno) {
 	return (await parseUtils(expandVariantGroup(body).split(/\s+/g).map((className) => className.trim().replace(/\\/, "")), uno)).sort(([aIndex], [bIndex]) => aIndex - bIndex).sort(([, , , aParent], [, , , bParent]) => (aParent ? uno.parentOrders.get(aParent) ?? 0 : 0) - (bParent ? uno.parentOrders.get(bParent) ?? 0 : 0)).reduce((acc, item) => {
-		const [, selector, body$1, parent] = item;
+		const [, selector, body, parent] = item;
 		const sibling = acc.find(([, targetSelector, , targetParent]) => targetSelector === selector && targetParent === parent);
-		if (sibling) sibling[2] += body$1;
+		if (sibling) sibling[2] += body;
 		else acc.push([...item]);
 		return acc;
 	}, []);
@@ -350,14 +339,12 @@ async function parseUtils(classNames, uno) {
 	}
 	return foundUtils.flat();
 }
-
 //#endregion
 //#region src/_preprocess/transformApply/removeOuterQuotes.ts
 function removeOuterQuotes(input) {
 	if (!input) return "";
 	return /^(['"]).*\1$/.test(input) ? input.slice(1, -1) : input;
 }
-
 //#endregion
 //#region src/_preprocess/transformApply/writeUtilStyles.ts
 function writeUtilStyles([, selector, body, parent], s, node, childNode) {
@@ -366,8 +353,8 @@ function writeUtilStyles([, selector, body, parent], s, node, childNode) {
 	if (!parent && !selectorChanged) return s.appendRight(childNode.loc.end.offset, body);
 	const originalSelector = generate(node.prelude);
 	if (parent && !selectorChanged) {
-		const css$1 = `${parent}{${originalSelector}{${body}}}`;
-		return s.appendLeft(node.loc.end.offset, css$1);
+		const css = `${parent}{${originalSelector}{${body}}}`;
+		return s.appendLeft(node.loc.end.offset, css);
 	}
 	const rule = `${surroundAllButOriginalSelectorWithGlobal(originalSelector, generateUpdatedSelector(selector.replace(regexScopePlaceholder, " "), node.prelude))}{${body}}`;
 	const css = parent ? `${parent}{${rule}}` : rule;
@@ -410,7 +397,6 @@ function findFirstCombinatorIndex(input) {
 	}
 	return -1;
 }
-
 //#endregion
 //#region src/_preprocess/transformApply/index.ts
 async function transformApply(ctx) {
@@ -447,7 +433,6 @@ function getChildNodeValue(childNode, applyVariables) {
 	if (childNode.type === "Atrule" && childNode.name === "apply" && childNode.prelude && childNode.prelude.type === "Raw") return childNode.prelude.value.trim();
 	if (childNode.type === "Declaration" && applyVariables.includes(childNode.property) && childNode.value.type === "Raw") return removeOuterQuotes(childNode.value.value.trim());
 }
-
 //#endregion
 //#region src/_preprocess/transformTheme.ts
 const themeRE = /theme\((.+?)\)/g;
@@ -463,7 +448,6 @@ function getThemeValue(rawArguments, theme) {
 	else current = current[key];
 	return current;
 }
-
 //#endregion
 //#region src/_preprocess/transformStyle.ts
 const DEFAULT_APPLY_VARIABLES = ["--at-apply"];
@@ -496,7 +480,6 @@ async function transformStyle({ content, uno, prepend, filename, applyVariables,
 		})
 	};
 }
-
 //#endregion
 //#region src/_preprocess/index.ts
 function UnocssSveltePreprocess(options = {}, unoContextFromVite, isViteBuild) {
@@ -558,6 +541,5 @@ function UnocssSveltePreprocess(options = {}, unoContextFromVite, isViteBuild) {
 		}
 	};
 }
-
 //#endregion
-export { UnocssSveltePreprocess as t };
+export { UnocssSveltePreprocess as t };

package/dist/preprocess.d.mts

@@ -1,2 +1,2 @@
-import { a as TransformDirectivesOptions, i as TransformClassesOptions, n as SvelteScopedContext, o as UnocssSveltePreprocessOptions, r as TransformApplyOptions, t as UnocssSveltePreprocess } from "./preprocess-twOgJvD9.mjs";
+import { a as TransformDirectivesOptions, i as TransformClassesOptions, n as SvelteScopedContext, o as UnocssSveltePreprocessOptions, r as TransformApplyOptions, t as UnocssSveltePreprocess } from "./preprocess-BolxGJ9J.mjs";
 export { SvelteScopedContext, TransformApplyOptions, TransformClassesOptions, TransformDirectivesOptions, UnocssSveltePreprocessOptions, UnocssSveltePreprocess as default };

package/dist/preprocess.mjs

@@ -1,3 +1,2 @@
-import { t as UnocssSveltePreprocess } from "./preprocess-smYe4zo2.mjs";
-
-export { UnocssSveltePreprocess as default };
+import { t as UnocssSveltePreprocess } from "./preprocess-CZVi4cj2.mjs";
+export { UnocssSveltePreprocess as default };

package/dist/vite.d.mts

@@ -1,4 +1,4 @@
-import { o as UnocssSveltePreprocessOptions } from "./preprocess-twOgJvD9.mjs";
+import { o as UnocssSveltePreprocessOptions } from "./preprocess-BolxGJ9J.mjs";
 import { PluginOptions } from "@unocss/core";
 import { Plugin } from "vite";
 

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { t as UnocssSveltePreprocess } from "./preprocess-smYe4zo2.mjs";
+import { t as UnocssSveltePreprocess } from "./preprocess-CZVi4cj2.mjs";
 import process from "node:process";
 import { createRecoveryConfigLoader } from "@unocss/config";
 import { createGenerator, cssIdRE } from "@unocss/core";
@@ -8,7 +8,6 @@ import remapping from "@jridgewell/remapping";
 import { existsSync, readFileSync, statSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-
 //#region src/_vite/config-hmr.ts
 function ConfigHMRPlugin({ ready }) {
 	return {
@@ -26,14 +25,9 @@ function ConfigHMRPlugin({ ready }) {
 		}
 	};
 }
-
-//#endregion
-//#region ../../virtual-shared/integration/src/constants.ts
-const IGNORE_COMMENT = "@unocss-ignore";
 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");
-
 //#endregion
 //#region ../../virtual-shared/integration/src/utils.ts
 function hash(str) {
@@ -59,11 +53,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();
@@ -86,13 +79,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 src/_vite/createCssTransformerPlugins.ts
 const svelteIdRE = /[&?]svelte/;
@@ -114,13 +106,11 @@ function createCssTransformerPlugins(context, cssTransformers) {
 		}
 	}));
 }
-
 //#endregion
 //#region src/_vite/constants.ts
 const PLACEHOLDER_USER_SETS_IN_INDEX_HTML = "%unocss-svelte-scoped.global%";
 const DEV_GLOBAL_STYLES_DATA_TITLE = "unocss-svelte-scoped global styles";
 const GLOBAL_STYLES_CSS_FILE_NAME = "unocss-svelte-scoped-global.css";
-
 //#endregion
 //#region src/_vite/getReset.ts
 const _dirname = typeof __dirname !== "undefined" ? __dirname : dirname(fileURLToPath(import.meta.url));
@@ -147,7 +137,6 @@ function getReset(injectReset) {
 function isFile(path) {
 	return existsSync(path) && statSync(path).isFile();
 }
-
 //#endregion
 //#region src/_vite/global.ts
 async function generateGlobalCss(uno, injectReset) {
@@ -163,13 +152,12 @@ function checkTransformPageChunkHook(server, isSvelteKit) {
 		const originalWrite = res.write;
 		res.write = function(chunk, ...rest) {
 			const str = typeof chunk === "string" ? chunk : chunk instanceof Buffer ? chunk.toString() : Array.isArray(chunk) || "at" in chunk ? Buffer.from(chunk).toString() : `${chunk}`;
-			if (str.includes("<head>") && !str.includes(DEV_GLOBAL_STYLES_DATA_TITLE)) server.config.logger.error(`[unocss] You have not setup the svelte-scoped global styles correctly. You must place '${PLACEHOLDER_USER_SETS_IN_INDEX_HTML}' in your \`${isSvelteKit ? "app.html" : "index.html"}\` file.`, { timestamp: true });
+			if (str.includes("<head>") && !str.includes("unocss-svelte-scoped global styles")) server.config.logger.error(`[unocss] You have not setup the svelte-scoped global styles correctly. You must place '${PLACEHOLDER_USER_SETS_IN_INDEX_HTML}' in your \`${isSvelteKit ? "app.html" : "index.html"}\` file.`, { timestamp: true });
 			return originalWrite.call(this, chunk, ...rest);
 		};
 		next();
 	});
 }
-
 //#endregion
 //#region src/_vite/globalStylesPlugin.ts
 function GlobalStylesPlugin(ctx, injectReset) {
@@ -195,29 +183,27 @@ function GlobalStylesPlugin(ctx, injectReset) {
 			await ctx.ready;
 			if (isSvelteKit) {
 				if (id.includes("hooks") && id.includes("server") && code.includes("unocss_svelte_scoped_global_styles")) this.warn(`[unocss] You are probably using an outdated setup for your sveltekit app. The server hook to handle an unocss styles placeholder is no longer needed.`);
-				if (viteConfig.command === "serve" && code.includes(PLACEHOLDER_USER_SETS_IN_INDEX_HTML)) {
+				if (viteConfig.command === "serve" && code.includes("%unocss-svelte-scoped.global%")) {
 					const tag = `<link href=\\"${viteConfig.base ?? "/"}${GLOBAL_STYLES_CSS_FILE_NAME}\\" rel=\\"stylesheet\\" data-title=\\"${DEV_GLOBAL_STYLES_DATA_TITLE}\\" />`;
 					return { code: code.replace(PLACEHOLDER_USER_SETS_IN_INDEX_HTML, tag) };
 				}
 			}
 		},
-		async buildStart() {
-			if (viteConfig.command === "build") unoCssFileReferenceId = this.emitFile({
-				type: "asset",
-				name: GLOBAL_STYLES_CSS_FILE_NAME
-			});
-		},
 		async buildEnd() {
 			if (viteConfig.command === "build") {
 				const css = await generateGlobalCss(ctx.uno, injectReset);
-				this.setAssetSource(unoCssFileReferenceId, css);
+				unoCssFileReferenceId = this.emitFile({
+					type: "asset",
+					name: GLOBAL_STYLES_CSS_FILE_NAME,
+					source: css
+				});
 			}
 		},
 		renderStart() {
 			unoCssGlobalFileName = this.getFileName(unoCssFileReferenceId);
 		},
 		renderChunk(code) {
-			if (isSvelteKit && code.includes(PLACEHOLDER_USER_SETS_IN_INDEX_HTML)) {
+			if (isSvelteKit && code.includes("%unocss-svelte-scoped.global%")) {
 				const tag = `<link href=\\"${viteConfig.base ?? "/"}${unoCssGlobalFileName}\\" rel=\\"stylesheet\\" />`;
 				return code.replace(PLACEHOLDER_USER_SETS_IN_INDEX_HTML, tag);
 			}
@@ -230,7 +216,6 @@ function GlobalStylesPlugin(ctx, injectReset) {
 		}
 	};
 }
-
 //#endregion
 //#region src/_vite/passPreprocessToSveltePlugin.ts
 function PassPreprocessToSveltePlugin(context, options = {}) {
@@ -245,7 +230,6 @@ function PassPreprocessToSveltePlugin(context, options = {}) {
 		api: { sveltePreprocess: UnocssSveltePreprocess(options, context, isBuild) }
 	};
 }
-
 //#endregion
 //#region src/_vite/index.ts
 function UnocssSvelteScopedVite(options = {}) {
@@ -283,6 +267,5 @@ function createSvelteScopedContext(configOrPath) {
 		ready
 	};
 }
-
 //#endregion
-export { UnocssSvelteScopedVite as default };
+export { UnocssSvelteScopedVite as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/svelte-scoped",
   "type": "module",
-  "version": "66.6.6",
+  "version": "66.6.8",
   "description": "Use UnoCSS in a modular fashion with styles being stored only in the Svelte component they are used in: Vite plugin for apps, Svelte preprocessor for component libraries",
   "author": "Jacob Bowdoin",
   "license": "MIT",
@@ -44,19 +44,19 @@
   ],
   "dependencies": {
     "acorn": "^8.16.0",
-    "css-tree": "^3.1.0",
+    "css-tree": "^3.2.1",
     "magic-string": "^0.30.21",
     "zimmerframe": "^1.1.4",
-    "@unocss/config": "66.6.6",
-    "@unocss/core": "66.6.6",
-    "@unocss/preset-uno": "66.6.6",
-    "@unocss/reset": "66.6.6",
-    "@unocss/preset-wind3": "66.6.6"
+    "@unocss/config": "66.6.8",
+    "@unocss/core": "66.6.8",
+    "@unocss/preset-uno": "66.6.8",
+    "@unocss/preset-wind3": "66.6.8",
+    "@unocss/reset": "66.6.8"
   },
   "devDependencies": {
     "prettier-plugin-svelte": "^2.10.1",
-    "svelte": "^5.53.3",
-    "vite": "^7.3.1"
+    "svelte": "^5.55.2",
+    "vite": "^8.0.7"
   },
   "scripts": {
     "build": "tsdown --config-loader unrun",