kirbyup 0.4.0 → 0.8.0

package/README.md

@@ -1,6 +1,6 @@
 # kirbyup
 
-> Take a lool into the [plainkit](./plainkit) folder for an example setup.
+> Take a lool into the [pluginkit](./pluginkit) folder for an example setup.
 
 The fastest and leanest way to bundle your Kirby Panel plugins. No configuration necessary.
 
@@ -12,35 +12,37 @@ Install it locally in your project folder:
 npm i kirbyup --save-dev
 ```
 
-You can also install it globally but it's not recommended.
+You can also install it globally.
 
 ## Usage
 
 ```json
 {
   "scripts": {
-    "dev": "kirbyup src/index.js --watch src",
+    "dev": "kirbyup src/index.js --watch",
     "build": "kirbyup src/index.js"
   },
   "devDependencies": {
-    "kirbyup": "^0.4.0"
+    "kirbyup": "^0.8.0"
   }
 }
 ```
 
 ### Development
 
+Rebuild the Panel plugin on any file changes:
+
 ```bash
 kirbyup src/index.js --watch
 ```
 
-You can also specify the directories to be watched. By default, if no path is specified, it watches the current directory.
+You can also specify the directories to be watched. By default, if no path is specified, kirbyup watches the directory specified by the input file (`src` for the example above).
 
 ```bash
 kirbyup src/index.js --watch src
 ```
 
-You can specify more than a single directory
+You can specify more than a single directory:
 
 ```bash
 kirbyup src/index.js --watch src --watch libs
@@ -54,10 +56,14 @@ kirbyup src/index.js
 
 The final panel plugin will be bundled, minified, and written into the current directory as `./index.js`.
 
+## TODO
+
+- [ ] HMR with Vite in lib mode
+
 ## Credits
 
 - [Vite](https://vitejs.dev) by Evan You and all of its contributors.
-- [EGOIST](https://github.com/egoist) for his work on [tsup](https://github.com/egoist/tsup), on which the CLI was built.
+- [EGOIST](https://github.com/egoist) for his work on [tsup](https://github.com/egoist/tsup), which this CLI was forked from.
 
 ## License
 

package/dist/cli.d.ts

@@ -0,0 +1 @@
+

package/dist/{cli-default.js → cli.js}

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -51,6 +50,15 @@ var init_cjs_shims = __esm({
   }
 });
 
+// package.json
+var name, version;
+var init_package = __esm({
+  "package.json"() {
+    name = "kirbyup";
+    version = "0.8.0";
+  }
+});
+
 // src/errors.ts
 function handleError(error) {
   if (error.loc) {
@@ -91,15 +99,6 @@ var init_errors = __esm({
   }
 });
 
-// package.json
-var name, version;
-var init_package = __esm({
-  "package.json"() {
-    name = "kirbyup";
-    version = "0.4.0";
-  }
-});
-
 // src/utils.ts
 function debouncePromise(fn, delay, onError) {
   let timeout;
@@ -132,23 +131,29 @@ var init_utils = __esm({
 });
 
 // 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));
+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);
   }
 }
-var import_chalk2, label, makeMessage;
+var import_chalk2, colorMap;
 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);
+    colorMap = new Map([
+      ["info", "yellow"],
+      ["success", "green"],
+      ["error", "red"]
+    ]);
   }
 });
 
@@ -160,63 +165,67 @@ __export(src_exports, {
 });
 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;
 }
 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);
@@ -246,19 +255,16 @@ var init_src = __esm({
   }
 });
 
-// src/cli-default.ts
-init_cjs_shims();
-init_errors();
-
-// src/cli-main.ts
+// src/cli.ts
 init_cjs_shims();
 var import_cac = __toModule(require("cac"));
 init_package();
+init_errors();
 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) => {
+  }).option("--watch [path]", 'Watch mode, if path is not specified, it watches the folder of the input file. 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) {
@@ -271,6 +277,4 @@ async function main(options = {}) {
   cli.parse(process.argv, { run: false });
   await cli.runMatchedCommand();
 }
-
-// src/cli-default.ts
 main().catch(handleError);