@evjs/cli 0.0.15 → 0.0.16

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,6 +19,7 @@ program
     .name("ev")
     .description("CLI for the evjs framework")
     .version(pkg.version);
+const logger = getLogger(["evjs", "cli"]);
 program
     .command("dev")
     .description("Start development server")
@@ -30,7 +31,7 @@ program
         await dev(config ?? undefined, { cwd });
     }
     catch (err) {
-        console.error(err);
+        logger.error `Failed to start dev server: ${err}`;
         process.exit(1);
     }
 });
@@ -45,7 +46,7 @@ program
         await build(config ?? undefined, { cwd });
     }
     catch (err) {
-        console.error(err);
+        logger.error `Build failed: ${err}`;
         process.exit(1);
     }
 });

package/dist/index.js

@@ -27,18 +27,28 @@ export async function dev(userConfig, options) {
     const cwd = options?.cwd ?? process.cwd();
     process.env.NODE_ENV ??= "development";
     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.
+    // Using a reference instead of a boolean allows proper restart on crash.
+    let apiProcess = null;
     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;
+        // 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,16 +75,21 @@ 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, {

package/dist/load-config.d.ts

@@ -1,4 +1,4 @@
-import type { EvConfig, EvConfigCtx } from "./config.js";
+import type { EvConfig, EvConfigCtx } from "@evjs/shared";
 /**
  * Load evjs config from the project root.
  *

package/dist/load-config.js

@@ -1,11 +1,6 @@
 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.
  *
@@ -19,10 +14,6 @@ export async function loadConfig(cwd, ctx) {
     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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evjs/cli",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "CLI and configuration layer for the evjs framework",
   "type": "module",
   "main": "./dist/index.js",

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, };