@base44-preview/cli 0.1.16-pr.634.fb8f8af → 0.1.16-pr.635.2ec10a1

package/dist/cli/index.js

@@ -119090,7 +119090,7 @@ import path52 from "path";
 import * as path42 from "path";
 import * as fs26 from "fs/promises";
 import * as path22 from "path";
-import process22 from "process";
+import process23 from "process";
 import * as path32 from "path";
 import process32 from "process";
 import path92 from "path";
@@ -119622,7 +119622,7 @@ function partition2(array2, predicate) {
   return result;
 }
 async function findInDirectory(nameOrNames, { typeCheck, cwd, allowSymlinks = true, filter: filter2 }) {
-  const directory = toAbsolutePath(cwd) ?? process22.cwd();
+  const directory = toAbsolutePath(cwd) ?? process23.cwd();
   const names = Array.isArray(nameOrNames) ? nameOrNames : [nameOrNames];
   for (const name of names) {
     const fileOrDirectory = path22.join(directory, name);
@@ -146002,10 +146002,10 @@ __export(exports_supports_color, {
   createSupportsColor: () => createSupportsColor2,
   default: () => supports_color_default2
 });
-import process21 from "node:process";
+import process24 from "node:process";
 import os9 from "node:os";
 import tty4 from "node:tty";
-function hasFlag2(flag, argv = globalThis.Deno ? globalThis.Deno.args : process21.argv) {
+function hasFlag2(flag, argv = globalThis.Deno ? globalThis.Deno.args : process24.argv) {
   const prefix = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
   const position = argv.indexOf(prefix + flag);
   const terminatorPosition = argv.indexOf("--");
@@ -146068,7 +146068,7 @@ function _supportsColor2(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
   if (env3.TERM === "dumb") {
     return min;
   }
-  if (process21.platform === "win32") {
+  if (process24.platform === "win32") {
     const osRelease = os9.release().split(".");
     if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
       return Number(osRelease[2]) >= 14931 ? 3 : 2;
@@ -146130,7 +146130,7 @@ function createSupportsColor2(stream, options = {}) {
 }
 var env3, flagForceColor2, supportsColor2, supports_color_default2;
 var init_supports_color = __esm(() => {
-  ({ env: env3 } = process21);
+  ({ env: env3 } = process24);
   if (hasFlag2("no-color") || hasFlag2("no-colors") || hasFlag2("color=false") || hasFlag2("color=never")) {
     flagForceColor2 = 0;
   } else if (hasFlag2("color") || hasFlag2("colors") || hasFlag2("color=true") || hasFlag2("color=always")) {
@@ -230705,10 +230705,11 @@ var TemplatesConfigSchema = object({
   templates: array(TemplateSchema)
 });
 var SiteConfigSchema = object({
-  buildCommand: string2().default("npm run build"),
-  serveCommand: string2().optional(),
-  outputDirectory: string2().optional(),
-  installCommand: string2().default("npm install")
+  buildCommand: string2().optional().default("npm run build"),
+  serveCommand: string2().optional().default("npm run dev"),
+  outputDirectory: string2().optional().default("./dist"),
+  installCommand: string2().optional().default("npm install"),
+  devHostFlag: string2().optional().default("--host")
 });
 var PluginMetadataSchema = object({
   namespace: string2().min(1, "Plugin namespace cannot be empty").regex(/^[a-zA-Z0-9_-]+$/, "Plugin namespace can only contain letters, numbers, underscores, and dashes")
@@ -246679,6 +246680,21 @@ async function gitHead(projectRoot) {
     return null;
   }
 }
+// src/core/site/serve-command.ts
+var NPM_RUN_COMMAND = /^npm(\s+--prefix\s+\S+)?\s+run\s+\S+$/;
+function withServeAddress(serveCommand, { host, port, hostFlag }) {
+  const args = [
+    ...host ? [hostFlag, host] : [],
+    ...port === undefined ? [] : ["--port", String(port)]
+  ];
+  if (args.length === 0 || !NPM_RUN_COMMAND.test(serveCommand.trim())) {
+    return serveCommand;
+  }
+  return `${serveCommand} -- ${args.join(" ")}`;
+}
+function forwardsServeAddress(serveCommand) {
+  return NPM_RUN_COMMAND.test(serveCommand.trim());
+}
 // src/core/project/deploy.ts
 function hasResourcesToDeploy(projectData) {
   const {
@@ -246691,7 +246707,7 @@ function hasResourcesToDeploy(projectData) {
     connectors,
     authConfig
   } = projectData;
-  const hasSite = Boolean(project.site?.outputDirectory);
+  const hasSite = project.site !== undefined;
   const hasEntities = entities.length > 0;
   const hasFunctions = functions.length > 0;
   const hasActors = actors.length > 0;
@@ -249978,6 +249994,36 @@ function printStripeResult(r, log) {
   log.info(`  Connectors dashboard: ${theme.colors.links(getConnectorsUrl())}`);
 }
 
+// src/cli/commands/project/install.ts
+async function installAction({
+  runTask
+}) {
+  const { project } = await readProjectConfig();
+  const installCommand = project.site?.installCommand;
+  if (!installCommand) {
+    throw new ConfigNotFoundError("No site install command found.", {
+      hints: [
+        {
+          message: `Add a 'site' block to your config.jsonc (e.g., "site": { "installCommand": "npm ci" }). Inside one, installCommand defaults to "npm install".`
+        }
+      ]
+    });
+  }
+  await runTask("Installing site dependencies...", () => execa({ cwd: project.root, shell: true })`${installCommand}`, {
+    successMessage: "Dependencies installed",
+    errorMessage: "Install failed"
+  });
+  return {
+    outroMessage: `Installed with ${theme.styles.bold(installCommand)}`
+  };
+}
+function getInstallCommand() {
+  return new Base44Command("install", {
+    requireAuth: false,
+    requireAppContext: false
+  }).description("Install the site's dependencies with its configured command").action(installAction);
+}
+
 // src/cli/commands/project/app-id-options.ts
 function readExplicitAppId(command) {
   const { appId } = command.optsWithGlobals();
@@ -251020,7 +251066,7 @@ async function deployTarball({ runTask }, project) {
     throw new ConfigNotFoundError("No site configuration found.", {
       hints: [
         {
-          message: `Add 'site.outputDirectory' to your config.jsonc (e.g., "site": { "outputDirectory": "dist" })`
+          message: `Add a 'site' block to your config.jsonc (e.g., "site": { "outputDirectory": "dist" }). Inside one, outputDirectory defaults to "./dist".`
         }
       ]
     });
@@ -251057,6 +251103,212 @@ function parseConcurrency(value) {
   return parsed;
 }
 
+// src/cli/dev/createDevLogger.ts
+var colorByType = {
+  error: theme.styles.error,
+  warn: theme.styles.warn,
+  log: (input) => input
+};
+var stringify = (item) => {
+  if (typeof item === "string") {
+    return item;
+  }
+  if (item instanceof Error) {
+    return item.toString();
+  }
+  try {
+    return JSON.stringify(item, null, 2) ?? String(item);
+  } catch {
+    return String(item);
+  }
+};
+function createDevLogger(label, labelColor = theme.styles.dim) {
+  const prefix = label ? `${labelColor(`[${label}]`)} ` : "";
+  const print = (type, ...args) => {
+    const colorize = colorByType[type];
+    console[type](prefix + args.map((item) => colorize(stringify(item))).join(" "));
+  };
+  return {
+    log: (...args) => print("log", ...args),
+    error: (msg, err) => {
+      print("error", msg);
+      if (err) {
+        print("error", err);
+      }
+    },
+    warn: (...args) => print("warn", ...args)
+  };
+}
+
+// src/cli/dev/dev-server/serve-runner.ts
+import { spawn as spawn2 } from "node:child_process";
+import process21 from "node:process";
+
+class ServeRunner {
+  command;
+  cwd;
+  env;
+  logger;
+  child;
+  stopping = false;
+  stopPromise;
+  exitListeners = [];
+  constructor(options) {
+    this.command = options.command;
+    this.cwd = options.cwd;
+    this.env = options.env;
+    this.logger = options.logger;
+  }
+  start() {
+    if (this.child) {
+      return;
+    }
+    const stdin = process21.platform === "win32" ? "ignore" : "inherit";
+    const child = spawn2(this.command, {
+      cwd: this.cwd,
+      shell: true,
+      detached: process21.platform !== "win32",
+      env: { ...process21.env, ...this.env },
+      stdio: [stdin, "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((resolve) => child.once("exit", () => resolve()));
+    if (process21.platform === "win32" && child.pid) {
+      const taskkill = spawn2("taskkill", ["/pid", String(child.pid), "/T", "/F"], {
+        stdio: "ignore",
+        windowsHide: true
+      });
+      await new Promise((resolve) => {
+        taskkill.once("exit", () => resolve());
+        taskkill.once("error", () => resolve());
+      });
+    } 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", (error) => {
+      this.logger.error("Frontend dev server failed to start:", error);
+      this.notifyExit(null);
+    });
+    child.on("exit", (code) => {
+      if (this.stopping) {
+        return;
+      }
+      this.logger.error(`Frontend dev server exited with code ${code}`);
+      this.notifyExit(code);
+    });
+  }
+  notifyExit(code) {
+    for (const listener of this.exitListeners) {
+      listener(code);
+    }
+  }
+  emitLines(data, type) {
+    const lines = data.toString().trimEnd().split(`
+`);
+    for (const line of lines) {
+      if (type === "error") {
+        this.logger.error(line);
+      } else {
+        this.logger.log(line);
+      }
+    }
+  }
+}
+
+// src/cli/dev/serve-command-runner.ts
+function createServeCommandRunner({
+  serveCommand,
+  projectRoot,
+  appId,
+  appBaseUrl
+}) {
+  return new ServeRunner({
+    command: serveCommand,
+    cwd: projectRoot,
+    env: {
+      VITE_BASE44_APP_ID: appId,
+      VITE_BASE44_APP_BASE_URL: appBaseUrl
+    },
+    logger: createDevLogger("frontend", theme.colors.base44Orange)
+  });
+}
+
+// src/cli/dev/stop-runner-on-signals.ts
+import process22 from "node:process";
+function stopRunnerOnProcessSignals(runner) {
+  const stop = () => void runner.stop();
+  process22.on("SIGINT", stop);
+  process22.on("SIGTERM", stop);
+}
+
+// src/cli/commands/site/dev.ts
+async function siteDevAction(ctx, options) {
+  const { app, log } = ctx;
+  if (!app) {
+    throw new InvalidInputError("No app id resolved for this project.");
+  }
+  const port = options.port === undefined ? undefined : Number(options.port);
+  if (port !== undefined && !Number.isInteger(port)) {
+    throw new InvalidInputError(`--port must be a whole number: ${options.port}`);
+  }
+  const { project } = await readProjectConfig(app.projectRoot);
+  const site = project.site;
+  if (!site) {
+    throw new InvalidInputError(`This project has no 'site' block in base44/config.jsonc, so there is no frontend to serve. Add one; inside it serveCommand defaults to "npm run dev".`);
+  }
+  const command = withServeAddress(site.serveCommand, {
+    host: options.host,
+    port,
+    hostFlag: site.devHostFlag
+  });
+  if ((options.host || port !== undefined) && !forwardsServeAddress(site.serveCommand)) {
+    log.warn(`serveCommand '${site.serveCommand}' is not an 'npm run' invocation, so --host/--port were not passed to it. Put the address in serveCommand itself.`);
+  }
+  const runner = createServeCommandRunner({
+    serveCommand: command,
+    projectRoot: project.root,
+    appId: app.id,
+    appBaseUrl: options.backendUrl
+  });
+  stopRunnerOnProcessSignals(runner);
+  runner.onExit((code) => process.exit(code ?? 1));
+  runner.start();
+  return {
+    outroMessage: `Frontend dev server running '${command}' against ${theme.styles.bold(options.backendUrl)}`
+  };
+}
+function getSiteDevCommand() {
+  return new Base44Command("dev", { requireAuth: false }).description("Run the site's dev server against a given backend (no local backend)").requiredOption("--backend-url <url>", "Backend the frontend should call, injected as VITE_BASE44_APP_BASE_URL").option("--host <address>", "Address to bind, e.g. 0.0.0.0").option("--port <number>", "Port to bind").action(siteDevAction);
+}
+
 // src/cli/commands/site/open.ts
 async function openAction({
   isNonInteractive
@@ -251073,7 +251325,7 @@ function getSiteOpenCommand() {
 
 // src/cli/commands/site/index.ts
 function getSiteCommand() {
-  return new Command2("site").description("Manage app site (frontend app)").addCommand(getSiteDeployCommand()).addCommand(getSiteOpenCommand());
+  return new Command2("site").description("Manage app site (frontend app)").addCommand(getSiteDeployCommand()).addCommand(getSiteDevCommand()).addCommand(getSiteOpenCommand());
 }
 
 // src/core/types/generator.ts
@@ -251593,43 +251845,6 @@ function getWorkspaceCommand() {
   return new Command2("workspace").description("List workspaces, inspect one, and move apps between them").addCommand(getWorkspaceListCommand()).addCommand(getWorkspaceGetCommand()).addCommand(getWorkspaceMoveCommand());
 }
 
-// src/cli/dev/createDevLogger.ts
-var colorByType = {
-  error: theme.styles.error,
-  warn: theme.styles.warn,
-  log: (input) => input
-};
-var stringify = (item) => {
-  if (typeof item === "string") {
-    return item;
-  }
-  if (item instanceof Error) {
-    return item.toString();
-  }
-  try {
-    return JSON.stringify(item, null, 2) ?? String(item);
-  } catch {
-    return String(item);
-  }
-};
-function createDevLogger(label, labelColor = theme.styles.dim) {
-  const prefix = label ? `${labelColor(`[${label}]`)} ` : "";
-  const print = (type, ...args) => {
-    const colorize = colorByType[type];
-    console[type](prefix + args.map((item) => colorize(stringify(item))).join(" "));
-  };
-  return {
-    log: (...args) => print("log", ...args),
-    error: (msg, err) => {
-      print("error", msg);
-      if (err) {
-        print("error", err);
-      }
-    },
-    warn: (...args) => print("warn", ...args)
-  };
-}
-
 // src/cli/dev/dev-server/main.ts
 var import_cors = __toESM(require_lib4(), 1);
 var import_express6 = __toESM(require_express(), 1);
@@ -251762,7 +251977,7 @@ var $dir = async (options) => dirWithOptions(options);
 var $tmpName = promisify11(tmp.tmpName);
 
 // src/cli/dev/dev-server/function-manager.ts
-import { spawn as spawn2 } from "node:child_process";
+import { spawn as spawn3 } from "node:child_process";
 import { dirname as dirname23, join as join31 } from "node:path";
 import { pathToFileURL } from "node:url";
 
@@ -251860,7 +252075,7 @@ class FunctionManager extends BaseFunctionManager {
   async stopFunction(_name, { process: proc }) {
     const exited = new Promise((r) => proc.once("exit", () => r()));
     if (process.platform === "win32" && proc.pid) {
-      spawn2("taskkill", ["/pid", String(proc.pid), "/T", "/F"]);
+      spawn3("taskkill", ["/pid", String(proc.pid), "/T", "/F"]);
     } else {
       proc.kill();
     }
@@ -251869,7 +252084,7 @@ class FunctionManager extends BaseFunctionManager {
   spawnFunction(func, port) {
     this.logger.log(`Spawning function "${func.name}" on port ${port}`);
     const importMapPath = join31(dirname23(this.wrapperPath), "import-map.json");
-    const process2 = spawn2("deno", ["run", "--allow-all", "--import-map", importMapPath, this.wrapperPath], {
+    const process2 = spawn3("deno", ["run", "--allow-all", "--import-map", importMapPath, this.wrapperPath], {
       env: {
         ...globalThis.process.env,
         FUNCTION_PATH: pathToFileURL(func.entryPath).href,
@@ -255399,127 +255614,6 @@ async function createDevServer(options) {
   return { port, server, shutdown };
 }
 
-// src/cli/dev/dev-server/serve-runner.ts
-import { spawn as spawn3 } from "node:child_process";
-import process23 from "node:process";
-
-class ServeRunner {
-  command;
-  cwd;
-  env;
-  logger;
-  child;
-  stopping = false;
-  stopPromise;
-  exitListeners = [];
-  constructor(options) {
-    this.command = options.command;
-    this.cwd = options.cwd;
-    this.env = options.env;
-    this.logger = options.logger;
-  }
-  start() {
-    if (this.child) {
-      return;
-    }
-    const stdin = process23.platform === "win32" ? "ignore" : "inherit";
-    const child = spawn3(this.command, {
-      cwd: this.cwd,
-      shell: true,
-      detached: process23.platform !== "win32",
-      env: { ...process23.env, ...this.env },
-      stdio: [stdin, "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((resolve) => child.once("exit", () => resolve()));
-    if (process23.platform === "win32" && child.pid) {
-      const taskkill = spawn3("taskkill", ["/pid", String(child.pid), "/T", "/F"], {
-        stdio: "ignore",
-        windowsHide: true
-      });
-      await new Promise((resolve) => {
-        taskkill.once("exit", () => resolve());
-        taskkill.once("error", () => resolve());
-      });
-    } else if (child.pid) {
-      try {
-        process23.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", (error) => {
-      this.logger.error("Frontend dev server failed to start:", error);
-      this.notifyExit(null);
-    });
-    child.on("exit", (code) => {
-      if (this.stopping) {
-        return;
-      }
-      this.logger.error(`Frontend dev server exited with code ${code}`);
-      this.notifyExit(code);
-    });
-  }
-  notifyExit(code) {
-    for (const listener of this.exitListeners) {
-      listener(code);
-    }
-  }
-  emitLines(data, type) {
-    const lines = data.toString().trimEnd().split(`
-`);
-    for (const line of lines) {
-      if (type === "error") {
-        this.logger.error(line);
-      } else {
-        this.logger.log(line);
-      }
-    }
-  }
-}
-
-// src/cli/dev/serve-command-runner.ts
-function createServeCommandRunner({
-  serveCommand,
-  projectRoot,
-  appId,
-  appBaseUrl
-}) {
-  return new ServeRunner({
-    command: serveCommand,
-    cwd: projectRoot,
-    env: {
-      VITE_BASE44_APP_ID: appId,
-      VITE_BASE44_APP_BASE_URL: appBaseUrl
-    },
-    logger: createDevLogger("frontend", theme.colors.base44Orange)
-  });
-}
-
 // src/cli/commands/dev.ts
 function localServerUrl(port) {
   return `http://localhost:${port}`;
@@ -255545,11 +255639,6 @@ async function resolveConfiguredSite(app) {
   const serveCommand = project.site?.serveCommand;
   return serveCommand ? { serveCommand, projectRoot: project.root } : undefined;
 }
-function stopRunnerOnProcessSignals(runner) {
-  const stop = () => void runner.stop();
-  process.on("SIGINT", stop);
-  process.on("SIGTERM", stop);
-}
 function startServeCommand(runner, backend) {
   stopRunnerOnProcessSignals(runner);
   runner.onExit(() => {
@@ -255561,7 +255650,7 @@ function startServeCommand(runner, backend) {
 async function remoteDevAction(app) {
   const site = await resolveConfiguredSite(app);
   if (!site) {
-    throw new ConfigInvalidError("base44 dev --remote serves the frontend against the production backend, but this project has no site.serveCommand in base44/config.jsonc.");
+    throw new ConfigInvalidError(`base44 dev --remote serves the frontend against the production backend, but this project has no 'site' block in base44/config.jsonc. Add one; inside it serveCommand defaults to "npm run dev".`);
   }
   const appBaseUrl = await getSiteUrl();
   const runner = createServeCommandRunner({
@@ -255812,16 +255901,17 @@ async function eject(ctx, options, command) {
     errorMessage: "Failed to pull project"
   });
   const { project } = await readProjectConfig(resolvedPath);
-  const site = project.site;
-  if (site?.outputDirectory) {
+  const installCommand = project.site?.installCommand;
+  const buildCommand = project.site?.buildCommand;
+  if (installCommand && buildCommand) {
     const shouldDeploy = options.yes ? true : await Re({
       message: "Would you like to deploy your project now?"
     });
     if (!Ct(shouldDeploy) && shouldDeploy) {
       await runTask("Installing dependencies...", async (updateMessage) => {
-        await execa({ cwd: resolvedPath, shell: true })`${site.installCommand}`;
+        await execa({ cwd: resolvedPath, shell: true })`${installCommand}`;
         updateMessage("Building project...");
-        await execa({ cwd: resolvedPath, shell: true })`${site.buildCommand}`;
+        await execa({ cwd: resolvedPath, shell: true })`${buildCommand}`;
       }, {
         successMessage: theme.colors.base44Orange("Project built successfully"),
         errorMessage: "Failed to build project"
@@ -255859,6 +255949,7 @@ function createProgram(context) {
   program.addCommand(getCreateCommand());
   program.addCommand(getScaffoldCommand());
   program.addCommand(getDashboardCommand());
+  program.addCommand(getInstallCommand());
   program.addCommand(getBuildCommand());
   program.addCommand(getDeployCommand3());
   program.addCommand(getVisibilityCommand());
@@ -259928,4 +260019,4 @@ export {
   runCLI
 };
 
-//# debugId=95E7F84ABD7A887164756E2164756E21
+//# debugId=26F032DEEC9B5A8664756E2164756E21