@unocss/config 0.12.18 → 0.14.1

package/dist/index.d.ts

@@ -1,10 +1,8 @@
 import { UserConfig } from '@unocss/core';
+import { LoadConfigSource, LoadConfigResult } from 'unconfig';
+export { LoadConfigResult, LoadConfigSource } from 'unconfig';
 
-interface ConfigResult<U> {
-    filepath?: string;
-    config?: U;
-}
-declare function loadConfig<U extends UserConfig>(dirOrPath?: string | U): ConfigResult<U>;
-declare function readConfig<U>(filepath: string): ConfigResult<U>;
+declare function createConfigLoader<U extends UserConfig>(configOrPath?: string | U, extraConfigSources?: LoadConfigSource[]): () => Promise<LoadConfigResult<U>>;
+declare function loadConfig<U extends UserConfig>(dirOrPath: string | U): Promise<LoadConfigResult<U>>;
 
-export { ConfigResult, loadConfig, readConfig };
+export { createConfigLoader, loadConfig };

package/dist/index.js

@@ -1,33 +1,10 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[Object.keys(fn)[0]])(fn = 0)), res;
-};
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[Object.keys(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
 var __export = (target, all) => {
   __markAsModule(target);
   for (var name in all)
@@ -45,376 +22,73 @@ var __toModule = (module2) => {
   return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
 };
 
-// ../../node_modules/.pnpm/tsup@5.5.0_typescript@4.5.2/node_modules/tsup/assets/cjs_shims.js
-var importMetaUrlShim;
-var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@5.5.0_typescript@4.5.2/node_modules/tsup/assets/cjs_shims.js"() {
-    importMetaUrlShim = typeof document === "undefined" ? new (require("url")).URL("file:" + __filename).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
-  }
-});
-
-// ../../node_modules/.pnpm/yocto-queue@0.1.0/node_modules/yocto-queue/index.js
-var require_yocto_queue = __commonJS({
-  "../../node_modules/.pnpm/yocto-queue@0.1.0/node_modules/yocto-queue/index.js"(exports, module2) {
-    init_cjs_shims();
-    var Node = class {
-      constructor(value) {
-        this.value = value;
-        this.next = void 0;
-      }
-    };
-    var Queue = class {
-      constructor() {
-        this.clear();
-      }
-      enqueue(value) {
-        const node = new Node(value);
-        if (this._head) {
-          this._tail.next = node;
-          this._tail = node;
-        } else {
-          this._head = node;
-          this._tail = node;
-        }
-        this._size++;
-      }
-      dequeue() {
-        const current = this._head;
-        if (!current) {
-          return;
-        }
-        this._head = this._head.next;
-        this._size--;
-        return current.value;
-      }
-      clear() {
-        this._head = void 0;
-        this._tail = void 0;
-        this._size = 0;
-      }
-      get size() {
-        return this._size;
-      }
-      *[Symbol.iterator]() {
-        let current = this._head;
-        while (current) {
-          yield current.value;
-          current = current.next;
-        }
-      }
-    };
-    module2.exports = Queue;
-  }
-});
-
-// ../../node_modules/.pnpm/p-limit@3.1.0/node_modules/p-limit/index.js
-var require_p_limit = __commonJS({
-  "../../node_modules/.pnpm/p-limit@3.1.0/node_modules/p-limit/index.js"(exports, module2) {
-    init_cjs_shims();
-    "use strict";
-    var Queue = require_yocto_queue();
-    var pLimit = (concurrency) => {
-      if (!((Number.isInteger(concurrency) || concurrency === Infinity) && concurrency > 0)) {
-        throw new TypeError("Expected `concurrency` to be a number from 1 and up");
-      }
-      const queue = new Queue();
-      let activeCount = 0;
-      const next = () => {
-        activeCount--;
-        if (queue.size > 0) {
-          queue.dequeue()();
-        }
-      };
-      const run = async (fn, resolve2, ...args) => {
-        activeCount++;
-        const result = (async () => fn(...args))();
-        resolve2(result);
-        try {
-          await result;
-        } catch {
-        }
-        next();
-      };
-      const enqueue = (fn, resolve2, ...args) => {
-        queue.enqueue(run.bind(null, fn, resolve2, ...args));
-        (async () => {
-          await Promise.resolve();
-          if (activeCount < concurrency && queue.size > 0) {
-            queue.dequeue()();
-          }
-        })();
-      };
-      const generator = (fn, ...args) => new Promise((resolve2) => {
-        enqueue(fn, resolve2, ...args);
-      });
-      Object.defineProperties(generator, {
-        activeCount: {
-          get: () => activeCount
-        },
-        pendingCount: {
-          get: () => queue.size
-        },
-        clearQueue: {
-          value: () => {
-            queue.clear();
-          }
-        }
-      });
-      return generator;
-    };
-    module2.exports = pLimit;
-  }
-});
-
-// ../../node_modules/.pnpm/p-locate@5.0.0/node_modules/p-locate/index.js
-var require_p_locate = __commonJS({
-  "../../node_modules/.pnpm/p-locate@5.0.0/node_modules/p-locate/index.js"(exports, module2) {
-    init_cjs_shims();
-    "use strict";
-    var pLimit = require_p_limit();
-    var EndError = class extends Error {
-      constructor(value) {
-        super();
-        this.value = value;
-      }
-    };
-    var testElement = async (element, tester) => tester(await element);
-    var finder = async (element) => {
-      const values = await Promise.all(element);
-      if (values[1] === true) {
-        throw new EndError(values[0]);
-      }
-      return false;
-    };
-    var pLocate = async (iterable, tester, options) => {
-      options = __spreadValues({
-        concurrency: Infinity,
-        preserveOrder: true
-      }, options);
-      const limit = pLimit(options.concurrency);
-      const items = [...iterable].map((element) => [element, limit(testElement, element, tester)]);
-      const checkLimit = pLimit(options.preserveOrder ? 1 : Infinity);
-      try {
-        await Promise.all(items.map((element) => checkLimit(finder, element)));
-      } catch (error) {
-        if (error instanceof EndError) {
-          return error.value;
-        }
-        throw error;
-      }
-    };
-    module2.exports = pLocate;
-  }
-});
-
-// ../../node_modules/.pnpm/locate-path@6.0.0/node_modules/locate-path/index.js
-var require_locate_path = __commonJS({
-  "../../node_modules/.pnpm/locate-path@6.0.0/node_modules/locate-path/index.js"(exports, module2) {
-    init_cjs_shims();
-    "use strict";
-    var path = require("path");
-    var fs2 = require("fs");
-    var { promisify } = require("util");
-    var pLocate = require_p_locate();
-    var fsStat = promisify(fs2.stat);
-    var fsLStat = promisify(fs2.lstat);
-    var typeMappings = {
-      directory: "isDirectory",
-      file: "isFile"
-    };
-    function checkType({ type }) {
-      if (type in typeMappings) {
-        return;
-      }
-      throw new Error(`Invalid type specified: ${type}`);
-    }
-    var matchType = (type, stat) => type === void 0 || stat[typeMappings[type]]();
-    module2.exports = async (paths, options) => {
-      options = __spreadValues({
-        cwd: process.cwd(),
-        type: "file",
-        allowSymlinks: true
-      }, options);
-      checkType(options);
-      const statFn = options.allowSymlinks ? fsStat : fsLStat;
-      return pLocate(paths, async (path_) => {
-        try {
-          const stat = await statFn(path.resolve(options.cwd, path_));
-          return matchType(options.type, stat);
-        } catch {
-          return false;
-        }
-      }, options);
-    };
-    module2.exports.sync = (paths, options) => {
-      options = __spreadValues({
-        cwd: process.cwd(),
-        allowSymlinks: true,
-        type: "file"
-      }, options);
-      checkType(options);
-      const statFn = options.allowSymlinks ? fs2.statSync : fs2.lstatSync;
-      for (const path_ of paths) {
-        try {
-          const stat = statFn(path.resolve(options.cwd, path_));
-          if (matchType(options.type, stat)) {
-            return path_;
-          }
-        } catch {
-        }
-      }
-    };
-  }
-});
-
-// ../../node_modules/.pnpm/path-exists@4.0.0/node_modules/path-exists/index.js
-var require_path_exists = __commonJS({
-  "../../node_modules/.pnpm/path-exists@4.0.0/node_modules/path-exists/index.js"(exports, module2) {
-    init_cjs_shims();
-    "use strict";
-    var fs2 = require("fs");
-    var { promisify } = require("util");
-    var pAccess = promisify(fs2.access);
-    module2.exports = async (path) => {
-      try {
-        await pAccess(path);
-        return true;
-      } catch (_) {
-        return false;
-      }
-    };
-    module2.exports.sync = (path) => {
-      try {
-        fs2.accessSync(path);
-        return true;
-      } catch (_) {
-        return false;
-      }
-    };
-  }
-});
-
-// ../../node_modules/.pnpm/find-up@5.0.0/node_modules/find-up/index.js
-var require_find_up = __commonJS({
-  "../../node_modules/.pnpm/find-up@5.0.0/node_modules/find-up/index.js"(exports, module2) {
-    init_cjs_shims();
-    "use strict";
-    var path = require("path");
-    var locatePath = require_locate_path();
-    var pathExists = require_path_exists();
-    var stop = Symbol("findUp.stop");
-    module2.exports = async (name, options = {}) => {
-      let directory = path.resolve(options.cwd || "");
-      const { root } = path.parse(directory);
-      const paths = [].concat(name);
-      const runMatcher = async (locateOptions) => {
-        if (typeof name !== "function") {
-          return locatePath(paths, locateOptions);
-        }
-        const foundPath = await name(locateOptions.cwd);
-        if (typeof foundPath === "string") {
-          return locatePath([foundPath], locateOptions);
-        }
-        return foundPath;
-      };
-      while (true) {
-        const foundPath = await runMatcher(__spreadProps(__spreadValues({}, options), { cwd: directory }));
-        if (foundPath === stop) {
-          return;
-        }
-        if (foundPath) {
-          return path.resolve(directory, foundPath);
-        }
-        if (directory === root) {
-          return;
-        }
-        directory = path.dirname(directory);
-      }
-    };
-    module2.exports.sync = (name, options = {}) => {
-      let directory = path.resolve(options.cwd || "");
-      const { root } = path.parse(directory);
-      const paths = [].concat(name);
-      const runMatcher = (locateOptions) => {
-        if (typeof name !== "function") {
-          return locatePath.sync(paths, locateOptions);
-        }
-        const foundPath = name(locateOptions.cwd);
-        if (typeof foundPath === "string") {
-          return locatePath.sync([foundPath], locateOptions);
-        }
-        return foundPath;
-      };
-      while (true) {
-        const foundPath = runMatcher(__spreadProps(__spreadValues({}, options), { cwd: directory }));
-        if (foundPath === stop) {
-          return;
-        }
-        if (foundPath) {
-          return path.resolve(directory, foundPath);
-        }
-        if (directory === root) {
-          return;
-        }
-        directory = path.dirname(directory);
-      }
-    };
-    module2.exports.exists = pathExists;
-    module2.exports.sync.exists = pathExists.sync;
-    module2.exports.stop = stop;
-  }
-});
-
 // src/index.ts
 __export(exports, {
-  loadConfig: () => loadConfig,
-  readConfig: () => readConfig
+  LoadConfigResult: () => import_unconfig.LoadConfigResult,
+  LoadConfigSource: () => import_unconfig.LoadConfigSource,
+  createConfigLoader: () => createConfigLoader,
+  loadConfig: () => loadConfig
 });
-init_cjs_shims();
-var import_fs = __toModule(require("fs"));
 var import_path = __toModule(require("path"));
-var import_find_up = __toModule(require_find_up());
-var import_sucrase = __toModule(require("sucrase"));
-function isDir(path) {
-  try {
-    const stat = import_fs.default.lstatSync(path);
-    return stat.isDirectory();
-  } catch (e) {
-    return false;
+var import_fs = __toModule(require("fs"));
+var import_unconfig = __toModule(require("unconfig"));
+function createConfigLoader(configOrPath = process.cwd(), extraConfigSources = []) {
+  let inlineConfig = {};
+  if (typeof configOrPath !== "string") {
+    inlineConfig = configOrPath;
+    if (inlineConfig.configFile === false) {
+      return async () => ({
+        config: inlineConfig,
+        sources: []
+      });
+    } else {
+      configOrPath = inlineConfig.configFile || process.cwd();
+    }
   }
-}
-function loadConfig(dirOrPath = process.cwd()) {
-  if (typeof dirOrPath !== "string") {
-    return {
-      config: dirOrPath
-    };
+  const resolved = (0, import_path.resolve)(configOrPath);
+  let cwd = resolved;
+  let isFile = false;
+  if (import_fs.default.existsSync(resolved) && import_fs.default.statSync(resolved).isFile()) {
+    isFile = true;
+    cwd = (0, import_path.dirname)(resolved);
   }
-  dirOrPath = (0, import_path.resolve)(dirOrPath);
-  let filepath = isDir(dirOrPath) ? import_find_up.default.sync([
-    "unocss.config.js",
-    "unocss.config.cjs",
-    "unocss.config.mjs",
-    "unocss.config.ts",
-    "unocss.config.mts",
-    "unocss.config.cts"
-  ], { cwd: dirOrPath }) : dirOrPath;
-  if (filepath && dirOrPath !== filepath)
-    filepath = (0, import_path.resolve)(dirOrPath, filepath);
-  if (!filepath || !import_fs.default.existsSync(filepath))
-    return {};
-  return readConfig(filepath);
-}
-function readConfig(filepath) {
-  const content = import_fs.default.readFileSync(filepath, "utf-8");
-  const transformed = (0, import_sucrase.transform)(content, { transforms: ["typescript", "imports"] }).code;
-  const result = new Function("require", `let exports = {};${transformed}; return exports.default;`)(require);
-  return {
-    filepath,
-    config: result
+  const loader = (0, import_unconfig.createConfigLoader)({
+    sources: isFile ? [
+      {
+        files: resolved,
+        extensions: []
+      }
+    ] : [
+      {
+        files: [
+          "unocss.config",
+          "uno.config"
+        ]
+      },
+      ...extraConfigSources
+    ],
+    cwd,
+    defaults: inlineConfig
+  });
+  return async () => {
+    const result = await loader.load();
+    result.config = result.config || inlineConfig;
+    if (result.config.configDeps) {
+      result.sources = [
+        ...result.sources,
+        ...result.config.configDeps.map((i) => (0, import_path.resolve)(cwd, i))
+      ];
+    }
+    return result;
   };
 }
+function loadConfig(dirOrPath) {
+  return createConfigLoader(dirOrPath)();
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  loadConfig,
-  readConfig
+  LoadConfigResult,
+  LoadConfigSource,
+  createConfigLoader,
+  loadConfig
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/config",
-  "version": "0.12.18",
+  "version": "0.14.1",
   "description": "Config loader for UnoCSS",
   "keywords": [],
   "homepage": "https://github.com/antfu/unocss/tree/main/packages/config#readme",
@@ -28,11 +28,8 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@unocss/core": "0.12.18",
-    "sucrase": "^3.20.3"
-  },
-  "devDependencies": {
-    "find-up": "^5"
+    "@unocss/core": "0.14.1",
+    "unconfig": "^0.2.2"
   },
   "scripts": {
     "build": "tsup",