@unocss/postcss 66.1.2 → 66.1.4

package/dist/esm.mjs

@@ -3,7 +3,7 @@ import { normalize } from 'node:path';
 import process from 'node:process';
 import { expandVariantGroup, notNull, regexScopePlaceholder, createGenerator } from '@unocss/core';
 import { createRecoveryConfigLoader } from '@unocss/config';
-import { transformThemeFn, hasThemeFn } from '@unocss/rule-utils';
+import { calcMaxWidthBySize, transformThemeFn, hasThemeFn } from '@unocss/rule-utils';
 import postcss from 'postcss';
 import { glob } from 'tinyglobby';
 import { parse, generate, clone } from 'css-tree';
@@ -118,12 +118,6 @@ async function parseScreen(root, uno, directiveName) {
     rule.params = `${generateMediaQuery(breakpointName, prefix)}`;
   });
 }
-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 parseTheme(root, uno) {
   root.walkDecls((decl) => {
@@ -253,22 +247,39 @@ function createPlugin(options) {
     classes.clear();
     const excludes = [];
     root.walkAtRules(directiveMap.unocss, (rule) => {
+      const source = rule.source;
       if (rule.params) {
-        const source = rule.source;
-        const layers = rule.params.split(",").map((v) => v.trim());
-        const css = postcss.parse(
-          layers.map((i) => (i === "all" ? c.getLayers() : c.getLayer(i)) || "").filter(Boolean).join("\n")
-        );
+        const excludeLayers = [];
+        const includeLayers = [];
+        for (const layer of rule.params.split(",")) {
+          const name = layer.trim();
+          if (!name)
+            continue;
+          if (name.startsWith("!")) {
+            if (name.slice(1)) {
+              excludeLayers.push(name.slice(1));
+            }
+          } else {
+            includeLayers.push(name);
+          }
+        }
+        if (excludeLayers.length > 0 && includeLayers.length > 0) {
+          console.warn(`Warning: Mixing normal and negated layer names in "@${directiveMap.unocss} ${rule.params}" is not recommended.`);
+        }
+        let result2 = "";
+        if (includeLayers.length > 0) {
+          result2 = includeLayers.map((i) => (i === "all" ? c.getLayers() : c.getLayer(i)) || "").filter(Boolean).join("\n");
+          excludes.push(...includeLayers);
+        } else if (excludeLayers.length > 0) {
+          result2 = c.getLayers(void 0, excludeLayers) || "";
+          excludes.push(...excludeLayers);
+        }
+        const css = postcss.parse(result2);
         css.walkDecls((declaration) => {
           declaration.source = source;
         });
         rule.replaceWith(css);
-        excludes.push(rule.params);
-      }
-    });
-    root.walkAtRules(directiveMap.unocss, (rule) => {
-      if (!rule.params) {
-        const source = rule.source;
+      } else {
         const css = postcss.parse(c.getLayers(void 0, excludes) || "");
         css.walkDecls((declaration) => {
           declaration.source = source;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/postcss",
   "type": "module",
-  "version": "66.1.2",
+  "version": "66.1.4",
   "description": "PostCSS plugin for UnoCSS",
   "author": "sibbng <sibbngheid@gmail.com>",
   "license": "MIT",
@@ -57,9 +57,9 @@
     "css-tree": "^3.1.0",
     "postcss": "^8.5.3",
     "tinyglobby": "^0.2.13",
-    "@unocss/config": "66.1.2",
-    "@unocss/core": "66.1.2",
-    "@unocss/rule-utils": "66.1.2"
+    "@unocss/config": "66.1.4",
+    "@unocss/core": "66.1.4",
+    "@unocss/rule-utils": "66.1.4"
   },
   "scripts": {
     "build": "unbuild",