kirbyup 1.0.2 → 1.2.1

package/{bin/kirbyup.mjs → cli.mjs}

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 'use strict'
-import('../dist/cli.mjs')
+import('./dist/cli.mjs')

package/dist/chunks/index.mjs

@@ -1,7 +1,7 @@
-import { existsSync, statSync } from 'fs';
+import { existsSync as existsSync$1 } from 'node:fs';
 import { resolve, normalize, relative, dirname, basename } from 'pathe';
 import { build as build$1, mergeConfig } from 'vite';
-import { createVuePlugin } from 'vite-plugin-vue2';
+import vuePlugin from '@vitejs/plugin-vue2';
 import postcssrc from 'postcss-load-config';
 import postcssLogical from 'postcss-logical';
 import postcssDirPseudoClass from 'postcss-dir-pseudo-class';
@@ -11,11 +11,12 @@ import colors from 'picocolors';
 import { readFile } from 'fs/promises';
 import { gzip } from 'zlib';
 import { promisify } from 'util';
+import { existsSync, statSync } from 'fs';
 import { createConfigLoader } from 'unconfig';
 import MagicString from 'magic-string';
 
 const name = "kirbyup";
-const version = "1.0.2";
+const version = "1.2.1";
 
 class PrettyError extends Error {
   constructor(message) {
@@ -130,19 +131,18 @@ function kirbyupAutoImportPlugin() {
 
 let resolvedKirbyupConfig;
 let resolvedPostCssConfig;
-async function viteBuild(options) {
+async function generate(options) {
   let result;
   const mode = options.watch ? "development" : "production";
-  const root = process.cwd();
-  const outDir = options.outDir ?? root;
-  const aliasDir = resolve(root, dirname(options.entry));
+  const outDir = options.outDir || options.cwd;
+  const aliasDir = resolve(options.cwd, dirname(options.entry));
   const { alias = {}, extendViteConfig = {} } = resolvedKirbyupConfig;
   const defaultConfig = {
     mode,
-    plugins: [createVuePlugin(), kirbyupAutoImportPlugin()],
+    plugins: [vuePlugin(), kirbyupAutoImportPlugin()],
     build: {
       lib: {
-        entry: resolve(root, options.entry),
+        entry: resolve(options.cwd, options.entry),
         formats: ["iife"],
         name: "kirbyupExport",
         fileName: () => "index.js"
@@ -183,21 +183,23 @@ async function viteBuild(options) {
   if (result && !options.watch) {
     const { output } = toArray(result)[0];
     for (const { fileName, type, code } of output)
-      printFileInfo(root, outDir, fileName, type, code);
+      printFileInfo(options.cwd, outDir, fileName, type, code);
   }
   return result;
 }
 async function resolveOptions(options) {
+  options.cwd = options.cwd || process.cwd();
   if (!options.entry) {
     throw new PrettyError(`No input file, try ${colors.cyan(`${name} <path/to/file.js>`)}`);
   }
-  if (!existsSync(options.entry))
-    throw new PrettyError(`Cannot find ${options.entry}`);
+  if (!existsSync$1(resolve(options.cwd, options.entry)))
+    throw new PrettyError(`Cannot find "${options.entry}"`);
   return options;
 }
 async function build(_options) {
   const options = await resolveOptions(_options);
-  const { config, sources: configSources } = await loadConfig();
+  const { cwd } = options;
+  const { config, sources: configSources } = await loadConfig(cwd);
   resolvedKirbyupConfig = config;
   try {
     resolvedPostCssConfig = await postcssrc({});
@@ -208,12 +210,14 @@ async function build(_options) {
       plugins: [postcssLogical(), postcssDirPseudoClass()]
     };
   }
-  consola.log(colors.green(`${name} v${version}`));
-  consola.start(`Building ${colors.cyan(options.entry)}`);
+  {
+    consola.log(colors.green(`${name} v${version}`));
+    consola.start(`Building ${colors.cyan(options.entry)}`);
+  }
   if (options.watch)
     consola.info("Running in watch mode");
   const debouncedBuild = debounce(async () => {
-    viteBuild(options).catch(handleError);
+    generate(options).catch(handleError);
   }, 100);
   const startWatcher = async () => {
     if (!options.watch)
@@ -228,7 +232,8 @@ async function build(_options) {
     const watcher = watch(watchPaths, {
       ignoreInitial: true,
       ignorePermissionErrors: true,
-      ignored
+      ignored,
+      cwd
     });
     if (configSources.length)
       watcher.add(configSources);
@@ -242,7 +247,7 @@ async function build(_options) {
       debouncedBuild();
     });
   };
-  await viteBuild(options);
+  await generate(options);
   consola.success("Build successful");
   startWatcher();
 }

package/dist/cli.mjs

@@ -1,9 +1,9 @@
 import { cac } from 'cac';
-import { h as handleError, n as name, b as build, v as version } from './chunks/index.mjs';
-import 'fs';
+import { n as name, b as build, v as version, h as handleError } from './chunks/index.mjs';
+import 'node:fs';
 import 'pathe';
 import 'vite';
-import 'vite-plugin-vue2';
+import '@vitejs/plugin-vue2';
 import 'postcss-load-config';
 import 'postcss-logical';
 import 'postcss-dir-pseudo-class';
@@ -13,17 +13,19 @@ import 'picocolors';
 import 'fs/promises';
 import 'zlib';
 import 'util';
+import 'fs';
 import 'unconfig';
 import 'magic-string';
 
-async function main(options = {}) {
+async function startCli(cwd = process.cwd(), argv = process.argv, options = {}) {
   const cli = cac(name);
   cli.command("[file]", "Panel input file", {
     ignoreOptionDefaultValue: true
   }).option("-d, --out-dir <dir>", "Output directory", {
-    default: process.cwd()
-  }).option("-w, --watch [path]", 'Watch mode. If no path is specified, the folder of the input file will be watched. Repeat "--watch" for multiple paths.').action(async (file, flags) => {
+    default: cwd
+  }).option("-w, --watch [path]", 'Watch for file changes. If no path is specified, the folder of the input file will be watched. Repeat "--watch" for multiple paths.').action(async (file, flags) => {
     Object.assign(options, {
+      cwd,
       ...flags
     });
     if (file)
@@ -32,7 +34,8 @@ async function main(options = {}) {
   });
   cli.help();
   cli.version(version);
-  cli.parse(process.argv, { run: false });
+  cli.parse(argv, { run: false });
   await cli.runMatchedCommand();
 }
-main().catch(handleError);
+
+startCli().catch(handleError);

package/dist/index.d.ts

@@ -2,11 +2,12 @@ import { AliasOptions, InlineConfig } from 'vite';
 
 declare type MarkRequired<T, RK extends keyof T> = Exclude<T, RK> & Required<Pick<T, RK>>;
 interface CliOptions {
+    cwd?: string;
     entry?: string;
     outDir?: string;
     watch?: boolean | string | Array<boolean | string>;
 }
-declare type ResolvedCliOptions = MarkRequired<CliOptions, 'entry'>;
+declare type ResolvedCliOptions = MarkRequired<CliOptions, 'cwd' | 'entry'>;
 interface UserConfig {
     /**
      * Load from config files

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import 'fs';
+import 'node:fs';
 import 'pathe';
 import 'vite';
-import 'vite-plugin-vue2';
+import '@vitejs/plugin-vue2';
 import 'postcss-load-config';
 import 'postcss-logical';
 import 'postcss-dir-pseudo-class';
@@ -12,5 +12,6 @@ export { b as build, d as defineConfig, r as resolveOptions } from './chunks/ind
 import 'fs/promises';
 import 'zlib';
 import 'util';
+import 'fs';
 import 'unconfig';
 import 'magic-string';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kirbyup",
-  "version": "1.0.2",
-  "packageManager": "pnpm@7.1.9",
+  "version": "1.2.1",
+  "packageManager": "pnpm@7.5.2",
   "description": "Zero-config bundler for Kirby Panel plugins",
   "author": {
     "name": "Johann Schopplich",
@@ -21,8 +21,9 @@
     "kirby-cms",
     "kirby-plugin",
     "kirby",
+    "cli",
     "panel",
-    "bundle"
+    "bundler"
   ],
   "exports": {
     ".": {
@@ -36,9 +37,7 @@
   },
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "bin": {
-    "kirbyup": "./bin/kirbyup.mjs"
-  },
+  "bin": "./cli.mjs",
   "files": [
     "bin",
     "dist"
@@ -48,7 +47,7 @@
   },
   "scripts": {
     "build": "unbuild",
-    "stub": "unbuild --stub",
+    "dev": "unbuild --stub",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "release": "bumpp --commit --push --tag",
@@ -57,38 +56,36 @@
     "prepare": "pnpm exec simple-git-hooks"
   },
   "dependencies": {
+    "@vitejs/plugin-vue2": "^1.1.2",
     "cac": "^6.7.12",
     "chokidar": "^3.5.3",
     "consola": "^2.15.3",
-    "pathe": "^0.3.0",
+    "magic-string": "^0.26.2",
+    "pathe": "^0.3.2",
     "perfect-debounce": "^0.1.3",
     "picocolors": "^1.0.0",
     "postcss": "^8.4.14",
-    "postcss-dir-pseudo-class": "^6.0.4",
+    "postcss-dir-pseudo-class": "^6.0.5",
     "postcss-load-config": "^4.0.1",
     "postcss-logical": "^5.0.4",
-    "sass": "^1.52.2",
-    "unconfig": "^0.3.4",
-    "vite": "2.9.9",
-    "vite-plugin-vue2": "^2.0.1",
-    "vue": "^2.6.14",
-    "vue-template-compiler": "^2.6.14"
+    "sass": "^1.53.0",
+    "unconfig": "^0.3.5",
+    "vite": "^3.0.1",
+    "vue": "^2.7.7"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.25.1",
+    "@antfu/eslint-config": "^0.25.2",
     "@types/fs-extra": "^9.0.13",
-    "@types/node": "^17.0.41",
+    "@types/node": "^18.0.6",
     "@types/prompts": "^2.4.0",
-    "bumpp": "^7.1.1",
-    "eslint": "^8.17.0",
-    "execa": "^6.1.0",
+    "bumpp": "^8.2.1",
+    "eslint": "^8.20.0",
     "fast-glob": "^3.2.11",
     "fs-extra": "^10.1.0",
     "simple-git-hooks": "^2.8.0",
-    "tsx": "^3.4.2",
-    "typescript": "^4.7.3",
+    "typescript": "^4.7.4",
     "unbuild": "^0.7.4",
-    "vitest": "^0.14.1"
+    "vitest": "^0.18.1"
   },
   "simple-git-hooks": {
     "commit-msg": "node scripts/verifyCommit.mjs $1"