kirbyup 1.0.0 → 1.1.0

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,9 +1,7 @@
-import { resolve, dirname, normalize, relative, basename } from 'pathe';
-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 MagicString from 'magic-string';
-import { createConfigLoader } from 'unconfig';
 import postcssrc from 'postcss-load-config';
 import postcssLogical from 'postcss-logical';
 import postcssDirPseudoClass from 'postcss-dir-pseudo-class';
@@ -13,39 +11,46 @@ 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 multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//gm;
-const singlelineCommentsRE = /\/\/.*/g;
+const name = "kirbyup";
+const version = "1.1.0";
 
-function kirbyupAutoImportPlugin() {
-  let config;
-  return {
-    name: "kirbyup:auto-import",
-    configResolved(resolvedConfig) {
-      config = resolvedConfig;
-    },
-    async transform(code, id) {
-      if (code.includes("kirbyup.import")) {
-        const kirbyupImportRE = /\bkirbyup\.import\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*\)/g;
-        const noCommentsCode = code.replace(multilineCommentsRE, (m) => " ".repeat(m.length)).replace(singlelineCommentsRE, (m) => " ".repeat(m.length));
-        let s = null;
-        let match;
-        while (match = kirbyupImportRE.exec(noCommentsCode)) {
-          const { 0: exp, 1: rawPath, index } = match;
-          if (!s)
-            s = new MagicString(code);
-          s.overwrite(index, index + exp.length, `kirbyup.import(import.meta.globEager(${rawPath}))`);
-        }
-        if (s) {
-          return {
-            code: s.toString(),
-            map: config.build.sourcemap ? s.generateMap({ hires: true }) : null
-          };
-        }
-      }
-      return null;
-    }
-  };
+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, type, content) {
+  content ?? (content = await readFile(resolve(outDir, filePath), "utf8"));
+  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)}   ${colors.dim(`${kibs.toFixed(2)} KiB${compressedSize}`)}`);
 }
 
 function defineConfig(config) {
@@ -90,60 +95,54 @@ async function loadConfig(cwd = process.cwd(), configOrPath = cwd, extraConfigSo
   return result;
 }
 
-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;
-}
+const multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//gm;
+const singlelineCommentsRE = /\/\/.*/g;
 
-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, type, content) {
-  content ?? (content = await readFile(resolve(outDir, filePath), "utf8"));
-  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) + "   " + colors.dim(`${kibs.toFixed(2)} KiB${compressedSize}`));
+function kirbyupAutoImportPlugin() {
+  let config;
+  return {
+    name: "kirbyup:auto-import",
+    configResolved(resolvedConfig) {
+      config = resolvedConfig;
+    },
+    async transform(code) {
+      if (code.includes("kirbyup.import")) {
+        const kirbyupImportRE = /\bkirbyup\.import\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*\)/g;
+        const noCommentsCode = code.replace(multilineCommentsRE, (m) => " ".repeat(m.length)).replace(singlelineCommentsRE, (m) => " ".repeat(m.length));
+        let s = null;
+        let match;
+        while (match = kirbyupImportRE.exec(noCommentsCode)) {
+          const { 0: exp, 1: rawPath, index } = match;
+          if (!s)
+            s = new MagicString(code);
+          s.overwrite(index, index + exp.length, `kirbyup.import(import.meta.globEager(${rawPath}))`);
+        }
+        if (s) {
+          return {
+            code: s.toString(),
+            map: config.build.sourcemap ? s.generateMap({ hires: true }) : null
+          };
+        }
+      }
+      return null;
+    }
+  };
 }
 
-const name = "kirbyup";
-const version = "1.0.0";
-
 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()],
     build: {
       lib: {
-        entry: resolve(root, options.entry),
+        entry: resolve(options.cwd, options.entry),
         formats: ["iife"],
         name: "kirbyupExport",
         fileName: () => "index.js"
@@ -178,48 +177,45 @@ async function viteBuild(options) {
     result = await build$1(mergeConfig(defaultConfig, extendViteConfig));
   } catch (error) {
     consola.error("Build failed");
-    if (mode === "production") {
+    if (mode === "production")
       throw error;
-    }
   }
   if (result && !options.watch) {
     const { output } = toArray(result)[0];
-    for (const { fileName, type, code } of output) {
-      printFileInfo(root, outDir, fileName, type, code);
-    }
+    for (const { fileName, type, code } of output)
+      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({});
   } catch (err) {
-    if (!/No PostCSS Config found/.test(err.message)) {
+    if (!/No PostCSS Config found/.test(err.message))
       throw err;
-    }
     resolvedPostCssConfig = {
       plugins: [postcssLogical(), postcssDirPseudoClass()]
     };
   }
   consola.log(colors.green(`${name} v${version}`));
   consola.start(`Building ${colors.cyan(options.entry)}`);
-  if (options.watch) {
+  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)
@@ -230,26 +226,26 @@ async function build(_options) {
       "index.{css,js}"
     ];
     const watchPaths = typeof options.watch === "boolean" ? dirname(options.entry) : Array.isArray(options.watch) ? options.watch.filter((path) => typeof path === "string") : options.watch;
-    consola.info("Watching for changes in " + toArray(watchPaths).map((i) => colors.cyan(i)).join(", "));
+    consola.info(`Watching for changes in ${toArray(watchPaths).map((i) => colors.cyan(i)).join(", ")}`);
     const watcher = watch(watchPaths, {
       ignoreInitial: true,
       ignorePermissionErrors: true,
-      ignored
+      ignored,
+      cwd
     });
-    if (configSources.length) {
+    if (configSources.length)
       watcher.add(configSources);
-    }
     watcher.on("all", async (type, file) => {
       if (configSources.includes(file)) {
         resolvedKirbyupConfig = (await loadConfig()).config;
         consola.info(`${colors.cyan(basename(file))} changed, setting new config`);
       } else {
-        consola.log(colors.green(type) + " " + colors.white(colors.dim(file)));
+        consola.log(`${colors.green(type)} ${colors.white(colors.dim(file))}`);
       }
       debouncedBuild();
     });
   };
-  await viteBuild(options);
+  await generate(options);
   consola.success("Build successful");
   startWatcher();
 }

package/dist/cli.mjs

@@ -1,11 +1,9 @@
 import { cac } from 'cac';
-import { h as handleError, n as name, b as build, v as version } from './chunks/index.mjs';
+import { n as name, b as build, v as version, h as handleError } from './chunks/index.mjs';
+import 'node:fs';
 import 'pathe';
-import 'fs';
 import 'vite';
 import 'vite-plugin-vue2';
-import 'magic-string';
-import 'unconfig';
 import 'postcss-load-config';
 import 'postcss-logical';
 import 'postcss-dir-pseudo-class';
@@ -15,25 +13,29 @@ 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) {
+    if (file)
       options.entry = file;
-    }
     await build(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

@@ -1,12 +1,13 @@
 import { AliasOptions, InlineConfig } from 'vite';
 
 declare type MarkRequired<T, RK extends keyof T> = Exclude<T, RK> & Required<Pick<T, RK>>;
-declare type CliOptions = {
+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,16 +1,17 @@
+import 'node:fs';
 import 'pathe';
-import 'fs';
 import 'vite';
 import 'vite-plugin-vue2';
-export { b as build, d as defineConfig, r as resolveOptions } from './chunks/index.mjs';
 import 'postcss-load-config';
 import 'postcss-logical';
 import 'postcss-dir-pseudo-class';
 import 'consola';
 import 'perfect-debounce';
 import 'picocolors';
-import 'magic-string';
-import 'unconfig';
+export { b as build, d as defineConfig, r as resolveOptions } from './chunks/index.mjs';
 import 'fs/promises';
 import 'zlib';
 import 'util';
+import 'fs';
+import 'unconfig';
+import 'magic-string';

package/dist/plugin.d.ts

@@ -1,6 +1,6 @@
-declare type Module = {
+interface Module {
     [key: string]: any;
-};
+}
 declare const kirbyup: Readonly<{
     /**
      * Auto-import Kirby Panel components, will be transformed by

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "kirbyup",
-  "version": "1.0.0",
+  "version": "1.1.0",
+  "packageManager": "pnpm@7.3.0",
   "description": "Zero-config bundler for Kirby Panel plugins",
   "author": {
     "name": "Johann Schopplich",
@@ -35,9 +36,7 @@
   },
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "bin": {
-    "kirbyup": "./bin/kirbyup.mjs"
-  },
+  "bin": "./cli.mjs",
   "files": [
     "bin",
     "dist"
@@ -47,51 +46,47 @@
   },
   "scripts": {
     "build": "unbuild",
-    "stub": "unbuild --stub",
-    "test": "vitest --watch",
-    "test:update": "vitest --update",
-    "format": "prettier --write \"src/**/*.ts\"",
-    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
-    "release": "vitest --run && tsx scripts/release.ts",
+    "dev": "unbuild --stub",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "release": "bumpp --commit --push --tag",
+    "test": "vitest",
+    "typecheck": "tsc --noEmit",
     "prepare": "pnpm exec simple-git-hooks"
   },
-  "simple-git-hooks": {
-    "commit-msg": "node scripts/verifyCommit.mjs $1"
-  },
   "dependencies": {
     "cac": "^6.7.12",
     "chokidar": "^3.5.3",
     "consola": "^2.15.3",
-    "execa": "6.1.0",
-    "pathe": "^0.3.0",
+    "pathe": "^0.3.1",
     "perfect-debounce": "^0.1.3",
     "picocolors": "^1.0.0",
     "postcss": "^8.4.14",
     "postcss-dir-pseudo-class": "^6.0.4",
     "postcss-load-config": "^4.0.1",
     "postcss-logical": "^5.0.4",
-    "sass": "^1.52.2",
+    "sass": "^1.53.0",
     "unconfig": "^0.3.4",
-    "vite": "^2.9.10",
+    "vite": "2.9.9",
     "vite-plugin-vue2": "^2.0.1",
     "vue": "^2.6.14",
     "vue-template-compiler": "^2.6.14"
   },
   "devDependencies": {
+    "@antfu/eslint-config": "^0.25.2",
     "@types/fs-extra": "^9.0.13",
-    "@types/node": "^17.0.41",
+    "@types/node": "^18.0.0",
     "@types/prompts": "^2.4.0",
-    "@types/semver": "^7.3.9",
-    "conventional-changelog-cli": "^2.2.2",
+    "bumpp": "^8.2.1",
+    "eslint": "^8.18.0",
     "fast-glob": "^3.2.11",
     "fs-extra": "^10.1.0",
-    "minimist": "^1.2.6",
-    "prettier": "^2.6.2",
-    "prompts": "^2.4.2",
     "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.16.0"
+  },
+  "simple-git-hooks": {
+    "commit-msg": "node scripts/verifyCommit.mjs $1"
   }
 }