@unocss/cli 0.53.0 → 0.53.3

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 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.5c7ff2fe.mjs';
+import { b as build, v as version, h as handleError } from './shared/cli.06279c51.mjs';
 import 'node:fs';
 import 'pathe';
 import 'fast-glob';
@@ -11,6 +11,7 @@ import 'perfect-debounce';
 import '@rollup/pluginutils';
 import 'magic-string';
 import '@ampproject/remapping';
+import 'node:crypto';
 import '@unocss/preset-uno';
 
 async function startCli(cwd = process.cwd(), argv = process.argv, options = {}) {
@@ -19,6 +20,8 @@ async function startCli(cwd = process.cwd(), argv = process.argv, options = {})
     ignoreOptionDefaultValue: true
   }).option("-o, --out-file <file>", "Output file", {
     default: cwd
+  }).option("--stdout", "Output to STDOUT", {
+    default: false
   }).option("-c, --config [file]", "Config file").option("-w, --watch", "Watch for file changes").option("--preflights", "Enable preflights", { default: true }).option("-m, --minify", "Minify generated CSS", { default: false }).action(async (patterns, flags) => {
     Object.assign(options, {
       cwd,

package/dist/index.d.ts

@@ -6,6 +6,7 @@ interface CliOptions {
     outFile?: string;
     watch?: boolean;
     config?: string;
+    stdout?: boolean;
     preflights?: boolean;
     minify?: boolean;
 }

package/dist/index.mjs

@@ -5,9 +5,10 @@ import 'consola';
 import 'colorette';
 import 'perfect-debounce';
 import '@unocss/core';
-export { b as build, r as resolveOptions } from './shared/cli.5c7ff2fe.mjs';
+export { b as build, r as resolveOptions } from './shared/cli.06279c51.mjs';
 import '@rollup/pluginutils';
 import '@unocss/config';
 import 'magic-string';
 import '@ampproject/remapping';
+import 'node:crypto';
 import '@unocss/preset-uno';

package/dist/shared/{cli.5c7ff2fe.mjs → cli.06279c51.mjs}

@@ -9,11 +9,15 @@ import { createFilter } from '@rollup/pluginutils';
 import { loadConfig } from '@unocss/config';
 import MagicString from 'magic-string';
 import remapping from '@ampproject/remapping';
+import 'node:crypto';
 import presetUno from '@unocss/preset-uno';
 
 const INCLUDE_COMMENT = "@unocss-include";
 const IGNORE_COMMENT = "@unocss-ignore";
 const CSS_PLACEHOLDER = "@unocss-placeholder";
+const SKIP_START_COMMENT = "@unocss-skip-start";
+const SKIP_END_COMMENT = "@unocss-skip-end";
+const SKIP_COMMENT_RE = new RegExp(`(//\\s*?${SKIP_START_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_START_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_START_COMMENT}\\s*?-->)[\\s\\S]*?(//\\s*?${SKIP_END_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_END_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_END_COMMENT}\\s*?-->)`, "g");
 
 const defaultPipelineExclude = [cssIdRE];
 const defaultPipelineInclude = [/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/];
@@ -63,7 +67,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
       rawConfig.content?.pipeline?.exclude || rawConfig.exclude || defaultPipelineExclude
     );
     tokens.clear();
-    await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
+    await Promise.all(modules.map((code, id) => uno.applyExtractors(code.replace(SKIP_COMMENT_RE, ""), id, tokens)));
     invalidate();
     dispatchReload();
     const presets = /* @__PURE__ */ new Set();
@@ -94,7 +98,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     if (id)
       modules.set(id, code);
     const len = tokens.size;
-    await uno.applyExtractors(code, id, tokens);
+    await uno.applyExtractors(code.replace(SKIP_COMMENT_RE, ""), id, tokens);
     if (tokens.size > len)
       invalidate();
   }
@@ -139,14 +143,26 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   };
 }
 
+function hash(str) {
+  let i;
+  let l;
+  let hval = 2166136261;
+  for (i = 0, l = str.length; i < l; i++) {
+    hval ^= str.charCodeAt(i);
+    hval += (hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) + (hval << 24);
+  }
+  return `00000${(hval >>> 0).toString(36)}`.slice(-6);
+}
+
 async function applyTransformers(ctx, original, id, enforce = "default") {
   if (original.includes(IGNORE_COMMENT))
     return;
   const transformers = (ctx.uno.config.transformers || []).filter((i) => (i.enforce || "default") === enforce);
   if (!transformers.length)
     return;
+  const skipMap = /* @__PURE__ */ new Map();
   let code = original;
-  let s = new MagicString(code);
+  let s = new MagicString(transformSkipCode(code, skipMap));
   const maps = [];
   for (const t of transformers) {
     if (t.idFilter) {
@@ -157,7 +173,7 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
     }
     await t.transform(s, id, ctx);
     if (s.hasChanged()) {
-      code = s.toString();
+      code = restoreSkipCode(s.toString(), skipMap);
       maps.push(s.generateMap({ hires: true, source: id }));
       s = new MagicString(code);
     }
@@ -170,8 +186,24 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
     };
   }
 }
+function transformSkipCode(code, map) {
+  for (const item of Array.from(code.matchAll(SKIP_COMMENT_RE))) {
+    if (item != null) {
+      const matched = item[0];
+      const withHashKey = `@unocss-skip-placeholder-${hash(matched)}`;
+      map.set(withHashKey, matched);
+      code = code.replace(matched, withHashKey);
+    }
+  }
+  return code;
+}
+function restoreSkipCode(code, map) {
+  for (const [withHashKey, matched] of map.entries())
+    code = code.replace(withHashKey, matched);
+  return code;
+}
 
-const version = "0.53.0";
+const version = "0.53.3";
 
 const defaultConfig = {
   envMode: "build",
@@ -237,8 +269,10 @@ async function build(_options) {
       fileCache.set(file, await promises.readFile(file, "utf8"));
     })
   );
-  consola.log(green(`${name} v${version}`));
-  consola.start(`UnoCSS ${options.watch ? "in watch mode..." : "for production..."}`);
+  if (!options.stdout) {
+    consola.log(green(`${name} v${version}`));
+    consola.start(`UnoCSS ${options.watch ? "in watch mode..." : "for production..."}`);
+  }
   const debouncedBuild = debounce(
     async () => {
       generate(options).catch(handleError);
@@ -246,7 +280,7 @@ async function build(_options) {
     100
   );
   const startWatcher = async () => {
-    if (!options.watch)
+    if (options.stdout || !options.watch)
       return;
     const { patterns } = options;
     const watcher = await getWatcher(options);
@@ -283,7 +317,6 @@ async function build(_options) {
   }
   async function generate(options2) {
     const sourceCache = Array.from(fileCache).map(([id, code]) => ({ id, code }));
-    const outFile = resolve(options2.cwd || process.cwd(), options2.outFile ?? "uno.css");
     const preTransform = await transformFiles(sourceCache, "pre");
     const defaultTransform = await transformFiles(preTransform);
     const postTransform = await transformFiles(defaultTransform, "post");
@@ -300,6 +333,11 @@ async function build(_options) {
         minify: options2.minify
       }
     );
+    if (options2.stdout) {
+      process.stdout.write(css);
+      return;
+    }
+    const outFile = resolve(options2.cwd || process.cwd(), options2.outFile ?? "uno.css");
     const dir = dirname(outFile);
     if (!existsSync(dir))
       await promises.mkdir(dir, { recursive: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/cli",
-  "version": "0.53.0",
+  "version": "0.53.3",
   "description": "CLI for UnoCSS",
   "author": {
     "name": "Johann Schopplich",
@@ -49,9 +49,9 @@
     "magic-string": "^0.30.0",
     "pathe": "^1.1.1",
     "perfect-debounce": "^1.0.0",
-    "@unocss/config": "0.53.0",
-    "@unocss/core": "0.53.0",
-    "@unocss/preset-uno": "0.53.0"
+    "@unocss/config": "0.53.3",
+    "@unocss/core": "0.53.3",
+    "@unocss/preset-uno": "0.53.3"
   },
   "scripts": {
     "build": "unbuild",