@unocss/postcss 0.52.7 → 0.53.0

package/dist/index.cjs

@@ -15,7 +15,9 @@ const fg__default = /*#__PURE__*/_interopDefaultLegacy(fg);
 const postcss__default = /*#__PURE__*/_interopDefaultLegacy(postcss);
 const MagicString__default = /*#__PURE__*/_interopDefaultLegacy(MagicString);
 
-const defaultIncludeGlobs = ["**/*.{html,js,ts,jsx,tsx,vue,svelte,astro,elm,php,phtml,mdx,md}"];
+const defaultFilesystemGlobs = [
+  "**/*.{html,js,ts,jsx,tsx,vue,svelte,astro,elm,php,phtml,mdx,md}"
+];
 
 async function parseApply(root, uno, directiveName) {
   root.walkAtRules(directiveName, async (rule) => {
@@ -157,7 +159,7 @@ async function parseScreen(root, uno, directiveName) {
 function calcMaxWidthBySize(size) {
   const value = size.match(/^-?[0-9]+\.?[0-9]*/)?.[0] || "";
   const unit = size.slice(value.length);
-  const maxWidth = parseFloat(value) - 0.1;
+  const maxWidth = Number.parseFloat(value) - 0.1;
   return Number.isNaN(maxWidth) ? size : `${maxWidth}${unit}`;
 }
 
@@ -167,7 +169,6 @@ function unocss(options = {}) {
   );
   const {
     cwd = process.cwd(),
-    content,
     configOrPath
   } = options;
   const directiveMap = Object.assign({
@@ -233,8 +234,8 @@ function unocss(options = {}) {
         } catch (error) {
           throw new Error(`UnoCSS config not found: ${error.message}`);
         }
-        const globs = content?.filter((v) => typeof v === "string") ?? defaultIncludeGlobs;
-        const rawContent = content?.filter((v) => typeof v === "object") ?? [];
+        const globs = uno.config.content?.filesystem ?? defaultFilesystemGlobs;
+        const plainContent = uno.config.content?.inline ?? [];
         const entries = await fg__default(isScanTarget ? globs : from, {
           cwd,
           absolute: true,
@@ -245,10 +246,12 @@ function unocss(options = {}) {
         await parseTheme(root, uno, directiveMap.theme);
         await parseScreen(root, uno, directiveMap.screen);
         promises$1.push(
-          ...rawContent.map(async (v) => {
-            const { matched } = await uno.generate(v.raw, {
-              id: `unocss.${v.extension}`
-            });
+          ...plainContent.map(async (c2, idx) => {
+            if (typeof c2 === "function")
+              c2 = await c2();
+            if (typeof c2 === "string")
+              c2 = { code: c2 };
+            const { matched } = await uno.generate(c2.code, { id: c2.id ?? `__plain_content_${idx}__` });
             for (const candidate of matched)
               classes.add(candidate);
           }),
@@ -263,8 +266,8 @@ function unocss(options = {}) {
               return;
             else
               fileMap.set(file, mtimeMs);
-            const content2 = await promises.readFile(file, "utf8");
-            const { matched } = await uno.generate(content2, {
+            const content = await promises.readFile(file, "utf8");
+            const { matched } = await uno.generate(content, {
               id: file
             });
             fileClassMap.set(file, matched);

package/dist/index.mjs

@@ -7,7 +7,9 @@ import { loadConfig } from '@unocss/config';
 import { parse, generate, clone } from 'css-tree';
 import MagicString from 'magic-string';
 
-const defaultIncludeGlobs = ["**/*.{html,js,ts,jsx,tsx,vue,svelte,astro,elm,php,phtml,mdx,md}"];
+const defaultFilesystemGlobs = [
+  "**/*.{html,js,ts,jsx,tsx,vue,svelte,astro,elm,php,phtml,mdx,md}"
+];
 
 async function parseApply(root, uno, directiveName) {
   root.walkAtRules(directiveName, async (rule) => {
@@ -149,7 +151,7 @@ async function parseScreen(root, uno, directiveName) {
 function calcMaxWidthBySize(size) {
   const value = size.match(/^-?[0-9]+\.?[0-9]*/)?.[0] || "";
   const unit = size.slice(value.length);
-  const maxWidth = parseFloat(value) - 0.1;
+  const maxWidth = Number.parseFloat(value) - 0.1;
   return Number.isNaN(maxWidth) ? size : `${maxWidth}${unit}`;
 }
 
@@ -159,7 +161,6 @@ function unocss(options = {}) {
   );
   const {
     cwd = process.cwd(),
-    content,
     configOrPath
   } = options;
   const directiveMap = Object.assign({
@@ -225,8 +226,8 @@ function unocss(options = {}) {
         } catch (error) {
           throw new Error(`UnoCSS config not found: ${error.message}`);
         }
-        const globs = content?.filter((v) => typeof v === "string") ?? defaultIncludeGlobs;
-        const rawContent = content?.filter((v) => typeof v === "object") ?? [];
+        const globs = uno.config.content?.filesystem ?? defaultFilesystemGlobs;
+        const plainContent = uno.config.content?.inline ?? [];
         const entries = await fg(isScanTarget ? globs : from, {
           cwd,
           absolute: true,
@@ -237,10 +238,12 @@ function unocss(options = {}) {
         await parseTheme(root, uno, directiveMap.theme);
         await parseScreen(root, uno, directiveMap.screen);
         promises.push(
-          ...rawContent.map(async (v) => {
-            const { matched } = await uno.generate(v.raw, {
-              id: `unocss.${v.extension}`
-            });
+          ...plainContent.map(async (c2, idx) => {
+            if (typeof c2 === "function")
+              c2 = await c2();
+            if (typeof c2 === "string")
+              c2 = { code: c2 };
+            const { matched } = await uno.generate(c2.code, { id: c2.id ?? `__plain_content_${idx}__` });
             for (const candidate of matched)
               classes.add(candidate);
           }),
@@ -255,8 +258,8 @@ function unocss(options = {}) {
               return;
             else
               fileMap.set(file, mtimeMs);
-            const content2 = await readFile(file, "utf8");
-            const { matched } = await uno.generate(content2, {
+            const content = await readFile(file, "utf8");
+            const { matched } = await uno.generate(content, {
               id: file
             });
             fileClassMap.set(file, matched);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/postcss",
-  "version": "0.52.7",
+  "version": "0.53.0",
   "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.24",
-    "@unocss/config": "0.52.7",
-    "@unocss/core": "0.52.7"
+    "@unocss/config": "0.53.0",
+    "@unocss/core": "0.53.0"
   },
   "scripts": {
     "build": "unbuild",