kirbyup 3.2.0 → 3.2.1

package/dist/node/cli.mjs

@@ -1,5 +1,5 @@
 import { cac } from 'cac';
-import { n as name, b as build, s as serve, v as version, h as handleError } from '../shared/kirbyup.zmDi6JQM.mjs';
+import { n as name, b as build, s as serve, v as version, h as handleError } from '../shared/kirbyup.Dy3k0wjA.mjs';
 import 'node:fs';
 import 'node:fs/promises';
 import '@vitejs/plugin-vue2';
@@ -18,6 +18,11 @@ import 'postcss-load-config';
 import 'postcss-logical';
 import 'magic-string';
 import 'node:module';
+import 'child_process';
+import 'path';
+import 'process';
+import 'stream';
+import 'readline';
 import 'node:buffer';
 import 'node:util';
 import 'node:zlib';

package/dist/node/index.mjs

@@ -10,13 +10,18 @@ import 'rollup-plugin-external-globals';
 import 'vite';
 import 'vite-plugin-full-reload';
 import 'vue/compiler-sfc';
-export { b as build, s as serve } from '../shared/kirbyup.zmDi6JQM.mjs';
+export { b as build, s as serve } from '../shared/kirbyup.Dy3k0wjA.mjs';
 import 'c12';
 import 'postcss-dir-pseudo-class';
 import 'postcss-load-config';
 import 'postcss-logical';
 import 'magic-string';
 import 'node:module';
+import 'child_process';
+import 'path';
+import 'process';
+import 'stream';
+import 'readline';
 import 'node:buffer';
 import 'node:util';
 import 'node:zlib';

package/dist/shared/{kirbyup.zmDi6JQM.mjs → kirbyup.Dy3k0wjA.mjs}

@@ -9,7 +9,7 @@ import { colors } from 'consola/utils';
 import { resolve, join, normalize, relative, dirname, basename } from 'pathe';
 import { debounce } from 'perfect-debounce';
 import externalGlobals from 'rollup-plugin-external-globals';
-import { createLogger, createServer, mergeConfig, build as build$1 } from 'vite';
+import { createLogger, createServer, build as build$1, mergeConfig } from 'vite';
 import fullReloadPlugin from 'vite-plugin-full-reload';
 import * as vueCompilerSfc from 'vue/compiler-sfc';
 import { loadConfig as loadConfig$1 } from 'c12';
@@ -17,13 +17,18 @@ import postcssDirPseudoClass from 'postcss-dir-pseudo-class';
 import postcssrc from 'postcss-load-config';
 import postcssLogical from 'postcss-logical';
 import MagicString from 'magic-string';
-import 'node:module';
-import { Buffer } from 'node:buffer';
+import { createRequire } from 'node:module';
+import 'child_process';
+import 'path';
+import 'process';
+import 'stream';
+import 'readline';
+import { Buffer as Buffer$1 } from 'node:buffer';
 import { promisify } from 'node:util';
 import { gzip } from 'node:zlib';
 
 const name = "kirbyup";
-const version = "3.2.0";
+const version = "3.2.1";
 
 function loadConfig(cwd = process.cwd()) {
   return loadConfig$1({
@@ -176,6 +181,357 @@ function kirbyupGlobImportPlugin() {
   };
 }
 
+const require = createRequire(import.meta.url);
+var St = Object.create;
+var $ = Object.defineProperty;
+var kt = Object.getOwnPropertyDescriptor;
+var Tt = Object.getOwnPropertyNames;
+var At = Object.getPrototypeOf, Rt = Object.prototype.hasOwnProperty;
+var h = /* @__PURE__ */ ((t) => typeof require < "u" ? require : typeof Proxy < "u" ? new Proxy(t, {
+  get: (e, n) => (typeof require < "u" ? require : e)[n]
+}) : t)(function(t) {
+  if (typeof require < "u") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + t + '" is not supported');
+});
+var l = (t, e) => () => (e || t((e = { exports: {} }).exports, e), e.exports);
+var $t = (t, e, n, r) => {
+  if (e && typeof e == "object" || typeof e == "function")
+    for (let s of Tt(e))
+      !Rt.call(t, s) && s !== n && $(t, s, { get: () => e[s], enumerable: !(r = kt(e, s)) || r.enumerable });
+  return t;
+};
+var Nt = (t, e, n) => (n = t != null ? St(At(t)) : {}, $t(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  $(n, "default", { value: t, enumerable: true }) ,
+  t
+));
+
+// node_modules/isexe/windows.js
+var W = l((Se, H) => {
+  H.exports = z;
+  z.sync = Wt;
+  var j = h("fs");
+  function Ht(t, e) {
+    var n = e.pathExt !== void 0 ? e.pathExt : process.env.PATHEXT;
+    if (!n || (n = n.split(";"), n.indexOf("") !== -1))
+      return true;
+    for (var r = 0; r < n.length; r++) {
+      var s = n[r].toLowerCase();
+      if (s && t.substr(-s.length).toLowerCase() === s)
+        return true;
+    }
+    return false;
+  }
+  function F(t, e, n) {
+    return !t.isSymbolicLink() && !t.isFile() ? false : Ht(e, n);
+  }
+  function z(t, e, n) {
+    j.stat(t, function(r, s) {
+      n(r, r ? false : F(s, t, e));
+    });
+  }
+  function Wt(t, e) {
+    return F(j.statSync(t), t, e);
+  }
+});
+
+// node_modules/isexe/mode.js
+var X = l((ke, B) => {
+  B.exports = K;
+  K.sync = Dt;
+  var D = h("fs");
+  function K(t, e, n) {
+    D.stat(t, function(r, s) {
+      n(r, r ? false : M(s, e));
+    });
+  }
+  function Dt(t, e) {
+    return M(D.statSync(t), e);
+  }
+  function M(t, e) {
+    return t.isFile() && Kt(t, e);
+  }
+  function Kt(t, e) {
+    var n = t.mode, r = t.uid, s = t.gid, o = e.uid !== void 0 ? e.uid : process.getuid && process.getuid(), i = e.gid !== void 0 ? e.gid : process.getgid && process.getgid(), a = parseInt("100", 8), c = parseInt("010", 8), u = parseInt("001", 8), f = a | c, p = n & u || n & c && s === i || n & a && r === o || n & f && o === 0;
+    return p;
+  }
+});
+
+// node_modules/isexe/index.js
+var U = l((Ae, G) => {
+  h("fs"); var v;
+  process.platform === "win32" || global.TESTING_WINDOWS ? v = W() : v = X();
+  G.exports = y;
+  y.sync = Mt;
+  function y(t, e, n) {
+    if (typeof e == "function" && (n = e, e = {}), !n) {
+      if (typeof Promise != "function")
+        throw new TypeError("callback not provided");
+      return new Promise(function(r, s) {
+        y(t, e || {}, function(o, i) {
+          o ? s(o) : r(i);
+        });
+      });
+    }
+    v(t, e || {}, function(r, s) {
+      r && (r.code === "EACCES" || e && e.ignoreErrors) && (r = null, s = false), n(r, s);
+    });
+  }
+  function Mt(t, e) {
+    try {
+      return v.sync(t, e || {});
+    } catch (n) {
+      if (e && e.ignoreErrors || n.code === "EACCES")
+        return false;
+      throw n;
+    }
+  }
+});
+
+// node_modules/which/which.js
+var et = l((Re, tt) => {
+  var g = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys", Y = h("path"), Bt = g ? ";" : ":", V = U(), J = (t) => Object.assign(new Error(`not found: ${t}`), { code: "ENOENT" }), Q = (t, e) => {
+    let n = e.colon || Bt, r = t.match(/\//) || g && t.match(/\\/) ? [""] : [
+      // windows always checks the cwd first
+      ...g ? [process.cwd()] : [],
+      ...(e.path || process.env.PATH || /* istanbul ignore next: very unusual */
+      "").split(n)
+    ], s = g ? e.pathExt || process.env.PATHEXT || ".EXE;.CMD;.BAT;.COM" : "", o = g ? s.split(n) : [""];
+    return g && t.indexOf(".") !== -1 && o[0] !== "" && o.unshift(""), {
+      pathEnv: r,
+      pathExt: o,
+      pathExtExe: s
+    };
+  }, Z = (t, e, n) => {
+    typeof e == "function" && (n = e, e = {}), e || (e = {});
+    let { pathEnv: r, pathExt: s, pathExtExe: o } = Q(t, e), i = [], a = (u) => new Promise((f, p) => {
+      if (u === r.length)
+        return e.all && i.length ? f(i) : p(J(t));
+      let d = r[u], w = /^".*"$/.test(d) ? d.slice(1, -1) : d, m = Y.join(w, t), b = !w && /^\.[\\\/]/.test(t) ? t.slice(0, 2) + m : m;
+      f(c(b, u, 0));
+    }), c = (u, f, p) => new Promise((d, w) => {
+      if (p === s.length)
+        return d(a(f + 1));
+      let m = s[p];
+      V(u + m, { pathExt: o }, (b, Ot) => {
+        if (!b && Ot)
+          if (e.all)
+            i.push(u + m);
+          else
+            return d(u + m);
+        return d(c(u, f, p + 1));
+      });
+    });
+    return n ? a(0).then((u) => n(null, u), n) : a(0);
+  }, Xt = (t, e) => {
+    e = e || {};
+    let { pathEnv: n, pathExt: r, pathExtExe: s } = Q(t, e), o = [];
+    for (let i = 0; i < n.length; i++) {
+      let a = n[i], c = /^".*"$/.test(a) ? a.slice(1, -1) : a, u = Y.join(c, t), f = !c && /^\.[\\\/]/.test(t) ? t.slice(0, 2) + u : u;
+      for (let p = 0; p < r.length; p++) {
+        let d = f + r[p];
+        try {
+          if (V.sync(d, { pathExt: s }))
+            if (e.all)
+              o.push(d);
+            else
+              return d;
+        } catch {
+        }
+      }
+    }
+    if (e.all && o.length)
+      return o;
+    if (e.nothrow)
+      return null;
+    throw J(t);
+  };
+  tt.exports = Z;
+  Z.sync = Xt;
+});
+
+// node_modules/path-key/index.js
+var rt = l(($e, _) => {
+  var nt = (t = {}) => {
+    let e = t.env || process.env;
+    return (t.platform || process.platform) !== "win32" ? "PATH" : Object.keys(e).reverse().find((r) => r.toUpperCase() === "PATH") || "Path";
+  };
+  _.exports = nt;
+  _.exports.default = nt;
+});
+
+// node_modules/cross-spawn/lib/util/resolveCommand.js
+var ct = l((Ne, it) => {
+  var st = h("path"), Gt = et(), Ut = rt();
+  function ot(t, e) {
+    let n = t.options.env || process.env, r = process.cwd(), s = t.options.cwd != null, o = s && process.chdir !== void 0 && !process.chdir.disabled;
+    if (o)
+      try {
+        process.chdir(t.options.cwd);
+      } catch {
+      }
+    let i;
+    try {
+      i = Gt.sync(t.command, {
+        path: n[Ut({ env: n })],
+        pathExt: e ? st.delimiter : void 0
+      });
+    } catch {
+    } finally {
+      o && process.chdir(r);
+    }
+    return i && (i = st.resolve(s ? t.options.cwd : "", i)), i;
+  }
+  function Yt(t) {
+    return ot(t) || ot(t, true);
+  }
+  it.exports = Yt;
+});
+
+// node_modules/cross-spawn/lib/util/escape.js
+var ut = l((qe, P) => {
+  var C = /([()\][%!^"`<>&|;, *?])/g;
+  function Vt(t) {
+    return t = t.replace(C, "^$1"), t;
+  }
+  function Jt(t, e) {
+    return t = `${t}`, t = t.replace(/(\\*)"/g, '$1$1\\"'), t = t.replace(/(\\*)$/, "$1$1"), t = `"${t}"`, t = t.replace(C, "^$1"), e && (t = t.replace(C, "^$1")), t;
+  }
+  P.exports.command = Vt;
+  P.exports.argument = Jt;
+});
+
+// node_modules/shebang-regex/index.js
+var lt = l((Ie, at) => {
+  at.exports = /^#!(.*)/;
+});
+
+// node_modules/shebang-command/index.js
+var dt = l((Le, pt) => {
+  var Qt = lt();
+  pt.exports = (t = "") => {
+    let e = t.match(Qt);
+    if (!e)
+      return null;
+    let [n, r] = e[0].replace(/#! ?/, "").split(" "), s = n.split("/").pop();
+    return s === "env" ? r : r ? `${s} ${r}` : s;
+  };
+});
+
+// node_modules/cross-spawn/lib/util/readShebang.js
+var ht = l((je, ft) => {
+  var O = h("fs"), Zt = dt();
+  function te(t) {
+    let n = Buffer.alloc(150), r;
+    try {
+      r = O.openSync(t, "r"), O.readSync(r, n, 0, 150, 0), O.closeSync(r);
+    } catch {
+    }
+    return Zt(n.toString());
+  }
+  ft.exports = te;
+});
+
+// node_modules/cross-spawn/lib/parse.js
+var wt = l((Fe, Et) => {
+  var ee = h("path"), mt = ct(), gt = ut(), ne = ht(), re = process.platform === "win32", se = /\.(?:com|exe)$/i, oe = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
+  function ie(t) {
+    t.file = mt(t);
+    let e = t.file && ne(t.file);
+    return e ? (t.args.unshift(t.file), t.command = e, mt(t)) : t.file;
+  }
+  function ce(t) {
+    if (!re)
+      return t;
+    let e = ie(t), n = !se.test(e);
+    if (t.options.forceShell || n) {
+      let r = oe.test(e);
+      t.command = ee.normalize(t.command), t.command = gt.command(t.command), t.args = t.args.map((o) => gt.argument(o, r));
+      let s = [t.command].concat(t.args).join(" ");
+      t.args = ["/d", "/s", "/c", `"${s}"`], t.command = process.env.comspec || "cmd.exe", t.options.windowsVerbatimArguments = true;
+    }
+    return t;
+  }
+  function ue(t, e, n) {
+    e && !Array.isArray(e) && (n = e, e = null), e = e ? e.slice(0) : [], n = Object.assign({}, n);
+    let r = {
+      command: t,
+      args: e,
+      options: n,
+      file: void 0,
+      original: {
+        command: t,
+        args: e
+      }
+    };
+    return n.shell ? r : ce(r);
+  }
+  Et.exports = ue;
+});
+
+// node_modules/cross-spawn/lib/enoent.js
+var bt = l((ze, vt) => {
+  var S = process.platform === "win32";
+  function k(t, e) {
+    return Object.assign(new Error(`${e} ${t.command} ENOENT`), {
+      code: "ENOENT",
+      errno: "ENOENT",
+      syscall: `${e} ${t.command}`,
+      path: t.command,
+      spawnargs: t.args
+    });
+  }
+  function ae(t, e) {
+    if (!S)
+      return;
+    let n = t.emit;
+    t.emit = function(r, s) {
+      if (r === "exit") {
+        let o = xt(s, e);
+        if (o)
+          return n.call(t, "error", o);
+      }
+      return n.apply(t, arguments);
+    };
+  }
+  function xt(t, e) {
+    return S && t === 1 && !e.file ? k(e.original, "spawn") : null;
+  }
+  function le(t, e) {
+    return S && t === 1 && !e.file ? k(e.original, "spawnSync") : null;
+  }
+  vt.exports = {
+    hookChildProcess: ae,
+    verifyENOENT: xt,
+    verifyENOENTSync: le,
+    notFoundError: k
+  };
+});
+
+// node_modules/cross-spawn/index.js
+var Ct = l((He, E) => {
+  var yt = h("child_process"), T = wt(), A = bt();
+  function _t(t, e, n) {
+    let r = T(t, e, n), s = yt.spawn(r.command, r.args, r.options);
+    return A.hookChildProcess(s, r), s;
+  }
+  function pe(t, e, n) {
+    let r = T(t, e, n), s = yt.spawnSync(r.command, r.args, r.options);
+    return s.error = s.error || A.verifyENOENTSync(s.status, r), s;
+  }
+  E.exports = _t;
+  E.exports.spawn = _t;
+  E.exports.sync = pe;
+  E.exports._parse = T;
+  E.exports._enoent = A;
+});
+
+// src/main.ts
+Nt(Ct());
+
 async function findup(cwd, match, options = {}) {
   const segments = normalize(cwd).split("/");
   while (segments.length > 0) {
@@ -187,6 +543,23 @@ async function findup(cwd, match, options = {}) {
     segments.pop();
   }
 }
+function parsePackageManagerField(packageManager) {
+  const [name, _version] = (packageManager || "").split("@");
+  const [version, buildMeta] = _version?.split("+") || [];
+  if (name && name !== "-" && /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/.test(name)) {
+    return { name, version, buildMeta };
+  }
+  const sanitized = name.replace(/\W+/g, "");
+  const warnings = [
+    `Abnormal characters found in \`packageManager\` field, sanitizing from \`${name}\` to \`${sanitized}\``
+  ];
+  return {
+    name: sanitized,
+    version,
+    buildMeta,
+    warnings
+  };
+}
 
 const packageManagers = [
   {
@@ -208,15 +581,14 @@ const packageManagers = [
   {
     name: "yarn",
     command: "yarn",
-    majorVersion: "1",
-    lockFile: "yarn.lock"
-  },
-  {
-    name: "yarn",
-    command: "yarn",
-    majorVersion: "3",
     lockFile: "yarn.lock",
     files: [".yarnrc.yml"]
+  },
+  {
+    name: "deno",
+    command: "deno",
+    lockFile: "deno.lock",
+    files: ["deno.json"]
   }
 ];
 async function detectPackageManager(cwd, options = {}) {
@@ -230,20 +602,34 @@ async function detectPackageManager(cwd, options = {}) {
             await readFile(packageJSONPath, "utf8")
           );
           if (packageJSON?.packageManager) {
-            const [name, version = "0.0.0"] = packageJSON.packageManager.split("@");
-            const majorVersion = version.split(".")[0];
-            const packageManager = packageManagers.find(
-              (pm) => pm.name === name && pm.majorVersion === majorVersion
-            ) || packageManagers.find((pm) => pm.name === name);
-            return {
-              ...packageManager,
+            const {
               name,
-              command: name,
-              version,
-              majorVersion
-            };
+              version = "0.0.0",
+              buildMeta,
+              warnings
+            } = parsePackageManagerField(packageJSON.packageManager);
+            if (name) {
+              const majorVersion = version.split(".")[0];
+              const packageManager = packageManagers.find(
+                (pm) => pm.name === name && pm.majorVersion === majorVersion
+              ) || packageManagers.find((pm) => pm.name === name);
+              return {
+                name,
+                command: name,
+                version,
+                majorVersion,
+                buildMeta,
+                warnings,
+                files: packageManager?.files,
+                lockFile: packageManager?.lockFile
+              };
+            }
           }
         }
+        const denoJSONPath = join(path, "deno.json");
+        if (existsSync(denoJSONPath)) {
+          return packageManagers.find((pm) => pm.name === "deno");
+        }
       }
       if (!options.ignoreLockFile) {
         for (const packageManager of packageManagers) {
@@ -337,7 +723,7 @@ function toArray(array) {
 }
 const compress = promisify(gzip);
 async function getCompressedSize(code) {
-  const size = (await compress(typeof code === "string" ? code : Buffer.from(code))).length / 1024;
+  const size = (await compress(typeof code === "string" ? code : Buffer$1.from(code))).length / 1024;
   return ` / gzip: ${size.toFixed(2)} KiB`;
 }
 async function printFileInfo(root, outDir, filePath, content, type, maxLength) {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "kirbyup",
   "type": "module",
-  "version": "3.2.0",
-  "packageManager": "pnpm@9.13.0",
+  "version": "3.2.1",
+  "packageManager": "pnpm@10.5.2",
   "description": "Zero-config bundler for Kirby Panel plugins",
   "author": {
     "name": "Johann Schopplich",
@@ -74,33 +74,39 @@
     "@vitejs/plugin-vue2": "2.2.0",
     "@vitejs/plugin-vue2-jsx": "1.1.0",
     "@vue/compiler-sfc": "^2.7.16",
-    "c12": "^2.0.1",
+    "c12": "^3.0.2",
     "cac": "^6.7.14",
     "chokidar": "~3.6.0",
-    "consola": "^3.2.3",
-    "magic-string": "^0.30.12",
-    "pathe": "^1.1.2",
+    "consola": "^3.4.0",
+    "magic-string": "^0.30.17",
+    "pathe": "^2.0.3",
     "perfect-debounce": "^1.0.0",
-    "postcss": "^8.4.49",
+    "postcss": "^8.5.3",
     "postcss-dir-pseudo-class": "^9.0.1",
     "postcss-load-config": "^6.0.1",
-    "postcss-logical": "^8.0.0",
-    "rollup-plugin-external-globals": "^0.12.0",
-    "sass": "^1.80.7",
-    "vite": "~5.4.11",
+    "postcss-logical": "^8.1.0",
+    "rollup-plugin-external-globals": "^0.13.0",
+    "sass": "^1.85.1",
+    "vite": "~5.4.14",
     "vite-plugin-full-reload": "^1.2.0",
     "vue": "^2.7.16"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^3.9.1",
-    "@types/node": "^20.17.6",
+    "@antfu/eslint-config": "^4.3.0",
+    "@types/node": "^22.13.5",
     "@types/prompts": "^2.4.9",
-    "bumpp": "^9.8.1",
-    "eslint": "^9.14.0",
-    "fast-glob": "^3.3.2",
-    "nypm": "^0.3.12",
-    "typescript": "^5.6.3",
-    "unbuild": "^3.0.0-rc.11",
-    "vitest": "^2.1.5"
+    "bumpp": "^10.0.3",
+    "eslint": "^9.21.0",
+    "fast-glob": "^3.3.3",
+    "nypm": "^0.6.0",
+    "typescript": "^5.7.3",
+    "unbuild": "^3.5.0",
+    "vitest": "^3.0.7"
+  },
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "@parcel/watcher",
+      "esbuild"
+    ]
   }
 }