kirbyup 3.0.1 → 3.1.0-beta.0

package/LICENSE

@@ -1,7 +1,7 @@
 MIT License
 
-Copyright (c) 2021-2023 Johann Schopplich <https://github.com/johannschopplich>
-Copyright (c) 2022-2023 Jonas Kuske <https://github.com/jonaskuske>
+Copyright (c) 2021-PRESENT Johann Schopplich <https://github.com/johannschopplich>
+Copyright (c) 2022-PRESENT Jonas Kuske <https://github.com/jonaskuske>
 
 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/README.md

@@ -1,5 +1,6 @@
 # kirbyup
 
+> [!TIP]
 > Take a look into Kirby's [pluginkit](https://github.com/getkirby/pluginkit/tree/4-panel) repository for an example setup.
 
 The fastest and leanest way to bundle your Kirby Panel plugins. No configuration necessary.
@@ -23,9 +24,10 @@ The fastest and leanest way to bundle your Kirby Panel plugins. No configuration
 
 … With one of the following Panel plugin kits:
 
-- [`eslint-and-prettier`](./examples/eslint-and-prettier) (recommended)
+- [`eslint`](./examples/eslint)
 - [`tailwindcss`](./examples/tailwindcss)
-- [Kirby's default `pluginkit`](https://github.com/getkirby/pluginkit/tree/4-panel)
+
+I highly recommend using one of these starters instead of [Kirby's default `pluginkit`](https://github.com/getkirby/pluginkit/tree/4-panel). They provide a better developer experience out of the box.
 
 ## Installation
 
@@ -41,6 +43,7 @@ If you want to use kirbyup right away, there is no need to install it. Simply ca
 }
 ```
 
+> [!NOTE]
 > If `npx` doesn't use the latest kirbyup version, although it is available, run `npx -y kirbyup@latest` instead or delete the `~/.npm/_npx` cache folder.
 
 While kirbyup will stay backwards compatible, exact build reproducibility may be of importance to you. If so, I recommend targeting a specific package version, rather than using `npx`. Install kirbyup with a package manager of your choice locally to your project:
@@ -72,7 +75,8 @@ Global installation is supported as well, but not recommended.
 
 Start a development server for the Panel plugin:
 
-> ℹ️ This feature requires Kirby v3.7.4+.
+> [!NOTE]
+> This feature requires Kirby v3.7.4+.
 
 ```bash
 kirbyup serve src/index.js
@@ -122,7 +126,8 @@ You can use the alias:
 import someUtility from '~/utils'
 ```
 
-> ℹ️ You can use `@/` as path alias as well.
+> [!TIP]
+> You can use `@/` as path alias as well.
 
 ### Auto-Import Blocks and Fields
 
@@ -172,7 +177,7 @@ Loaded env variables are also exposed to your source code via `import.meta.env`.
 
 To prevent accidentally leaking env variables for distribution, only variables prefixed with `KIRBYUP_` or `VITE_` are exposed to your processed code. Take the following file as an example:
 
-```
+```ini
 DB_PASSWORD=foobar
 KIRBYUP_SOME_KEY=123
 ```
@@ -215,6 +220,7 @@ For a complete list of options, take a look at the [Vite configuration options](
 
 ## Options
 
+> [!TIP]
 > Inspect all available options with `kirbyup --help` and `kirbyup serve --help`.
 
 ### `kirbyup <input>`
@@ -241,7 +247,8 @@ The output directory where the plugin file read by Kirby is saved. Defaults to t
 
 Specifies additional files that should be watched for changes, with changes causing the page to reload. Repeat `--watch` for multiple paths.
 
-> 💡 By default, kirbyup will watch all PHP files (`./**/*.php`) in the plugin directory and reload the page if it detects changes. Using `--watch` to set your own path overrides this setting, so you need to add the PHP glob explicitly if you want to keep the behavior: `--watch ./my/files/* --watch ./**/*.php`
+> [!NOTE]
+> By default, kirbyup will watch all PHP files (`./**/*.php`) in the plugin directory and reload the page if it detects changes. Using `--watch` to set your own path overrides this setting, so you need to add the PHP glob explicitly if you want to keep the behavior: `--watch ./my/files/* --watch ./**/*.php`
 
 ##### `--no-watch`
 
@@ -254,6 +261,6 @@ Disables the default behavior of watching all PHP files for changes.
 
 ## License
 
-[MIT](./LICENSE) License © 2021-2023 [Johann Schopplich](https://github.com/johannschopplich)
+[MIT](./LICENSE) License © 2021-PRESENT [Johann Schopplich](https://github.com/johannschopplich)
 
-[MIT](./LICENSE) License © 2022-2023 [Jonas Kuske](https://github.com/jonaskuske)
+[MIT](./LICENSE) License © 2022-PRESENT [Jonas Kuske](https://github.com/jonaskuske)

package/dist/node/cli.mjs

@@ -1,5 +1,5 @@
 import { cac } from 'cac';
-import { n as name, b as build, s as serve, v as version, h as handleError } from '../shared/kirbyup.40eb0c24.mjs';
+import { n as name, b as build, s as serve, v as version, h as handleError } from '../shared/kirbyup.ca743799.mjs';
 import 'node:fs';
 import 'node:fs/promises';
 import 'pathe';
@@ -18,7 +18,7 @@ import 'postcss-dir-pseudo-class';
 import 'node:zlib';
 import 'node:util';
 import 'node:buffer';
-import 'unconfig';
+import 'c12';
 import 'magic-string';
 import 'detect-package-manager';
 

package/dist/node/index.mjs

@@ -13,10 +13,10 @@ import 'rollup-plugin-external-globals';
 import 'postcss-load-config';
 import 'postcss-logical';
 import 'postcss-dir-pseudo-class';
-export { b as build, s as serve } from '../shared/kirbyup.40eb0c24.mjs';
+export { b as build, s as serve } from '../shared/kirbyup.ca743799.mjs';
 import 'node:zlib';
 import 'node:util';
 import 'node:buffer';
-import 'unconfig';
+import 'c12';
 import 'magic-string';
 import 'detect-package-manager';

package/dist/shared/{kirbyup.40eb0c24.mjs → kirbyup.ca743799.mjs}

@@ -1,4 +1,4 @@
-import { existsSync, statSync, unlinkSync } from 'node:fs';
+import { existsSync, unlinkSync } from 'node:fs';
 import { writeFile, readFile } from 'node:fs/promises';
 import { normalize, relative, resolve, dirname, basename } from 'pathe';
 import { consola } from 'consola';
@@ -16,12 +16,12 @@ import postcssDirPseudoClass from 'postcss-dir-pseudo-class';
 import { gzip } from 'node:zlib';
 import { promisify } from 'node:util';
 import { Buffer } from 'node:buffer';
-import { createConfigLoader } from 'unconfig';
+import { loadConfig as loadConfig$1 } from 'c12';
 import MagicString from 'magic-string';
 import { detect } from 'detect-package-manager';
 
 const name = "kirbyup";
-const version = "3.0.1";
+const version = "3.1.0-beta.0";
 
 class PrettyError extends Error {
   constructor(message) {
@@ -59,43 +59,16 @@ async function printFileInfo(root, outDir, filePath, content, type, maxLength) {
   );
 }
 
-async function loadConfig(cwd = process.cwd(), configOrPath = cwd, extraConfigSources = []) {
-  let inlineConfig = {};
-  if (typeof configOrPath !== "string") {
-    inlineConfig = configOrPath;
-    if (inlineConfig.configFile === false) {
-      return {
-        config: inlineConfig,
-        sources: []
-      };
-    } else {
-      configOrPath = inlineConfig.configFile || process.cwd();
-    }
-  }
-  const resolved = resolve(configOrPath);
-  let isFile = false;
-  if (existsSync(resolved) && statSync(resolved).isFile()) {
-    isFile = true;
-    cwd = dirname(resolved);
-  }
-  const loader = createConfigLoader({
-    sources: isFile ? [
-      {
-        files: resolved,
-        extensions: []
-      }
-    ] : [
-      {
-        files: ["kirbyup.config"]
-      },
-      ...extraConfigSources
-    ],
+function loadConfig(cwd = process.cwd()) {
+  return loadConfig$1({
     cwd,
-    defaults: inlineConfig
+    name: "kirbyup",
+    rcFile: false,
+    jitiOptions: {
+      interopDefault: true,
+      esmResolve: true
+    }
   });
-  const result = await loader.load();
-  result.config = result.config || inlineConfig;
-  return result;
 }
 
 const multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//gm;
@@ -362,8 +335,8 @@ async function generate(options) {
 async function build(options) {
   ensureEntry(options);
   const { cwd } = options;
-  const { config, sources: configSources } = await loadConfig(cwd);
-  resolvedKirbyupConfig = config;
+  const { config, configFile } = await loadConfig(cwd);
+  resolvedKirbyupConfig = config ?? {};
   try {
     resolvedPostCssConfig = await postcssrc(void 0, void 0, { stopDir: cwd });
   } catch (err) {
@@ -404,11 +377,11 @@ async function build(options) {
       ignored,
       cwd
     });
-    if (configSources.length)
-      watcher.add(configSources);
+    if (configFile)
+      watcher.add(configFile);
     watcher.on("all", async (type, file) => {
-      if (configSources.includes(file)) {
-        resolvedKirbyupConfig = (await loadConfig()).config;
+      if (configFile === file) {
+        resolvedKirbyupConfig = (await loadConfig(cwd)).config ?? {};
         consola.info(
           `${colors.cyan(basename(file))} changed, setting new config`
         );
@@ -426,7 +399,7 @@ async function serve(options) {
   ensureEntry(options);
   const { cwd } = options;
   const { config } = await loadConfig(cwd);
-  resolvedKirbyupConfig = config;
+  resolvedKirbyupConfig = config ?? {};
   try {
     resolvedPostCssConfig = await postcssrc(void 0, void 0, { stopDir: cwd });
   } catch (err) {

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "kirbyup",
-  "version": "3.0.1",
-  "packageManager": "pnpm@8.7.4",
+  "type": "module",
+  "version": "3.1.0-beta.0",
+  "packageManager": "pnpm@8.11.0",
   "description": "Zero-config bundler for Kirby Panel plugins",
   "author": {
     "name": "Johann Schopplich",
@@ -55,11 +56,11 @@
     "dist"
   ],
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "scripts": {
     "build": "unbuild",
-    "dev": "STUB=true unbuild",
+    "dev": "UNBUILD_STUB=true unbuild",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "release": "bumpp --commit --push --tag",
@@ -70,38 +71,38 @@
   "dependencies": {
     "@vitejs/plugin-vue2": "2.2.0",
     "@vitejs/plugin-vue2-jsx": "1.1.0",
-    "@vue/compiler-sfc": "^2.7.14",
+    "@vue/compiler-sfc": "^2.7.15",
+    "c12": "^1.5.1",
     "cac": "^6.7.14",
     "chokidar": "^3.5.3",
     "consola": "^3.2.3",
     "detect-package-manager": "^3.0.1",
-    "magic-string": "^0.30.3",
+    "magic-string": "^0.30.5",
     "pathe": "^1.1.1",
     "perfect-debounce": "^1.0.0",
-    "postcss": "^8.4.29",
+    "postcss": "^8.4.32",
     "postcss-dir-pseudo-class": "^8.0.0",
-    "postcss-load-config": "^4.0.1",
+    "postcss-load-config": "^5.0.2",
     "postcss-logical": "^7.0.0",
-    "rollup-plugin-external-globals": "^0.8.0",
-    "sass": "^1.66.1",
-    "unconfig": "^0.3.10",
-    "vite": "^4.4.9",
-    "vite-plugin-full-reload": "^1.0.5",
-    "vue": "^2.7.14"
+    "rollup-plugin-external-globals": "^0.9.1",
+    "sass": "^1.69.5",
+    "vite": "^5.0.6",
+    "vite-plugin-full-reload": "^1.1.0",
+    "vue": "^2.7.15"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.41.0",
-    "@types/fs-extra": "^11.0.1",
-    "@types/node": "^18.17.15",
-    "@types/prompts": "^2.4.4",
+    "@antfu/eslint-config": "^2.3.4",
+    "@types/fs-extra": "^11.0.4",
+    "@types/node": "^20.10.4",
+    "@types/prompts": "^2.4.9",
     "bumpp": "^9.2.0",
-    "eslint": "^8.49.0",
-    "fast-glob": "^3.3.1",
-    "fs-extra": "^11.1.1",
+    "eslint": "^8.55.0",
+    "fast-glob": "^3.3.2",
+    "fs-extra": "^11.2.0",
     "simple-git-hooks": "^2.9.0",
-    "typescript": "~5.2.2",
+    "typescript": "~5.3.3",
     "unbuild": "^2.0.0",
-    "vitest": "^0.34.4"
+    "vitest": "^1.0.1"
   },
   "simple-git-hooks": {
     "commit-msg": "node scripts/verifyCommit.mjs $1"