kirbyup 0.21.1 → 0.22.3

package/dist/cli.mjs

@@ -0,0 +1,38 @@
+import { cac } from 'cac';
+import { h as handleError, n as name, b as build, v as version } from './chunks/index.mjs';
+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';
+import 'consola';
+import 'picocolors';
+import 'fs/promises';
+import 'zlib';
+import 'util';
+
+async function main(options = {}) {
+  const cli = cac(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 build(options);
+  });
+  cli.help();
+  cli.version(version);
+  cli.parse(process.argv, { run: false });
+  await cli.runMatchedCommand();
+}
+main().catch(handleError);

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.d.ts

@@ -1,16 +1,30 @@
-import * as rollup from 'rollup';
-import { RollupOutput } from 'rollup';
-import { MarkRequired } from 'ts-essentials';
+import { AliasOptions, InlineConfig } from 'vite';
 
-declare type MaybeArray<T> = T | Array<T>;
-declare type Options = {
+declare type MarkRequired<T, RK extends keyof T> = Exclude<T, RK> & Required<Pick<T, RK>>;
+declare type CliOptions = {
     entry?: string;
     outDir?: string;
-    watch?: MaybeArray<boolean | string>;
+    watch?: boolean | string | Array<boolean | string>;
 };
-declare type NormalizedOptions = MarkRequired<Options, 'entry'>;
+declare type ResolvedCliOptions = MarkRequired<CliOptions, 'entry'>;
+interface UserConfig {
+    /**
+     * Specifies an `Object`, or an `Array` of `Object`,
+     * which defines aliases used to replace values in `import` statements.
+     * With either format, the order of the entries is important,
+     * in that the first defined rules are applied first.
+     */
+    alias?: AliasOptions;
+    /**
+     * Extends Vite's configuration. Will be merged with kirbyup's
+     * default configuration. Be careful what to extend.
+     */
+    extendViteConfig?: InlineConfig;
+}
 
-declare function runViteBuild(options: NormalizedOptions): Promise<RollupOutput | RollupOutput[] | rollup.RollupWatcher | undefined>;
-declare function build(_options: Options): Promise<void>;
+declare function defineConfig(config: UserConfig): UserConfig;
 
-export { build, runViteBuild };
+declare function resolveOptions(options: CliOptions): Promise<ResolvedCliOptions>;
+declare function build(_options: CliOptions): Promise<void>;
+
+export { build, defineConfig, resolveOptions };

package/dist/index.mjs

@@ -0,0 +1,15 @@
+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 'picocolors';
+import 'magic-string';
+import 'unconfig';
+import 'fs/promises';
+import 'zlib';
+import 'util';

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/{client/plugin.d.ts → plugin.d.ts}

@@ -1,8 +1,7 @@
-/** Inherits Vite's `import.meta.globEager` result type */
-declare type GlobEagerResult = Record<string, {
+declare type Module = {
     [key: string]: any;
-}>;
-export declare const kirbyup: Readonly<{
+};
+declare const kirbyup: Readonly<{
     /**
      * Auto-import Kirby Panel components, will be transformed by
      * kirbyup's auto import plugin for Vite
@@ -10,6 +9,7 @@ export 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 {};
+
+export { kirbyup };

package/dist/{client/plugin.js → plugin.mjs}

@@ -7,6 +7,5 @@ const kirbyup = Object.freeze({
     }, {});
   }
 });
-export {
-  kirbyup
-};
+
+export { kirbyup };

package/package.json

@@ -1,31 +1,7 @@
 {
   "name": "kirbyup",
-  "version": "0.21.1",
+  "version": "0.22.3",
   "description": "Zero-config bundler for Kirby Panel plugins",
-  "files": [
-    "bin",
-    "dist"
-  ],
-  "exports": {
-    ".": {
-      "require": "./dist/index.js"
-    },
-    "./plugin": {
-      "import": "./dist/client/plugin.js"
-    }
-  },
-  "main": "./dist/index.js",
-  "bin": {
-    "kirbyup": "./bin/kirbyup.js"
-  },
-  "types": "./dist/index.d.ts",
-  "engines": {
-    "node": ">=14"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/johannschopplich/kirbyup.git"
-  },
   "keywords": [
     "kirby-cms",
     "kirby-plugin",
@@ -33,55 +9,90 @@
     "panel",
     "bundle"
   ],
+  "homepage": "https://github.com/johannschopplich/kirbyup#readme",
+  "bugs": {
+    "url": "https://github.com/johannschopplich/kirbyup/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/johannschopplich/kirbyup.git"
+  },
+  "license": "MIT",
   "author": {
     "name": "Johann Schopplich",
     "email": "pkg@johannschopplich.com",
     "url": "https://johannschopplich.com"
   },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/johannschopplich/kirbyup/issues"
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./plugin": {
+      "require": "./dist/plugin.cjs",
+      "import": "./dist/plugin.mjs",
+      "types": "./dist/plugin.d.ts"
+    }
+  },
+  "types": "./dist/index.d.ts",
+  "bin": {
+    "kirbyup": "./bin/kirbyup.cjs"
+  },
+  "files": [
+    "bin",
+    "dist"
+  ],
+  "engines": {
+    "node": ">=14"
   },
-  "homepage": "https://github.com/johannschopplich/kirbyup#readme",
   "scripts": {
-    "dev": "tsup --watch src",
-    "build": "tsup && npm run build:client",
-    "build:client": "esbuild src/client/plugin.ts --format=esm --outdir=dist/client && tsc src/client/plugin.ts --declaration --emitDeclarationOnly --outDir dist/client",
-    "test": "npm run build && jest",
+    "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": "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.11",
-    "chokidar": "^3.5.2",
-    "colorette": "^2.0.16",
+    "cac": "^6.7.12",
+    "chokidar": "^3.5.3",
     "consola": "^2.15.3",
+    "execa": "5.1.1",
     "pathe": "^0.2.0",
-    "postcss-dir-pseudo-class": "^6.0.0",
-    "postcss-logical": "^5.0.0",
-    "sass": "^1.43.4",
-    "vite": "^2.6.14",
-    "vite-plugin-vue2": "^1.9.0",
+    "picocolors": "^1.0.0",
+    "postcss": "^8.4.6",
+    "postcss-dir-pseudo-class": "^6.0.4",
+    "postcss-load-config": "^3.1.3",
+    "postcss-logical": "^5.0.4",
+    "sass": "^1.49.8",
+    "unconfig": "^0.3.1",
+    "vite": "^2.8.4",
+    "vite-plugin-vue2": "^1.9.3",
     "vue": "^2.6.14",
     "vue-template-compiler": "^2.6.14"
   },
   "devDependencies": {
+    "@antfu/utils": "^0.5.0",
     "@types/fs-extra": "^9.0.13",
-    "@types/jest": "^27.0.2",
-    "@types/node": "^16.11.7",
-    "conventional-changelog-cli": "^2.1.1",
-    "execa": "^5.1.1",
-    "fast-glob": "^3.2.7",
+    "@types/node": "^17.0.19",
+    "@types/prompts": "^2.4.0",
+    "@types/semver": "^7.3.9",
+    "conventional-changelog-cli": "^2.2.2",
+    "esno": "^0.14.1",
+    "fast-glob": "^3.2.11",
     "fs-extra": "^10.0.0",
-    "husky": "^7.0.4",
-    "jest": "^27.3.1",
-    "prettier": "^2.4.1",
+    "minimist": "^1.2.5",
+    "prettier": "^2.5.1",
     "prompts": "^2.4.2",
-    "ts-essentials": "^9.0.0",
-    "ts-jest": "^27.0.7",
-    "tsup": "^5.6.0",
-    "typescript": "^4.4.4"
+    "simple-git-hooks": "^2.7.0",
+    "typescript": "^4.5.5",
+    "unbuild": "^0.6.9",
+    "vitest": "^0.5.1"
   }
 }

package/bin/kirbyup.js

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-require('../dist/cli')