@evjs/cli 0.0.28 → 0.0.30

package/dist/cli.js

@@ -7,7 +7,28 @@ import { Command } from "commander";
 import { build, dev } from "./index.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 await configure({
-    sinks: { console: getConsoleSink() },
+    sinks: {
+        console: getConsoleSink({
+            formatter: (record) => {
+                const time = new Date(record.timestamp).toLocaleTimeString("en-US", {
+                    hour12: false,
+                });
+                const levelColor = record.level === "info"
+                    ? "\x1b[36m"
+                    : record.level === "warning"
+                        ? "\x1b[33m"
+                        : record.level === "error" || record.level === "fatal"
+                            ? "\x1b[31m"
+                            : "\x1b[32m";
+                const reset = "\x1b[0m";
+                const cat = record.category[1]
+                    ? `\x1b[90m[${record.category[1]}]\x1b[0m `
+                    : "";
+                const msg = record.message.map(String).join("");
+                return `${levelColor}${time}${reset} ${cat}${msg}\n`;
+            },
+        }),
+    },
     loggers: [
         { category: ["logtape", "meta"], lowestLevel: "warning" },
         { category: ["evjs"], sinks: ["console"], lowestLevel: "info" },

package/dist/index.js

@@ -99,10 +99,21 @@ export async function dev(userConfig, options) {
     // Run buildStart hooks
     await runBuildStartHooks(hooks);
     const bundler = await getBundlerAdapter(config);
+    // Validate HTML files exist
+    if (config.pages) {
+        for (const [name, page] of Object.entries(config.pages)) {
+            if (!fs.existsSync(path.resolve(cwd, page.html))) {
+                throw new Error(`[evjs] MPA page "${name}" html template not found: ${page.html}`);
+            }
+        }
+    }
+    else if (!fs.existsSync(path.resolve(cwd, config.html))) {
+        throw new Error(`[evjs] HTML template not found: ${config.html}`);
+    }
     // Track the running API server process for lifecycle management.
     let apiProcess = null;
     let isFirstBuild = true;
-    const handleServerBundleReady = () => {
+    const handleServerBundleReady = async () => {
         if (!config.serverEnabled)
             return;
         const manifestPath = path.resolve(cwd, "dist/server/manifest.json");
@@ -133,13 +144,19 @@ export async function dev(userConfig, options) {
         // Kill previous process before restarting (handles both first start and restarts)
         if (apiProcess) {
             logger.info `Restarting API server...`;
-            apiProcess.kill();
+            const oldProcess = apiProcess;
             apiProcess = null;
+            oldProcess.kill();
+            try {
+                await Promise.race([
+                    oldProcess.catch(() => { }),
+                    new Promise((resolve) => setTimeout(resolve, 3000)),
+                ]);
+            }
+            catch { }
         }
         const serverPort = config?.server?.dev?.port ?? CONFIG_DEFAULTS.serverPort;
-        const runtimeConfig = config?.server?.runtime ?? "node";
-        const [runtime, ...runtimeExtraArgs] = runtimeConfig.split(/\s+/);
-        logger.info `Server bundle detected, starting ${runtime} API...`;
+        logger.info `Server bundle detected, starting API...`;
         const bootstrapPath = path.resolve(cwd, "dist/server/_dev_start.cjs");
         try {
             const serverBundlePath = path.resolve(cwd, "dist/server", manifest.entry);
@@ -147,22 +164,13 @@ export async function dev(userConfig, options) {
                 fs.mkdirSync(path.dirname(bootstrapPath), { recursive: true });
             }
             fs.writeFileSync(bootstrapPath, [
-                `const bundle = require(${JSON.stringify(serverBundlePath)});`,
-                `const app = bundle.app || bundle.createApp({ endpoint: ${JSON.stringify(config.server.endpoint)} });`,
+                `const handler = require(${JSON.stringify(serverBundlePath)}).default;`,
                 `const { serve } = require("@evjs/server/node");`,
-                `serve(app, { port: ${serverPort}, https: ${JSON.stringify(config.server.dev.https)} });`,
+                `serve({ fetch: handler }, { port: ${serverPort}, https: ${JSON.stringify(config.server.dev.https)} });`,
             ].join("\n"));
-            // node gets --watch flags; other runtimes use their own args as-is
-            const runtimeArgs = runtime === "node"
-                ? [
-                    "--watch",
-                    "--watch-preserve-output",
-                    ...runtimeExtraArgs,
-                    bootstrapPath,
-                ]
-                : [...runtimeExtraArgs, bootstrapPath];
+            const runtimeArgs = [bootstrapPath];
             // Don't await execa here since it's a long-running watch process
-            const child = execa(runtime, runtimeArgs, {
+            const child = execa("node", runtimeArgs, {
                 stdio: "inherit",
                 env: { ...process.env, NODE_ENV: "development" },
             });
@@ -197,6 +205,17 @@ export async function build(userConfig, options) {
     // Run buildStart hooks
     await runBuildStartHooks(hooks);
     const bundler = await getBundlerAdapter(config);
+    // Validate HTML files exist
+    if (config.pages) {
+        for (const [name, page] of Object.entries(config.pages)) {
+            if (!fs.existsSync(path.resolve(cwd, page.html))) {
+                throw new Error(`[evjs] MPA page "${name}" html template not found: ${page.html}`);
+            }
+        }
+    }
+    else if (!fs.existsSync(path.resolve(cwd, config.html))) {
+        throw new Error(`[evjs] HTML template not found: ${config.html}`);
+    }
     await bundler.build(config, cwd, hooks);
     // Run buildEnd hooks with manifests
     const buildResult = readBuildResult(cwd, config.serverEnabled, false);

package/package.json

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