@base44-preview/cli 0.1.16-pr.635.0ca7e05 → 0.1.16-pr.635.2ec10a1

package/dist/cli/index.js

@@ -230705,11 +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"),
-  devHostFlag: string2().optional()
+  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")
@@ -246681,40 +246681,19 @@ async function gitHead(projectRoot) {
   }
 }
 // src/core/site/serve-command.ts
-var DEFAULT_SERVE_COMMAND = "npm run dev";
-var DEFAULT_HOST_FLAG = "--host";
-var SCRIPT = "[A-Za-z0-9:_.-]+";
-var PREFIX2 = "[A-Za-z0-9._/-]+";
-var SCRIPT_RUNNERS = [
-  {
-    pattern: new RegExp(String.raw`^npm(\s+--prefix\s+${PREFIX2})?\s+run\s+${SCRIPT}$`),
-    separator: " -- "
-  },
-  {
-    pattern: new RegExp(String.raw`^(?:pnpm|yarn|bun)(\s+run)?\s+${SCRIPT}$`),
-    separator: " "
-  }
-];
-function runnerFor(serveCommand) {
-  return SCRIPT_RUNNERS.find((runner) => runner.pattern.test(serveCommand));
-}
+var NPM_RUN_COMMAND = /^npm(\s+--prefix\s+\S+)?\s+run\s+\S+$/;
 function withServeAddress(serveCommand, { host, port, hostFlag }) {
-  const command = serveCommand.trim();
   const args = [
-    ...host ? [hostFlag ?? DEFAULT_HOST_FLAG, host] : [],
+    ...host ? [hostFlag, host] : [],
     ...port === undefined ? [] : ["--port", String(port)]
   ];
-  if (args.length === 0) {
-    return { command, droppedAddress: false };
+  if (args.length === 0 || !NPM_RUN_COMMAND.test(serveCommand.trim())) {
+    return serveCommand;
   }
-  const runner = runnerFor(command);
-  if (!runner) {
-    return { command, droppedAddress: true };
-  }
-  return {
-    command: `${command}${runner.separator}${args.join(" ")}`,
-    droppedAddress: false
-  };
+  return `${serveCommand} -- ${args.join(" ")}`;
+}
+function forwardsServeAddress(serveCommand) {
+  return NPM_RUN_COMMAND.test(serveCommand.trim());
 }
 // src/core/project/deploy.ts
 function hasResourcesToDeploy(projectData) {
@@ -246728,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;
@@ -249618,7 +249597,7 @@ async function buildAction(ctx) {
   };
 }
 function getBuildCommand() {
-  return new Base44Command("build", { requireAuth: false }).description("Build the site with the Base44 app id injected").action(buildAction);
+  return new Base44Command("build").description("Build the site with the Base44 app id injected").action(buildAction);
 }
 
 // src/cli/commands/project/create.ts
@@ -251087,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".`
         }
       ]
     });
@@ -251276,7 +251255,7 @@ function createServeCommandRunner({
     cwd: projectRoot,
     env: {
       VITE_BASE44_APP_ID: appId,
-      ...appBaseUrl ? { VITE_BASE44_APP_BASE_URL: appBaseUrl } : {}
+      VITE_BASE44_APP_BASE_URL: appBaseUrl
     },
     logger: createDevLogger("frontend", theme.colors.base44Orange)
   });
@@ -251291,34 +251270,27 @@ function stopRunnerOnProcessSignals(runner) {
 }
 
 // src/cli/commands/site/dev.ts
-function parsePort(value) {
-  if (!/^\d+$/.test(value)) {
-    throw new InvalidArgumentError2("must be a whole number");
-  }
-  const port = Number(value);
-  if (port < 1 || port > 65535) {
-    throw new InvalidArgumentError2("must be between 1 and 65535");
-  }
-  return port;
-}
 async function siteDevAction(ctx, options) {
-  const { app } = ctx;
-  if (!app?.projectRoot) {
-    throw new ConfigInvalidError("base44 site dev requires a linked local project. Run it from a project with base44/.app.jsonc.");
+  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 naming its serveCommand; site dev falls back to "npm run dev".`);
+    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 serveCommand = site.serveCommand ?? DEFAULT_SERVE_COMMAND;
-  const { command, droppedAddress } = withServeAddress(serveCommand, {
+  const command = withServeAddress(site.serveCommand, {
     host: options.host,
-    port: options.port,
+    port,
     hostFlag: site.devHostFlag
   });
-  if (droppedAddress) {
-    throw new InvalidInputError(`serveCommand '${serveCommand}' takes no forwarded arguments, so --host/--port cannot be passed to it. Put the address in serveCommand itself, or use an 'npm run', 'pnpm', 'yarn' or 'bun run' script.`);
+  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,
@@ -251330,11 +251302,11 @@ async function siteDevAction(ctx, options) {
   runner.onExit((code) => process.exit(code ?? 1));
   runner.start();
   return {
-    outroMessage: options.backendUrl ? `Frontend dev server running '${command}' against ${theme.styles.bold(options.backendUrl)}` : `Frontend dev server running '${command}'`
+    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)").option("--backend-url <url>", "Backend the frontend should call, injected as VITE_BASE44_APP_BASE_URL. Omit for a frontend that reaches its backend same-origin.").option("--host <address>", "Address to bind, e.g. 0.0.0.0").option("--port <number>", "Port to bind", parsePort).action(siteDevAction);
+  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
@@ -255678,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({
@@ -255780,7 +255752,7 @@ function readStdin2() {
     process.stdin.on("error", reject);
   });
 }
-function parsePort2(value) {
+function parsePort(value) {
   const port = Number(value);
   if (!Number.isInteger(port) || port <= 0 || port > 65535) {
     throw new InvalidInputError(`Invalid --port value: "${value}".`, {
@@ -255817,7 +255789,7 @@ async function execAction({ app, isNonInteractive }, options) {
   if (!code.trim()) {
     throw noInputError;
   }
-  const local = options.local ? await resolveLocalTarget(options.port !== undefined ? parsePort2(options.port) : DEFAULT_DEV_SERVER_PORT) : undefined;
+  const local = options.local ? await resolveLocalTarget(options.port !== undefined ? parsePort(options.port) : DEFAULT_DEV_SERVER_PORT) : undefined;
   const { exitCode } = await runScript({
     appId: app.id,
     code,
@@ -255929,22 +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"
@@ -260052,4 +260019,4 @@ export {
   runCLI
 };
 
-//# debugId=641CFB9F676DAC6564756E2164756E21
+//# debugId=26F032DEEC9B5A8664756E2164756E21