kirbyup 0.22.1 → 0.23.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Johann Schopplich
+Copyright (c) 2021-2022 Johann Schopplich
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/chunks/index.cjs

@@ -0,0 +1,293 @@
+'use strict';
+
+const pathe = require('pathe');
+const fs = require('fs');
+const vite = require('vite');
+const vitePluginVue2 = require('vite-plugin-vue2');
+const MagicString = require('magic-string');
+const unconfig = require('unconfig');
+const postcssrc = require('postcss-load-config');
+const postcssLogical = require('postcss-logical');
+const postcssDirPseudoClass = require('postcss-dir-pseudo-class');
+const consola = require('consola');
+const picocolors = require('picocolors');
+const promises = require('fs/promises');
+const zlib = require('zlib');
+const util = require('util');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
+
+const MagicString__default = /*#__PURE__*/_interopDefaultLegacy(MagicString);
+const postcssrc__default = /*#__PURE__*/_interopDefaultLegacy(postcssrc);
+const postcssLogical__default = /*#__PURE__*/_interopDefaultLegacy(postcssLogical);
+const postcssDirPseudoClass__default = /*#__PURE__*/_interopDefaultLegacy(postcssDirPseudoClass);
+const consola__default = /*#__PURE__*/_interopDefaultLegacy(consola);
+
+const multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//gm;
+const singlelineCommentsRE = /\/\/.*/g;
+
+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__default(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;
+    }
+  };
+}
+
+function defineConfig(config) {
+  return config;
+}
+function createConfigLoader(configOrPath = process.cwd(), extraConfigSources = []) {
+  let inlineConfig = {};
+  if (typeof configOrPath !== "string") {
+    inlineConfig = configOrPath;
+    configOrPath = process.cwd();
+  }
+  const resolved = pathe.resolve(configOrPath);
+  let cwd = resolved;
+  let isFile = false;
+  if (fs.existsSync(resolved) && fs.statSync(resolved).isFile()) {
+    isFile = true;
+    cwd = pathe.dirname(resolved);
+  }
+  const loader = unconfig.createConfigLoader({
+    sources: isFile ? [
+      {
+        files: resolved,
+        extensions: []
+      }
+    ] : [
+      {
+        files: ["kirbyup.config"]
+      },
+      ...extraConfigSources
+    ],
+    cwd,
+    defaults: inlineConfig
+  });
+  return async () => {
+    const result = await loader.load();
+    result.config = result.config || inlineConfig;
+    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__default.error(error.message);
+  process.exitCode = 1;
+}
+
+const compress = util.promisify(zlib.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 promises.readFile(pathe.resolve(outDir, filePath), "utf8"));
+  const prettyOutDir = pathe.normalize(pathe.relative(root, pathe.resolve(root, outDir))) + "/";
+  const kibs = content.length / 1024;
+  const compressedSize = await getCompressedSize(content);
+  const writeColor = type === "chunk" ? picocolors.cyan : picocolors.magenta;
+  consola__default.log(picocolors.white(picocolors.dim(prettyOutDir)) + writeColor(filePath) + "   " + picocolors.dim(`${kibs.toFixed(2)} KiB${compressedSize}`));
+}
+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)
+        clearTimeout(timeout);
+      timeout = setTimeout(() => {
+        timeout = void 0;
+        promiseInFly = fn(...args).catch(onError).finally(() => {
+          promiseInFly = void 0;
+          if (callbackPending)
+            callbackPending();
+        });
+      }, delay);
+    }
+  };
+}
+
+function toArray(array) {
+  array = array || [];
+  if (Array.isArray(array))
+    return array;
+  return [array];
+}
+
+const name = "kirbyup";
+const version = "0.23.0";
+
+let resolvedKirbyupConfig;
+let resolvedPostCssConfig;
+async function viteBuild(options) {
+  let result;
+  const mode = options.watch ? "development" : "production";
+  const root = process.cwd();
+  const outDir = options.outDir ?? root;
+  const aliasDir = pathe.resolve(root, pathe.dirname(options.entry));
+  const { alias = {}, extendViteConfig = {} } = resolvedKirbyupConfig;
+  const defaultConfig = {
+    mode,
+    plugins: [vitePluginVue2.createVuePlugin(), kirbyupAutoImportPlugin()],
+    build: {
+      lib: {
+        entry: pathe.resolve(root, options.entry),
+        formats: ["iife"],
+        name: "kirbyupExport",
+        fileName: () => "index.js"
+      },
+      minify: mode === "production",
+      outDir,
+      emptyOutDir: false,
+      rollupOptions: {
+        external: ["vue"],
+        output: {
+          assetFileNames: "index.[ext]",
+          globals: {
+            vue: "Vue"
+          }
+        }
+      }
+    },
+    resolve: {
+      alias: {
+        "~/": `${aliasDir}/`,
+        "@/": `${aliasDir}/`,
+        ...alias
+      }
+    },
+    css: {
+      postcss: resolvedPostCssConfig
+    },
+    envPrefix: ["VITE_", "KIRBYUP_"],
+    logLevel: "warn"
+  };
+  try {
+    result = await vite.build(vite.mergeConfig(defaultConfig, extendViteConfig));
+  } catch (error) {
+    consola__default.error("Build failed");
+    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);
+    }
+  }
+  return result;
+}
+async function resolveOptions(options) {
+  if (!options.entry) {
+    throw new PrettyError(`No input file, try ${picocolors.cyan(`${name} <path/to/file.js>`)}`);
+  }
+  if (!fs.existsSync(options.entry)) {
+    throw new PrettyError(`Cannot find ${options.entry}`);
+  }
+  return options;
+}
+async function build(_options) {
+  const options = await resolveOptions(_options);
+  const loadConfig = createConfigLoader();
+  const { config, sources: configSources } = await loadConfig();
+  resolvedKirbyupConfig = config;
+  try {
+    resolvedPostCssConfig = await postcssrc__default({});
+  } catch (err) {
+    if (!/No PostCSS Config found/.test(err.message)) {
+      throw err;
+    }
+    resolvedPostCssConfig = {
+      plugins: [postcssLogical__default(), postcssDirPseudoClass__default()]
+    };
+  }
+  consola__default.log(picocolors.green(`${name} v${version}`));
+  consola__default.start(`Building ${picocolors.cyan(options.entry)}`);
+  if (options.watch) {
+    consola__default.info("Running in watch mode");
+  }
+  const debouncedBuild = debouncePromise(async () => {
+    viteBuild(options);
+  }, 100, handleError);
+  const startWatcher = async () => {
+    if (!options.watch)
+      return;
+    const { watch } = await import('chokidar');
+    const ignored = [
+      "**/{.git,node_modules}/**",
+      "index.{css,js}"
+    ];
+    const watchPaths = typeof options.watch === "boolean" ? pathe.dirname(options.entry) : Array.isArray(options.watch) ? options.watch.filter((path) => typeof path === "string") : options.watch;
+    consola__default.info("Watching for changes in " + toArray(watchPaths).map((i) => picocolors.cyan(i)).join(", "));
+    const watcher = watch(watchPaths, {
+      ignoreInitial: true,
+      ignorePermissionErrors: true,
+      ignored
+    });
+    if (configSources.length) {
+      watcher.add(configSources);
+    }
+    watcher.on("all", async (type, file) => {
+      if (configSources.includes(file)) {
+        resolvedKirbyupConfig = (await loadConfig()).config;
+        consola__default.info(`${picocolors.cyan(pathe.basename(file))} changed, setting new config`);
+      } else {
+        consola__default.log(picocolors.green(type) + " " + picocolors.white(picocolors.dim(file)));
+      }
+      debouncedBuild();
+    });
+  };
+  await viteBuild(options);
+  consola__default.success("Build successful");
+  startWatcher();
+}
+
+exports.build = build;
+exports.defineConfig = defineConfig;
+exports.handleError = handleError;
+exports.name = name;
+exports.resolveOptions = resolveOptions;
+exports.version = version;

package/dist/chunks/index.mjs

@@ -8,7 +8,7 @@ import postcssrc from 'postcss-load-config';
 import postcssLogical from 'postcss-logical';
 import postcssDirPseudoClass from 'postcss-dir-pseudo-class';
 import consola from 'consola';
-import { white, dim, cyan, magenta, green } from 'colorette';
+import { white, dim, cyan, magenta, green } from 'picocolors';
 import { readFile } from 'fs/promises';
 import { gzip } from 'zlib';
 import { promisify } from 'util';
@@ -97,9 +97,7 @@ class PrettyError extends Error {
   }
 }
 function handleError(error) {
-  if (error instanceof PrettyError) {
-    consola.error(error.message);
-  }
+  consola.error(error.message);
   process.exitCode = 1;
 }
 
@@ -141,9 +139,6 @@ function debouncePromise(fn, delay, onError) {
   };
 }
 
-// src/math.ts
-
-// src/array.ts
 function toArray(array) {
   array = array || [];
   if (Array.isArray(array))
@@ -152,7 +147,7 @@ function toArray(array) {
 }
 
 const name = "kirbyup";
-const version = "0.22.1";
+const version = "0.23.0";
 
 let resolvedKirbyupConfig;
 let resolvedPostCssConfig;
@@ -217,7 +212,7 @@ async function viteBuild(options) {
 }
 async function resolveOptions(options) {
   if (!options.entry) {
-    throw new PrettyError("No input file, try " + cyan(`${name} <path/to/file.js>`));
+    throw new PrettyError(`No input file, try ${cyan(`${name} <path/to/file.js>`)}`);
   }
   if (!existsSync(options.entry)) {
     throw new PrettyError(`Cannot find ${options.entry}`);
@@ -240,7 +235,7 @@ async function build(_options) {
     };
   }
   consola.log(green(`${name} v${version}`));
-  consola.start("Building " + cyan(options.entry));
+  consola.start(`Building ${cyan(options.entry)}`);
   if (options.watch) {
     consola.info("Running in watch mode");
   }

package/dist/cli.cjs

@@ -0,0 +1,40 @@
+'use strict';
+
+const cac = require('cac');
+const index = require('./chunks/index.cjs');
+require('pathe');
+require('fs');
+require('vite');
+require('vite-plugin-vue2');
+require('magic-string');
+require('unconfig');
+require('postcss-load-config');
+require('postcss-logical');
+require('postcss-dir-pseudo-class');
+require('consola');
+require('picocolors');
+require('fs/promises');
+require('zlib');
+require('util');
+
+async function main(options = {}) {
+  const cli = cac.cac(index.name);
+  cli.command("[file]", "Panel input file", {
+    ignoreOptionDefaultValue: true
+  }).option("-d, --out-dir <dir>", "Output directory", {
+    default: process.cwd()
+  }).option("--watch [path]", 'Watch mode, if path is not specified, it watches the folder of the input file. Repeat "--watch" for multiple paths').action(async (file, flags) => {
+    Object.assign(options, {
+      ...flags
+    });
+    if (file) {
+      options.entry = file;
+    }
+    await index.build(options);
+  });
+  cli.help();
+  cli.version(index.version);
+  cli.parse(process.argv, { run: false });
+  await cli.runMatchedCommand();
+}
+main().catch(index.handleError);

package/dist/cli.mjs

@@ -10,7 +10,7 @@ import 'postcss-load-config';
 import 'postcss-logical';
 import 'postcss-dir-pseudo-class';
 import 'consola';
-import 'colorette';
+import 'picocolors';
 import 'fs/promises';
 import 'zlib';
 import 'util';

package/dist/index.cjs

@@ -0,0 +1,25 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('pathe');
+require('fs');
+require('vite');
+require('vite-plugin-vue2');
+const index = require('./chunks/index.cjs');
+require('postcss-load-config');
+require('postcss-logical');
+require('postcss-dir-pseudo-class');
+require('consola');
+require('picocolors');
+require('magic-string');
+require('unconfig');
+require('fs/promises');
+require('zlib');
+require('util');
+
+
+
+exports.build = index.build;
+exports.defineConfig = index.defineConfig;
+exports.resolveOptions = index.resolveOptions;

package/dist/index.mjs

@@ -7,7 +7,7 @@ import 'postcss-load-config';
 import 'postcss-logical';
 import 'postcss-dir-pseudo-class';
 import 'consola';
-import 'colorette';
+import 'picocolors';
 import 'magic-string';
 import 'unconfig';
 import 'fs/promises';

package/dist/plugin.cjs

@@ -0,0 +1,15 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const getComponentName = (path) => path.substring(path.lastIndexOf("/") + 1, path.lastIndexOf(".")).toLowerCase();
+const kirbyup = Object.freeze({
+  import(modules) {
+    return Object.entries(modules).reduce((accumulator, [path, component]) => {
+      accumulator[getComponentName(path)] = component.default;
+      return accumulator;
+    }, {});
+  }
+});
+
+exports.kirbyup = kirbyup;

package/dist/plugin.d.ts

@@ -1,7 +1,6 @@
-/** Inherits Vite's `import.meta.globEager` result type */
-declare type GlobEagerResult = Record<string, {
+declare type Module = {
     [key: string]: any;
-}>;
+};
 declare const kirbyup: Readonly<{
     /**
      * Auto-import Kirby Panel components, will be transformed by
@@ -10,7 +9,7 @@ declare const kirbyup: Readonly<{
      * @example
      * kirbyup.import('./components/blocks/*.vue')
      */
-    import(modules: GlobEagerResult): Record<string, any>;
+    import(modules: Record<string, Module>): Record<string, any>;
 }>;
 
 export { kirbyup };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kirbyup",
-  "version": "0.22.1",
+  "version": "0.23.0",
   "description": "Zero-config bundler for Kirby Panel plugins",
   "keywords": [
     "kirby-cms",
@@ -49,46 +49,50 @@
   "scripts": {
     "build": "unbuild",
     "stub": "unbuild --stub",
-    "test": "vitest",
-    "test:update": "vitest -u",
+    "test": "vitest --watch",
+    "test:update": "vitest --update",
     "format": "prettier --write \"src/**/*.ts\"",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
-    "release": "node scripts/release.js",
-    "prepare": "husky install"
+    "release": "vitest --run && esno scripts/release.ts",
+    "prepare": "pnpm exec simple-git-hooks"
+  },
+  "simple-git-hooks": {
+    "commit-msg": "pnpm exec esno scripts/verifyCommit.ts $1"
   },
   "dependencies": {
     "cac": "^6.7.12",
-    "chokidar": "^3.5.2",
-    "colorette": "^2.0.16",
+    "chokidar": "^3.5.3",
     "consola": "^2.15.3",
+    "execa": "5.1.1",
     "pathe": "^0.2.0",
-    "postcss": "^8.4.5",
-    "postcss-dir-pseudo-class": "^6.0.2",
-    "postcss-load-config": "^3.1.1",
-    "postcss-logical": "^5.0.2",
-    "sass": "^1.46.0",
-    "unconfig": "^0.2.2",
-    "vite": "^2.7.10",
-    "vite-plugin-vue2": "^1.9.2",
+    "picocolors": "^1.0.0",
+    "postcss": "^8.4.12",
+    "postcss-dir-pseudo-class": "^6.0.4",
+    "postcss-load-config": "^3.1.3",
+    "postcss-logical": "^5.0.4",
+    "sass": "^1.49.9",
+    "unconfig": "^0.3.2",
+    "vite": "^2.8.6",
+    "vite-plugin-vue2": "^1.9.3",
     "vue": "^2.6.14",
     "vue-template-compiler": "^2.6.14"
   },
   "devDependencies": {
-    "@antfu/utils": "^0.4.0",
-    "@types/cross-spawn": "^6.0.2",
+    "@antfu/utils": "^0.5.0",
     "@types/fs-extra": "^9.0.13",
-    "@types/node": "^17.0.8",
+    "@types/node": "^17.0.21",
+    "@types/prompts": "^2.4.0",
+    "@types/semver": "^7.3.9",
     "conventional-changelog-cli": "^2.2.2",
-    "esno": "^0.13.0",
-    "execa": "5.1.1",
-    "fast-glob": "^3.2.7",
-    "fs-extra": "^10.0.0",
-    "husky": "^7.0.4",
-    "prettier": "^2.5.1",
+    "esno": "^0.14.1",
+    "fast-glob": "^3.2.11",
+    "fs-extra": "^10.0.1",
+    "minimist": "^1.2.5",
+    "prettier": "^2.6.0",
     "prompts": "^2.4.2",
-    "ts-essentials": "^9.1.2",
-    "typescript": "^4.5.4",
-    "unbuild": "^0.6.7",
-    "vitest": "^0.0.134"
+    "simple-git-hooks": "^2.7.0",
+    "typescript": "^4.6.2",
+    "unbuild": "^0.7.0",
+    "vitest": "^0.7.4"
   }
 }