@unocss/transformer-directives 66.1.2 → 66.1.3

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { expandVariantGroup, notNull, regexScopePlaceholder, toArray, cssIdRE } from '@unocss/core';
-import { transformThemeFn, transformThemeString, hasThemeFn, hasIconFn } from '@unocss/rule-utils';
+import { transformThemeFn, transformThemeString, calcMaxWidthBySize, hasThemeFn, hasIconFn } from '@unocss/rule-utils';
 import { generate, parse, clone, List, walk } from 'css-tree';
 
 async function handleApply(ctx, node) {
@@ -44,9 +44,9 @@ async function parseApply({ code, uno, applyVariable }, node, childNode) {
     return;
   let semicolonOffset = original[childNode.loc.end.offset] === ";" ? 1 : original[childNode.loc.end.offset] === "@" ? -1 : 0;
   for (const i of utils) {
-    const [, _selector, body2, parent] = i;
+    const [, _selector, body2, parent, meta] = i;
     const selectorOrGroup = _selector?.replace(regexScopePlaceholder, " ") || _selector;
-    if (parent || selectorOrGroup && selectorOrGroup !== ".\\-" && !selectorOrGroup.startsWith("@property")) {
+    if (parent || selectorOrGroup && selectorOrGroup !== ".\\-" || meta?.noMerge) {
       let newSelector = generate(node.prelude);
       const className = code.slice(node.prelude.loc.start.offset, node.prelude.loc.end.offset);
       if (selectorOrGroup && selectorOrGroup !== ".\\-") {
@@ -194,11 +194,8 @@ function handleScreen({ code, uno }, node) {
     breakpointName = match[2];
   }
   const resolveBreakpoints = () => {
-    let breakpoints;
-    if (uno.userConfig && uno.userConfig.theme)
-      breakpoints = uno.userConfig.theme.breakpoints;
-    if (!breakpoints)
-      breakpoints = uno.config.theme.breakpoints;
+    const key = uno.config.presets.some((p) => p.name === "@unocss/preset-wind4") ? "breakpoint" : "breakpoints";
+    const breakpoints = uno.config.theme[key];
     return breakpoints ? Object.entries(breakpoints).sort((a, b) => Number.parseInt(a[1].replace(/[a-z]+/gi, "")) - Number.parseInt(b[1].replace(/[a-z]+/gi, ""))).map(([point, size]) => ({ point, size })) : void 0;
   };
   const variantEntries = (resolveBreakpoints() ?? []).map(({ point, size }, idx) => [point, size, idx]);
@@ -228,12 +225,6 @@ function handleScreen({ code, uno }, node) {
     );
   }
 }
-function calcMaxWidthBySize(size) {
-  const value = size.match(/^-?\d+\.?\d*/)?.[0] || "";
-  const unit = size.slice(value.length);
-  const maxWidth = Number.parseFloat(value) - 0.1;
-  return Number.isNaN(maxWidth) ? size : `${maxWidth}${unit}`;
-}
 
 async function transformDirectives(code, uno, options, filename, originalCode, offset) {
   let { applyVariable } = options;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/transformer-directives",
   "type": "module",
-  "version": "66.1.2",
+  "version": "66.1.3",
   "description": "UnoCSS transformer for `@apply` directive",
   "author": "hannoeru <me@hanlee.co>",
   "license": "MIT",
@@ -33,8 +33,8 @@
   ],
   "dependencies": {
     "css-tree": "^3.1.0",
-    "@unocss/core": "66.1.2",
-    "@unocss/rule-utils": "66.1.2"
+    "@unocss/core": "66.1.3",
+    "@unocss/rule-utils": "66.1.3"
   },
   "devDependencies": {
     "magic-string": "^0.30.17"