kirbyup 0.4.0 → 0.8.0

package/dist/index.js

@@ -105,54 +105,61 @@ var import_chalk2 = __toModule(require("chalk"));
 
 // package.json
 var name = "kirbyup";
-var version = "0.4.0";
+var version = "0.8.0";
 
 // src/log.ts
-var label = import_chalk2.default.gray(`[${name}]`);
-var makeMessage = (input, type) => import_chalk2.default[type === "info" ? "yellow" : type === "error" ? "red" : "green"](input);
-function log(type, message) {
-  switch (type) {
-    case "error": {
-      return console.error(label, makeMessage(message, type));
-    }
-    default:
-      console.log(label, makeMessage(message, type));
+var colorMap = new Map([
+  ["info", "yellow"],
+  ["success", "green"],
+  ["error", "red"]
+]);
+function log(message, type = "info") {
+  var _a;
+  const content = [
+    import_chalk2.default.gray(`[${name}]`),
+    import_chalk2.default[(_a = colorMap.get(type)) != null ? _a : "white"](message)
+  ];
+  if (type === "error") {
+    console.error(...content);
+  } else {
+    console.log(...content);
   }
 }
 
 // src/index.ts
 async function runViteBuild(options) {
   let result;
+  const fileName = "index";
+  const currentDir = process.cwd();
   try {
     result = await (0, import_vite.build)({
       plugins: [(0, import_vite_plugin_vue2.createVuePlugin)()],
       build: {
         lib: {
-          entry: (0, import_path.resolve)(process.cwd(), options.entry),
+          entry: (0, import_path.resolve)(currentDir, options.entry),
           formats: ["es"],
-          fileName: "index"
+          fileName
         },
-        outDir: ".",
+        outDir: currentDir,
+        emptyOutDir: false,
         rollupOptions: {
           external: ["vue"],
           output: {
             entryFileNames: "[name].js",
-            assetFileNames: "index.[ext]",
+            assetFileNames: `${fileName}.[ext]`,
             globals: {
               vue: "Vue"
             }
           }
         }
       },
-      logLevel: "error"
+      logLevel: "warn"
     });
   } catch (error) {
-    log("error", "Build failed");
+    log("Build failed", "error");
     throw error;
   }
-  if (result) {
-    log("success", `Build success`);
-  }
+  log("Build successful", "success");
   return result;
 }
 var normalizeOptions = async (options) => {
@@ -166,29 +173,32 @@ var normalizeOptions = async (options) => {
 };
 async function build(_options) {
   const options = await normalizeOptions(_options);
-  log("info", `#{name} v${version}`);
-  log("info", `Building: ${options.entry}`);
+  log(`${name} v${version}`);
+  log(`Building: ${options.entry}`);
   if (options.watch) {
-    log("info", "Running in watch mode");
+    log("Running in watch mode");
   }
-  const debouncedBuildAll = debouncePromise(async () => {
+  const debouncedBuild = debouncePromise(async () => {
     runViteBuild(options);
   }, 100, handleError);
   const startWatcher = async () => {
     if (!options.watch)
       return;
     const { watch } = await import("chokidar");
-    const ignored = ["**/{.git,node_modules}/**"];
+    const ignored = [
+      "**/{.git,node_modules}/**",
+      "index.js"
+    ];
     const watchPaths = typeof options.watch === "boolean" ? (0, import_path.dirname)(options.entry) : Array.isArray(options.watch) ? options.watch.filter((path) => typeof path === "string") : options.watch;
-    log("info", `Watching for changes in ${Array.isArray(watchPaths) ? watchPaths.map((v) => '"' + v + '"').join(" | ") : '"' + watchPaths + '"'}`);
+    log(`Watching for changes in ${Array.isArray(watchPaths) ? watchPaths.map((v) => '"' + v + '"').join(" | ") : '"' + watchPaths + '"'}`);
     const watcher = watch(watchPaths, {
       ignoreInitial: true,
       ignorePermissionErrors: true,
       ignored
     });
     watcher.on("all", async (type, file) => {
-      log("info", `Change detected: ${type} ${file}`);
-      debouncedBuildAll();
+      log(`Change detected: ${type} ${file}`);
+      debouncedBuild();
     });
   };
   await runViteBuild(options);

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "kirbyup",
-  "version": "0.4.0",
-  "description": "Bundle your Kirby Panel plugins with ease",
+  "version": "0.8.0",
+  "description": "Zero-config bundler for Kirby Panel plugins",
   "files": [
     "dist"
   ],
   "main": "dist/index.js",
   "bin": {
-    "kirbyup": "dist/cli-default.js"
+    "kirbyup": "dist/cli.js"
   },
   "types": "dist/index.d.ts",
   "repository": {
@@ -15,8 +15,11 @@
     "url": "git+https://github.com/johannschopplich/kirbyup.git"
   },
   "keywords": [
+    "kirby-cms",
+    "kirby-plugin",
     "kirby",
-    "bundler"
+    "panel",
+    "bundle"
   ],
   "author": {
     "name": "Johann Schopplich",
@@ -29,7 +32,7 @@
   },
   "homepage": "https://github.com/johannschopplich/kirbyup#readme",
   "scripts": {
-    "build": "tsup src/cli-*.ts src/index.ts --target node14 --clean --dts-resolve",
+    "build": "tsup src/cli.ts src/index.ts --target node14 --clean --dts",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
@@ -37,12 +40,12 @@
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
     "sass": "^1.41.1",
-    "vite": "^2.5.8",
+    "vite": "^2.5.10",
     "vite-plugin-vue2": "^1.8.2",
     "vue": "^2.6.14"
   },
   "devDependencies": {
-    "@types/node": "^16.9.2",
+    "@types/node": "^16.9.4",
     "prettier": "^2.4.1",
     "ts-essentials": "^8.1.0",
     "tsup": "^5.1.0",

package/dist/cli-default.d.ts

@@ -1 +0,0 @@
-#!/usr/bin/env node

package/dist/cli-main.d.ts

@@ -1,5 +0,0 @@
-import { Options } from './index';
-
-declare function main(options?: Options): Promise<void>;
-
-export { main };

package/dist/cli-main.js

@@ -1,275 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __require = typeof require !== "undefined" ? require : (x) => {
-  throw new Error('Dynamic require of "' + x + '" is not supported');
-};
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[Object.keys(fn)[0]])(fn = 0)), res;
-};
-var __export = (target, all) => {
-  __markAsModule(target);
-  for (var name2 in all)
-    __defProp(target, name2, { get: all[name2], enumerable: true });
-};
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
-  }
-  return target;
-};
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
-};
-
-// node_modules/tsup/assets/cjs_shims.js
-var importMetaUrlShim;
-var init_cjs_shims = __esm({
-  "node_modules/tsup/assets/cjs_shims.js"() {
-    importMetaUrlShim = typeof document === "undefined" ? new (require("url")).URL("file:" + __filename).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
-  }
-});
-
-// package.json
-var name, version;
-var init_package = __esm({
-  "package.json"() {
-    name = "kirbyup";
-    version = "0.4.0";
-  }
-});
-
-// src/errors.ts
-function handleError(error) {
-  if (error.loc) {
-    console.error(import_chalk.default.bold(import_chalk.default.red(`Error parsing: ${error.loc.file}:${error.loc.line}:${error.loc.column}`)));
-  }
-  if (error.frame) {
-    console.error(import_chalk.default.red(error.message));
-    console.error(import_chalk.default.dim(error.frame));
-  } else {
-    if (error instanceof PrettyError) {
-      console.error(import_chalk.default.red(error.message));
-    } else {
-      console.error(import_chalk.default.red(error.stack));
-    }
-  }
-  process.exitCode = 1;
-  if (!import_worker_threads.isMainThread && import_worker_threads.parentPort) {
-    import_worker_threads.parentPort.postMessage("has-error");
-  }
-}
-var import_worker_threads, import_chalk, PrettyError;
-var init_errors = __esm({
-  "src/errors.ts"() {
-    init_cjs_shims();
-    import_worker_threads = __toModule(require("worker_threads"));
-    import_chalk = __toModule(require("chalk"));
-    PrettyError = class 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;
-        }
-      }
-    };
-  }
-});
-
-// src/utils.ts
-function debouncePromise(fn, delay, onError) {
-  let timeout;
-  let promiseInFly;
-  let callbackPending;
-  return function debounced(...args) {
-    if (promiseInFly) {
-      callbackPending = () => {
-        debounced(...args);
-        callbackPending = void 0;
-      };
-    } else {
-      if (timeout != null)
-        clearTimeout(timeout);
-      timeout = setTimeout(() => {
-        timeout = void 0;
-        promiseInFly = fn(...args).catch(onError).finally(() => {
-          promiseInFly = void 0;
-          if (callbackPending)
-            callbackPending();
-        });
-      }, delay);
-    }
-  };
-}
-var init_utils = __esm({
-  "src/utils.ts"() {
-    init_cjs_shims();
-  }
-});
-
-// src/log.ts
-function log(type, message) {
-  switch (type) {
-    case "error": {
-      return console.error(label, makeMessage(message, type));
-    }
-    default:
-      console.log(label, makeMessage(message, type));
-  }
-}
-var import_chalk2, label, makeMessage;
-var init_log = __esm({
-  "src/log.ts"() {
-    init_cjs_shims();
-    import_chalk2 = __toModule(require("chalk"));
-    init_package();
-    label = import_chalk2.default.gray(`[${name}]`);
-    makeMessage = (input, type) => import_chalk2.default[type === "info" ? "yellow" : type === "error" ? "red" : "green"](input);
-  }
-});
-
-// src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  build: () => build,
-  runViteBuild: () => runViteBuild
-});
-async function runViteBuild(options) {
-  let result;
-  try {
-    result = await (0, import_vite.build)({
-      plugins: [(0, import_vite_plugin_vue2.createVuePlugin)()],
-      build: {
-        lib: {
-          entry: (0, import_path.resolve)(process.cwd(), options.entry),
-          formats: ["es"],
-          fileName: "index"
-        },
-        outDir: ".",
-        rollupOptions: {
-          external: ["vue"],
-          output: {
-            entryFileNames: "[name].js",
-            assetFileNames: "index.[ext]",
-            globals: {
-              vue: "Vue"
-            }
-          }
-        }
-      },
-      logLevel: "error"
-    });
-  } catch (error) {
-    log("error", "Build failed");
-    throw error;
-  }
-  if (result) {
-    log("success", `Build success`);
-  }
-  return result;
-}
-async function build(_options) {
-  const options = await normalizeOptions(_options);
-  log("info", `#{name} v${version}`);
-  log("info", `Building: ${options.entry}`);
-  if (options.watch) {
-    log("info", "Running in watch mode");
-  }
-  const debouncedBuildAll = debouncePromise(async () => {
-    runViteBuild(options);
-  }, 100, handleError);
-  const startWatcher = async () => {
-    if (!options.watch)
-      return;
-    const { watch } = await import("chokidar");
-    const ignored = ["**/{.git,node_modules}/**"];
-    const watchPaths = typeof options.watch === "boolean" ? (0, import_path.dirname)(options.entry) : Array.isArray(options.watch) ? options.watch.filter((path) => typeof path === "string") : options.watch;
-    log("info", `Watching for changes in ${Array.isArray(watchPaths) ? watchPaths.map((v) => '"' + v + '"').join(" | ") : '"' + watchPaths + '"'}`);
-    const watcher = watch(watchPaths, {
-      ignoreInitial: true,
-      ignorePermissionErrors: true,
-      ignored
-    });
-    watcher.on("all", async (type, file) => {
-      log("info", `Change detected: ${type} ${file}`);
-      debouncedBuildAll();
-    });
-  };
-  await runViteBuild(options);
-  startWatcher();
-}
-var import_path, import_fs, import_vite, import_vite_plugin_vue2, normalizeOptions;
-var init_src = __esm({
-  "src/index.ts"() {
-    init_cjs_shims();
-    import_path = __toModule(require("path"));
-    import_fs = __toModule(require("fs"));
-    import_vite = __toModule(require("vite"));
-    import_vite_plugin_vue2 = __toModule(require("vite-plugin-vue2"));
-    init_errors();
-    init_utils();
-    init_log();
-    init_package();
-    normalizeOptions = async (options) => {
-      if (!options.entry) {
-        throw new PrettyError(`No input file, try "${name} <path/to/file.js>"`);
-      }
-      if (!(0, import_fs.existsSync)(options.entry)) {
-        throw new PrettyError(`Cannot find ${options.entry}`);
-      }
-      return options;
-    };
-  }
-});
-
-// src/cli-main.ts
-__export(exports, {
-  main: () => main
-});
-init_cjs_shims();
-var import_cac = __toModule(require("cac"));
-init_package();
-async function main(options = {}) {
-  const cli = (0, import_cac.cac)(name);
-  cli.command("[file]", "Panel input file", {
-    ignoreOptionDefaultValue: true
-  }).option("--watch [path]", 'Watch mode, if path is not specified, it watches the current folder ".". Repeat "--watch" for more than one path').action(async (file, flags) => {
-    const { build: build2 } = await Promise.resolve().then(() => (init_src(), src_exports));
-    Object.assign(options, __spreadValues({}, flags));
-    if (file) {
-      options.entry = file;
-    }
-    await build2(options);
-  });
-  cli.help();
-  cli.version(version);
-  cli.parse(process.argv, { run: false });
-  await cli.runMatchedCommand();
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  main
-});