kirbyup 4.0.0-alpha.6 → 4.0.0-alpha.8

package/README.md

@@ -2,23 +2,31 @@
 
 # kirbyup
 
-The official bundler for Kirby Panel plugins with zero-config usage and built-in HMR.
+The official bundler for Kirby Panel plugins. Zero-config, built-in HMR.
 
 - [✨  Release Notes](https://github.com/johannschopplich/kirbyup/releases)
 - [📖  Read the documentation](https://kirbyup.getkirby.com)
 
 ## Key Features
 
-- 🔄 [Hot module replacement](https://kirbyup.getkirby.com/guide/getting-started.html#development)
-- 🎒 PostCSS support
-- 🧭 Add custom path aliases
-- 🔌 Run actions based on environment variables
-- 🦔 [Extends Vite with `kirbyup.config.js`](https://kirbyup.getkirby.com/guide/config-file)
+- 🔄 [Hot Module Replacement](https://kirbyup.getkirby.com/guide/getting-started.html#development)
+- 🎒 [PostCSS & Sass](https://kirbyup.getkirby.com/guide/postcss)
+- 🧩 [kirbyuse Integration](https://kirbyup.getkirby.com/guide/kirbyuse)
+- 🔌 [Environment Variables](https://kirbyup.getkirby.com/guide/environment-variables)
+- 🦔 [Configuration File](https://kirbyup.getkirby.com/guide/config-file)
+- 🧭 [Path Aliases](https://kirbyup.getkirby.com/guide/path-aliases)
+
+## Requirements
+
+- **Node.js 24+**: paired with a package manager (pnpm, npm, or yarn).
+- **Kirby 6 or newer**: kirbyup 4.x targets the Vue 3-based Panel runtime introduced in Kirby 6. For Kirby 4 or 5 plugins, use kirbyup 3.x.
 
 ## Setup
 
 > [!TIP]
-> [📖 Read the documentation](https://kirbyup.getkirby.com)
+> Skip starting from scratch and pick one of the following starters:
+> - [`eslint`](./examples/eslint)
+> - [`unocss`](./examples/unocss)
 
 ```bash
 # pnpm
@@ -26,16 +34,12 @@ pnpm add -D kirbyup
 
 # npm
 npm i -D kirbyup
-```
 
-## Basic Usage
-
-> [!TIP]
-> [📖 Read the documentation](https://kirbyup.getkirby.com) or skip starting from scratch and pick one of the following starters:
-> - [`eslint`](./examples/eslint)
-> - [`unocss`](./examples/unocss)
+# yarn
+yarn add -D kirbyup
+```
 
-Having installed kirbyup, you can add the following scripts as shortcuts to the commands you will use most often:
+After installation, add these scripts to your `package.json`:
 
 ```json
 {
@@ -44,18 +48,18 @@ Having installed kirbyup, you can add the following scripts as shortcuts to the
     "build": "kirbyup src/index.js"
   },
   "devDependencies": {
-    "kirbyup": "^3.4.0"
+    "kirbyup": "^4.0.0-alpha.6"
   }
 }
 ```
 
-## 💻 Development
+## Development
 
 1. Clone this repository
 2. Enable [Corepack](https://github.com/nodejs/corepack) using `corepack enable`
 3. Install dependencies using `pnpm install`
-4. Run `pnpm run dev:prepare`
-5. Start development server using `pnpm run dev`
+4. Build with `pnpm run build`
+5. Run tests with `pnpm test`
 
 ## License
 

package/dist/client/config.d.mts

@@ -1,4 +1,4 @@
-import { r as UserConfig } from "../types-0NUTyTUQ.mjs";
+import { r as UserConfig } from "../types-3hN383nZ.mjs";
 
 //#region src/client/config.d.ts
 declare function defineConfig(config: UserConfig): UserConfig;

package/dist/client/plugin.mjs

@@ -8,6 +8,7 @@ const kirbyup = Object.freeze({
 * kirbyup.import('./components/blocks/*.vue')
 */
 import(glob) {
+	if (typeof glob === "string") throw new TypeError("[kirbyup] kirbyup.import() requires the kirbyup build pipeline. The call must be transformed at build time by the kirbyup:glob-import plugin.");
 	return Object.entries(glob).reduce((accumulator, [path, component]) => {
 		accumulator[getComponentName(path)] = component.default;
 		return accumulator;

package/dist/node/cli.mjs

@@ -1,4 +1,4 @@
-import { a as version, i as name, n as serve, r as handleError, t as build } from "../node-Do_IAs2E.mjs";
+import { a as version, i as name, n as serve, r as handleError, t as build } from "../node-DFNV7EsB.mjs";
 import { cac } from "cac";
 //#region src/node/cli-start.ts
 async function startCli(cwd = process.cwd(), argv = process.argv) {

package/dist/node/index.d.mts

@@ -1,4 +1,4 @@
-import { n as ServeOptions, t as BuildOptions } from "../types-0NUTyTUQ.mjs";
+import { n as ServeOptions, t as BuildOptions } from "../types-3hN383nZ.mjs";
 import { ViteDevServer } from "vite";
 
 //#region src/node/index.d.ts

package/dist/node/index.mjs

@@ -1,2 +1,2 @@
-import { n as serve, t as build } from "../node-Do_IAs2E.mjs";
+import { n as serve, t as build } from "../node-DFNV7EsB.mjs";
 export { build, serve };

package/dist/{node-Do_IAs2E.mjs → node-DFNV7EsB.mjs}

@@ -1,25 +1,21 @@
 import * as fs from "node:fs";
 import * as fsp from "node:fs/promises";
+import { basename, dirname, relative, resolve } from "node:path";
 import vuePlugin from "@vitejs/plugin-vue";
 import vueJsxPlugin from "@vitejs/plugin-vue-jsx";
 import { consola } from "consola";
 import { colors } from "consola/utils";
-import { basename, dirname, normalize, relative, resolve } from "pathe";
 import { debounce } from "perfect-debounce";
-import { build, createLogger, createServer, mergeConfig, normalizePath } from "vite";
-import fullReloadPlugin from "vite-plugin-full-reload";
-import * as vueCompilerSfc from "vue/compiler-sfc";
+import { build, createFilter, createLogger, createServer, mergeConfig, normalizePath } from "vite";
 import { loadConfig } from "c12";
-import postcssrc from "postcss-load-config";
-import { fileURLToPath, pathToFileURL } from "node:url";
-import { detectPackageManager } from "nypm";
+import postcssrcLoad from "postcss-load-config";
+import { gzipSync } from "node:zlib";
+import MagicString from "magic-string";
+import { stripLiteral } from "strip-literal";
 import { isIP } from "node:net";
-import { Buffer } from "node:buffer";
-import { promisify } from "node:util";
-import { gzip } from "node:zlib";
 //#region package.json
 var name = "kirbyup";
-var version = "4.0.0-alpha.6";
+var version = "4.0.0-alpha.8";
 //#endregion
 //#region src/node/config.ts
 function loadConfig$1(cwd = process.cwd()) {
@@ -32,7 +28,7 @@ function loadConfig$1(cwd = process.cwd()) {
 }
 async function resolvePostCSSConfig(cwd) {
 	try {
-		return await postcssrc(void 0, void 0, { stopDir: cwd });
+		return await postcssrcLoad(void 0, void 0, { stopDir: cwd });
 	} catch (error) {
 		if (!error.message.includes("No PostCSS Config found")) throw error;
 	}
@@ -43,8 +39,7 @@ var PrettyError = class 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;
+		Error.captureStackTrace(this, this.constructor);
 	}
 };
 function handleError(error) {
@@ -69,14 +64,93 @@ function kirbyupBuildCleanupPlugin(options) {
 	};
 }
 //#endregion
+//#region src/node/utils.ts
+function toArray(array) {
+	array ??= [];
+	return Array.isArray(array) ? array : [array];
+}
+async function printFileInfo({ root, outDir, filePath, content, type, maxLength }) {
+	const prettyOutDir = `${normalizePath(relative(root, outDir))}/`;
+	const kibs = content.length / 1024;
+	const compressedKibs = gzipSync(content).length / 1024;
+	const writeColor = type === "chunk" ? colors.cyan : colors.magenta;
+	consola.log(colors.white(colors.dim(prettyOutDir)) + writeColor(filePath.padEnd(maxLength + 2)) + colors.dim(`${kibs.toFixed(2)} kB / gzip: ${compressedKibs.toFixed(2)} KiB`));
+}
+//#endregion
+//#region src/node/plugins/full-reload.ts
+/**
+* Triggers a full browser reload when files matching the given globs change.
+* Vite forces chokidar's `disableGlobbing: true` by default; this plugin
+* resets it so glob strings passed to `watcher.add` are expanded by chokidar.
+*/
+function kirbyupFullReloadPlugin(paths) {
+	return {
+		name: "kirbyup:full-reload",
+		apply: "serve",
+		config() {
+			return { server: { watch: { disableGlobbing: false } } };
+		},
+		configureServer({ watcher, ws, config: { root, logger } }) {
+			const files = toArray(paths).map((p) => resolve(root, p));
+			const matches = createFilter(files);
+			watcher.add(files);
+			const reload = (path) => {
+				if (!matches(path)) return;
+				setTimeout(() => ws.send({
+					type: "full-reload",
+					path: "*"
+				}), 0);
+				logger.info(`${colors.green("full reload")} ${colors.dim(normalizePath(relative(root, path)))}`, {
+					clear: true,
+					timestamp: true
+				});
+			};
+			watcher.on("add", reload);
+			watcher.on("change", reload);
+		}
+	};
+}
+//#endregion
+//#region src/node/plugins/glob-import.ts
+/**
+* Transforms `kirbyup.import(<path>)` to `kirbyup.import(import.meta.glob(<path>, { eager: true }))`.
+*
+* Must run before Vite's own `import.meta.glob` plugin (also `enforce: 'pre'`),
+* otherwise the emitted call is never expanded.
+*/
+function kirbyupGlobImportPlugin() {
+	let config;
+	return {
+		name: "kirbyup:glob-import",
+		enforce: "pre",
+		configResolved(resolvedConfig) {
+			config = resolvedConfig;
+		},
+		transform(code) {
+			if (!code.includes("kirbyup.import")) return;
+			const kirbyupImportRE = /\bkirbyup\.import\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*\)/dg;
+			const cleanCode = stripLiteral(code);
+			let s;
+			for (const match of cleanCode.matchAll(kirbyupImportRE)) {
+				const { 0: exp, index } = match;
+				const [argStart, argEnd] = match.indices[1];
+				const rawPath = code.slice(argStart, argEnd);
+				if (!s) s = new MagicString(code);
+				s.overwrite(index, index + exp.length, `kirbyup.import(import.meta.glob(${rawPath}, { eager: true }))`);
+			}
+			if (s) return {
+				code: s.toString(),
+				map: config.build.sourcemap ? s.generateMap({ hires: true }) : void 0
+			};
+		}
+	};
+}
+//#endregion
 //#region src/node/utils/server.ts
 function resolveOriginFromServerOptions(serverOptions, port, fallbackHostname) {
 	const protocol = serverOptions?.https && (typeof serverOptions.https === "boolean" || Object.keys(serverOptions.https).length > 0) ? "https" : "http";
 	const configuredHost = normalizeHost(serverOptions?.host);
-	return `${protocol}://${formatHostname(configuredHost || fallbackHostname || "localhost")}${(configuredHost ? hostIncludesPort(configuredHost) : false) || !needsExplicitPort(protocol, port) ? "" : `:${port}`}`;
-}
-function ensureTrailingSlash(url) {
-	return url.endsWith("/") ? url : `${url}/`;
+	return `${protocol}://${formatHostname(configuredHost || fallbackHostname || "localhost")}${(configuredHost ? hostIncludesPort(configuredHost) : false) || protocol === "http" && port === 80 || protocol === "https" && port === 443 ? "" : `:${port}`}`;
 }
 function normalizeHost(host) {
 	if (host === false || host === void 0) return;
@@ -96,13 +170,9 @@ function hostIncludesPort(host) {
 	if (isIP(host) === 6) return false;
 	return host.includes(":");
 }
-function needsExplicitPort(protocol, port) {
-	if (protocol === "http") return port !== 80;
-	return port !== 443;
-}
 //#endregion
 //#region src/node/plugins/runtime/hmr-shim.js?raw
-var hmr_shim_default = "/* eslint-disable no-undef */\nimport 'vue'\n\nif (typeof __VUE_HMR_RUNTIME__ !== 'undefined') {\n  const originalReload = __VUE_HMR_RUNTIME__.reload\n\n  __VUE_HMR_RUNTIME__.reload = function (id, newComp) {\n    const plugins = window.panel && window.panel.plugins\n    const app = window.panel && window.panel.app\n\n    if (\n      plugins\n      && app\n      && plugins.components\n      && typeof plugins.resolveComponentExtension === 'function'\n      && typeof plugins.resolveComponentRender === 'function'\n      && typeof plugins.resolveComponentMixins === 'function'\n    ) {\n      for (const name in plugins.components) {\n        const pluginComp = plugins.components[name]\n        if (\n          pluginComp.__hmrId === id\n          || (newComp.__file && pluginComp.__file === newComp.__file)\n        ) {\n          plugins.resolveComponentExtension(app, name, newComp)\n          plugins.resolveComponentRender(newComp)\n          plugins.resolveComponentMixins(newComp)\n          break\n        }\n      }\n    }\n\n    return originalReload.call(this, id, newComp)\n  }\n}\nelse {\n  console.warn(\n    '[kirbyup] Vue HMR runtime not detected; component changes will fall back to full page reload. The Kirby Panel may be loading a production build of Vue.',\n  )\n}\n";
+var hmr_shim_default = "/* eslint-disable no-undef */\nimport 'vue'\n\nif (typeof __VUE_HMR_RUNTIME__ !== 'undefined') {\n  const originalReload = __VUE_HMR_RUNTIME__.reload\n\n  __VUE_HMR_RUNTIME__.reload = function (id, newComp) {\n    const { plugins, app } = window.panel ?? {}\n\n    if (plugins?.components) {\n      for (const [name, pluginComp] of Object.entries(plugins.components)) {\n        if (\n          pluginComp.__hmrId === id\n          || (newComp.__file && pluginComp.__file === newComp.__file)\n        ) {\n          plugins.resolveComponentExtension(app, name, newComp)\n          plugins.resolveComponentRender(newComp)\n          plugins.resolveComponentMixins(newComp)\n          break\n        }\n      }\n    }\n\n    return originalReload(id, newComp)\n  }\n}\nelse {\n  console.warn(\n    '[kirbyup] Vue HMR runtime not detected; component changes will fall back to full page reload. The Kirby Panel may be loading a production build of Vue.',\n  )\n}\n";
 //#endregion
 //#region src/node/plugins/runtime/vue-stub.js?raw
 var vue_stub_default = "const __kirbyupVueImportMapEl = typeof document !== 'undefined'\n  ? document.querySelector('script[type=\"importmap\"]')\n  : null\nconst __kirbyupVueImports = __kirbyupVueImportMapEl\n  ? (() => {\n      try {\n        return JSON.parse(__kirbyupVueImportMapEl.textContent || '{}').imports || {}\n      }\n      // eslint-disable-next-line unused-imports/no-unused-vars\n      catch (_) {\n        return {}\n      }\n    })()\n  : {}\nconst __kirbyupVueUrl = __kirbyupVueImports.vue\nif (!__kirbyupVueUrl) {\n  throw new Error(\n    '[kirbyup] No \"vue\" entry found in the page <script type=\"importmap\">. Ensure Kirby\\'s Panel is loaded with v6 import maps enabled.',\n  )\n}\n// eslint-disable-next-line no-unused-vars, antfu/no-top-level-await\nconst __kirbyupVueModule = await import(/* @vite-ignore */ __kirbyupVueUrl)\n";
@@ -118,21 +188,6 @@ var vue_stub_default = "const __kirbyupVueImportMapEl = typeof document !== 'und
 */
 const __HMR_SHIM_CODE__ = hmr_shim_default;
 /**
-* Extract public named exports from a Rollup-style ESM bundle. Vue's
-* `dist/vue.esm-browser.js` ships a single trailing `export { ... }` block
-* with a few `internalName as publicName` aliases.
-*
-* Only the last block is read; `as`-aliased entries yield the public name.
-*/
-function extractEsmNamedExports(source) {
-	const blockMatches = [...source.matchAll(/export\s*\{([^}]*)\}/g)];
-	if (blockMatches.length === 0) return [];
-	return blockMatches.at(-1)[1].split(",").map((entry) => entry.trim()).filter(Boolean).map((entry) => {
-		const aliasMatch = entry.match(/^\S+\s+as\s+(\S+)$/);
-		return aliasMatch ? aliasMatch[1] : entry;
-	});
-}
-/**
 * Reads Kirby's panel-vue URL at runtime from the page's
 * `<script type="importmap">` and dynamic-imports it; the browser's module
 * map dedups by URL, so plugin SFCs share Kirby's Vue instance (and
@@ -141,7 +196,11 @@ function extractEsmNamedExports(source) {
 */
 function buildVueStubCode(namedExports) {
 	if (namedExports.length === 0) return vue_stub_default;
-	return vue_stub_default + `\nexport const {\n${namedExports.map((name) => `  ${name},`).join("\n")}\n} = __kirbyupVueModule\n`;
+	return [vue_stub_default, `
+export const {
+${namedExports.map((name) => `  ${name},`).join("\n")}
+} = __kirbyupVueModule
+`.trimStart()].join("\n");
 }
 //#endregion
 //#region src/node/plugins/hmr.ts
@@ -149,7 +208,7 @@ const SHIM_ID = "\0kirbyup:hmr-shim";
 const SHIM_PUBLIC_ID = SHIM_ID.slice(1);
 const VUE_STUB_ID = "\0kirbyup:vue-stub";
 const VUE_STUB_PUBLIC_ID = VUE_STUB_ID.slice(1);
-const VUE_NOT_FOUND_STUB = `throw new Error('[kirbyup] Cannot resolve "vue/dist/vue.esm-browser.js" from the plugin project. Make sure "vue" is installed as a dependency.')\n`;
+const VUE_NOT_FOUND_STUB = `throw new Error('[kirbyup] Cannot resolve "vue" from the plugin project. Make sure "vue" is installed as a dependency.')\n`;
 function kirbyupHmrPlugin(options) {
 	let config;
 	let entry;
@@ -169,14 +228,14 @@ function kirbyupHmrPlugin(options) {
 				}] }
 			};
 		},
-		configResolved(resolvedConfig) {
+		async configResolved(resolvedConfig) {
 			config = resolvedConfig;
 			entry = resolve(config.root, options.entry);
 			entryId = normalizePath(entry);
 			devIndexPath = resolve(config.root, options.outDir ?? "", "index.dev.js");
 			try {
-				const vueUrl = import.meta.resolve("vue/dist/vue.esm-browser.js", pathToFileURL(`${config.root}/_`).href);
-				const namedExports = extractEsmNamedExports(fs.readFileSync(fileURLToPath(vueUrl), "utf8"));
+				const vueModule = await import("vue");
+				const namedExports = Object.keys(vueModule).filter((name) => name !== "default" && /^[A-Z_$][\w$]*$/i.test(name));
 				vueStubCode = namedExports.length > 0 ? buildVueStubCode(namedExports) : void 0;
 			} catch {
 				vueStubCode = void 0;
@@ -212,7 +271,7 @@ function kirbyupHmrPlugin(options) {
 				const entryPath = entry.replace(`${config.root}/`, "");
 				const baseUrl = getDevBaseUrl(server, config);
 				const entryUrl = new URL(entryPath, baseUrl).href;
-				const pm = await detectPackageManager(config.root);
+				const pm = detectPackageManager(config.root);
 				await fsp.writeFile(devIndexPath, getViteProxyModule(entryUrl, pm));
 			});
 		},
@@ -222,13 +281,12 @@ function kirbyupHmrPlugin(options) {
 	};
 }
 function getViteProxyModule(entryUrl, packageManager) {
-	const pm = packageManager?.name || "npm";
 	return `
 try {
   await import("${entryUrl}");
 } catch (error) {
   console.error(
-    "[kirbyup] Couldn't connect to the development server at ${entryUrl}. Run \`${pm} run serve\` to start Vite or build the plugin with \`${pm} run build\` so Kirby uses the production version."
+    "[kirbyup] Couldn't connect to the development server at ${entryUrl}. Run \`${packageManager} run serve\` to start Vite or build the plugin with \`${packageManager} run build\` so Kirby uses the production version."
   );
   throw error;
 }
@@ -236,42 +294,25 @@ try {
 }
 function getDevBaseUrl(server, config) {
 	const { address, port } = server.httpServer.address();
-	const normalizedOrigin = ensureTrailingSlash(config.server?.origin ?? server.resolvedUrls?.local?.[0] ?? server.resolvedUrls?.network?.[0] ?? resolveOriginFromServerOptions(config.server, port, address));
+	const origin = config.server?.origin ?? server.resolvedUrls?.local?.[0] ?? server.resolvedUrls?.network?.[0] ?? resolveOriginFromServerOptions(config.server, port, address);
 	const base = config.base ?? "/";
-	return new URL(base, normalizedOrigin).href;
-}
-//#endregion
-//#region src/node/utils.ts
-const compress = promisify(gzip);
-function toArray(array) {
-	array ??= [];
-	return Array.isArray(array) ? array : [array];
+	return new URL(base, origin).href;
 }
-async function getCompressedSize(code) {
-	return ` / gzip: ${((await compress(typeof code === "string" ? code : Buffer.from(code))).length / 1024).toFixed(2)} KiB`;
-}
-async function printFileInfo({ root, outDir, filePath, content, type, maxLength }) {
-	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.padEnd(maxLength + 2)) + colors.dim(`${kibs.toFixed(2)} kB${compressedSize}`));
+function detectPackageManager(cwd) {
+	if (fs.existsSync(resolve(cwd, "pnpm-lock.yaml"))) return "pnpm";
+	if (fs.existsSync(resolve(cwd, "bun.lock")) || fs.existsSync(resolve(cwd, "bun.lockb"))) return "bun";
+	if (fs.existsSync(resolve(cwd, "yarn.lock"))) return "yarn";
+	if (fs.existsSync(resolve(cwd, "deno.lock"))) return "deno";
+	return "npm";
 }
 //#endregion
 //#region src/node/index.ts
 const DEV_OUTPUT_FILENAME = "index.dev.js";
-let resolvedKirbyupConfig;
-let resolvedPostCssConfig;
+const SUPPRESSED_WARNING_PREFIX = "\n(!) build.outDir";
 const logLevel = "warn";
-const logger = createLogger(logLevel);
-const loggerWarn = logger.warn;
-logger.warn = (msg, options) => {
-	if (msg.includes("(!) build.outDir")) return;
-	loggerWarn(msg, options);
-};
-function getViteConfig(command, options) {
+function getViteConfig(command, options, { kirbyupConfig, postCssConfig, logger }) {
 	const aliasDir = resolve(options.cwd, dirname(options.entry));
-	const { alias = {}, vite } = resolvedKirbyupConfig;
+	const { alias = {}, vite } = kirbyupConfig;
 	const userConfig = vite ?? {};
 	const sharedConfig = {
 		resolve: { alias: {
@@ -279,9 +320,16 @@ function getViteConfig(command, options) {
 			"@/": `${aliasDir}/`,
 			...alias
 		} },
-		plugins: [vuePlugin({ compiler: vueCompilerSfc }), vueJsxPlugin()],
+		plugins: [
+			vuePlugin(),
+			vueJsxPlugin(),
+			kirbyupGlobImportPlugin()
+		],
 		build: { copyPublicDir: false },
-		...resolvedPostCssConfig && { css: { postcss: resolvedPostCssConfig } },
+		...postCssConfig && { css: { postcss: {
+			...postCssConfig.options,
+			plugins: postCssConfig.plugins
+		} } },
 		envDir: options.cwd,
 		envPrefix: ["VITE_", "KIRBYUP_"],
 		customLogger: logger,
@@ -291,7 +339,7 @@ function getViteConfig(command, options) {
 		const { port, watch } = options;
 		const inferredOrigin = userConfig.server?.origin ?? resolveOriginFromServerOptions(userConfig.server, port, "localhost");
 		return mergeConfig(mergeConfig(sharedConfig, {
-			plugins: [kirbyupHmrPlugin(options), watch && fullReloadPlugin(watch)].filter(Boolean),
+			plugins: [kirbyupHmrPlugin(options), watch && kirbyupFullReloadPlugin(watch)].filter(Boolean),
 			build: { rollupOptions: { input: resolve(options.cwd, options.entry) } },
 			server: {
 				port,
@@ -321,58 +369,55 @@ function getViteConfig(command, options) {
 		}
 	}), userConfig);
 }
-async function generate(options) {
-	const config = getViteConfig("build", options);
+async function generate(options, context) {
+	const config = getViteConfig("build", options, context);
 	let result;
 	try {
 		result = await build(config);
 	} catch (error) {
-		if (config.mode === "production") throw error;
-		else consola.error(error);
+		if (!options.watch) throw error;
+		consola.error(error);
 	}
-	if (result && !options.watch) {
-		const { output } = toArray(result)[0];
-		let maxLength = 0;
-		for (const chunkFile in output) {
-			const fileNameLength = output[chunkFile].fileName.length;
-			if (fileNameLength > maxLength) maxLength = fileNameLength;
-		}
-		for (const { fileName, type, code } of output) {
-			const content = code || await fsp.readFile(resolve(options.outDir, fileName), "utf8");
-			await printFileInfo({
-				root: options.cwd,
-				outDir: options.outDir,
-				filePath: fileName,
-				content,
-				type,
-				maxLength
-			});
-		}
+	if (!result || options.watch) return;
+	const { output } = toArray(result)[0];
+	const maxLength = Math.max(0, ...output.map((item) => item.fileName.length));
+	for (const item of output) {
+		const content = item.type === "chunk" ? item.code : await fsp.readFile(resolve(options.outDir, item.fileName), "utf8");
+		await printFileInfo({
+			root: options.cwd,
+			outDir: options.outDir,
+			filePath: item.fileName,
+			content,
+			type: item.type,
+			maxLength
+		});
 	}
-	return result;
 }
 async function build$1(options) {
 	assertEntryExists(options);
 	const { cwd } = options;
 	const { config, configFile } = await loadConfig$1(cwd);
-	resolvedKirbyupConfig = config ?? {};
-	resolvedPostCssConfig = await resolvePostCSSConfig(cwd);
+	const postCssConfig = await resolvePostCSSConfig(cwd);
+	const context = {
+		kirbyupConfig: config ?? {},
+		postCssConfig,
+		logger: createKirbyupLogger()
+	};
 	consola.log(colors.green(`${name} v${version}`));
 	consola.start(`Building ${colors.cyan(options.entry)}`);
-	if (options.watch) consola.info("Running in watch mode");
-	await generate(options);
+	await generate(options, context);
 	consola.success("Build successful");
 	if (!options.watch) return;
 	const { watch } = await import("chokidar");
-	const debouncedBuild = debounce(async () => {
-		generate(options).catch(handleError);
+	const debouncedBuild = debounce(() => {
+		generate(options, context).catch(handleError);
 	}, 100);
 	const ignored = [
 		"**/{.git,node_modules}/**",
 		"index.{css,js}",
 		DEV_OUTPUT_FILENAME
 	];
-	const watchPaths = typeof options.watch === "boolean" ? dirname(options.entry) : Array.isArray(options.watch) ? options.watch.filter((path) => typeof path === "string") : options.watch;
+	const watchPaths = options.watch === true ? dirname(options.entry) : toArray(options.watch);
 	consola.info(`Watching for changes in ${toArray(watchPaths).map((i) => colors.cyan(i)).join(", ")}`);
 	const watcher = watch(watchPaths, {
 		ignoreInitial: true,
@@ -390,13 +435,15 @@ async function build$1(options) {
 			fs.rmSync(devOutputPath, { force: true });
 		} catch {}
 	});
-	const onShutdown = () => void cleanup().finally(() => process.exit(0));
+	const onShutdown = () => {
+		cleanup().finally(() => process.exit(0));
+	};
 	process.once("SIGINT", onShutdown);
 	process.once("SIGTERM", onShutdown);
 	if (configFile) watcher.add(configFile);
 	watcher.on("all", async (type, file) => {
 		if (configFile === resolve(cwd, file)) {
-			resolvedKirbyupConfig = (await loadConfig$1(cwd)).config ?? {};
+			context.kirbyupConfig = (await loadConfig$1(cwd)).config ?? {};
 			consola.info(`${colors.cyan(basename(file))} changed, setting new config`);
 		} else consola.log(`${colors.green(type)} ${colors.white(colors.dim(file))}`);
 		debouncedBuild();
@@ -406,15 +453,29 @@ async function serve(options) {
 	assertEntryExists(options);
 	const { cwd } = options;
 	const { config } = await loadConfig$1(cwd);
-	resolvedKirbyupConfig = config ?? {};
-	resolvedPostCssConfig = await resolvePostCSSConfig(cwd);
+	const postCssConfig = await resolvePostCSSConfig(cwd);
+	const context = {
+		kirbyupConfig: config ?? {},
+		postCssConfig,
+		logger: createKirbyupLogger()
+	};
 	consola.log(colors.green(`${name} v${version}`));
 	consola.info("Starting development server…");
-	const server = await createServer(getViteConfig("serve", options));
+	const server = await createServer(getViteConfig("serve", options, context));
 	await server.listen();
 	consola.success(`Server is listening on :${server.config.server.port}`);
 	return server;
 }
+function createKirbyupLogger() {
+	const baseLogger = createLogger(logLevel);
+	return {
+		...baseLogger,
+		warn(msg, options) {
+			if (msg.startsWith(SUPPRESSED_WARNING_PREFIX)) return;
+			baseLogger.warn(msg, options);
+		}
+	};
+}
 function assertEntryExists(options) {
 	if (!fs.existsSync(resolve(options.cwd, options.entry))) throw new PrettyError(`Cannot find "${options.entry}"`);
 }

package/dist/{types-0NUTyTUQ.d.mts → types-3hN383nZ.d.mts}

@@ -1,4 +1,5 @@
 import { AliasOptions, InlineConfig } from "vite";
+
 //#region src/node/types.d.ts
 interface BaseOptions {
   cwd: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kirbyup",
   "type": "module",
-  "version": "4.0.0-alpha.6",
+  "version": "4.0.0-alpha.8",
   "packageManager": "pnpm@10.33.3",
   "description": "Zero-config bundler for Kirby Panel plugins",
   "author": {
@@ -39,16 +39,6 @@
     }
   },
   "types": "./dist/node/index.d.mts",
-  "typesVersions": {
-    "*": {
-      "config": [
-        "./dist/client/config.d.mts"
-      ],
-      "plugin": [
-        "./dist/client/plugin.d.mts"
-      ]
-    }
-  },
   "bin": {
     "kirbyup": "bin/kirbyup.mjs"
   },
@@ -73,20 +63,17 @@
   "dependencies": {
     "@vitejs/plugin-vue": "^6.0.6",
     "@vitejs/plugin-vue-jsx": "^5.1.5",
-    "@vue/compiler-sfc": "^3.5.34",
     "c12": "^4.0.0-beta.4",
     "cac": "^7.0.0",
     "chokidar": "^5.0.0",
     "consola": "^3.4.2",
     "magic-string": "^0.30.21",
-    "nypm": "^0.6.6",
-    "pathe": "^2.0.3",
     "perfect-debounce": "^2.1.0",
     "postcss": "^8.5.14",
     "postcss-load-config": "^6.0.1",
     "sass": "^1.99.0",
+    "strip-literal": "^3.1.0",
     "vite": "^8.0.10",
-    "vite-plugin-full-reload": "^1.2.0",
     "vue": "^3.5.34"
   },
   "devDependencies": {
@@ -95,7 +82,6 @@
     "bumpp": "^11.0.1",
     "eslint": "^10.3.0",
     "eslint-flat-config-utils": "^3.2.0",
-    "tinyglobby": "^0.2.16",
     "tsdown": "^0.21.10",
     "typescript": "^6.0.3",
     "unplugin-raw": "^0.7.0",