@vercube/devkit 0.0.47 → 1.0.0-beta.1

package/dist/index.d.mts

@@ -64,9 +64,10 @@ declare namespace DevKitTypes {
 //#endregion
 //#region src/Common/App.d.ts
 /**
- * Creates a development server application.
- * @param {DeepPartial<ConfigTypes.Config>} cfg - The configuration for the application.
- * @returns {DevKitTypes.App} The development server application instance.
+ * Loads dev config, builds a `Hookable` app object, and runs plugin `hooks()` in the parent process.
+ *
+ * @param cfg - Partial config merged before load (typically sets `dev: true` via spread).
+ * @returns App handle with `hooks` and resolved `config`.
  */
 declare function createVercube(cfg?: DeepPartial<ConfigTypes.Config>): Promise<DevKitTypes.App>;
 //#endregion
@@ -97,4 +98,4 @@ declare function watch(app: DevKitTypes.App): Promise<void>;
  */
 declare function createDevServer(app: DevKitTypes.App): DevKitTypes.DevServer;
 //#endregion
-export { build, createDevServer, createVercube, watch };
+export { DevKitTypes, build, createDevServer, createVercube, watch };

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { builtinModules } from "node:module";
-import { loadVercubeConfig } from "@vercube/core";
+import { invokeVercubePluginDevHooks, loadVercubeConfig } from "@vercube/core";
 import { createHooks } from "hookable";
 import { join, resolve } from "node:path";
 import consola, { consola as consola$1 } from "consola";
@@ -12,18 +12,27 @@ import { watch as watch$2 } from "chokidar";
 import { fork } from "node:child_process";
 //#region src/Common/App.ts
 /**
-* Creates a development server application.
-* @param {DeepPartial<ConfigTypes.Config>} cfg - The configuration for the application.
-* @returns {DevKitTypes.App} The development server application instance.
+* Loads dev config, builds a `Hookable` app object, and runs plugin `hooks()` in the parent process.
+*
+* @param cfg - Partial config merged before load (typically sets `dev: true` via spread).
+* @returns App handle with `hooks` and resolved `config`.
 */
 async function createVercube(cfg) {
-	return {
-		hooks: createHooks(),
-		config: await loadVercubeConfig({
-			...cfg,
-			dev: true
-		})
+	const hooks = createHooks();
+	const cwd = cfg?.build?.root ?? process.cwd();
+	const config = await loadVercubeConfig({
+		...cfg,
+		dev: true
+	}, { cwd });
+	const app = {
+		hooks,
+		config
 	};
+	await invokeVercubePluginDevHooks(config.plugins, {
+		hooks,
+		config
+	});
+	return app;
 }
 //#endregion
 //#region src/Bundlers/Rolldown/Config.ts
@@ -105,6 +114,22 @@ async function build$1(ctx) {
 	});
 }
 //#endregion
+//#region src/Common/reloadConfig.ts
+/**
+* Reloads config from disk into `app.config` and invokes each plugin's `hooks()` again with the new config.
+*
+* @param app - Devkit app instance returned by `createVercube` (mutates `app.config`).
+* @returns Resolves when config load and all plugin `hooks` calls finish.
+*/
+async function reloadDevkitResolvedConfig(app) {
+	const next = await loadVercubeConfig({ dev: true }, { cwd: app.config.build?.root ?? process.cwd() });
+	app.config = next;
+	await invokeVercubePluginDevHooks(next.plugins, {
+		hooks: app.hooks,
+		config: next
+	});
+}
+//#endregion
 //#region src/Bundlers/Rolldown/Watch.ts
 /**
 * Creates a watcher for rolldown
@@ -113,37 +138,49 @@ async function build$1(ctx) {
 * @see https://github.com/nitrojs/nitro/blob/v2/src/core/build/dev.ts
 */
 async function watch$3(app) {
-	const watcher = watch$1({
-		...await getRolldownConfig(app.config.build),
-		onwarn: () => {}
-	});
-	const extraWatcher = watch$2([
-		resolve$1(app.config.build?.root ?? process.cwd(), (app.config?.c12?.dotenv)?.fileName?.[0] ?? ".env"),
-		resolve$1(app.config.build?.root ?? process.cwd(), "vercube.config.ts"),
-		resolve$1(app.config.build?.root ?? process.cwd(), app.config.build?.tsconfig ?? "tsconfig.json")
-	], { ignoreInitial: true });
-	extraWatcher.on("all", () => {
-		app.hooks.callHook("bundler-watch:restart");
-	});
-	watcher.on("close", () => {
-		extraWatcher.close();
-	});
-	watcher.on("event", (event) => {
-		switch (event.code) {
-			case "START":
-				app.hooks.callHook("bundler-watch:init");
-				return;
-			case "BUNDLE_START":
-				app.hooks.callHook("bundler-watch:start");
-				return;
-			case "END":
-				app.hooks.callHook("bundler-watch:end");
-				return;
-			case "ERROR":
-				console.error(event.error);
-				app.hooks.callHook("bundler-watch:error", event.error);
-		}
-	});
+	let rolldownWatcher;
+	let extraWatcher;
+	const root = () => app.config.build?.root ?? process.cwd();
+	const filesToWatch = () => [
+		resolve$1(root(), (app.config?.c12?.dotenv)?.fileName?.[0] ?? ".env"),
+		resolve$1(root(), "vercube.config.ts"),
+		resolve$1(root(), app.config.build?.tsconfig ?? "tsconfig.json")
+	];
+	const startRolldown = async () => {
+		rolldownWatcher?.close();
+		const watcher = watch$1({
+			...await getRolldownConfig(app.config.build),
+			onwarn: () => {}
+		});
+		rolldownWatcher = watcher;
+		watcher.on("event", (event) => {
+			switch (event.code) {
+				case "START":
+					app.hooks.callHook("bundler-watch:init");
+					return;
+				case "BUNDLE_START":
+					app.hooks.callHook("bundler-watch:start");
+					return;
+				case "END":
+					app.hooks.callHook("bundler-watch:end");
+					return;
+				case "ERROR":
+					console.error(event.error);
+					app.hooks.callHook("bundler-watch:error", event.error);
+			}
+		});
+	};
+	const startChokidar = () => {
+		extraWatcher?.close();
+		extraWatcher = watch$2(filesToWatch(), { ignoreInitial: true });
+		extraWatcher.on("all", async () => {
+			await reloadDevkitResolvedConfig(app);
+			await app.hooks.callHook("bundler-watch:restart");
+			await startRolldown();
+		});
+	};
+	await startRolldown();
+	startChokidar();
 }
 //#endregion
 //#region src/Utils/Utils.ts
@@ -203,9 +240,8 @@ async function watch(app) {
 		console.clear();
 		consola.info({
 			tag: "build",
-			message: "Configuration changed, reloading..."
+			message: "Configuration changed, rebuilding..."
 		});
-		app.hooks.callHook("dev:reload");
 	});
 	app.hooks.hook("bundler-watch:error", (error) => {
 		console.log(error);
@@ -226,29 +262,47 @@ function createDevServer(app) {
 	let reloadPromise;
 	let currentFork;
 	/**
+	* Terminates a worker and resolves only once it has fully exited, so the
+	* resources it owns (the HTTP port and any message-queue consumers) are
+	* released before a replacement is spawned.
+	*
+	* A graceful SIGTERM may not stop a worker that holds long-lived handles -
+	* e.g. an open message-queue connection keeps the event loop alive - so fall
+	* back to SIGKILL after a short grace period.
+	* @param {ChildProcess} worker - The worker process to terminate.
+	* @returns {Promise<void>} A promise that resolves when the worker has exited.
+	*/
+	function killWorker(worker) {
+		if (worker.exitCode !== null || worker.signalCode !== null) return Promise.resolve();
+		return new Promise((resolve) => {
+			const killTimer = setTimeout(() => worker.kill("SIGKILL"), 1e3);
+			worker.once("exit", () => {
+				clearTimeout(killTimer);
+				resolve();
+			});
+			worker.kill("SIGTERM");
+		});
+	}
+	/**
 	* Reloads the fork by killing the old one and creating a new one.
 	* @returns {Promise<void>} A promise that resolves when the fork is reloaded.
 	*/
 	async function _reload() {
 		const oldFork = currentFork;
 		currentFork = void 0;
-		if (oldFork) await new Promise((resolve) => {
-			const killTimer = setTimeout(() => oldFork.kill("SIGKILL"), 1e3);
-			oldFork.once("exit", () => {
-				clearTimeout(killTimer);
-				resolve();
-			});
-			oldFork.kill("SIGTERM");
-		});
+		if (oldFork) await killWorker(oldFork);
 		currentFork = fork(forkEntry);
-		if (!currentFork) return;
 	}
 	/**
 	* Reloads the fork.
+	*
+	* Reloads are serialized: overlapping file-change events chain onto the
+	* previous reload instead of running concurrently, which would otherwise
+	* spawn a second worker while another is still shutting down.
 	* @returns {Promise<void>} A promise that resolves when the worker is reloaded.
 	*/
 	const reload = () => {
-		reloadPromise = _reload().then(() => {
+		reloadPromise = (reloadPromise ?? Promise.resolve()).then(() => _reload()).then(() => {
 			consola.success({
 				tag: "worker",
 				message: "Worker reloaded successfully"
@@ -259,8 +313,6 @@ function createDevServer(app) {
 				message: "Failed to reload worker",
 				error
 			});
-		}).finally(() => {
-			reloadPromise = void 0;
 		});
 		return reloadPromise;
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercube/devkit",
-  "version": "0.0.47",
+  "version": "1.0.0-beta.1",
   "description": "Devkit  module for Vercube framework",
   "repository": {
     "type": "git",
@@ -22,19 +22,19 @@
     "README.md"
   ],
   "dependencies": {
-    "@oxc-project/runtime": "0.133.0",
+    "@oxc-project/runtime": "0.135.0",
     "c12": "4.0.0-beta.5",
     "chokidar": "5.0.0",
     "consola": "3.4.2",
     "defu": "6.1.7",
     "dotenv": "17.4.2",
     "hookable": "6.1.1",
-    "oxc-parser": "0.133.0",
-    "oxc-transform": "0.133.0",
+    "oxc-parser": "0.135.0",
+    "oxc-transform": "0.135.0",
     "pathe": "2.0.3",
-    "rolldown": "1.0.2",
+    "rolldown": "1.1.1",
     "unplugin-isolated-decl": "0.16.0",
-    "@vercube/core": "0.0.47"
+    "@vercube/core": "1.0.0-beta.1"
   },
   "publishConfig": {
     "access": "public"