ecopages 0.2.0-beta.0 → 0.2.0-beta.2

package/bin/cli.js

@@ -32,6 +32,10 @@ const sharedServerOptionDefinitions = {
   runtime: {
     type: "string"
   },
+  "entry-file": {
+    type: "string",
+    short: "e"
+  },
   help: {
     type: "boolean",
     short: "h"
@@ -57,21 +61,22 @@ function getMainHelpText() {
     "",
     "Commands:",
     "  init <dir>              Initialize a new project from a template",
-    "  dev [entry]             Start the development server",
-    "  dev:watch [entry]       Start the development server with watch mode",
-    "  dev:hot [entry]         Start the development server with hot reload",
-    "  build [entry]           Build the project for production",
-    "  start [entry]           Start the production server",
-    "  preview [entry]         Preview the production build",
+    "  dev                     Start the development server",
+    "  dev:watch               Start the development server with watch mode",
+    "  dev:hot                 Start the development server with hot reload",
+    "  build                   Build the project for production",
+    "  start                   Start the production server",
+    "  preview                 Preview the production build",
     "",
     "Global options:",
+    "  -e, --entry-file <file> Entry file (default: app.ts)",
     "  -h, --help              Show help",
     "  --version               Show version"
   ].join("\n");
 }
 function getServerCommandHelpText(commandName, description) {
   return [
-    `Usage: ecopages ${commandName} [entry] [options]`,
+    `Usage: ecopages ${commandName} [options]`,
     "",
     description,
     "",
@@ -82,12 +87,13 @@ function getServerCommandHelpText(commandName, description) {
     "  -d, --debug                             Enable debug logging",
     "  -r, --react-fast-refresh                Enable React Fast Refresh for Bun HMR",
     "      --runtime <runtime>                 Force bun or node",
+    "  -e, --entry-file <file>                 Entry file (default: app.ts)",
     "  -h, --help                              Show help"
   ].join("\n");
 }
 function getBuildCommandHelpText() {
   return [
-    "Usage: ecopages build [entry] [options]",
+    "Usage: ecopages build [options]",
     "",
     "Build the project for production.",
     "",
@@ -98,6 +104,7 @@ function getBuildCommandHelpText() {
     "  -d, --debug                             Enable debug logging",
     "  -r, --react-fast-refresh                Enable React Fast Refresh for Bun HMR",
     "      --runtime <runtime>                 Force bun or node",
+    "  -e, --entry-file <file>                 Entry file (default: app.ts)",
     "  -h, --help                              Show help"
   ].join("\n");
 }
@@ -127,11 +134,14 @@ function parseServerCommandArgs(rawArgs, commandName, description, mode = "serve
     console.log(mode === "build" ? getBuildCommandHelpText() : getServerCommandHelpText(commandName, description));
     return { help: true };
   }
-  if (positionals.length > 1) {
-    throw new Error(`Too many positional arguments provided for \`${commandName}\`.`);
+  if (positionals.length > 0) {
+    throw new Error(
+      `Positional entry file arguments are not supported for \`${commandName}\`. Use --entry-file <file> instead.`
+    );
   }
+  const entry = values["entry-file"] ?? "app.ts";
   return {
-    entry: positionals[0] ?? "app.ts",
+    entry,
     options: {
       port: values.port,
       hostname: values.hostname,
@@ -180,14 +190,15 @@ function runLaunchPlan(launchPlan) {
     process.exit(code || 0);
   });
 }
-async function runEntryCommand(args, options = {}, entryFile = "app.ts") {
+async function runEntryCommand(args, options = {}, entryFile = "app.ts", launchMode = "start") {
   let launchPlan;
-  if (!existsSync(entryFile)) {
+  const requiresBuiltBundle = launchMode === "start";
+  if (!requiresBuiltBundle && !existsSync(entryFile)) {
     logger.error(`Error: Entry file "${entryFile}" not found in the current directory.`);
     process.exit(1);
   }
   try {
-    launchPlan = await createLaunchPlan(args, options, entryFile);
+    launchPlan = await createLaunchPlan(args, options, entryFile, launchMode);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     logger.error(message);
@@ -230,7 +241,12 @@ async function runServerCommand(rawArgs, definition) {
   if (parsed.help) {
     return;
   }
-  await runEntryCommand(definition.entryArgs, { ...parsed.options, ...definition.optionOverrides }, parsed.entry);
+  await runEntryCommand(
+    definition.entryArgs,
+    { ...parsed.options, ...definition.optionOverrides, entryFile: parsed.entry },
+    parsed.entry,
+    definition.launchMode ?? definition.name
+  );
 }
 async function runCli(rawArgs = process.argv.slice(2)) {
   const [commandName, ...commandArgs] = rawArgs;
@@ -252,6 +268,7 @@ async function runCli(rawArgs = process.argv.slice(2)) {
           name: "dev",
           description: "Start the development server.",
           entryArgs: ["--dev"],
+          launchMode: "dev",
           optionOverrides: { nodeEnv: "development" }
         });
         return;
@@ -260,6 +277,7 @@ async function runCli(rawArgs = process.argv.slice(2)) {
           name: "dev:watch",
           description: "Start the development server with watch mode.",
           entryArgs: ["--dev"],
+          launchMode: "dev",
           optionOverrides: { watch: true, nodeEnv: "development" }
         });
         return;
@@ -268,6 +286,7 @@ async function runCli(rawArgs = process.argv.slice(2)) {
           name: "dev:hot",
           description: "Start the development server with hot reload.",
           entryArgs: ["--dev"],
+          launchMode: "dev",
           optionOverrides: { hot: true, nodeEnv: "development" }
         });
         return;
@@ -276,6 +295,7 @@ async function runCli(rawArgs = process.argv.slice(2)) {
           name: "build",
           description: "Build the project for production.",
           entryArgs: ["--build"],
+          launchMode: "build",
           optionOverrides: { nodeEnv: "production" },
           mode: "build"
         });
@@ -285,6 +305,7 @@ async function runCli(rawArgs = process.argv.slice(2)) {
           name: "start",
           description: "Start the production server.",
           entryArgs: [],
+          launchMode: "start",
           optionOverrides: { nodeEnv: "production" }
         });
         return;
@@ -293,6 +314,7 @@ async function runCli(rawArgs = process.argv.slice(2)) {
           name: "preview",
           description: "Preview the production build.",
           entryArgs: ["--preview"],
+          launchMode: "preview",
           optionOverrides: { nodeEnv: "production" }
         });
         return;

package/bin/launch-plan.js

@@ -1,5 +1,7 @@
 import { existsSync, readFileSync } from "node:fs";
+import path from "node:path";
 import { parseEnv } from "node:util";
+import { SERVER_BUNDLE_DIR, SERVER_BUNDLE_FILENAME } from "@ecopages/core/utils/resolve-entry-file";
 const nodeRequirePreload = import.meta.resolve("./node-require-preload.js");
 const tsxLoader = import.meta.resolve("tsx/esm");
 function getEnvFilePaths(nodeEnv) {
@@ -16,6 +18,7 @@ function buildEnvOverrides(options) {
   if (options.baseUrl) env.ECOPAGES_BASE_URL = options.baseUrl;
   if (options.debug) env.ECOPAGES_LOGGER_DEBUG = "true";
   if (options.nodeEnv) env.NODE_ENV = options.nodeEnv;
+  if (options.entryFile) env.ECOPAGES_ENTRY_FILE = options.entryFile;
   return env;
 }
 function buildLaunchEnv(options) {
@@ -55,14 +58,59 @@ function buildBunArgs(args, options, entryFile, hasConfig) {
   }
   return bunArgs;
 }
-function createLaunchPlan(args, options = {}, entryFile = "app.ts") {
-  const { envOverrides, env } = buildLaunchEnv(options);
-  const runtime = detectRuntime(options);
+function usesProductionBundle(launchMode) {
+  return launchMode === "start";
+}
+function inferLaunchMode(args, launchMode) {
+  if (launchMode) {
+    return launchMode;
+  }
+  if (args.includes("--build")) {
+    return "build";
+  }
+  if (args.includes("--preview")) {
+    return "preview";
+  }
+  if (args.includes("--dev")) {
+    return "dev";
+  }
+  return "start";
+}
+function createLaunchPlan(args, options, entryFile, launchMode) {
+  const resolvedOptions = options ?? {};
+  const resolvedEntryFile = entryFile ?? "app.ts";
+  const { envOverrides, env } = buildLaunchEnv(resolvedOptions);
+  const runtime = detectRuntime(resolvedOptions);
+  const resolvedLaunchMode = inferLaunchMode(args, launchMode);
+  const distServerApp = path.join(process.cwd(), "dist", SERVER_BUNDLE_DIR, SERVER_BUNDLE_FILENAME);
+  const shouldUseBundle = usesProductionBundle(resolvedLaunchMode);
+  const useBundle = shouldUseBundle && existsSync(distServerApp);
+  if (shouldUseBundle && !useBundle) {
+    throw new Error("No production bundle found. Run `ecopages build` before starting in production mode.");
+  }
+  if (useBundle) {
+    if (runtime === "node") {
+      return {
+        runtime,
+        command: process.execPath,
+        commandArgs: [distServerApp, ...args],
+        envOverrides,
+        env
+      };
+    }
+    return {
+      runtime,
+      command: "bun",
+      commandArgs: ["run", distServerApp, ...args],
+      envOverrides,
+      env
+    };
+  }
   if (runtime === "node") {
     return {
       runtime,
       command: process.execPath,
-      commandArgs: ["--import", nodeRequirePreload, "--import", tsxLoader, entryFile, ...args],
+      commandArgs: ["--import", nodeRequirePreload, "--import", tsxLoader, resolvedEntryFile, ...args],
       envOverrides,
       env
     };
@@ -70,7 +118,7 @@ function createLaunchPlan(args, options = {}, entryFile = "app.ts") {
   return {
     runtime,
     command: "bun",
-    commandArgs: buildBunArgs(args, options, entryFile, existsSync("eco.config.ts")),
+    commandArgs: buildBunArgs(args, resolvedOptions, resolvedEntryFile, existsSync("eco.config.ts")),
     envOverrides,
     env
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ecopages",
-  "version": "0.2.0-beta.0",
+  "version": "0.2.0-beta.2",
   "description": "CLI utilities for Ecopages",
   "type": "module",
   "engines": {
@@ -32,7 +32,7 @@
     "ecopages": "bin/cli.js"
   },
   "dependencies": {
-    "@ecopages/core": "0.2.0-beta.0",
+    "@ecopages/core": "0.2.0-beta.2",
     "@ecopages/logger": "^0.2.3",
     "giget": "^2.0.0",
     "tsx": "^4.22.3"