kirbyup 4.0.0-alpha.4 → 4.0.0-alpha.5

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-GoJ-fFA1.mjs";
+import { a as version, i as name, n as serve, r as handleError, t as build } from "../node-B8aLFfzt.mjs";
 import { cac } from "cac";
 
 //#region src/node/cli-start.ts

package/dist/node/index.mjs

@@ -1,3 +1,3 @@
-import { n as serve, t as build } from "../node-GoJ-fFA1.mjs";
+import { n as serve, t as build } from "../node-B8aLFfzt.mjs";
 
 export { build, serve };

package/dist/{node-GoJ-fFA1.mjs → node-B8aLFfzt.mjs}

@@ -12,13 +12,14 @@ import * as vueCompilerSfc from "vue/compiler-sfc";
 import { loadConfig } from "c12";
 import postcssrc from "postcss-load-config";
 import { detectPackageManager } from "nypm";
+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.4";
+var version = "4.0.0-alpha.5";
 
 //#endregion
 //#region src/node/config.ts
@@ -70,6 +71,39 @@ function kirbyupBuildCleanupPlugin(options) {
 	};
 }
 
+//#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}/`;
+}
+function normalizeHost(host) {
+	if (host === false || host === void 0) return;
+	if (host === true) return "0.0.0.0";
+	return host;
+}
+function formatHostname(host) {
+	if (!host) return "localhost";
+	if (host.startsWith("[") && host.endsWith("]")) return host;
+	return isIP(host) === 6 ? `[${host}]` : host;
+}
+function hostIncludesPort(host) {
+	if (host.startsWith("[")) {
+		const closingIndex = host.indexOf("]");
+		return closingIndex > -1 && host.slice(closingIndex + 1).startsWith(":");
+	}
+	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/utils.ts
 /**
@@ -232,7 +266,7 @@ function kirbyupHmrPlugin(options) {
 		configResolved(resolvedConfig) {
 			config = resolvedConfig;
 			entry = resolve(config.root, options.entry);
-			devIndexPath = resolve(config.root, options.outDir || "", "index.dev.mjs");
+			devIndexPath = resolve(config.root, options.outDir ?? "", "index.dev.mjs");
 		},
 		transform(code, id) {
 			if (!id.endsWith(".vue")) return;
@@ -248,15 +282,14 @@ function kirbyupHmrPlugin(options) {
 			if (!server.httpServer) return;
 			server.httpServer.once("listening", async () => {
 				const entryPath = entry.replace(`${config.root}/`, "");
-				const { address, family, port } = server.httpServer.address();
-				const baseUrl = `http://${family === "IPv6" ? `[${address}]` : address}:${port}${config.base}`;
+				const baseUrl = getDevBaseUrl(server, config);
 				const entryUrl = new URL(entryPath, baseUrl).href;
 				const pm = await detectPackageManager(config.root);
 				await fsp.writeFile(devIndexPath, getViteProxyModule(entryUrl, pm));
 			});
 		},
-		closeBundle() {
-			if (fs.existsSync(devIndexPath)) fs.unlinkSync(devIndexPath);
+		async closeBundle() {
+			await fsp.rm(devIndexPath, { force: true });
 		}
 	};
 }
@@ -268,106 +301,19 @@ function getViteProxyModule(entryUrl, packageManager) {
 	return `
 try {
   await import("${entryUrl}");
-} catch (err) {
+} catch (error) {
   console.error(
-    "[kirbyup] Couldn't connect to the development server. 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 \`${pm} run serve\` to start Vite or build the plugin with \`${pm} run build\` so Kirby uses the production version."
   );
-  throw err;
+  throw error;
 }
 `.trimStart();
 }
-
-//#endregion
-//#region src/node/plugins/vite-running.ts
-const VITE_RUNNING_FILENAME = ".vite-running";
-function kirbyupRunningMarkerPlugin(options = {}) {
-	let config;
-	let pluginDir;
-	let markerPath;
-	let exitCleanupRegistered = false;
-	const ensureMarker = async () => {
-		if (markerPath) return;
-		try {
-			const resolvedPath = await ensureViteRunningMarker(pluginDir);
-			if (resolvedPath) markerPath = resolvedPath;
-		} catch (error) {
-			config.logger.warn(`[kirbyup] Failed to write ${VITE_RUNNING_FILENAME}: ${error.message}`);
-		}
-	};
-	const cleanupMarker = async () => {
-		if (!markerPath) return;
-		try {
-			await removeViteRunningMarker(markerPath);
-		} catch (error) {
-			config.logger.warn(`[kirbyup] Failed to remove ${VITE_RUNNING_FILENAME}: ${error.message}`);
-		} finally {
-			markerPath = void 0;
-		}
-	};
-	const registerProcessCleanup = () => {
-		if (exitCleanupRegistered) return;
-		exitCleanupRegistered = true;
-		process.once("exit", () => {
-			if (markerPath && fs.existsSync(markerPath)) try {
-				fs.rmSync(markerPath, { force: true });
-			} catch {}
-		});
-	};
-	return {
-		name: "kirbyup:vite-running",
-		configResolved(resolved) {
-			config = resolved;
-			pluginDir = resolve(resolved.root, options.outDir || "");
-			registerProcessCleanup();
-		},
-		configureServer(server) {
-			server.httpServer?.once("listening", () => ensureMarker());
-			server.httpServer?.once("close", () => cleanupMarker());
-		},
-		buildStart() {
-			if (config.command !== "build" || !config.build.watch) return;
-			ensureMarker();
-		}
-	};
-}
-/**
-* Creates the `.vite-running` marker file if the directory is inside `site/plugins/`.
-* Returns `undefined` if the directory is not a Kirby plugin directory.
-*/
-async function ensureViteRunningMarker(targetDir) {
-	if (!isInsideKirbyPlugins(targetDir)) return;
-	const markerPath = resolve(targetDir, VITE_RUNNING_FILENAME);
-	await fsp.writeFile(markerPath, "", "utf8");
-	return markerPath;
-}
-/**
-* Removes the `.vite-running` marker file.
-*/
-async function removeViteRunningMarker(markerPath) {
-	if (!markerPath) return;
-	await fsp.rm(markerPath, { force: true });
-}
-/**
-* Checks if a directory is inside a Kirby plugin directory (`site/plugins/*`).
-* This is used to determine whether to create the `.vite-running` marker file,
-* which Kirby 6+ uses to detect development mode and load the development
-* build of Vue instead of the production build.
-*/
-function isInsideKirbyPlugins(targetDir) {
-	const initialDir = normalize(targetDir);
-	let currentDir = initialDir;
-	while (true) {
-		const parentDir = dirname(currentDir);
-		if (currentDir !== initialDir && isPathSegmentEqual(basename(currentDir), "plugins") && isPathSegmentEqual(basename(parentDir), "site")) return true;
-		if (currentDir === parentDir) return false;
-		currentDir = parentDir;
-	}
-}
-/**
-* Performs case-insensitive comparison of path segments.
-*/
-function isPathSegmentEqual(segment, expected) {
-	return segment.toLowerCase() === expected;
+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 base = config.base ?? "/";
+	return new URL(base, normalizedOrigin).href;
 }
 
 //#endregion
@@ -390,6 +336,7 @@ async function printFileInfo({ root, outDir, filePath, content, type, maxLength
 
 //#endregion
 //#region src/node/index.ts
+const DEV_OUTPUT_FILENAME = "index.dev.js";
 let resolvedKirbyupConfig;
 let resolvedPostCssConfig;
 const logLevel = "warn";
@@ -419,29 +366,26 @@ function getViteConfig(command, options) {
 	};
 	if (command === "serve") {
 		const { port, watch } = options;
+		const inferredOrigin = userConfig.server?.origin ?? resolveOriginFromServerOptions(userConfig.server, port, "localhost");
 		return mergeConfig(mergeConfig(sharedConfig, {
-			plugins: [
-				kirbyupHmrPlugin(options),
-				kirbyupRunningMarkerPlugin({ outDir: options.outDir }),
-				watch && fullReloadPlugin(watch)
-			].filter(Boolean),
+			plugins: [kirbyupHmrPlugin(options), watch && fullReloadPlugin(watch)].filter(Boolean),
 			build: { rollupOptions: { input: resolve(options.cwd, options.entry) } },
 			server: {
 				port,
 				strictPort: true,
-				origin: `http://localhost:${port}`
+				origin: inferredOrigin
 			}
 		}), userConfig);
 	}
 	const mode = options.watch ? "development" : "production";
 	return mergeConfig(mergeConfig(sharedConfig, {
 		mode,
-		plugins: [kirbyupBuildCleanupPlugin(options), options.watch && kirbyupRunningMarkerPlugin({ outDir: options.outDir })].filter(Boolean),
+		plugins: [kirbyupBuildCleanupPlugin(options)],
 		build: {
 			lib: {
 				entry: resolve(options.cwd, options.entry),
 				formats: ["es"],
-				fileName: () => "index.js"
+				fileName: () => options.watch ? DEV_OUTPUT_FILENAME : "index.js"
 			},
 			minify: mode === "production",
 			outDir: options.outDir,
@@ -492,33 +436,47 @@ async function build$1(options) {
 	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);
+	consola.success("Build successful");
+	if (!options.watch) return;
+	const { watch } = await import("chokidar");
 	const debouncedBuild = debounce(async () => {
 		generate(options).catch(handleError);
 	}, 100);
-	const startWatcher = async () => {
-		if (!options.watch) return;
-		const { watch } = await import("chokidar");
-		const ignored = ["**/{.git,node_modules}/**", "index.{css,js,mjs}"];
-		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(", ")}`);
-		const watcher = watch(watchPaths, {
-			ignoreInitial: true,
-			ignorePermissionErrors: true,
-			ignored,
-			cwd
-		});
-		if (configFile) watcher.add(configFile);
-		watcher.on("all", async (type, file) => {
-			if (configFile === resolve(cwd, file)) {
-				resolvedKirbyupConfig = (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();
-		});
+	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;
+	consola.info(`Watching for changes in ${toArray(watchPaths).map((i) => colors.cyan(i)).join(", ")}`);
+	const watcher = watch(watchPaths, {
+		ignoreInitial: true,
+		ignorePermissionErrors: true,
+		ignored,
+		cwd
+	});
+	const devOutputPath = resolve(options.outDir, DEV_OUTPUT_FILENAME);
+	const cleanup = async () => {
+		await watcher.close().catch(() => {});
+		await fsp.rm(devOutputPath, { force: true }).catch(() => {});
 	};
-	await generate(options);
-	consola.success("Build successful");
-	startWatcher();
+	process.once("exit", () => {
+		try {
+			fs.rmSync(devOutputPath, { force: true });
+		} catch {}
+	});
+	const onShutdown = () => void 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 ?? {};
+			consola.info(`${colors.cyan(basename(file))} changed, setting new config`);
+		} else consola.log(`${colors.green(type)} ${colors.white(colors.dim(file))}`);
+		debouncedBuild();
+	});
 }
 async function serve(options) {
 	assertEntryExists(options);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kirbyup",
   "type": "module",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.5",
   "packageManager": "pnpm@10.25.0",
   "description": "Zero-config bundler for Kirby Panel plugins",
   "author": {