@unocss/cli 0.61.5 → 0.61.6

package/dist/cli.mjs

@@ -2,7 +2,7 @@ import process from 'node:process';
 import { cac } from 'cac';
 import { loadConfig } from '@unocss/config';
 import { toArray } from '@unocss/core';
-import { b as build, v as version, h as handleError } from './shared/cli.C2hYuVeJ.mjs';
+import { b as build, v as version, h as handleError } from './shared/cli.DnNH4kX3.mjs';
 import 'node:fs';
 import 'pathe';
 import 'fast-glob';

package/dist/index.mjs

@@ -6,7 +6,7 @@ import 'consola';
 import 'colorette';
 import 'perfect-debounce';
 import '@unocss/core';
-export { b as build, r as resolveOptions } from './shared/cli.C2hYuVeJ.mjs';
+export { b as build, r as resolveOptions } from './shared/cli.DnNH4kX3.mjs';
 import '@rollup/pluginutils';
 import '@unocss/config';
 import 'magic-string';

package/dist/shared/{cli.C2hYuVeJ.mjs → cli.DnNH4kX3.mjs}

@@ -214,7 +214,7 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
   }
 }
 
-const version = "0.61.5";
+const version = "0.61.6";
 
 const defaultConfig = {
   envMode: "build",
@@ -335,51 +335,36 @@ async function build(_options) {
   }
   async function generate(options2) {
     const sourceCache = Array.from(fileCache).map(([id, code]) => ({ id, code }));
-    const preTransform = await transformFiles(sourceCache, "pre");
-    const defaultTransform = await transformFiles(preTransform);
-    const postTransform = await transformFiles(defaultTransform, "post");
+    const afterPreTrans = await transformFiles(sourceCache, "pre");
+    const afterDefaultTrans = await transformFiles(afterPreTrans);
+    const afterPostTrans = await transformFiles(afterDefaultTrans, "post");
     if (options2.writeTransformed) {
       await Promise.all(
-        postTransform.filter(({ transformedCode }) => !!transformedCode).map(({ transformedCode, id }) => new Promise((resolve2) => {
+        afterPostTrans.filter(({ transformedCode }) => !!transformedCode).map(async ({ transformedCode, id }) => {
           if (existsSync(id))
-            promises.writeFile(id, transformedCode, "utf-8").then(resolve2);
-        }))
+            await promises.writeFile(id, transformedCode, "utf-8");
+        })
       );
     }
-    const firstIdType = postTransform[0].id.split(".").pop();
-    const isSameFileType = postTransform.every(({ id }) => id.split(".").pop() === firstIdType);
-    let css;
-    let matched;
-    if (isSameFileType) {
-      const { css: _css, matched: _matched } = await ctx.uno.generate(
-        [...postTransform.map(({ code, transformedCode }) => (transformedCode ?? code).replace(SKIP_COMMENT_RE, ""))].join("\n"),
+    const tokens = /* @__PURE__ */ new Set();
+    for (const file of afterPostTrans) {
+      const { matched: matched2 } = await ctx.uno.generate(
+        (file.transformedCode || file.code).replace(SKIP_COMMENT_RE, ""),
         {
-          preflights: options2.preflights,
-          minify: options2.minify,
-          id: postTransform[0].id
+          preflights: false,
+          minify: true,
+          id: file.id
         }
       );
-      css = _css;
-      matched = _matched;
-    } else {
-      const result = await Promise.all(postTransform.map(({ code, transformedCode, id }) => ctx.uno.generate(transformedCode ?? code, {
-        preflights: options2.preflights,
-        minify: options2.minify,
-        id
-      })));
-      const cssCollection = {};
-      result.forEach(({ css: css2, layers }) => {
-        css2.split(/\/\*.*?\*\//g).filter(Boolean).forEach((c, i) => {
-          if (!cssCollection[layers[i]]) {
-            cssCollection[layers[i]] = c.split("\n");
-          } else {
-            cssCollection[layers[i]] = [.../* @__PURE__ */ new Set([...cssCollection[layers[i]], ...c.split("\n")])];
-          }
-        });
-      });
-      css = result[0].layers.map((layer) => `/* layer: ${layer} */${cssCollection[layer].join("\n")}`).join("\n");
-      matched = new Set(result.map(({ matched: matched2 }) => [...matched2]).flat());
+      matched2.forEach((i) => tokens.add(i));
     }
+    const { css, matched } = await ctx.uno.generate(
+      tokens,
+      {
+        preflights: options2.preflights,
+        minify: options2.minify
+      }
+    );
     if (options2.stdout) {
       process$1.stdout.write(css);
       return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/cli",
   "type": "module",
-  "version": "0.61.5",
+  "version": "0.61.6",
   "description": "CLI for UnoCSS",
   "author": {
     "name": "Johann Schopplich",
@@ -50,9 +50,9 @@
     "magic-string": "^0.30.10",
     "pathe": "^1.1.2",
     "perfect-debounce": "^1.0.0",
-    "@unocss/config": "0.61.5",
-    "@unocss/core": "0.61.5",
-    "@unocss/preset-uno": "0.61.5"
+    "@unocss/core": "0.61.6",
+    "@unocss/preset-uno": "0.61.6",
+    "@unocss/config": "0.61.6"
   },
   "scripts": {
     "build": "unbuild",