@base44-preview/cli 0.0.55-pr.541.ec65d32 → 0.0.55-pr.545.0401b80

package/dist/cli/index.js

@@ -234018,7 +234018,7 @@ function normalizeBase44Env() {
 loadProjectEnvFiles();
 
 // src/cli/index.ts
-import { dirname as dirname23, join as join29 } from "node:path";
+import { dirname as dirname23, join as join28 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 
 // ../../node_modules/@clack/core/dist/index.mjs
@@ -241707,7 +241707,7 @@ async function initAppContext(options = {}) {
     if (!id) {
       throw new InvalidInputError("App id cannot be empty.");
     }
-    cache2 = { id, projectRoot: projectRoot?.root };
+    cache2 = { id };
     return cache2;
   }
   if (cache2) {
@@ -253953,10 +253953,6 @@ function getTypesCommand() {
   return new Command("types").description("Manage TypeScript type generation").addCommand(getTypesGenerateCommand());
 }
 
-// src/cli/commands/dev.ts
-import { join as join28 } from "node:path";
-import process21 from "node:process";
-
 // src/cli/dev/dev-server/main.ts
 var import_cors = __toESM(require_lib4(), 1);
 var import_express6 = __toESM(require_express(), 1);
@@ -254112,12 +254108,11 @@ var stringify = (item) => {
     return String(item);
   }
 };
-function createDevLogger() {
+function createDevLogger(label2, labelColor = theme.styles.dim) {
+  const prefix = label2 ? `${labelColor(`[${label2}]`)} ` : "";
   const print = (type, ...args) => {
     const colorize = colorByType[type];
-    console[type](...args.map((item) => {
-      return colorize(stringify(item));
-    }));
+    console[type](prefix + args.map((item) => colorize(stringify(item))).join(" "));
   };
   return {
     log: (...args) => print("log", ...args),
@@ -255484,6 +255479,109 @@ function createCustomIntegrationRoutes(remoteProxy, logger2) {
   return router;
 }
 
+// src/cli/dev/dev-server/serve-runner.ts
+import { spawn as spawn3 } from "node:child_process";
+import process21 from "node:process";
+
+class ServeRunner {
+  command;
+  cwd;
+  env;
+  logger;
+  child;
+  stopping = false;
+  stopPromise;
+  exitListeners = [];
+  constructor(options8) {
+    this.command = options8.command;
+    this.cwd = options8.cwd;
+    this.env = options8.env;
+    this.logger = options8.logger;
+  }
+  start() {
+    if (this.child) {
+      return;
+    }
+    const stdin2 = process21.platform === "win32" ? "ignore" : "inherit";
+    const child = spawn3(this.command, {
+      cwd: this.cwd,
+      shell: true,
+      detached: process21.platform !== "win32",
+      env: { ...process21.env, ...this.env },
+      stdio: [stdin2, "pipe", "pipe"],
+      windowsHide: true
+    });
+    this.child = child;
+    this.setupHandlers(child);
+  }
+  onExit(listener) {
+    this.exitListeners.push(listener);
+  }
+  async stop() {
+    if (this.stopPromise) {
+      return this.stopPromise;
+    }
+    this.stopPromise = this.stopChild();
+    return this.stopPromise;
+  }
+  async stopChild() {
+    const child = this.child;
+    if (!child || child.exitCode !== null) {
+      return;
+    }
+    this.stopping = true;
+    const exited = new Promise((resolve10) => child.once("exit", () => resolve10()));
+    if (process21.platform === "win32" && child.pid) {
+      const taskkill = spawn3("taskkill", ["/pid", String(child.pid), "/T", "/F"], {
+        stdio: "ignore",
+        windowsHide: true
+      });
+      await new Promise((resolve10) => {
+        taskkill.once("exit", () => resolve10());
+        taskkill.once("error", () => resolve10());
+      });
+    } else if (child.pid) {
+      try {
+        process21.kill(-child.pid, "SIGTERM");
+      } catch {
+        child.kill();
+      }
+    }
+    await exited;
+  }
+  setupHandlers(child) {
+    child.stdout?.on("data", (data) => this.emitLines(data, "log"));
+    child.stderr?.on("data", (data) => this.emitLines(data, "error"));
+    child.on("error", (error48) => {
+      this.logger.error("Frontend dev server failed to start:", error48);
+      this.notifyExit(null);
+    });
+    child.on("exit", (code2) => {
+      if (this.stopping) {
+        return;
+      }
+      this.logger.error(`Frontend dev server exited with code ${code2}`);
+      this.notifyExit(code2);
+    });
+  }
+  notifyExit(code2) {
+    for (const listener of this.exitListeners) {
+      listener(code2);
+    }
+  }
+  emitLines(data, type) {
+    const lines = data.toString().trimEnd().split(`
+`);
+    for (const line3 of lines) {
+      if (type === "error") {
+        this.logger.error(line3);
+      } else {
+        this.logger.log(line3);
+      }
+    }
+  }
+}
+
 // src/cli/dev/dev-server/watcher.ts
 import { EventEmitter as EventEmitter4 } from "node:events";
 import { relative as relative6 } from "node:path";
@@ -257189,7 +257287,7 @@ async function createDevServer(options8) {
     port: process.env.IS_TEST === "true" ? undefined : DEFAULT_PORT
   });
   const baseUrl = `http://localhost:${port}`;
-  const { functions, entities, project: project2 } = await options8.loadResources();
+  const { functions, entities, project: project2, siteUrl } = await options8.loadResources();
   const app = import_express6.default();
   const remoteProxy = import_http_proxy_middleware2.createProxyMiddleware({
     target: BASE44_APP_URL,
@@ -257207,17 +257305,17 @@ async function createDevServer(options8) {
     }
     next();
   });
-  const devLogger = createDevLogger();
+  const devLogger = createDevLogger("backend", theme.styles.info);
   const functionManager = new FunctionManager(functions, devLogger, options8.denoWrapperPath);
   const functionRoutes = createFunctionRouter(functionManager, devLogger);
   app.use("/api/apps/:appId/functions", functionRoutes);
   if (functionManager.getFunctionNames().length > 0) {
-    options8.log.info(`Loaded functions: ${functionManager.getFunctionNames().join(", ")}`);
+    devLogger.log(`Loaded functions: ${functionManager.getFunctionNames().join(", ")}`);
   }
   const db2 = new Database;
   await db2.load(entities);
   if (db2.getCollectionNames().length > 0) {
-    options8.log.info(`Loaded entities: ${db2.getCollectionNames().join(", ")}`);
+    devLogger.log(`Loaded entities: ${db2.getCollectionNames().join(", ")}`);
   }
   let emitEntityEvent = () => {};
   const entityRoutes = await createEntityRoutes(db2, devLogger, (...args) => emitEntityEvent(...args));
@@ -257249,6 +257347,12 @@ async function createDevServer(options8) {
   const customIntegrationRoutes = createCustomIntegrationRoutes(remoteProxy, devLogger);
   app.use("/api/apps/:appId/integrations/custom", customIntegrationRoutes);
   app.use((req, res, next) => {
+    if (siteUrl && (req.path === "/login" || req.path.startsWith("/login/"))) {
+      const targetUrl = new URL(req.originalUrl, siteUrl);
+      devLogger.warn(`"${req.originalUrl}" requires hosted login, redirecting to ${targetUrl.toString()}`);
+      res.redirect(targetUrl.toString());
+      return;
+    }
     if (!req.originalUrl.endsWith("analytics/track/batch")) {
       devLogger.warn(`"${req.originalUrl}" is not supported in local development, passing call to production`);
     }
@@ -257305,59 +257409,96 @@ async function createDevServer(options8) {
     }
   });
   await base44ConfigWatcher.start();
-  const shutdown = async () => {
+  const serveCommand = project2.site?.serveCommand;
+  let serveRunner;
+  if (options8.appId && serveCommand) {
+    serveRunner = new ServeRunner({
+      command: serveCommand,
+      cwd: project2.root,
+      env: {
+        VITE_BASE44_APP_ID: options8.appId,
+        VITE_BASE44_APP_BASE_URL: baseUrl
+      },
+      logger: createDevLogger("frontend", theme.colors.base44Orange)
+    });
+  }
+  const closeServer = () => new Promise((resolve12, reject) => {
+    server.close((error48) => {
+      if (error48) {
+        reject(error48);
+        return;
+      }
+      resolve12();
+    });
+  });
+  const handleShutdownError = (error48) => {
+    const errorMessage = error48 instanceof Error ? error48.message : String(error48);
+    devLogger.error(`Failed to shut down dev server: ${errorMessage}`);
+  };
+  const runShutdown = async () => {
     base44ConfigWatcher.close();
     io6.close();
     await functionManager.stopAll();
-    server.close();
+    await serveRunner?.stop();
+    await closeServer();
+  };
+  let shutdownPromise;
+  const shutdown = () => {
+    shutdownPromise ??= runShutdown().catch(handleShutdownError);
+    return shutdownPromise;
   };
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
-  return { port, server };
+  serveRunner?.onExit(() => {
+    shutdown().finally(() => process.exit(1));
+  });
+  if (serveRunner) {
+    devLogger.log(`Backend running on ${baseUrl}`);
+    serveRunner.start();
+  }
+  return { port, server, isServingFrontend: serveRunner !== undefined };
 }
 
 // src/cli/commands/dev.ts
 function localServerUrl(port) {
   return `http://localhost:${port}`;
 }
-async function writeEnvLocalIfMissing(projectRoot, port, log) {
-  const envLocalPath = join28(projectRoot, ".env.local");
-  if (await pathExists(envLocalPath)) {
-    return;
+function validateDevOptions(command2) {
+  const { appId } = command2.optsWithGlobals();
+  if (appId !== undefined) {
+    command2.error(`base44 dev cannot be used with --app-id or ${BASE44_APP_ID_ENV_VAR}.`);
   }
-  const { id: appId } = await initAppContext();
-  await writeFile(envLocalPath, `VITE_BASE44_APP_ID=${appId}
-VITE_BASE44_APP_BASE_URL=${localServerUrl(port)}
-`);
-  log.info("Created .env.local with app ID and dev server URL");
 }
-async function devAction({ log }, options8) {
+async function devAction(ctx, options8) {
+  const { log, app } = ctx;
+  if (!app?.projectRoot) {
+    throw new ConfigInvalidError("base44 dev requires a linked local project. Run it from a project with base44/.app.jsonc.");
+  }
   const port = options8.port ? Number(options8.port) : undefined;
-  let projectRoot;
-  const { port: resolvedPort } = await createDevServer({
+  const appId = app.id;
+  const siteUrlPromise = getSiteUrl().catch(() => {
+    return;
+  });
+  const { port: resolvedPort, isServingFrontend } = await createDevServer({
     log,
     port,
-    cwd: process21.cwd(),
+    appId,
     denoWrapperPath: getDenoWrapperPath(),
     loadResources: async () => {
       const { functions, entities, project: project2 } = await readProjectConfig();
-      projectRoot = project2.root;
-      return { functions, entities, project: project2 };
+      const siteUrl = await siteUrlPromise;
+      return { functions, entities, project: project2, siteUrl };
     }
   });
-  if (projectRoot) {
-    await writeEnvLocalIfMissing(projectRoot, resolvedPort, log);
-  }
-  return {
-    outroMessage: `Dev server is available at ${theme.colors.links(localServerUrl(resolvedPort))}`
-  };
+  const outroMessage = isServingFrontend ? "Open your app using the frontend dev server URL" : `Dev server is available at ${theme.colors.links(localServerUrl(resolvedPort))}`;
+  return { outroMessage };
 }
 function getDevCommand() {
-  return new Base44Command("dev").description("Start the development server").option("-p, --port <number>", "Port for the development server").action(devAction);
+  return new Base44Command("dev").description("Start the development server").option("-p, --port <number>", "Port for the development server").hook("preAction", validateDevOptions).action(devAction);
 }
 
 // src/core/exec/run-script.ts
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn4 } from "node:child_process";
 import { copyFileSync, writeFileSync as writeFileSync2 } from "node:fs";
 async function runScript(options8) {
   const { appId, code: code2 } = options8;
@@ -257376,7 +257517,7 @@ async function runScript(options8) {
   copyFileSync(getExecWrapperPath(), tempWrapper.path);
   try {
     const exitCode = await new Promise((resolvePromise) => {
-      const child = spawn3("deno", ["run", "--allow-all", "--node-modules-dir=auto", tempWrapper.path], {
+      const child = spawn4("deno", ["run", "--allow-all", "--node-modules-dir=auto", tempWrapper.path], {
         env: {
           ...process.env,
           SCRIPT_PATH: scriptPath,
@@ -257585,7 +257726,7 @@ function createProgram(context) {
   program2.addCommand(getSiteCommand());
   program2.addCommand(getTypesCommand());
   program2.addCommand(getExecCommand());
-  program2.addCommand(getDevCommand(), { hidden: true });
+  program2.addCommand(getDevCommand());
   program2.addCommand(getLogsCommand());
   return program2;
 }
@@ -261795,7 +261936,7 @@ function addCommandInfoToErrorReporter(program2, errorReporter) {
 // src/cli/index.ts
 var __dirname4 = dirname23(fileURLToPath6(import.meta.url));
 async function runCLI(options8) {
-  ensureNpmAssets(join29(__dirname4, "../assets"));
+  ensureNpmAssets(join28(__dirname4, "../assets"));
   const errorReporter = new ErrorReporter;
   errorReporter.registerProcessErrorHandlers();
   const isNonInteractive = !process.stdin.isTTY || !process.stdout.isTTY;
@@ -261832,4 +261973,4 @@ export {
   CLIExitError
 };
 
-//# debugId=7B666BE0D75AFE4564756E2164756E21
+//# debugId=EDDC63E20F783F9364756E2164756E21