@evjs/cli 0.0.1-rc.28 → 0.0.3

package/dist/cli.js

@@ -0,0 +1,52 @@
+#!/usr/bin/env node
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { configure, getConsoleSink } from "@logtape/logtape";
+import { Command } from "commander";
+import fs from "fs-extra";
+import { build, dev } from "./index.js";
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+await configure({
+    sinks: { console: getConsoleSink() },
+    loggers: [
+        { category: ["logtape", "meta"], lowestLevel: "warning" },
+        { category: ["evjs"], sinks: ["console"], lowestLevel: "info" },
+    ],
+});
+const pkg = fs.readJsonSync(path.resolve(__dirname, "../package.json"));
+const program = new Command();
+program
+    .name("ev")
+    .description("CLI for the evjs framework")
+    .version(pkg.version);
+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);
+    try {
+        await dev(config ?? undefined, { cwd });
+    }
+    catch (err) {
+        console.error(err);
+        process.exit(1);
+    }
+});
+program
+    .command("build")
+    .description("Build project for production")
+    .action(async () => {
+    const cwd = process.cwd();
+    const { loadConfig } = await import("./load-config.js");
+    const config = await loadConfig(cwd);
+    try {
+        await build(config ?? undefined, { cwd });
+    }
+    catch (err) {
+        console.error(err);
+        process.exit(1);
+    }
+});
+program.parse();

package/dist/config.js

@@ -24,7 +24,7 @@ export const CONFIG_DEFAULTS = {
  *     dev: { port: 3000 },
  *   },
  *   server: {
- *     endpoint: "/api/fn",
+ *     functions: { endpoint: "/api/fn" },
  *     dev: { port: 3001 },
  *   },
  * });

package/dist/create-webpack-config.js

@@ -15,7 +15,7 @@ export function createWebpackConfig(config, cwd) {
     const html = client?.html ?? CONFIG_DEFAULTS.html;
     const clientPort = client?.dev?.port ?? CONFIG_DEFAULTS.clientPort;
     const serverPort = server?.dev?.port ?? CONFIG_DEFAULTS.serverPort;
-    const endpoint = server?.endpoint ?? CONFIG_DEFAULTS.endpoint;
+    const endpoint = server?.functions?.endpoint ?? CONFIG_DEFAULTS.endpoint;
     const isProduction = process.env.NODE_ENV === "production";
     const HtmlWebpackPlugin = esmRequire("html-webpack-plugin");
     const { EvWebpackPlugin } = esmRequire("@evjs/webpack-plugin");
@@ -74,8 +74,8 @@ export function createWebpackConfig(config, cwd) {
                         },
                     ],
                 },
-                // Plugin-declared loaders
-                ...(client?.plugins ?? []).flatMap((plugin) => (plugin.loaders ?? []).map((rule) => {
+                // Plugin-declared loaders (client + server)
+                ...[...(client?.plugins ?? []), ...(server?.plugins ?? [])].flatMap((plugin) => (plugin.loaders ?? []).map((rule) => {
                     const entries = Array.isArray(rule.use) ? rule.use : [rule.use];
                     return {
                         test: rule.test,

package/dist/index.js

@@ -1,119 +1,96 @@
-#!/usr/bin/env node
 import { createRequire } from "node:module";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
-import { configure, getConsoleSink, getLogger } from "@logtape/logtape";
-import { Command } from "commander";
+import { getLogger } from "@logtape/logtape";
 import { execa } from "execa";
 import fs from "fs-extra";
 import { CONFIG_DEFAULTS } from "./config.js";
+export { CONFIG_DEFAULTS, defineConfig } from "./config.js";
 const esmRequire = createRequire(import.meta.url);
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-await configure({
-    sinks: { console: getConsoleSink() },
-    loggers: [
-        { category: ["logtape", "meta"], lowestLevel: "warning" },
-        { category: ["evjs"], sinks: ["console"], lowestLevel: "info" },
-    ],
-});
 const logger = getLogger(["evjs", "cli"]);
-const pkg = fs.readJsonSync(path.resolve(__dirname, "../package.json"));
-const program = new Command();
-program
-    .name("ev")
-    .description("CLI for the evjs framework")
-    .version(pkg.version);
 /**
- * Load config and create webpack configuration object.
- *
- * Uses ev.config.ts when present, otherwise falls back to convention-based defaults.
- * No webpack.config.cjs fallback — the meta-framework owns the build config.
+ * Create webpack configuration from an EvConfig object.
  */
-async function resolveWebpackConfig(cwd) {
-    const { loadConfig } = await import("./load-config.js");
-    const evjsConfig = await loadConfig(cwd);
+async function resolveWebpackConfig(config, cwd) {
     const { createWebpackConfig } = await import("./create-webpack-config.js");
-    logger.info `Using ${evjsConfig ? "ev.config.ts" : "convention-based defaults"}`;
-    const webpackConfig = createWebpackConfig(evjsConfig, cwd);
-    return { evjsConfig, webpackConfig };
+    return createWebpackConfig(config, cwd);
 }
-program
-    .command("dev")
-    .description("Start development server")
-    .action(async () => {
-    const cwd = process.cwd();
+/**
+ * Start the development server programmatically.
+ *
+ * @param config - evjs configuration object (from `defineConfig`)
+ * @param options - additional options like `cwd`
+ */
+export async function dev(config, options) {
+    const cwd = options?.cwd ?? process.cwd();
     process.env.NODE_ENV ??= "development";
-    const { evjsConfig, webpackConfig } = await resolveWebpackConfig(cwd);
-    const serverPort = evjsConfig?.server?.dev?.port ?? CONFIG_DEFAULTS.serverPort;
+    const webpackConfig = await resolveWebpackConfig(config, cwd);
+    const serverPort = config?.server?.dev?.port ?? CONFIG_DEFAULTS.serverPort;
     logger.info `Starting development server...`;
-    try {
-        const webpack = esmRequire("webpack");
-        const WebpackDevServer = esmRequire("webpack-dev-server");
-        const compiler = webpack(webpackConfig);
-        const devServerOptions = webpackConfig.devServer ?? {};
-        const server = new WebpackDevServer(devServerOptions, compiler);
-        await server.start();
-        // Background: start Node API when server bundle is ready
-        let apiStarted = false;
-        compiler.hooks.done.tap("EvDevServer", async () => {
-            if (apiStarted)
+    const webpack = esmRequire("webpack");
+    const WebpackDevServer = esmRequire("webpack-dev-server");
+    const compiler = webpack(webpackConfig);
+    const devServerOptions = webpackConfig.devServer ?? {};
+    const server = new WebpackDevServer(devServerOptions, compiler);
+    await server.start();
+    // Background: start Node API when server bundle is ready
+    let apiStarted = false;
+    compiler.hooks.done.tap("EvDevServer", async () => {
+        if (apiStarted)
+            return;
+        const manifestPath = path.resolve(cwd, "dist/manifest.json");
+        const bootstrapPath = path.resolve(cwd, "dist/server/_dev_start.cjs");
+        if (fs.existsSync(manifestPath)) {
+            const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
+            // Start API server if there's a server entry
+            if (!manifest.server?.entry)
                 return;
-            const manifestPath = path.resolve(cwd, "dist/manifest.json");
-            const bootstrapPath = path.resolve(cwd, "dist/server/_dev_start.cjs");
-            if (fs.existsSync(manifestPath)) {
-                const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
-                // Start API server if there's a server entry
-                if (!manifest.server?.entry)
-                    return;
-                apiStarted = true;
-                const backendConfig = evjsConfig?.server?.backend ?? "node";
-                const [backend, ...backendExtraArgs] = backendConfig.split(/\s+/);
-                logger.info `Server bundle detected, starting ${backend} API...`;
-                try {
-                    const serverBundlePath = path.resolve(cwd, "dist/server", manifest.server.entry);
-                    fs.ensureDirSync(path.dirname(bootstrapPath));
-                    fs.writeFileSync(bootstrapPath, [
-                        `const bundle = require(${JSON.stringify(serverBundlePath)});`,
-                        `const app = bundle.app || bundle.createApp({ endpoint: ${JSON.stringify(evjsConfig?.server?.endpoint ?? CONFIG_DEFAULTS.endpoint)} });`,
-                        `const { serve } = require("@evjs/server/node");`,
-                        `serve(app, { port: ${serverPort} });`,
-                    ].join("\n"));
-                    // node gets --watch flags; other runtimes use their own args as-is
-                    const backendArgs = backend === "node"
-                        ? [
-                            "--watch",
-                            "--watch-preserve-output",
-                            ...backendExtraArgs,
-                            bootstrapPath,
-                        ]
-                        : [...backendExtraArgs, bootstrapPath];
-                    // Don't await execa here since it's a long-running watch process
-                    execa(backend, backendArgs, {
-                        stdio: "inherit",
-                        env: { ...process.env, NODE_ENV: "development" },
-                    }).catch(() => {
-                        apiStarted = false;
-                    });
-                }
-                catch (err) {
-                    logger.error `Server backend failed: ${err}`;
+            apiStarted = true;
+            const backendConfig = config?.server?.backend ?? "node";
+            const [backend, ...backendExtraArgs] = backendConfig.split(/\s+/);
+            logger.info `Server bundle detected, starting ${backend} API...`;
+            try {
+                const serverBundlePath = path.resolve(cwd, "dist/server", manifest.server.entry);
+                fs.ensureDirSync(path.dirname(bootstrapPath));
+                fs.writeFileSync(bootstrapPath, [
+                    `const bundle = require(${JSON.stringify(serverBundlePath)});`,
+                    `const app = bundle.app || bundle.createApp({ endpoint: ${JSON.stringify(config?.server?.functions?.endpoint ?? CONFIG_DEFAULTS.endpoint)} });`,
+                    `const { serve } = require("@evjs/server/node");`,
+                    `serve(app, { port: ${serverPort}, https: ${Boolean(config?.server?.dev?.https)} });`,
+                ].join("\n"));
+                // node gets --watch flags; other runtimes use their own args as-is
+                const backendArgs = backend === "node"
+                    ? [
+                        "--watch",
+                        "--watch-preserve-output",
+                        ...backendExtraArgs,
+                        bootstrapPath,
+                    ]
+                    : [...backendExtraArgs, bootstrapPath];
+                // Don't await execa here since it's a long-running watch process
+                execa(backend, backendArgs, {
+                    stdio: "inherit",
+                    env: { ...process.env, NODE_ENV: "development" },
+                }).catch(() => {
                     apiStarted = false;
-                }
+                });
             }
-        });
-    }
-    catch (err) {
-        logger.error `Dev server failed to start: ${err}`;
-        process.exit(1);
-    }
-});
-program
-    .command("build")
-    .description("Build project for production")
-    .action(async () => {
-    const cwd = process.cwd();
+            catch (err) {
+                logger.error `Server backend failed: ${err}`;
+                apiStarted = false;
+            }
+        }
+    });
+}
+/**
+ * Run a production build programmatically.
+ *
+ * @param config - evjs configuration object (from `defineConfig`)
+ * @param options - additional options like `cwd`
+ */
+export async function build(config, options) {
+    const cwd = options?.cwd ?? process.cwd();
     process.env.NODE_ENV ??= "production";
-    const { webpackConfig } = await resolveWebpackConfig(cwd);
+    const webpackConfig = await resolveWebpackConfig(config, cwd);
     logger.info `Building for production...`;
     const webpack = esmRequire("webpack");
     const compiler = webpack(webpackConfig);
@@ -135,5 +112,4 @@ program
         });
     });
     logger.info `Build complete!`;
-});
-program.parse();
+}

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@evjs/cli",
-  "version": "0.0.1-rc.28",
+  "version": "0.0.3",
   "description": "CLI and configuration layer for the evjs framework",
   "type": "module",
-  "main": "./dist/config.js",
-  "types": "./dist/config.d.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/config.d.ts",
-      "import": "./dist/config.js"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
     }
   },
   "publishConfig": {
     "access": "public"
   },
   "bin": {
-    "ev": "dist/index.js"
+    "ev": "dist/cli.js"
   },
   "files": [
     "dist"