@unocss/cli 0.45.20 → 0.45.22

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 import { cac } from 'cac';
-import { b as build, v as version, h as handleError } from './shared/cli.5cbccb9d.mjs';
+import { b as build, v as version, h as handleError } from './shared/cli.387664ed.mjs';
 import 'fs';
 import 'pathe';
 import 'fast-glob';
@@ -8,6 +8,9 @@ import 'colorette';
 import 'perfect-debounce';
 import '@unocss/core';
 import '@unocss/config';
+import '@rollup/pluginutils';
+import 'magic-string';
+import '@ampproject/remapping';
 import '@unocss/preset-uno';
 
 async function startCli(cwd = process.cwd(), argv = process.argv, options = {}) {

package/dist/index.mjs

@@ -6,5 +6,8 @@ import 'colorette';
 import 'perfect-debounce';
 import '@unocss/core';
 import '@unocss/config';
-export { b as build, r as resolveOptions } from './shared/cli.5cbccb9d.mjs';
+export { b as build, r as resolveOptions } from './shared/cli.387664ed.mjs';
+import '@rollup/pluginutils';
+import 'magic-string';
+import '@ampproject/remapping';
 import '@unocss/preset-uno';

package/dist/shared/cli.387664ed.mjs

@@ -0,0 +1,278 @@
+import { promises, existsSync } from 'fs';
+import { resolve, dirname, relative, basename } from 'pathe';
+import fg from 'fast-glob';
+import consola from 'consola';
+import { cyan, green, dim } from 'colorette';
+import { debounce } from 'perfect-debounce';
+import { cssIdRE, createGenerator, BetterMap, toArray } from '@unocss/core';
+import { loadConfig } from '@unocss/config';
+import { createFilter } from '@rollup/pluginutils';
+import MagicString from 'magic-string';
+import remapping from '@ampproject/remapping';
+import presetUno from '@unocss/preset-uno';
+
+const version = "0.45.22";
+
+const INCLUDE_COMMENT = "@unocss-include";
+const IGNORE_COMMENT = "@unocss-ignore";
+const CSS_PLACEHOLDER = "@unocss-placeholder";
+
+const defaultExclude = [cssIdRE];
+const defaultInclude = [/\.vue$/, /\.vue\?vue/, /\.svelte$/, /\.[jt]sx$/, /\.mdx?$/, /\.astro$/, /\.elm$/, /\.html$/];
+
+function createContext(configOrPath, defaults = {}, extraConfigSources = [], resolveConfigResult = () => {
+}) {
+  let root = process.cwd();
+  let rawConfig = {};
+  let configFileList = [];
+  const uno = createGenerator(rawConfig, defaults);
+  let rollupFilter = createFilter(defaultInclude, defaultExclude);
+  const invalidations = [];
+  const reloadListeners = [];
+  const modules = new BetterMap();
+  const tokens = /* @__PURE__ */ new Set();
+  const affectedModules = /* @__PURE__ */ new Set();
+  let ready = reloadConfig();
+  async function reloadConfig() {
+    const result = await loadConfig(root, configOrPath, extraConfigSources);
+    resolveConfigResult(result);
+    rawConfig = result.config;
+    configFileList = result.sources;
+    uno.setConfig(rawConfig);
+    uno.config.envMode = "dev";
+    rollupFilter = createFilter(
+      rawConfig.include || defaultInclude,
+      rawConfig.exclude || defaultExclude
+    );
+    tokens.clear();
+    await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
+    invalidate();
+    dispatchReload();
+    const presets = /* @__PURE__ */ new Set();
+    uno.config.presets.forEach((i) => {
+      if (!i.name)
+        return;
+      if (presets.has(i.name))
+        console.warn(`[unocss] duplication of preset ${i.name} found, there might be something wrong with your config.`);
+      else
+        presets.add(i.name);
+    });
+    return result;
+  }
+  async function updateRoot(newRoot) {
+    if (newRoot !== root) {
+      root = newRoot;
+      ready = reloadConfig();
+    }
+    return await ready;
+  }
+  function invalidate() {
+    invalidations.forEach((cb) => cb());
+  }
+  function dispatchReload() {
+    reloadListeners.forEach((cb) => cb());
+  }
+  async function extract(code, id) {
+    if (id)
+      modules.set(id, code);
+    const len = tokens.size;
+    await uno.applyExtractors(code, id, tokens);
+    if (tokens.size > len)
+      invalidate();
+  }
+  const filter = (code, id) => {
+    if (code.includes(IGNORE_COMMENT))
+      return false;
+    return code.includes(INCLUDE_COMMENT) || code.includes(CSS_PLACEHOLDER) || rollupFilter(id.replace(/\?v=\w+$/, ""));
+  };
+  async function getConfig() {
+    await ready;
+    return rawConfig;
+  }
+  return {
+    get ready() {
+      return ready;
+    },
+    tokens,
+    modules,
+    affectedModules,
+    invalidate,
+    onInvalidate(fn) {
+      invalidations.push(fn);
+    },
+    filter,
+    reloadConfig,
+    onReload(fn) {
+      reloadListeners.push(fn);
+    },
+    uno,
+    extract,
+    getConfig,
+    root,
+    updateRoot,
+    getConfigFileList: () => configFileList
+  };
+}
+
+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;
+  let code = original;
+  let s = new MagicString(code);
+  const maps = [];
+  for (const t of transformers) {
+    if (t.idFilter) {
+      if (!t.idFilter(id))
+        continue;
+    } else if (!ctx.filter(code, id)) {
+      continue;
+    }
+    await t.transform(s, id, ctx);
+    if (s.hasChanged()) {
+      code = s.toString();
+      maps.push(s.generateMap({ hires: true, source: id }));
+      s = new MagicString(code);
+    }
+  }
+  if (code !== original) {
+    ctx.affectedModules.add(id);
+    return {
+      code,
+      map: remapping(maps, () => null)
+    };
+  }
+}
+
+class PrettyError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = this.constructor.name;
+    if (typeof Error.captureStackTrace === "function")
+      Error.captureStackTrace(this, this.constructor);
+    else
+      this.stack = new Error(message).stack;
+  }
+}
+function handleError(error) {
+  if (error instanceof PrettyError)
+    consola.error(error.message);
+  process.exitCode = 1;
+}
+
+const defaultConfig = {
+  envMode: "build",
+  presets: [
+    presetUno()
+  ]
+};
+
+const name = "unocss";
+async function resolveOptions(options) {
+  if (!options.patterns?.length) {
+    throw new PrettyError(
+      `No glob patterns, try ${cyan(`${name} <path/to/**/*>`)}`
+    );
+  }
+  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(cwd, options.config);
+  const ctx = createContext(config, defaultConfig);
+  const files = await fg(options.patterns, { cwd, absolute: true });
+  await Promise.all(
+    files.map(async (file) => {
+      fileCache.set(file, await promises.readFile(file, "utf8"));
+    })
+  );
+  consola.log(green(`${name} v${version}`));
+  consola.start(`UnoCSS ${options.watch ? "in watch mode..." : "for production..."}`);
+  const debouncedBuild = debounce(
+    async () => {
+      generate(options).catch(handleError);
+    },
+    100
+  );
+  const startWatcher = async () => {
+    if (!options.watch)
+      return;
+    const { watch } = await import('chokidar');
+    const { patterns } = options;
+    const ignored = ["**/{.git,node_modules}/**"];
+    const watcher = watch(patterns, {
+      ignoreInitial: true,
+      ignorePermissionErrors: true,
+      ignored,
+      cwd
+    });
+    if (configSources.length)
+      watcher.add(configSources);
+    watcher.on("all", async (type, file) => {
+      const absolutePath = resolve(cwd, file);
+      if (configSources.includes(absolutePath)) {
+        await ctx.reloadConfig();
+        consola.info(`${cyan(basename(file))} changed, setting new config`);
+      } else {
+        consola.log(`${green(type)} ${dim(file)}`);
+        if (type.startsWith("unlink"))
+          fileCache.delete(absolutePath);
+        else
+          fileCache.set(absolutePath, await promises.readFile(absolutePath, "utf8"));
+      }
+      debouncedBuild();
+    });
+    consola.info(
+      `Watching for changes in ${toArray(patterns).map((i) => cyan(i)).join(", ")}`
+    );
+  };
+  await generate(options);
+  await startWatcher().catch(handleError);
+  function transformFiles(sources, enforce = "default") {
+    return Promise.all(
+      sources.map(({ id, code, transformedCode }) => new Promise((resolve2) => {
+        applyTransformers(ctx, code, id, enforce).then((transformsRes) => {
+          resolve2({ id, code, transformedCode: transformsRes?.code || transformedCode });
+        });
+      }))
+    );
+  }
+  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");
+    await Promise.all(
+      postTransform.filter(({ transformedCode }) => !!transformedCode).map(({ transformedCode, id }) => new Promise((resolve2) => {
+        if (existsSync(id))
+          promises.writeFile(id, transformedCode, "utf-8").then(resolve2);
+      }))
+    );
+    const { css, matched } = await ctx.uno.generate(
+      [...postTransform.map(({ code, transformedCode }) => transformedCode ?? code)].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, handleError as h, resolveOptions as r, version as v };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/cli",
-  "version": "0.45.20",
+  "version": "0.45.22",
   "description": "CLI for UnoCSS",
   "author": {
     "name": "Johann Schopplich",
@@ -39,15 +39,18 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@unocss/config": "0.45.20",
-    "@unocss/core": "0.45.20",
-    "@unocss/preset-uno": "0.45.20",
+    "@ampproject/remapping": "^2.2.0",
+    "@rollup/pluginutils": "^4.2.1",
+    "@unocss/config": "0.45.22",
+    "@unocss/core": "0.45.22",
+    "@unocss/preset-uno": "0.45.22",
     "cac": "^6.7.14",
     "chokidar": "^3.5.3",
     "colorette": "^2.0.19",
     "consola": "^2.15.3",
-    "fast-glob": "^3.2.11",
-    "pathe": "^0.3.5",
+    "fast-glob": "^3.2.12",
+    "magic-string": "^0.26.3",
+    "pathe": "^0.3.7",
     "perfect-debounce": "^0.1.3"
   },
   "scripts": {

package/dist/shared/cli.5cbccb9d.mjs

@@ -1,126 +0,0 @@
-import { promises, existsSync } from 'fs';
-import { resolve, dirname, relative, basename } from 'pathe';
-import fg from 'fast-glob';
-import consola from 'consola';
-import { cyan, green, dim } from 'colorette';
-import { debounce } from 'perfect-debounce';
-import { createGenerator, toArray } from '@unocss/core';
-import { loadConfig } from '@unocss/config';
-import presetUno from '@unocss/preset-uno';
-
-const version = "0.45.20";
-
-class PrettyError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = this.constructor.name;
-    if (typeof Error.captureStackTrace === "function")
-      Error.captureStackTrace(this, this.constructor);
-    else
-      this.stack = new Error(message).stack;
-  }
-}
-function handleError(error) {
-  if (error instanceof PrettyError)
-    consola.error(error.message);
-  process.exitCode = 1;
-}
-
-const defaultConfig = {
-  envMode: "build",
-  presets: [
-    presetUno()
-  ]
-};
-
-const name = "unocss";
-async function resolveOptions(options) {
-  if (!options.patterns?.length) {
-    throw new PrettyError(
-      `No glob patterns, try ${cyan(`${name} <path/to/**/*>`)}`
-    );
-  }
-  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(cwd, options.config);
-  const uno = createGenerator(
-    config,
-    defaultConfig
-  );
-  const files = await fg(options.patterns, { cwd, absolute: true });
-  await Promise.all(
-    files.map(async (file) => {
-      fileCache.set(file, await promises.readFile(file, "utf8"));
-    })
-  );
-  consola.log(green(`${name} v${version}`));
-  consola.start(`UnoCSS ${options.watch ? "in watch mode..." : "for production..."}`);
-  const debouncedBuild = debounce(
-    async () => {
-      generate(options).catch(handleError);
-    },
-    100
-  );
-  const startWatcher = async () => {
-    if (!options.watch)
-      return;
-    const { watch } = await import('chokidar');
-    const { patterns } = options;
-    const ignored = ["**/{.git,node_modules}/**"];
-    const watcher = watch(patterns, {
-      ignoreInitial: true,
-      ignorePermissionErrors: true,
-      ignored,
-      cwd
-    });
-    if (configSources.length)
-      watcher.add(configSources);
-    watcher.on("all", async (type, file) => {
-      const absolutePath = resolve(cwd, file);
-      if (configSources.includes(absolutePath)) {
-        uno.setConfig((await loadConfig()).config);
-        consola.info(`${cyan(basename(file))} changed, setting new config`);
-      } else {
-        consola.log(`${green(type)} ${dim(file)}`);
-        if (type.startsWith("unlink"))
-          fileCache.delete(absolutePath);
-        else
-          fileCache.set(absolutePath, await promises.readFile(absolutePath, "utf8"));
-      }
-      debouncedBuild();
-    });
-    consola.info(
-      `Watching for changes in ${toArray(patterns).map((i) => cyan(i)).join(", ")}`
-    );
-  };
-  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, handleError as h, resolveOptions as r, version as v };