@unocss/postcss 0.50.6 → 0.50.8

package/README.md

@@ -1,11 +1,11 @@
 # @unocss/postcss
 
-## Experimental
-This package is in an experimental state right now. It doesn't follow semver, and may introduce breaking changes in patch versions.
+PostCSS plugin for UnoCSS. Supports `@apply`、`@screen` and `theme()` directives.
 
-<!-- @unocss-ignore -->
+> **Warning**: Experimental
+> This package is in an experimental state right now. It doesn't follow semver, and may introduce breaking changes in patch versions.
 
-PostCSS plugin for UnoCSS. Supports `@apply`、`@screen` and `theme()` directives.
+<!-- @unocss-ignore -->
 
 ## Install
 
@@ -26,7 +26,7 @@ module.exports = {
 ```
 
 ```ts
-// uno.config.js
+// uno.config.ts
 import { defineConfig, presetUno } from 'unocss'
 
 export default defineConfig({
@@ -92,16 +92,16 @@ The `@screen` directive allows you to create media queries that reference your b
 
 ```css
 .grid {
-  --uno: grid grid-cols-2;
+  @apply grid grid-cols-2;
 }
 @screen xs {
   .grid {
-    --uno: grid-cols-1;
+    @apply grid-cols-1;
   }
 }
 @screen sm {
   .grid {
-    --uno: grid-cols-3;
+    @apply grid-cols-3;
   }
 }
 /* ... */
@@ -135,16 +135,16 @@ Will be transformed to:
 
 ```css
 .grid {
-  --uno: grid grid-cols-2;
+  @apply grid grid-cols-2;
 }
 @screen lt-xs {
   .grid {
-    --uno: grid-cols-1;
+    @apply grid-cols-1;
   }
 }
 @screen lt-sm {
   .grid {
-    --uno: grid-cols-3;
+    @apply grid-cols-3;
   }
 }
 /* ... */
@@ -174,21 +174,21 @@ Will be transformed to:
 
 ```css
 .grid {
-  --uno: grid grid-cols-2;
+  @apply grid grid-cols-2;
 }
 @screen at-xs {
   .grid {
-    --uno: grid-cols-1;
+    @apply grid-cols-1;
   }
 }
 @screen at-xl {
   .grid {
-    --uno: grid-cols-3;
+    @apply grid-cols-3;
   }
 }
 @screen at-xxl {
   .grid {
-    --uno: grid-cols-4;
+    @apply grid-cols-4;
   }
 }
 /* ... */

package/dist/index.cjs

@@ -78,7 +78,9 @@ async function parseApply(root, uno, directiveName) {
   });
 }
 
-const themeFnRE = (directiveName) => new RegExp(`${directiveName}\\((.*?)\\)`, "g");
+function themeFnRE(directiveName) {
+  return new RegExp(`${directiveName}\\((.*?)\\)`, "g");
+}
 async function parseTheme(root, uno, directiveName) {
   root.walkDecls((decl) => {
     const matches = Array.from(decl.value.matchAll(themeFnRE(directiveName)));
@@ -187,32 +189,36 @@ function unocss(options = {}) {
     postcssPlugin: directiveMap.unocss,
     plugins: [
       async function(root, result) {
-        if (!result.opts.from?.split("?")[0].endsWith(".css"))
+        const from = result.opts.from?.split("?")[0];
+        if (!from)
           return;
-        let isTarget = false;
+        let isTarget = targetCache.has(from);
+        const isScanTarget = root.toString().includes(`@${directiveMap.unocss}`);
         if (targetRE.test(root.toString())) {
-          if (!targetCache.has(result.opts.from)) {
+          if (!isTarget) {
             root.walkAtRules((rule) => {
-              if (rule.name === directiveMap.unocss || rule.name === directiveMap.apply || rule.name === directiveMap.theme || rule.name === directiveMap.screen)
+              if (rule.name === directiveMap.unocss || rule.name === directiveMap.apply || rule.name === directiveMap.screen)
                 isTarget = true;
+              if (isTarget)
+                return false;
             });
             if (!isTarget) {
               const themeFn = themeFnRE(directiveMap.theme);
               root.walkDecls((decl) => {
-                if (themeFn.test(decl.value))
+                if (themeFn.test(decl.value)) {
                   isTarget = true;
+                  return false;
+                }
               });
+            } else {
+              targetCache.add(from);
             }
-          } else {
-            isTarget = true;
           }
-        } else if (targetCache.has(result.opts.from)) {
-          targetCache.delete(result.opts.from);
+        } else if (targetCache.has(from)) {
+          targetCache.delete(from);
         }
         if (!isTarget)
           return;
-        else
-          targetCache.add(result.opts.from);
         try {
           const cfg = await config$1;
           if (!uno) {
@@ -229,19 +235,13 @@ function unocss(options = {}) {
         }
         const globs = content?.filter((v) => typeof v === "string") ?? defaultIncludeGlobs;
         const rawContent = content?.filter((v) => typeof v === "object") ?? [];
-        const entries = await fg__default(globs, {
+        const entries = await fg__default(isScanTarget ? globs : from, {
           cwd,
           dot: true,
           absolute: true,
           ignore: ["**/{.git,node_modules}/**"],
           stats: true
         });
-        result.messages.push({
-          type: "dependency",
-          plugin: directiveMap.unocss,
-          file: result.opts.from,
-          parent: result.opts.from
-        });
         await parseApply(root, uno, directiveMap.apply);
         await parseTheme(root, uno, directiveMap.theme);
         await parseScreen(root, uno, directiveMap.screen);
@@ -258,7 +258,7 @@ function unocss(options = {}) {
               type: "dependency",
               plugin: directiveMap.unocss,
               file: node_path.normalize(file),
-              parent: result.opts.from
+              parent: from
             });
             if (fileMap.has(file) && mtimeMs <= fileMap.get(file))
               return;

package/dist/index.mjs

@@ -70,7 +70,9 @@ async function parseApply(root, uno, directiveName) {
   });
 }
 
-const themeFnRE = (directiveName) => new RegExp(`${directiveName}\\((.*?)\\)`, "g");
+function themeFnRE(directiveName) {
+  return new RegExp(`${directiveName}\\((.*?)\\)`, "g");
+}
 async function parseTheme(root, uno, directiveName) {
   root.walkDecls((decl) => {
     const matches = Array.from(decl.value.matchAll(themeFnRE(directiveName)));
@@ -179,32 +181,36 @@ function unocss(options = {}) {
     postcssPlugin: directiveMap.unocss,
     plugins: [
       async function(root, result) {
-        if (!result.opts.from?.split("?")[0].endsWith(".css"))
+        const from = result.opts.from?.split("?")[0];
+        if (!from)
           return;
-        let isTarget = false;
+        let isTarget = targetCache.has(from);
+        const isScanTarget = root.toString().includes(`@${directiveMap.unocss}`);
         if (targetRE.test(root.toString())) {
-          if (!targetCache.has(result.opts.from)) {
+          if (!isTarget) {
             root.walkAtRules((rule) => {
-              if (rule.name === directiveMap.unocss || rule.name === directiveMap.apply || rule.name === directiveMap.theme || rule.name === directiveMap.screen)
+              if (rule.name === directiveMap.unocss || rule.name === directiveMap.apply || rule.name === directiveMap.screen)
                 isTarget = true;
+              if (isTarget)
+                return false;
             });
             if (!isTarget) {
               const themeFn = themeFnRE(directiveMap.theme);
               root.walkDecls((decl) => {
-                if (themeFn.test(decl.value))
+                if (themeFn.test(decl.value)) {
                   isTarget = true;
+                  return false;
+                }
               });
+            } else {
+              targetCache.add(from);
             }
-          } else {
-            isTarget = true;
           }
-        } else if (targetCache.has(result.opts.from)) {
-          targetCache.delete(result.opts.from);
+        } else if (targetCache.has(from)) {
+          targetCache.delete(from);
         }
         if (!isTarget)
           return;
-        else
-          targetCache.add(result.opts.from);
         try {
           const cfg = await config;
           if (!uno) {
@@ -221,19 +227,13 @@ function unocss(options = {}) {
         }
         const globs = content?.filter((v) => typeof v === "string") ?? defaultIncludeGlobs;
         const rawContent = content?.filter((v) => typeof v === "object") ?? [];
-        const entries = await fg(globs, {
+        const entries = await fg(isScanTarget ? globs : from, {
           cwd,
           dot: true,
           absolute: true,
           ignore: ["**/{.git,node_modules}/**"],
           stats: true
         });
-        result.messages.push({
-          type: "dependency",
-          plugin: directiveMap.unocss,
-          file: result.opts.from,
-          parent: result.opts.from
-        });
         await parseApply(root, uno, directiveMap.apply);
         await parseTheme(root, uno, directiveMap.theme);
         await parseScreen(root, uno, directiveMap.screen);
@@ -250,7 +250,7 @@ function unocss(options = {}) {
               type: "dependency",
               plugin: directiveMap.unocss,
               file: normalize(file),
-              parent: result.opts.from
+              parent: from
             });
             if (fileMap.has(file) && mtimeMs <= fileMap.get(file))
               return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/postcss",
-  "version": "0.50.6",
+  "version": "0.50.8",
   "description": "PostCSS plugin for UnoCSS",
   "author": "sibbng <sibbngheid@gmail.com>",
   "license": "MIT",
@@ -40,8 +40,8 @@
     "fast-glob": "^3.2.12",
     "magic-string": "^0.30.0",
     "postcss": "^8.4.21",
-    "@unocss/config": "0.50.6",
-    "@unocss/core": "0.50.6"
+    "@unocss/config": "0.50.8",
+    "@unocss/core": "0.50.8"
   },
   "scripts": {
     "build": "unbuild",