kirbyup 3.1.4 → 3.1.6

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.DSMJ9KWQ.mjs';
+import { n as name, b as build, s as serve, v as version, h as handleError } from '../shared/kirbyup.CoQcp64G.mjs';
 import 'node:fs';
 import 'node:fs/promises';
 import 'pathe';

package/dist/node/index.mjs

@@ -10,7 +10,7 @@ import '@vitejs/plugin-vue2';
 import '@vitejs/plugin-vue2-jsx';
 import 'vite-plugin-full-reload';
 import 'rollup-plugin-external-globals';
-export { b as build, s as serve } from '../shared/kirbyup.DSMJ9KWQ.mjs';
+export { b as build, s as serve } from '../shared/kirbyup.CoQcp64G.mjs';
 import 'node:zlib';
 import 'node:util';
 import 'node:buffer';

package/dist/shared/{kirbyup.DSMJ9KWQ.mjs → kirbyup.CoQcp64G.mjs}

@@ -21,7 +21,7 @@ import MagicString from 'magic-string';
 import 'node:module';
 
 const name = "kirbyup";
-const version = "3.1.4";
+const version = "3.1.6";
 
 class PrettyError extends Error {
   constructor(message) {
@@ -185,7 +185,7 @@ function kirbyupGlobImportPlugin() {
 async function findup(cwd, match, options = {}) {
   const segments = normalize(cwd).split("/");
   while (segments.length > 0) {
-    const path = segments.join("/");
+    const path = segments.join("/") || "/";
     const result = await match(path);
     if (result || !options.includeParentDirs) {
       return result;
@@ -195,7 +195,11 @@ async function findup(cwd, match, options = {}) {
 }
 
 const packageManagers = [
-  { name: "npm", command: "npm", lockFile: "package-lock.json" },
+  {
+    name: "npm",
+    command: "npm",
+    lockFile: "package-lock.json"
+  },
   {
     name: "pnpm",
     command: "pnpm",
@@ -223,7 +227,7 @@ const packageManagers = [
 ];
 async function detectPackageManager(cwd, options = {}) {
   const detected = await findup(
-    cwd,
+    resolve(cwd || "."),
     async (path) => {
       if (!options.ignorePackageJSON) {
         const packageJSONPath = join(path, "package.json");
@@ -265,6 +269,17 @@ async function detectPackageManager(cwd, options = {}) {
       includeParentDirs: options.includeParentDirs ?? true
     }
   );
+  if (!detected && !options.ignoreArgv) {
+    const scriptArg = process.argv[1];
+    if (scriptArg) {
+      for (const packageManager of packageManagers) {
+        const re = new RegExp(`[/\\\\]\\.?${packageManager.command}`);
+        if (re.test(scriptArg)) {
+          return packageManager;
+        }
+      }
+    }
+  }
   return detected;
 }
 
@@ -344,7 +359,7 @@ function getViteConfig(command, options) {
   const aliasDir = resolve(options.cwd, dirname(options.entry));
   const { alias = {}, vite, extendViteConfig } = resolvedKirbyupConfig;
   const userConfig = vite ?? extendViteConfig ?? {};
-  const baseConfig = {
+  const sharedConfig = {
     resolve: {
       alias: {
         "~/": `${aliasDir}/`,
@@ -366,7 +381,7 @@ function getViteConfig(command, options) {
   };
   if (command === "serve") {
     const { port, watch } = options;
-    const serveConfig = mergeConfig(baseConfig, {
+    const serveConfig = mergeConfig(sharedConfig, {
       plugins: [
         kirbyupHmrPlugin(options),
         watch && fullReloadPlugin(watch)
@@ -379,7 +394,7 @@ function getViteConfig(command, options) {
     return mergeConfig(serveConfig, userConfig);
   }
   const mode = options.watch ? "development" : "production";
-  const buildConfig = mergeConfig(baseConfig, {
+  const buildConfig = mergeConfig(sharedConfig, {
     plugins: [kirbyupBuildCleanupPlugin(options)],
     mode,
     build: {
@@ -433,7 +448,7 @@ async function generate(options) {
   return result;
 }
 async function build(options) {
-  ensureEntry(options);
+  assertEntryExists(options);
   const { cwd } = options;
   const { config, configFile } = await loadConfig(cwd);
   resolvedKirbyupConfig = config ?? {};
@@ -488,7 +503,7 @@ async function build(options) {
   startWatcher();
 }
 async function serve(options) {
-  ensureEntry(options);
+  assertEntryExists(options);
   const { cwd } = options;
   const { config } = await loadConfig(cwd);
   resolvedKirbyupConfig = config ?? {};
@@ -502,7 +517,7 @@ async function serve(options) {
   consola.success(`Server is listening on :${server.config.server.port}`);
   return server;
 }
-function ensureEntry(options) {
+function assertEntryExists(options) {
   if (!existsSync(resolve(options.cwd, options.entry)))
     throw new PrettyError(`Cannot find "${options.entry}"`);
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "kirbyup",
   "type": "module",
-  "version": "3.1.4",
-  "packageManager": "pnpm@8.15.3",
+  "version": "3.1.6",
+  "packageManager": "pnpm@9.1.1",
   "description": "Zero-config bundler for Kirby Panel plugins",
   "author": {
     "name": "Johann Schopplich",
-    "email": "pkg@johannschopplich.com",
+    "email": "hello@johannschopplich.com",
     "url": "https://johannschopplich.com"
   },
   "license": "MIT",
@@ -61,9 +61,9 @@
   "scripts": {
     "build": "unbuild",
     "dev": "UNBUILD_STUB=true unbuild",
-    "docs": "pnpm -C docs run dev",
-    "docs:build": "pnpm -C docs run build",
-    "docs:serve": "pnpm -C docs run serve",
+    "docs:dev": "vitepress dev docs",
+    "docs:build": "vitepress build docs",
+    "docs:preview": "vitepress preview docs",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "release": "bumpp --commit --push --tag",
@@ -75,37 +75,37 @@
     "@vitejs/plugin-vue2": "2.2.0",
     "@vitejs/plugin-vue2-jsx": "1.1.0",
     "@vue/compiler-sfc": "^2.7.16",
-    "c12": "^1.8.0",
+    "c12": "^1.10.0",
     "cac": "^6.7.14",
     "chokidar": "^3.6.0",
     "consola": "^3.2.3",
-    "magic-string": "^0.30.7",
+    "magic-string": "^0.30.10",
     "pathe": "^1.1.2",
     "perfect-debounce": "^1.0.0",
-    "postcss": "^8.4.35",
+    "postcss": "^8.4.38",
     "postcss-dir-pseudo-class": "^8.0.1",
-    "postcss-load-config": "^5.0.3",
+    "postcss-load-config": "^5.1.0",
     "postcss-logical": "^7.0.1",
-    "rollup-plugin-external-globals": "^0.9.2",
-    "sass": "^1.70.0",
-    "vite": "^5.1.2",
+    "rollup-plugin-external-globals": "^0.10.0",
+    "sass": "^1.77.1",
+    "vite": "~5.1.7",
     "vite-plugin-full-reload": "^1.1.0",
     "vue": "^2.7.16"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.6.4",
+    "@antfu/eslint-config": "^2.18.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.11.18",
+    "@types/node": "^20.12.12",
     "@types/prompts": "^2.4.9",
-    "bumpp": "^9.3.0",
-    "eslint": "^8.56.0",
+    "bumpp": "^9.4.1",
+    "eslint": "^9.2.0",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
-    "nypm": "^0.3.6",
-    "simple-git-hooks": "^2.9.0",
-    "typescript": "~5.3.3",
+    "nypm": "^0.3.8",
+    "simple-git-hooks": "^2.11.1",
+    "typescript": "^5.4.5",
     "unbuild": "^3.0.0-rc.1",
-    "vitest": "^1.2.2"
+    "vitest": "^1.6.0"
   },
   "simple-git-hooks": {
     "commit-msg": "node scripts/verifyCommit.mjs $1"