@unocss/cli 0.39.2 → 0.39.3

package/dist/chunks/index.mjs

@@ -1,4 +1,4 @@
-import { existsSync, promises } from 'fs';
+import { promises, existsSync } from 'fs';
 import { resolve, dirname, relative, basename } from 'pathe';
 import fg from 'fast-glob';
 import consola from 'consola';
@@ -8,7 +8,7 @@ import { createGenerator, toArray } from '@unocss/core';
 import { loadConfig } from '@unocss/config';
 import presetUno from '@unocss/preset-uno';
 
-const version = "0.39.2";
+const version = "0.39.3";
 
 class PrettyError extends Error {
   constructor(message) {
@@ -34,21 +34,6 @@ const defaultConfig = {
 };
 
 const name = "unocss";
-let uno;
-const fileCache = /* @__PURE__ */ new Map();
-const getAbsolutePath = (file) => resolve(process.cwd(), file);
-async function generate(options) {
-  const outFile = options.outFile ?? getAbsolutePath("uno.css");
-  const { css, matched } = await uno.generate([...fileCache].join("\n"));
-  const dir = dirname(outFile);
-  if (!existsSync(dir))
-    await promises.mkdir(dir, { recursive: true });
-  await promises.writeFile(outFile, css, "utf-8");
-  if (!options.watch) {
-    consola.success(`${[...matched].length} utilities generated to ${cyan(relative(process.cwd(), outFile))}
-`);
-  }
-}
 async function resolveOptions(options) {
   if (!options.patterns?.length) {
     throw new PrettyError(`No glob patterns, try ${cyan(`${name} <path/to/**/*>`)}`);
@@ -56,13 +41,14 @@ async function resolveOptions(options) {
   return options;
 }
 async function build(_options) {
+  const fileCache = /* @__PURE__ */ new Map();
+  const cwd = _options.cwd || process.cwd();
   const options = await resolveOptions(_options);
-  const { config, sources: configSources } = await loadConfig(process.cwd(), options.config);
-  uno = createGenerator(config, defaultConfig);
-  const files = await fg(options.patterns);
+  const { config, sources: configSources } = await loadConfig(cwd, options.config);
+  const uno = createGenerator(config, defaultConfig);
+  const files = await fg(options.patterns, { cwd, absolute: true });
   await Promise.all(files.map(async (file) => {
-    const absolutePath = getAbsolutePath(file);
-    fileCache.set(absolutePath, await promises.readFile(absolutePath, "utf8"));
+    fileCache.set(file, await promises.readFile(file, "utf8"));
   }));
   consola.log(green(`${name} v${version}`));
   consola.start(`UnoCSS ${options.watch ? "in watch mode..." : "for production..."}`);
@@ -78,7 +64,8 @@ async function build(_options) {
     const watcher = watch(patterns, {
       ignoreInitial: true,
       ignorePermissionErrors: true,
-      ignored
+      ignored,
+      cwd
     });
     if (configSources.length)
       watcher.add(configSources);
@@ -88,7 +75,7 @@ async function build(_options) {
         consola.info(`${cyan(basename(file))} changed, setting new config`);
       } else {
         consola.log(`${green(type)} ${dim(file)}`);
-        const absolutePath = getAbsolutePath(file);
+        const absolutePath = resolve(cwd, file);
         if (type.startsWith("unlink"))
           fileCache.delete(absolutePath);
         else
@@ -100,6 +87,21 @@ async function build(_options) {
   };
   await generate(options);
   startWatcher();
+  async function generate(options2) {
+    const outFile = resolve(options2.cwd || process.cwd(), options2.outFile ?? "uno.css");
+    const { css, matched } = await uno.generate([...fileCache].join("\n"), {
+      preflights: options2.preflights,
+      minify: options2.minify
+    });
+    const dir = dirname(outFile);
+    if (!existsSync(dir))
+      await promises.mkdir(dir, { recursive: true });
+    await promises.writeFile(outFile, css, "utf-8");
+    if (!options2.watch) {
+      consola.success(`${[...matched].length} utilities generated to ${cyan(relative(process.cwd(), outFile))}
+`);
+    }
+  }
 }
 
-export { build as b, generate as g, handleError as h, resolveOptions as r, version as v };
+export { build as b, handleError as h, resolveOptions as r, version as v };

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 import { cac } from 'cac';
-import { h as handleError, b as build, v as version } from './chunks/index.mjs';
+import { b as build, v as version, h as handleError } from './chunks/index.mjs';
 import 'fs';
 import 'pathe';
 import 'fast-glob';
@@ -10,15 +10,15 @@ import '@unocss/core';
 import '@unocss/config';
 import '@unocss/preset-uno';
 
-const name = "unocss";
-async function main(options = {}) {
-  const cli = cac(name);
+async function startCli(cwd = process.cwd(), argv = process.argv, options = {}) {
+  const cli = cac("unocss");
   cli.command("[...patterns]", "Glob patterns", {
     ignoreOptionDefaultValue: true
   }).option("-o, --out-file <file>", "Output file", {
-    default: process.cwd()
-  }).option("-c, --config [file]", "Config file").option("-w, --watch", "Watch for file changes").action(async (patterns, flags) => {
+    default: cwd
+  }).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,
       ...flags
     });
     if (patterns)
@@ -27,7 +27,8 @@ async function main(options = {}) {
   });
   cli.help();
   cli.version(version);
-  cli.parse(process.argv, { run: false });
+  cli.parse(argv, { run: false });
   await cli.runMatchedCommand();
 }
-main().catch(handleError);
+
+startCli().catch(handleError);

package/dist/index.d.ts

@@ -1,15 +1,17 @@
 /** Mark some properties as required, leaving others unchanged */
 declare type MarkRequired<T, RK extends keyof T> = Exclude<T, RK> & Required<Pick<T, RK>>;
 interface CliOptions {
+    cwd?: string;
     patterns?: Array<string>;
     outFile?: string;
     watch?: boolean;
     config?: string;
+    preflights?: boolean;
+    minify?: boolean;
 }
 declare type ResolvedCliOptions = MarkRequired<CliOptions, 'patterns'>;
 
-declare function generate(options: ResolvedCliOptions): Promise<void>;
 declare function resolveOptions(options: CliOptions): Promise<ResolvedCliOptions>;
 declare function build(_options: CliOptions): Promise<void>;
 
-export { build, generate, resolveOptions };
+export { build, resolveOptions };

package/dist/index.mjs

@@ -6,5 +6,5 @@ import 'colorette';
 import 'perfect-debounce';
 import '@unocss/core';
 import '@unocss/config';
-export { b as build, g as generate, r as resolveOptions } from './chunks/index.mjs';
+export { b as build, r as resolveOptions } from './chunks/index.mjs';
 import '@unocss/preset-uno';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/cli",
-  "version": "0.39.2",
+  "version": "0.39.3",
   "description": "CLI for UnoCSS",
   "author": {
     "name": "Johann Schopplich",
@@ -39,9 +39,9 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@unocss/config": "0.39.2",
-    "@unocss/core": "0.39.2",
-    "@unocss/preset-uno": "0.39.2",
+    "@unocss/config": "0.39.3",
+    "@unocss/core": "0.39.3",
+    "@unocss/preset-uno": "0.39.3",
     "cac": "^6.7.12",
     "chokidar": "^3.5.3",
     "colorette": "^2.0.16",