kirbyup 3.1.12 → 3.2.0

package/dist/node/cli.mjs

@@ -1,26 +1,26 @@
 import { cac } from 'cac';
-import { n as name, b as build, s as serve, v as version, h as handleError } from '../shared/kirbyup.TnJrqKie.mjs';
+import { n as name, b as build, s as serve, v as version, h as handleError } from '../shared/kirbyup.zmDi6JQM.mjs';
 import 'node:fs';
 import 'node:fs/promises';
-import 'pathe';
+import '@vitejs/plugin-vue2';
+import '@vitejs/plugin-vue2-jsx';
 import 'consola';
 import 'consola/utils';
+import 'pathe';
 import 'perfect-debounce';
+import 'rollup-plugin-external-globals';
 import 'vite';
-import 'vue/compiler-sfc';
-import '@vitejs/plugin-vue2';
-import '@vitejs/plugin-vue2-jsx';
 import 'vite-plugin-full-reload';
-import 'rollup-plugin-external-globals';
-import 'node:zlib';
-import 'node:util';
-import 'node:buffer';
+import 'vue/compiler-sfc';
 import 'c12';
+import 'postcss-dir-pseudo-class';
 import 'postcss-load-config';
 import 'postcss-logical';
-import 'postcss-dir-pseudo-class';
 import 'magic-string';
 import 'node:module';
+import 'node:buffer';
+import 'node:util';
+import 'node:zlib';
 
 async function startCli(cwd = process.cwd(), argv = process.argv) {
   const cli = cac(name);
@@ -29,13 +29,11 @@ async function startCli(cwd = process.cwd(), argv = process.argv) {
     "Watch for file changes. If no path is specified, the folder of the input file will be watched",
     { default: false }
   ).example("kirbyup src/index.js").example("kirbyup src/index.js --out-dir ~/kirby-site/site/plugins/demo").example("kirbyup src/index.js --watch src/**/*.{js,css} --watch assets/*\n").action(async (file, options) => {
-    if (!process.env.NODE_ENV)
-      process.env.NODE_ENV = options.watch ? "development" : "production";
+    process.env.NODE_ENV ||= options.watch ? "development" : "production";
     await build({ cwd, entry: file, ...options });
   });
   cli.command("serve <file>", "Start development server with live reload").option("--no-watch", "Don't watch .php files for changes", { default: "\0" }).option("-w, --watch <path>", "Watch additional files", { default: "./**/*.php" }).option("-p, --port <number>", "Port for the development server", { default: 5177 }).option("-d, --out-dir <dir>", "Output directory").example("kirbyup serve src/index.js").example("kirbyup serve src/index.js --no-watch --port 3003").example("kirbyup serve src/index.js --watch snippets/*.php --watch templates/*.php\n").action(async (file, options) => {
-    if (!process.env.NODE_ENV)
-      process.env.NODE_ENV = "development";
+    process.env.NODE_ENV ||= "development";
     const server = await serve({ cwd, entry: file, ...options });
     const exitProcess = async () => {
       try {

package/dist/node/index.mjs

@@ -1,22 +1,22 @@
 import 'node:fs';
 import 'node:fs/promises';
-import 'pathe';
+import '@vitejs/plugin-vue2';
+import '@vitejs/plugin-vue2-jsx';
 import 'consola';
 import 'consola/utils';
+import 'pathe';
 import 'perfect-debounce';
+import 'rollup-plugin-external-globals';
 import 'vite';
-import 'vue/compiler-sfc';
-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.TnJrqKie.mjs';
-import 'node:zlib';
-import 'node:util';
-import 'node:buffer';
+import 'vue/compiler-sfc';
+export { b as build, s as serve } from '../shared/kirbyup.zmDi6JQM.mjs';
 import 'c12';
+import 'postcss-dir-pseudo-class';
 import 'postcss-load-config';
 import 'postcss-logical';
-import 'postcss-dir-pseudo-class';
 import 'magic-string';
 import 'node:module';
+import 'node:buffer';
+import 'node:util';
+import 'node:zlib';

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

@@ -1,73 +1,36 @@
-import { existsSync, unlinkSync } from 'node:fs';
-import { readFile, writeFile } from 'node:fs/promises';
-import { normalize, relative, resolve, join, dirname, basename } from 'pathe';
+import * as fs from 'node:fs';
+import { existsSync } from 'node:fs';
+import * as fsp from 'node:fs/promises';
+import { readFile } from 'node:fs/promises';
+import vuePlugin from '@vitejs/plugin-vue2';
+import vueJsxPlugin from '@vitejs/plugin-vue2-jsx';
 import { consola } from 'consola';
 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 * as vueCompilerSfc from 'vue/compiler-sfc';
-import vuePlugin from '@vitejs/plugin-vue2';
-import vueJsxPlugin from '@vitejs/plugin-vue2-jsx';
 import fullReloadPlugin from 'vite-plugin-full-reload';
-import externalGlobals from 'rollup-plugin-external-globals';
-import { gzip } from 'node:zlib';
-import { promisify } from 'node:util';
-import { Buffer } from 'node:buffer';
+import * as vueCompilerSfc from 'vue/compiler-sfc';
 import { loadConfig as loadConfig$1 } from 'c12';
+import postcssDirPseudoClass from 'postcss-dir-pseudo-class';
 import postcssrc from 'postcss-load-config';
 import postcssLogical from 'postcss-logical';
-import postcssDirPseudoClass from 'postcss-dir-pseudo-class';
 import MagicString from 'magic-string';
 import 'node:module';
+import { Buffer } from 'node:buffer';
+import { promisify } from 'node:util';
+import { gzip } from 'node:zlib';
 
 const name = "kirbyup";
-const version = "3.1.12";
-
-class PrettyError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = this.constructor.name;
-    if (typeof Error.captureStackTrace === "function")
-      Error.captureStackTrace(this, this.constructor);
-    else
-      this.stack = new Error(message).stack;
-  }
-}
-function handleError(error) {
-  consola.error(error.message);
-  process.exitCode = 1;
-}
-
-function toArray(array) {
-  array = array || [];
-  if (Array.isArray(array))
-    return array;
-  return [array];
-}
-const compress = promisify(gzip);
-async function getCompressedSize(code) {
-  const size = (await compress(typeof code === "string" ? code : Buffer.from(code))).length / 1024;
-  return ` / gzip: ${size.toFixed(2)} KiB`;
-}
-async function printFileInfo(root, outDir, filePath, content, type, maxLength) {
-  const prettyOutDir = `${normalize(relative(root, resolve(root, outDir)))}/`;
-  const kibs = content.length / 1024;
-  const compressedSize = await getCompressedSize(content);
-  const writeColor = type === "chunk" ? colors.cyan : colors.magenta;
-  consola.log(
-    colors.white(colors.dim(prettyOutDir)) + writeColor(filePath.padEnd(maxLength + 2)) + colors.dim(`${kibs.toFixed(2)} kB${compressedSize}`)
-  );
-}
+const version = "3.2.0";
 
 function loadConfig(cwd = process.cwd()) {
   return loadConfig$1({
     cwd,
     name: "kirbyup",
     rcFile: false,
-    jitiOptions: {
-      interopDefault: true,
-      esmResolve: true
-    }
+    packageJson: false
   });
 }
 async function resolvePostCSSConfig(cwd) {
@@ -82,6 +45,37 @@ async function resolvePostCSSConfig(cwd) {
   }
 }
 
+class PrettyError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = this.constructor.name;
+    if (typeof Error.captureStackTrace === "function")
+      Error.captureStackTrace(this, this.constructor);
+    else
+      this.stack = new Error(message).stack;
+  }
+}
+function handleError(error) {
+  consola.error(error.message);
+  process.exitCode = 1;
+}
+
+function kirbyupBuildCleanupPlugin(options) {
+  let config;
+  let devIndexPath;
+  return {
+    name: "kirbyup:build-cleanup",
+    configResolved(resolvedConfig) {
+      config = resolvedConfig;
+      devIndexPath = resolve(config.root, options.outDir, "index.dev.mjs");
+    },
+    writeBundle() {
+      if (fs.existsSync(devIndexPath))
+        fs.unlinkSync(devIndexPath);
+    }
+  };
+}
+
 const multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//g;
 const singlelineCommentsRE = /\/\/.*/g;
 const HMR_RUNTIME_ID = "\0plugin-vue2:hmr-runtime";
@@ -209,18 +203,18 @@ const packageManagers = [
   {
     name: "bun",
     command: "bun",
-    lockFile: "bun.lockb"
+    lockFile: ["bun.lockb", "bun.lock"]
   },
   {
     name: "yarn",
     command: "yarn",
-    majorVersion: "1.0.0",
+    majorVersion: "1",
     lockFile: "yarn.lock"
   },
   {
     name: "yarn",
     command: "yarn",
-    majorVersion: "3.0.0",
+    majorVersion: "3",
     lockFile: "yarn.lock",
     files: [".yarnrc.yml"]
   }
@@ -255,8 +249,8 @@ async function detectPackageManager(cwd, options = {}) {
         for (const packageManager of packageManagers) {
           const detectionsFiles = [
             packageManager.lockFile,
-            ...packageManager.files || []
-          ].filter(Boolean);
+            packageManager.files
+          ].flat().filter(Boolean);
           if (detectionsFiles.some((file) => existsSync(resolve(path, file)))) {
             return {
               ...packageManager
@@ -314,12 +308,12 @@ function kirbyupHmrPlugin(options) {
         const baseUrl = `http://${hostname}:${port}${config.base}`;
         const entryUrl = new URL(entryPath, baseUrl).href;
         const pm = await detectPackageManager(config.root);
-        await writeFile(devIndexPath, getViteProxyModule(entryUrl, pm));
+        await fsp.writeFile(devIndexPath, getViteProxyModule(entryUrl, pm));
       });
     },
     closeBundle() {
-      if (existsSync(devIndexPath))
-        unlinkSync(devIndexPath);
+      if (fs.existsSync(devIndexPath))
+        fs.unlinkSync(devIndexPath);
     }
   };
 }
@@ -337,20 +331,23 @@ try {
 `.trimStart();
 }
 
-function kirbyupBuildCleanupPlugin(options) {
-  let config;
-  let devIndexPath;
-  return {
-    name: "kirbyup:build-cleanup",
-    configResolved(resolvedConfig) {
-      config = resolvedConfig;
-      devIndexPath = resolve(config.root, options.outDir, "index.dev.mjs");
-    },
-    writeBundle() {
-      if (existsSync(devIndexPath))
-        unlinkSync(devIndexPath);
-    }
-  };
+function toArray(array) {
+  array ??= [];
+  return Array.isArray(array) ? array : [array];
+}
+const compress = promisify(gzip);
+async function getCompressedSize(code) {
+  const size = (await compress(typeof code === "string" ? code : Buffer.from(code))).length / 1024;
+  return ` / gzip: ${size.toFixed(2)} KiB`;
+}
+async function printFileInfo(root, outDir, filePath, content, type, maxLength) {
+  const prettyOutDir = `${normalize(relative(root, resolve(root, outDir)))}/`;
+  const kibs = content.length / 1024;
+  const compressedSize = await getCompressedSize(content);
+  const writeColor = type === "chunk" ? colors.cyan : colors.magenta;
+  consola.log(
+    colors.white(colors.dim(prettyOutDir)) + writeColor(filePath.padEnd(maxLength + 2)) + colors.dim(`${kibs.toFixed(2)} kB${compressedSize}`)
+  );
 }
 
 let resolvedKirbyupConfig;
@@ -389,6 +386,7 @@ function getViteConfig(command, options) {
     css: {
       postcss: resolvedPostCssConfig
     },
+    envDir: options.cwd,
     envPrefix: ["VITE_", "KIRBYUP_"],
     customLogger: logger,
     logLevel
@@ -461,7 +459,7 @@ async function generate(options) {
         options.cwd,
         options.outDir,
         fileName,
-        code ?? await readFile(resolve(options.outDir, fileName), "utf8"),
+        code ?? await fsp.readFile(resolve(options.outDir, fileName), "utf8"),
         type,
         longest
       );
@@ -540,7 +538,7 @@ async function serve(options) {
   return server;
 }
 function assertEntryExists(options) {
-  if (!existsSync(resolve(options.cwd, options.entry)))
+  if (!fs.existsSync(resolve(options.cwd, options.entry)))
     throw new PrettyError(`Cannot find "${options.entry}"`);
 }
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "kirbyup",
   "type": "module",
-  "version": "3.1.12",
-  "packageManager": "pnpm@9.5.0",
+  "version": "3.2.0",
+  "packageManager": "pnpm@9.13.0",
   "description": "Zero-config bundler for Kirby Panel plugins",
   "author": {
     "name": "Johann Schopplich",
@@ -66,7 +66,7 @@
     "docs:preview": "vitepress preview docs",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "release": "bumpp --commit --push --tag",
+    "release": "bumpp",
     "test": "vitest --no-isolate",
     "test:types": "tsc --noEmit"
   },
@@ -74,35 +74,33 @@
     "@vitejs/plugin-vue2": "2.2.0",
     "@vitejs/plugin-vue2-jsx": "1.1.0",
     "@vue/compiler-sfc": "^2.7.16",
-    "c12": "^1.11.1",
+    "c12": "^2.0.1",
     "cac": "^6.7.14",
-    "chokidar": "^3.6.0",
+    "chokidar": "~3.6.0",
     "consola": "^3.2.3",
-    "magic-string": "^0.30.10",
+    "magic-string": "^0.30.12",
     "pathe": "^1.1.2",
     "perfect-debounce": "^1.0.0",
-    "postcss": "^8.4.39",
-    "postcss-dir-pseudo-class": "^8.0.1",
-    "postcss-load-config": "^5.1.0",
-    "postcss-logical": "^7.0.1",
-    "rollup-plugin-external-globals": "^0.11.0",
-    "sass": "^1.77.7",
-    "vite": "~5.3.3",
+    "postcss": "^8.4.49",
+    "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",
     "vite-plugin-full-reload": "^1.2.0",
     "vue": "^2.7.16"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.22.0",
-    "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.14.10",
+    "@antfu/eslint-config": "^3.9.1",
+    "@types/node": "^20.17.6",
     "@types/prompts": "^2.4.9",
-    "bumpp": "^9.4.1",
-    "eslint": "^9.6.0",
+    "bumpp": "^9.8.1",
+    "eslint": "^9.14.0",
     "fast-glob": "^3.3.2",
-    "fs-extra": "^11.2.0",
-    "nypm": "^0.3.9",
-    "typescript": "^5.5.3",
-    "unbuild": "^3.0.0-rc.6",
-    "vitest": "^2.0.1"
+    "nypm": "^0.3.12",
+    "typescript": "^5.6.3",
+    "unbuild": "^3.0.0-rc.11",
+    "vitest": "^2.1.5"
   }
 }