@evjs/cli 0.0.15 → 0.0.17

package/dist/cli.js

@@ -2,7 +2,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { configure, getConsoleSink } from "@logtape/logtape";
+import { configure, getConsoleSink, getLogger } from "@logtape/logtape";
 import { Command } from "commander";
 import { build, dev } from "./index.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -19,18 +19,19 @@ program
     .name("ev")
     .description("CLI for the evjs framework")
     .version(pkg.version);
+const logger = getLogger(["evjs", "cli"]);
 program
     .command("dev")
     .description("Start development server")
     .action(async () => {
     const cwd = process.cwd();
     const { loadConfig } = await import("./load-config.js");
-    const config = await loadConfig(cwd, { mode: "development" });
+    const config = await loadConfig(cwd);
     try {
         await dev(config ?? undefined, { cwd });
     }
     catch (err) {
-        console.error(err);
+        logger.error `Failed to start dev server: ${err}`;
         process.exit(1);
     }
 });
@@ -40,12 +41,12 @@ program
     .action(async () => {
     const cwd = process.cwd();
     const { loadConfig } = await import("./load-config.js");
-    const config = await loadConfig(cwd, { mode: "production" });
+    const config = await loadConfig(cwd);
     try {
         await build(config ?? undefined, { cwd });
     }
     catch (err) {
-        console.error(err);
+        logger.error `Build failed: ${err}`;
         process.exit(1);
     }
 });

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { CONFIG_DEFAULTS, defineConfig, type EvBundlerCtx, type EvConfig, type EvConfigCtx, type EvPlugin, type ResolvedEvConfig, resolveConfig } from "@evjs/shared";
-export { CONFIG_DEFAULTS, type EvConfig, type EvBundlerCtx, type EvConfigCtx, type EvPlugin, type ResolvedEvConfig, resolveConfig, defineConfig, };
+import { CONFIG_DEFAULTS, defineConfig, type EvBuildResult, type EvBundlerCtx, type EvConfig, type EvPlugin, type EvPluginContext, type EvPluginHooks, type ResolvedEvConfig, resolveConfig } from "@evjs/shared";
+export { CONFIG_DEFAULTS, type EvConfig, type EvBuildResult, type EvBundlerCtx, type EvPlugin, type EvPluginContext, type EvPluginHooks, type ResolvedEvConfig, resolveConfig, defineConfig, };
 export interface DevOptions {
     cwd?: string;
 }

package/dist/index.js

@@ -16,6 +16,60 @@ async function getBundlerAdapter(config) {
     }
     throw new Error(`Bundler '${bundlerName}' is not supported yet.`);
 }
+/**
+ * Run plugin setup() hooks and collect lifecycle hooks.
+ */
+async function collectPluginHooks(plugins, ctx) {
+    const allHooks = [];
+    for (const plugin of plugins) {
+        if (plugin.setup) {
+            const hooks = await plugin.setup(ctx);
+            if (hooks) {
+                allHooks.push(hooks);
+            }
+        }
+    }
+    return allHooks;
+}
+/**
+ * Run all buildStart hooks sequentially.
+ */
+async function runBuildStartHooks(hooks) {
+    for (const h of hooks) {
+        if (h.buildStart) {
+            await h.buildStart();
+        }
+    }
+}
+/**
+ * Run all buildEnd hooks sequentially.
+ */
+async function runBuildEndHooks(hooks, result) {
+    for (const h of hooks) {
+        if (h.buildEnd) {
+            await h.buildEnd(result);
+        }
+    }
+}
+/**
+ * Read build manifests from disk.
+ */
+function readBuildResult(cwd, serverEnabled, isRebuild) {
+    const clientManifestPath = serverEnabled
+        ? path.resolve(cwd, "dist/client/manifest.json")
+        : path.resolve(cwd, "dist/manifest.json");
+    if (!fs.existsSync(clientManifestPath))
+        return null;
+    const clientManifest = JSON.parse(fs.readFileSync(clientManifestPath, "utf-8"));
+    let serverManifest;
+    if (serverEnabled) {
+        const serverManifestPath = path.resolve(cwd, "dist/server/manifest.json");
+        if (fs.existsSync(serverManifestPath)) {
+            serverManifest = JSON.parse(fs.readFileSync(serverManifestPath, "utf-8"));
+        }
+    }
+    return { clientManifest, serverManifest, isRebuild };
+}
 /**
  * Start the development server programmatically.
  *
@@ -26,19 +80,42 @@ export async function dev(userConfig, options) {
     const config = resolveConfig(userConfig);
     const cwd = options?.cwd ?? process.cwd();
     process.env.NODE_ENV ??= "development";
+    // Collect plugin hooks
+    const pluginCtx = { mode: "development", config };
+    const hooks = await collectPluginHooks(config.plugins, pluginCtx);
+    // Run buildStart hooks
+    await runBuildStartHooks(hooks);
     const bundler = await getBundlerAdapter(config);
-    // Background: start Node API when server bundle is ready
-    let apiStarted = false;
+    // Track the running API server process for lifecycle management.
+    let apiProcess = null;
+    let isFirstBuild = true;
     const handleServerBundleReady = () => {
-        if (apiStarted)
+        if (!config.serverEnabled)
             return;
         const manifestPath = path.resolve(cwd, "dist/server/manifest.json");
         if (!fs.existsSync(manifestPath))
             return;
         const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
+        if (manifest.version !== 1) {
+            logger.warn `Unexpected server manifest version: ${manifest.version}. Expected 1.`;
+            return;
+        }
         if (!manifest.entry)
             return;
-        apiStarted = true;
+        // Run buildEnd hooks with manifests
+        const buildResult = readBuildResult(cwd, config.serverEnabled, !isFirstBuild);
+        if (buildResult) {
+            runBuildEndHooks(hooks, buildResult).catch((err) => {
+                logger.error `Plugin buildEnd hook failed: ${err}`;
+            });
+        }
+        isFirstBuild = false;
+        // Kill previous process before restarting (handles both first start and restarts)
+        if (apiProcess) {
+            logger.info `Restarting API server...`;
+            apiProcess.kill();
+            apiProcess = null;
+        }
         const serverPort = config?.server?.dev?.port ?? CONFIG_DEFAULTS.serverPort;
         const runtimeConfig = config?.server?.runtime ?? "node";
         const [runtime, ...runtimeExtraArgs] = runtimeConfig.split(/\s+/);
@@ -65,21 +142,24 @@ export async function dev(userConfig, options) {
                 ]
                 : [...runtimeExtraArgs, bootstrapPath];
             // Don't await execa here since it's a long-running watch process
-            execa(runtime, runtimeArgs, {
+            const child = execa(runtime, runtimeArgs, {
                 stdio: "inherit",
                 env: { ...process.env, NODE_ENV: "development" },
-            }).catch(() => {
-                apiStarted = false;
+            });
+            apiProcess = child;
+            child.catch(() => {
+                // Clear reference so the next compilation can restart
+                if (apiProcess === child) {
+                    apiProcess = null;
+                }
             });
         }
         catch (err) {
             logger.error `Server runtime failed: ${err}`;
-            apiStarted = false;
+            apiProcess = null;
         }
     };
-    await bundler.dev(config, cwd, {
-        onServerBundleReady: handleServerBundleReady,
-    });
+    await bundler.dev(config, cwd, { onServerBundleReady: handleServerBundleReady }, hooks);
 }
 /**
  * Run a production build programmatically.
@@ -91,6 +171,16 @@ export async function build(userConfig, options) {
     const config = resolveConfig(userConfig);
     const cwd = options?.cwd ?? process.cwd();
     process.env.NODE_ENV ??= "production";
+    // Collect plugin hooks
+    const pluginCtx = { mode: "production", config };
+    const hooks = await collectPluginHooks(config.plugins, pluginCtx);
+    // Run buildStart hooks
+    await runBuildStartHooks(hooks);
     const bundler = await getBundlerAdapter(config);
-    await bundler.build(config, cwd);
+    await bundler.build(config, cwd, hooks);
+    // Run buildEnd hooks with manifests
+    const buildResult = readBuildResult(cwd, config.serverEnabled, false);
+    if (buildResult) {
+        await runBuildEndHooks(hooks, buildResult);
+    }
 }

package/dist/load-config.d.ts

@@ -1,11 +1,8 @@
-import type { EvConfig, EvConfigCtx } from "./config.js";
+import type { EvConfig } from "@evjs/shared";
 /**
  * Load evjs config from the project root.
  *
  * Looks for `ev.config.ts`, `.js`, or `.mjs` in the given directory.
  * Returns undefined if no config file is found.
- *
- * After loading, all plugin `config` hooks are executed in order.
- * If a plugin injects new plugins, their hooks are also executed.
  */
-export declare function loadConfig(cwd: string, ctx?: EvConfigCtx): Promise<EvConfig | undefined>;
+export declare function loadConfig(cwd: string): Promise<EvConfig | undefined>;

package/dist/load-config.js

@@ -1,47 +1,18 @@
 import fs from "node:fs";
 import path from "node:path";
 const CONFIG_FILES = ["ev.config.ts", "ev.config.js", "ev.config.mjs"];
-/**
- * Historically used @swc-node/register, but it causes ERR_REQUIRE_CYCLE_MODULE inside Node 22.
- * Modern evjs relies on Node's native typescript handling or built-in --loader arguments.
- */
-async function ensureTsLoader() { }
 /**
  * Load evjs config from the project root.
  *
  * Looks for `ev.config.ts`, `.js`, or `.mjs` in the given directory.
  * Returns undefined if no config file is found.
- *
- * After loading, all plugin `config` hooks are executed in order.
- * If a plugin injects new plugins, their hooks are also executed.
  */
-export async function loadConfig(cwd, ctx) {
+export async function loadConfig(cwd) {
     for (const filename of CONFIG_FILES) {
         const configPath = path.resolve(cwd, filename);
         if (fs.existsSync(configPath)) {
-            // Register TS loader for .ts config files
-            if (filename.endsWith(".ts")) {
-                await ensureTsLoader();
-            }
             const mod = await import(configPath);
-            let config = mod.default ?? mod;
-            // Execute plugin config hooks
-            const currentCtx = ctx ?? { mode: "development" };
-            const executedConfigHooks = new Set();
-            let hasNewPlugins = true;
-            while (hasNewPlugins) {
-                hasNewPlugins = false;
-                const allPlugins = config.plugins ?? [];
-                for (const plugin of allPlugins) {
-                    if (plugin.config && !executedConfigHooks.has(plugin.name)) {
-                        config = plugin.config(config, currentCtx) ?? config;
-                        executedConfigHooks.add(plugin.name);
-                        hasNewPlugins = true;
-                        break;
-                    }
-                }
-            }
-            return config;
+            return mod.default ?? mod;
         }
     }
     return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evjs/cli",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "CLI and configuration layer for the evjs framework",
   "type": "module",
   "main": "./dist/index.js",
@@ -32,9 +32,7 @@
     "@evjs/shared": "*",
     "@logtape/logtape": "^2.0.4",
     "commander": "^12.1.0",
-    "execa": "^9.6.1",
-    "glob": "^13.0.6",
-    "picocolors": "^1.1.1"
+    "execa": "^9.6.1"
   },
   "devDependencies": {
     "@types/node": "^22.19.15",

package/dist/config.d.ts

@@ -1,2 +0,0 @@
-import { CONFIG_DEFAULTS, defineConfig, type EvBundlerCtx, type EvConfig, type EvConfigCtx, type EvPlugin, type ResolvedEvConfig, resolveConfig } from "@evjs/shared";
-export { type EvConfig, type EvConfigCtx, type EvBundlerCtx, type ResolvedEvConfig, type EvPlugin, CONFIG_DEFAULTS, defineConfig, resolveConfig, };

package/dist/config.js

@@ -1,2 +0,0 @@
-import { CONFIG_DEFAULTS, defineConfig, resolveConfig, } from "@evjs/shared";
-export { CONFIG_DEFAULTS, defineConfig, resolveConfig, };