@unocss/config 0.13.0 → 0.14.2

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { UserConfig } from '@unocss/core';
-import { LoadConfigResult } from 'unconfig';
-export { LoadConfigResult } from 'unconfig';
+import { LoadConfigSource, LoadConfigResult } from 'unconfig';
+export { LoadConfigResult, LoadConfigSource } from 'unconfig';
 
-declare function createConfigLoader<U extends UserConfig>(dirOrPath?: string | U): () => Promise<LoadConfigResult<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 { createConfigLoader, loadConfig };

package/dist/index.js

@@ -25,40 +25,62 @@ var __toModule = (module2) => {
 // src/index.ts
 __export(exports, {
   LoadConfigResult: () => import_unconfig.LoadConfigResult,
+  LoadConfigSource: () => import_unconfig.LoadConfigSource,
   createConfigLoader: () => createConfigLoader,
   loadConfig: () => loadConfig
 });
 var import_path = __toModule(require("path"));
+var import_fs = __toModule(require("fs"));
 var import_unconfig = __toModule(require("unconfig"));
-var import_presets = __toModule(require("unconfig/presets"));
-function createConfigLoader(dirOrPath = process.cwd()) {
-  if (typeof dirOrPath !== "string") {
-    return async () => ({
-      config: dirOrPath,
-      sources: []
-    });
+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();
+    }
+  }
+  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);
   const loader = (0, import_unconfig.createConfigLoader)({
-    sources: [
+    sources: isFile ? [
+      {
+        files: resolved,
+        extensions: []
+      }
+    ] : [
       {
         files: [
           "unocss.config",
           "uno.config"
         ]
       },
-      (0, import_presets.sourcePluginFactory)({
-        files: "vite.config",
-        targetModule: "unocss/vite"
-      }),
-      (0, import_presets.sourceObjectFields)({
-        files: "nuxt.config",
-        fields: "unocss"
-      })
+      ...extraConfigSources
     ],
-    cwd: dirOrPath
+    cwd,
+    defaults: inlineConfig
   });
-  return loader.load;
+  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)();
@@ -66,6 +88,7 @@ function loadConfig(dirOrPath) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   LoadConfigResult,
+  LoadConfigSource,
   createConfigLoader,
   loadConfig
 });

package/package.json

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