c12 0.2.5 → 0.2.8

package/README.md

@@ -24,7 +24,7 @@ Install package:
 npm install c12
 
 # yarn
-yarn install c12
+yarn add c12
 
 # pnpm
 pnpm install c12

package/dist/index.cjs

@@ -161,6 +161,7 @@ async function extendConfig(config, opts) {
   for (const extendSource of extendSources) {
     const _config = await resolveConfig(extendSource, opts);
     if (!_config.config) {
+      console.warn(`Cannot extend config from ${extendSource} in ${opts.cwd}`);
       continue;
     }
     await extendConfig(_config.config, { ...opts, cwd: _config.cwd });
@@ -172,6 +173,7 @@ async function extendConfig(config, opts) {
   }
 }
 const GIT_PREFIXES = ["github:", "gitlab:", "bitbucket:", "https://"];
+const NPM_PACKAGE_RE = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
 const jiti = createJiti__default(null, { cache: false, interopDefault: true, requireCache: false });
 async function resolveConfig(source, opts) {
   if (opts.resolve) {
@@ -192,22 +194,28 @@ async function resolveConfig(source, opts) {
     await gittar.extract(tarFile, tmpdir);
     source = pathe.resolve(tmpdir, subPath);
   }
+  if (NPM_PACKAGE_RE.test(source)) {
+    try {
+      source = jiti.resolve(source, { paths: [opts.cwd] });
+    } catch (_err) {
+    }
+  }
   const isDir = !pathe.extname(source);
   const cwd = pathe.resolve(opts.cwd, isDir ? source : pathe.dirname(source));
   if (isDir) {
     source = opts.configFile;
   }
-  const res = { config: {}, cwd };
+  const res = { config: null, cwd };
   try {
     res.configFile = jiti.resolve(pathe.resolve(cwd, source), { paths: [cwd] });
-    res.config = jiti(res.configFile);
-    if (typeof res.config === "function") {
-      res.config = await res.config();
-    }
-  } catch (err) {
-    if (err.code !== "MODULE_NOT_FOUND") {
-      throw err;
-    }
+  } catch (_err) {
+  }
+  if (!fs.existsSync(res.configFile)) {
+    return res;
+  }
+  res.config = jiti(res.configFile);
+  if (typeof res.config === "function") {
+    res.config = await res.config();
   }
   return res;
 }

package/dist/index.d.ts

@@ -37,7 +37,7 @@ declare function loadDotenv(opts: DotenvOptions): Promise<Env>;
 interface InputConfig extends Record<string, any> {
 }
 interface ConfigLayer<T extends InputConfig = InputConfig> {
-    config: T;
+    config: T | null;
     cwd?: string;
     configFile?: string;
 }

package/dist/index.mjs

@@ -137,6 +137,7 @@ async function extendConfig(config, opts) {
   for (const extendSource of extendSources) {
     const _config = await resolveConfig(extendSource, opts);
     if (!_config.config) {
+      console.warn(`Cannot extend config from ${extendSource} in ${opts.cwd}`);
       continue;
     }
     await extendConfig(_config.config, { ...opts, cwd: _config.cwd });
@@ -148,6 +149,7 @@ async function extendConfig(config, opts) {
   }
 }
 const GIT_PREFIXES = ["github:", "gitlab:", "bitbucket:", "https://"];
+const NPM_PACKAGE_RE = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
 const jiti = createJiti(null, { cache: false, interopDefault: true, requireCache: false });
 async function resolveConfig(source, opts) {
   if (opts.resolve) {
@@ -168,22 +170,28 @@ async function resolveConfig(source, opts) {
     await gittar.extract(tarFile, tmpdir);
     source = resolve(tmpdir, subPath);
   }
+  if (NPM_PACKAGE_RE.test(source)) {
+    try {
+      source = jiti.resolve(source, { paths: [opts.cwd] });
+    } catch (_err) {
+    }
+  }
   const isDir = !extname(source);
   const cwd = resolve(opts.cwd, isDir ? source : dirname(source));
   if (isDir) {
     source = opts.configFile;
   }
-  const res = { config: {}, cwd };
+  const res = { config: null, cwd };
   try {
     res.configFile = jiti.resolve(resolve(cwd, source), { paths: [cwd] });
-    res.config = jiti(res.configFile);
-    if (typeof res.config === "function") {
-      res.config = await res.config();
-    }
-  } catch (err) {
-    if (err.code !== "MODULE_NOT_FOUND") {
-      throw err;
-    }
+  } catch (_err) {
+  }
+  if (!existsSync(res.configFile)) {
+    return res;
+  }
+  res.config = jiti(res.configFile);
+  if (typeof res.config === "function") {
+    res.config = await res.config();
   }
   return res;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c12",
-  "version": "0.2.5",
+  "version": "0.2.8",
   "description": "Smart Config Loader",
   "repository": "unjs/c12",
   "license": "MIT",
@@ -18,22 +18,14 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "unbuild",
-    "dev": "vitest dev",
-    "lint": "eslint --ext .ts,.js,.mjs,.cjs .",
-    "prepack": "unbuild",
-    "release": "pnpm test && standard-version && git push --follow-tags && pnpm publish",
-    "test": "vitest run --coverage"
-  },
   "dependencies": {
     "defu": "^6.0.0",
-    "dotenv": "^16.0.0",
+    "dotenv": "^16.0.1",
     "gittar": "^0.1.1",
-    "jiti": "^1.12.14",
-    "mlly": "^0.5.1",
-    "pathe": "^0.2.0",
-    "rc9": "^1.2.1"
+    "jiti": "^1.14.0",
+    "mlly": "^0.5.4",
+    "pathe": "^0.3.2",
+    "rc9": "^1.2.2"
   },
   "devDependencies": {
     "@nuxtjs/eslint-config-typescript": "latest",
@@ -44,5 +36,12 @@
     "unbuild": "latest",
     "vitest": "latest"
   },
-  "packageManager": "pnpm@6.32.3"
-}
+  "packageManager": "pnpm@7.4.0",
+  "scripts": {
+    "build": "unbuild",
+    "dev": "vitest dev",
+    "lint": "eslint --ext .ts,.js,.mjs,.cjs .",
+    "release": "pnpm test && standard-version && git push --follow-tags && pnpm publish",
+    "test": "vitest run --coverage"
+  }
+}