c12 1.7.0 → 1.8.0

package/README.md

@@ -1,16 +1,20 @@
 # ⚙️ c12
 
-[![npm version][npm-version-src]][npm-version-href]
-[![npm downloads][npm-downloads-src]][npm-downloads-href]
-[![Codecov][codecov-src]][codecov-href]
-[![License][license-src]][license-href]
+<!-- automd:badges color=yellow codecov -->
+
+[![npm version](https://img.shields.io/npm/v/c12?color=yellow)](https://npmjs.com/package/c12)
+[![npm downloads](https://img.shields.io/npm/dm/c12?color=yellow)](https://npmjs.com/package/c12)
+[![codecov](https://img.shields.io/codecov/c/gh/unjs/c12?color=yellow)](https://codecov.io/gh/unjs/c12)
+
+<!-- /automd -->
 
 c12 (pronounced as /siːtwelv/, like c-twelve) is a smart configuration loader.
 
-## Features
+## ✅ Features
 
 - `.js`, `.ts`, `.cjs`, `.mjs` config loader with [unjs/jiti](https://github.com/unjs/jiti)
-- `.json`, `.json5` and `.jsonc` config support.
+- `.json`, `.json5` and `.jsonc` config support
+- `.config/` directory support following [config dir proposal](https://github.com/pi0/config-dir)
 - `.rc` config support with [unjs/rc9](https://github.com/unjs/rc9)
 - `.env` support with [dotenv](https://www.npmjs.com/package/dotenv)
 - Multiple sources merged with [unjs/defu](https://github.com/unjs/defu)
@@ -19,21 +23,40 @@ c12 (pronounced as /siːtwelv/, like c-twelve) is a smart configuration loader.
 - Overwrite with [environment-specific configuration](#environment-specific-configuration)
 - Config watcher with auto-reload and HMR support
 
+## 🦴 Used by
+
+- [Nuxt](https://nuxt.com/)
+- [Nitro](https://nitro.unjs.io/)
+- [Unbuild](https://unbuild.unjs.io)
+- [Automd](https://automd.unjs.io)
+- [Changelogen](https://changelogen.unjs.io)
+- [RemixKit](https://github.com/jrestall/remix-kit)
+
 ## Usage
 
 Install package:
 
+<!-- automd:pm-install -->
+
 ```sh
+# ✨ Auto-detect
+npx nypm i c12@^1.7.0
+
 # npm
-npm install c12
+npm install c12@^1.7.0
 
 # yarn
-yarn add c12
+yarn add c12@^1.7.0
 
 # pnpm
-pnpm install c12
+pnpm install c12@^1.7.0
+
+# bun
+bun install c12@^1.7.0
 ```
 
+<!-- /automd -->
+
 Import:
 
 ```js

package/dist/index.cjs

@@ -309,11 +309,14 @@ async function resolveConfig(source, options, sourceOptions = {}) {
     });
     source = cloned.dir;
   }
-  if (NPM_PACKAGE_RE.test(source)) {
+  const tryResolve = (id) => {
     try {
-      source = options.jiti.resolve(source, { paths: [options.cwd] });
+      return options.jiti.resolve(id, { paths: [options.cwd] });
     } catch {
     }
+  };
+  if (NPM_PACKAGE_RE.test(source)) {
+    source = tryResolve(source) || source;
   }
   const ext = pathe.extname(source);
   const isDir = !ext || ext === pathe.basename(source);
@@ -323,16 +326,12 @@ async function resolveConfig(source, options, sourceOptions = {}) {
   }
   const res = {
     config: void 0,
+    configFile: void 0,
     cwd,
     source,
     sourceOptions
   };
-  try {
-    res.configFile = options.jiti.resolve(pathe.resolve(cwd, source), {
-      paths: [cwd]
-    });
-  } catch {
-  }
+  res.configFile = tryResolve(pathe.resolve(cwd, source)) || tryResolve(pathe.resolve(cwd, ".config", source.replace(/\.config$/, ""))) || tryResolve(pathe.resolve(cwd, ".config", source)) || source;
   if (!node_fs.existsSync(res.configFile)) {
     return res;
   }
@@ -340,7 +339,9 @@ async function resolveConfig(source, options, sourceOptions = {}) {
     const { parse } = await import('jsonc-parser');
     res.config = parse(await promises.readFile(res.configFile, "utf8"));
   } else if (res.configFile.endsWith(".json5")) {
-    const { parse } = await import('json5');
+    const parse = await import('json5').then(
+      (m) => m.parse || m.default?.parse || m.default
+    );
     res.config = parse(await promises.readFile(res.configFile, "utf8"));
   } else {
     res.config = options.jiti(res.configFile);

package/dist/index.mjs

@@ -289,11 +289,14 @@ async function resolveConfig(source, options, sourceOptions = {}) {
     });
     source = cloned.dir;
   }
-  if (NPM_PACKAGE_RE.test(source)) {
+  const tryResolve = (id) => {
     try {
-      source = options.jiti.resolve(source, { paths: [options.cwd] });
+      return options.jiti.resolve(id, { paths: [options.cwd] });
     } catch {
     }
+  };
+  if (NPM_PACKAGE_RE.test(source)) {
+    source = tryResolve(source) || source;
   }
   const ext = extname(source);
   const isDir = !ext || ext === basename(source);
@@ -303,16 +306,12 @@ async function resolveConfig(source, options, sourceOptions = {}) {
   }
   const res = {
     config: void 0,
+    configFile: void 0,
     cwd,
     source,
     sourceOptions
   };
-  try {
-    res.configFile = options.jiti.resolve(resolve(cwd, source), {
-      paths: [cwd]
-    });
-  } catch {
-  }
+  res.configFile = tryResolve(resolve(cwd, source)) || tryResolve(resolve(cwd, ".config", source.replace(/\.config$/, ""))) || tryResolve(resolve(cwd, ".config", source)) || source;
   if (!existsSync(res.configFile)) {
     return res;
   }
@@ -320,7 +319,9 @@ async function resolveConfig(source, options, sourceOptions = {}) {
     const { parse } = await import('jsonc-parser');
     res.config = parse(await readFile(res.configFile, "utf8"));
   } else if (res.configFile.endsWith(".json5")) {
-    const { parse } = await import('json5');
+    const parse = await import('json5').then(
+      (m) => m.parse || m.default?.parse || m.default
+    );
     res.config = parse(await readFile(res.configFile, "utf8"));
   } else {
     res.config = options.jiti(res.configFile);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c12",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "Smart Config Loader",
   "repository": "unjs/c12",
   "license": "MIT",
@@ -47,6 +47,7 @@
   "devDependencies": {
     "@types/node": "^20.11.5",
     "@vitest/coverage-v8": "^1.2.1",
+    "automd": "^0.2.0",
     "changelogen": "^0.5.5",
     "eslint": "^8.56.0",
     "eslint-config-unjs": "^0.2.1",