c12 1.6.0 → 1.7.0

package/README.md

@@ -9,10 +9,11 @@ c12 (pronounced as /siːtwelv/, like c-twelve) is a smart configuration loader.
 
 ## Features
 
-- JSON, CJS, Typescript, and ESM config loader with [unjs/jiti](https://github.com/unjs/jiti)
-- RC config support with [unjs/rc9](https://github.com/unjs/rc9)
-- Multiple sources merged with [unjs/defu](https://github.com/unjs/defu)
+- `.js`, `.ts`, `.cjs`, `.mjs` config loader with [unjs/jiti](https://github.com/unjs/jiti)
+- `.json`, `.json5` and `.jsonc` config support.
+- `.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)
 - Reads config from the nearest `package.json` file
 - [Extends configurations](https://github.com/unjs/c12#extending-configuration) from multiple local or git sources
 - Overwrite with [environment-specific configuration](#environment-specific-configuration)

package/dist/index.cjs

@@ -120,6 +120,17 @@ async function loadConfig(options) {
     interopDefault: true,
     requireCache: false,
     esmResolve: true,
+    extensions: [
+      ".js",
+      ".mjs",
+      ".cjs",
+      ".ts",
+      ".mts",
+      ".cts",
+      ".json",
+      ".jsonc",
+      ".json5"
+    ],
     ...options.jitiOptions
   });
   const r = {
@@ -286,12 +297,13 @@ async function resolveConfig(source, options, sourceOptions = {}) {
     } else {
       cloneDir = process.env.XDG_CACHE_HOME ? pathe.resolve(process.env.XDG_CACHE_HOME, "c12", cloneName) : pathe.resolve(node_os.homedir(), ".cache/c12", cloneName);
     }
-    if (node_fs.existsSync(cloneDir)) {
+    if (node_fs.existsSync(cloneDir) && !sourceOptions.install) {
       await promises.rm(cloneDir, { recursive: true });
     }
     const cloned = await downloadTemplate(source, {
       dir: cloneDir,
       install: sourceOptions.install,
+      force: sourceOptions.install,
       ...options.giget,
       ...sourceOptions.giget
     });
@@ -324,7 +336,15 @@ async function resolveConfig(source, options, sourceOptions = {}) {
   if (!node_fs.existsSync(res.configFile)) {
     return res;
   }
-  res.config = options.jiti(res.configFile);
+  if (res.configFile.endsWith(".jsonc")) {
+    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');
+    res.config = parse(await promises.readFile(res.configFile, "utf8"));
+  } else {
+    res.config = options.jiti(res.configFile);
+  }
   if (res.config instanceof Function) {
     res.config = await res.config();
   }

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { existsSync, promises } from 'node:fs';
 import { resolve, dirname, basename, join, extname } from 'pathe';
 import * as dotenv from 'dotenv';
-import { rm } from 'node:fs/promises';
+import { rm, readFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import createJiti from 'jiti';
 import * as rc9 from 'rc9';
@@ -100,6 +100,17 @@ async function loadConfig(options) {
     interopDefault: true,
     requireCache: false,
     esmResolve: true,
+    extensions: [
+      ".js",
+      ".mjs",
+      ".cjs",
+      ".ts",
+      ".mts",
+      ".cts",
+      ".json",
+      ".jsonc",
+      ".json5"
+    ],
     ...options.jitiOptions
   });
   const r = {
@@ -266,12 +277,13 @@ async function resolveConfig(source, options, sourceOptions = {}) {
     } else {
       cloneDir = process.env.XDG_CACHE_HOME ? resolve(process.env.XDG_CACHE_HOME, "c12", cloneName) : resolve(homedir(), ".cache/c12", cloneName);
     }
-    if (existsSync(cloneDir)) {
+    if (existsSync(cloneDir) && !sourceOptions.install) {
       await rm(cloneDir, { recursive: true });
     }
     const cloned = await downloadTemplate(source, {
       dir: cloneDir,
       install: sourceOptions.install,
+      force: sourceOptions.install,
       ...options.giget,
       ...sourceOptions.giget
     });
@@ -304,7 +316,15 @@ async function resolveConfig(source, options, sourceOptions = {}) {
   if (!existsSync(res.configFile)) {
     return res;
   }
-  res.config = options.jiti(res.configFile);
+  if (res.configFile.endsWith(".jsonc")) {
+    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');
+    res.config = parse(await readFile(res.configFile, "utf8"));
+  } else {
+    res.config = options.jiti(res.configFile);
+  }
   if (res.config instanceof Function) {
     res.config = await res.config();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c12",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Smart Config Loader",
   "repository": "unjs/c12",
   "license": "MIT",
@@ -31,28 +31,30 @@
   },
   "dependencies": {
     "chokidar": "^3.5.3",
-    "defu": "^6.1.3",
-    "dotenv": "^16.3.1",
+    "defu": "^6.1.4",
+    "dotenv": "^16.3.2",
     "giget": "^1.2.1",
     "jiti": "^1.21.0",
-    "mlly": "^1.4.2",
+    "json5": "^2.2.3",
+    "jsonc-parser": "^3.2.1",
+    "mlly": "^1.5.0",
     "ohash": "^1.1.3",
-    "pathe": "^1.1.1",
+    "pathe": "^1.1.2",
     "perfect-debounce": "^1.0.0",
     "pkg-types": "^1.0.3",
     "rc9": "^2.1.1"
   },
   "devDependencies": {
-    "@types/node": "^20.10.5",
-    "@vitest/coverage-v8": "^1.1.0",
+    "@types/node": "^20.11.5",
+    "@vitest/coverage-v8": "^1.2.1",
     "changelogen": "^0.5.5",
     "eslint": "^8.56.0",
     "eslint-config-unjs": "^0.2.1",
     "expect-type": "^0.17.3",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.4",
     "typescript": "^5.3.3",
     "unbuild": "^2.0.0",
-    "vitest": "^1.1.0"
+    "vitest": "^1.2.1"
   },
-  "packageManager": "pnpm@8.13.1"
+  "packageManager": "pnpm@8.14.1"
 }