c12 1.0.0 → 1.1.0

package/dist/index.cjs

@@ -3,7 +3,8 @@
 const node_fs = require('node:fs');
 const pathe = require('pathe');
 const dotenv = require('dotenv');
-const os = require('node:os');
+const promises = require('node:fs/promises');
+const node_os = require('node:os');
 const createJiti = require('jiti');
 const rc9 = require('rc9');
 const defu = require('defu');
@@ -204,16 +205,16 @@ async function resolveConfig(source, options) {
     }
   }
   if (GIT_PREFIXES.some((prefix) => source.startsWith(prefix))) {
+    const { downloadTemplate } = await import('giget');
     const url = new URL(source);
-    const subPath = url.pathname.split("/").slice(2).join("/");
     const gitRepo = url.protocol + url.pathname.split("/").slice(0, 2).join("/");
-    const tmpdir = pathe.resolve(os.tmpdir(), "c12/", gitRepo.replace(/[#/:@\\]/g, "_"));
-    await node_fs.promises.rm(tmpdir, { recursive: true }).catch(() => {
-    });
-    const gittar = await import('gittar').then((r) => r.default || r);
-    const tarFile = await gittar.fetch(gitRepo);
-    await gittar.extract(tarFile, tmpdir);
-    source = pathe.resolve(tmpdir, subPath);
+    const name = gitRepo.replace(/[#/:@\\]/g, "_");
+    const tmpDir = process.env.XDG_CACHE_HOME ? pathe.resolve(process.env.XDG_CACHE_HOME, "c12", name) : pathe.resolve(node_os.homedir(), ".cache/c12", name);
+    if (node_fs.existsSync(tmpDir)) {
+      await promises.rmdir(tmpDir, { recursive: true });
+    }
+    const clonned = await downloadTemplate(source, { dir: tmpDir });
+    source = clonned.dir;
   }
   if (NPM_PACKAGE_RE.test(source)) {
     try {

package/dist/index.mjs

@@ -1,7 +1,8 @@
 import { existsSync, promises } from 'node:fs';
 import { resolve, extname, dirname } from 'pathe';
 import * as dotenv from 'dotenv';
-import os from 'node:os';
+import { rmdir } from 'node:fs/promises';
+import { homedir } from 'node:os';
 import createJiti from 'jiti';
 import * as rc9 from 'rc9';
 import { defu } from 'defu';
@@ -188,16 +189,16 @@ async function resolveConfig(source, options) {
     }
   }
   if (GIT_PREFIXES.some((prefix) => source.startsWith(prefix))) {
+    const { downloadTemplate } = await import('giget');
     const url = new URL(source);
-    const subPath = url.pathname.split("/").slice(2).join("/");
     const gitRepo = url.protocol + url.pathname.split("/").slice(0, 2).join("/");
-    const tmpdir = resolve(os.tmpdir(), "c12/", gitRepo.replace(/[#/:@\\]/g, "_"));
-    await promises.rm(tmpdir, { recursive: true }).catch(() => {
-    });
-    const gittar = await import('gittar').then((r) => r.default || r);
-    const tarFile = await gittar.fetch(gitRepo);
-    await gittar.extract(tarFile, tmpdir);
-    source = resolve(tmpdir, subPath);
+    const name = gitRepo.replace(/[#/:@\\]/g, "_");
+    const tmpDir = process.env.XDG_CACHE_HOME ? resolve(process.env.XDG_CACHE_HOME, "c12", name) : resolve(homedir(), ".cache/c12", name);
+    if (existsSync(tmpDir)) {
+      await rmdir(tmpDir, { recursive: true });
+    }
+    const clonned = await downloadTemplate(source, { dir: tmpDir });
+    source = clonned.dir;
   }
   if (NPM_PACKAGE_RE.test(source)) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c12",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Smart Config Loader",
   "repository": "unjs/c12",
   "license": "MIT",
@@ -19,23 +19,15 @@
   "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.1.1",
     "dotenv": "^16.0.3",
-    "gittar": "^0.1.1",
+    "giget": "^1.0.0",
     "jiti": "^1.16.0",
     "mlly": "^1.0.0",
     "pathe": "^1.0.0",
     "pkg-types": "^1.0.1",
-    "rc9": "^1.2.3"
+    "rc9": "^2.0.0"
   },
   "devDependencies": {
     "@vitest/coverage-c8": "^0.25.2",
@@ -46,5 +38,12 @@
     "unbuild": "^0.9.4",
     "vitest": "^0.25.2"
   },
-  "packageManager": "pnpm@7.16.0"
-}
+  "packageManager": "pnpm@7.16.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"
+  }
+}