@base44-preview/cli 0.1.31-pr.657.7711db6 → 0.1.32-pr.643.d9f6a73

package/dist/cli/index.js

@@ -221164,6 +221164,34 @@ var require_dist5 = __commonJS(function(exports, module) {
   }
 });
 
+// ../../node_modules/commander/index.js
+var exports_commander = {};
+__exportCjs(exports_commander, {
+  program: () => $program,
+  createCommand: () => $createCommand,
+  createOption: () => $createOption,
+  createArgument: () => $createArgument,
+  Command: () => $Command,
+  Option: () => $Option,
+  Argument: () => $Argument,
+  Help: () => $Help,
+  CommanderError: () => $CommanderError,
+  InvalidArgumentError: () => $InvalidArgumentError,
+  InvalidOptionArgumentError: () => $InvalidOptionArgumentError
+}, {
+  program: (value) => $program = value,
+  createCommand: (value) => $createCommand = value,
+  createOption: (value) => $createOption = value,
+  createArgument: (value) => $createArgument = value,
+  Command: (value) => $Command = value,
+  Option: (value) => $Option = value,
+  Argument: (value) => $Argument = value,
+  Help: (value) => $Help = value,
+  CommanderError: (value) => $CommanderError = value,
+  InvalidArgumentError: (value) => $InvalidArgumentError = value,
+  InvalidOptionArgumentError: (value) => $InvalidOptionArgumentError = value
+});
+
 // src/core/utils/env.ts
 var import_dotenv = __toESM(require_main(), 1);
 import { basename, dirname as dirname3, join } from "node:path";
@@ -229878,32 +229906,6 @@ class SimpleLogger {
   }
 }
 // ../../node_modules/commander/index.js
-var exports_commander = {};
-__exportCjs(exports_commander, {
-  program: () => $program,
-  createCommand: () => $createCommand,
-  createOption: () => $createOption,
-  createArgument: () => $createArgument,
-  Command: () => $Command,
-  Option: () => $Option,
-  Argument: () => $Argument,
-  Help: () => $Help,
-  CommanderError: () => $CommanderError,
-  InvalidArgumentError: () => $InvalidArgumentError,
-  InvalidOptionArgumentError: () => $InvalidOptionArgumentError
-}, {
-  program: (value) => $program = value,
-  createCommand: (value) => $createCommand = value,
-  createOption: (value) => $createOption = value,
-  createArgument: (value) => $createArgument = value,
-  Command: (value) => $Command = value,
-  Option: (value) => $Option = value,
-  Argument: (value) => $Argument = value,
-  Help: (value) => $Help = value,
-  CommanderError: (value) => $CommanderError = value,
-  InvalidArgumentError: (value) => $InvalidArgumentError = value,
-  InvalidOptionArgumentError: (value) => $InvalidOptionArgumentError = value
-});
 var { Argument } = require_argument();
 var { Command } = require_command();
 var { CommanderError, InvalidArgumentError } = require_error2();
@@ -236596,6 +236598,15 @@ var FinalizeDeploymentResponseSchema = object({
 }).transform((data) => ({
   deploymentId: data.deployment_id
 }));
+var PublishDeploymentResponseSchema = object({
+  git_hash: string2(),
+  deployed_at: string2(),
+  app_url: string2()
+}).transform((data) => ({
+  gitHash: data.git_hash,
+  deployedAt: data.deployed_at,
+  appUrl: data.app_url
+}));
 
 // src/core/project/api.ts
 var PUBLIC_SETTINGS = {
@@ -239374,7 +239385,7 @@ import { join as join13 } from "node:path";
 // package.json
 var package_default = {
   name: "base44",
-  version: "0.1.31",
+  version: "0.1.32",
   description: "Base44 CLI - Unified interface for managing Base44 applications",
   type: "module",
   bin: {
@@ -239678,6 +239689,22 @@ async function finalizeDeployment(deploymentId, sessionId, payload) {
   }
   return result.data;
 }
+async function publishDeployment(gitHash) {
+  const appClient = getAppClient();
+  let response;
+  try {
+    response = await appClient.post(`deployments/${gitHash}/publish`, {
+      timeout: 120000
+    });
+  } catch (error) {
+    throw await ApiError.fromHttpError(error, "publishing deployment");
+  }
+  const result = PublishDeploymentResponseSchema.safeParse(await response.json());
+  if (!result.success) {
+    throw new SchemaValidationError("Invalid response from server", result.error);
+  }
+  return result.data;
+}
 // src/core/site/config.ts
 async function getSiteFilePaths(outputDir) {
   return await globby("**/*", {
@@ -240261,11 +240288,6 @@ async function putPresignedBody(upload, body) {
 
 // src/core/site/deployment.ts
 var NO_ASSETS = { manifest: {}, filesByHash: new Map };
-var DEPLOYMENTS_API_ENV = "BASE44_DEPLOYMENTS_API";
-function deploymentsApiEnabled(env = process.env) {
-  const value = env[DEPLOYMENTS_API_ENV];
-  return value === "1" || value === "true";
-}
 async function deployToDeployments(options) {
   const { projectRoot, outputDir, gitHash, concurrency, progress } = options;
   const worker = await resolveWorkerBuild(projectRoot, progress);
@@ -246871,7 +246893,7 @@ async function gitHead(projectRoot) {
   }
 }
 // src/core/project/deploy.ts
-function hasResourcesToDeploy(projectData) {
+async function hasResourcesToDeploy(projectData) {
   const {
     project,
     entities,
@@ -246882,7 +246904,7 @@ function hasResourcesToDeploy(projectData) {
     connectors,
     authConfig
   } = projectData;
-  const hasSite = Boolean(project.site?.outputDirectory);
+  const hasSite = Boolean(project.site?.outputDirectory) || Boolean(await detectFullStackArtifact(project.root));
   const hasEntities = entities.length > 0;
   const hasFunctions = functions.length > 0;
   const hasActors = actors.length > 0;
@@ -246941,12 +246963,59 @@ async function deployAll(projectData, options) {
   await authConfigResource.push(authConfig);
   const skipConnectorSync = connectors.length === 0 && hasWorkspaceApiKeyAuth();
   const connectorResults = skipConnectorSync ? [] : (await pushConnectors(connectors)).results;
-  if (project.site?.outputDirectory) {
-    const outputDir = resolve5(project.root, project.site.outputDirectory);
+  const appUrl = await deployProjectSite(project, options);
+  return appUrl ? { appUrl, connectorResults } : { connectorResults };
+}
+async function deployProjectSite(project, options) {
+  const outputDirectory = project.site?.outputDirectory;
+  const outputDir = outputDirectory ? resolve5(project.root, outputDirectory) : null;
+  if (!outputDir) {
+    if (!await detectFullStackArtifact(project.root)) {
+      return;
+    }
+    const gitHash = await resolveGitHash(project.root, options?.gitHash);
+    return shipCommit(project.root, null, gitHash, options);
+  }
+  const gitHash = await resolveGitHash(project.root, options?.gitHash).catch(() => {
+    return;
+  });
+  if (!gitHash) {
+    options?.onSiteProgress?.("No commit found for this build, so it was deployed without one. Commit your work to address deployments by it.");
     const { appUrl } = await deploySite(outputDir);
-    return { appUrl, connectorResults };
+    return appUrl;
+  }
+  return shipCommit(project.root, outputDir, gitHash, options);
+}
+async function shipCommit(projectRoot, outputDir, gitHash, options) {
+  await deployToDeployments({
+    projectRoot,
+    outputDir,
+    gitHash,
+    progress: {
+      onWarning: (message) => options?.onSiteProgress?.(message),
+      onAssets: ({ totalAssets, newAssets }) => options?.onSiteProgress?.(`Found ${totalAssets} static assets (${newAssets} new)`)
+    }
+  });
+  if (options?.publish === false) {
+    return;
+  }
+  try {
+    const { appUrl } = await publishDeployment(gitHash);
+    return appUrl;
+  } catch (error) {
+    if (!publishesFromBuilder(error)) {
+      throw error;
+    }
+    options?.onSiteProgress?.("Site deployed. This app is published from the Base44 builder, so production was left where it was.");
+    return;
   }
-  return { connectorResults };
+}
+function publishesFromBuilder(error) {
+  if (!(error instanceof ApiError)) {
+    return false;
+  }
+  const body = error.responseBody;
+  return body?.extra_data?.code === "app_publishes_from_builder";
 }
 // src/core/project/target.ts
 import { dirname as dirname13, join as join19, resolve as resolve6 } from "node:path";
@@ -250078,7 +250147,7 @@ async function deployAction(ctx, options = {}) {
     throw new InvalidInputError("--yes is required in non-interactive mode");
   }
   const projectData = await readProjectConfig(options.projectRoot);
-  if (!hasResourcesToDeploy(projectData)) {
+  if (!await hasResourcesToDeploy(projectData)) {
     return {
       outroMessage: "No resources found to deploy"
     };
@@ -250137,6 +250206,11 @@ ${summaryLines.join(`
   const functionTotal = functions.length;
   let actorCompleted = 0;
   const result = await deployAll(projectData, {
+    gitHash: options.gitHash,
+    publish: options.publish,
+    onSiteProgress: (message) => {
+      log.message(theme.styles.dim(message));
+    },
     onVisibilitySet: (level) => {
       log.success(`App visibility set to ${level}`);
     },
@@ -250172,7 +250246,7 @@ ${summaryLines.join(`
   return { outroMessage: "App deployed successfully" };
 }
 function getDeployCommand3() {
-  return new Base44Command("deploy").description("Deploy all project resources (entities, functions, actors, agents, connectors, and site)").option("-y, --yes", "Skip confirmation prompt").option("--build", "Build the site before deploying (skips the prompt)").option("--no-build", "Deploy without building (skips the prompt)").action(deployAction);
+  return new Base44Command("deploy").description("Deploy all project resources (entities, functions, actors, agents, connectors, and site)").option("-y, --yes", "Skip confirmation prompt").option("--build", "Build the site before deploying (skips the prompt)").option("--no-build", "Deploy without building (skips the prompt)").option("--no-publish", "Deploy the site without serving it in production yet").addOption(new Option2("--git-hash <hash>", "Commit the built site came from (defaults to the checkout's HEAD)").argParser(parseGitHash)).action(deployAction);
 }
 async function handleOAuthConnectors(connectorResults, isNonInteractive, options, log) {
   const needsOAuth = filterPendingOAuth(connectorResults);
@@ -250193,6 +250267,12 @@ function printStripeResult(r, log) {
   }
   log.info(`  Connectors dashboard: ${theme.colors.links(getConnectorsUrl())}`);
 }
+function parseGitHash(value) {
+  if (!isGitCommitHash(value)) {
+    throw new InvalidArgumentError2("Expected a git commit hash (7-64 hex chars).");
+  }
+  return value;
+}
 
 // src/cli/commands/project/app-id-options.ts
 function readExplicitAppId(command) {
@@ -262074,17 +262154,18 @@ async function deployAction2(ctx, options) {
       return { outroMessage: "Deployment cancelled" };
     }
   }
-  return deploymentsApiEnabled() ? await deployToDeploymentsApi(ctx, project, options) : await deployTarball(ctx, project);
+  return deployToDeploymentsApi(ctx, project, options);
 }
 async function deployToDeploymentsApi(ctx, project, options) {
   const { runTask, log, jsonMode } = ctx;
   const projectRoot = project.root;
+  const outputDir = siteOutputDir(project);
   const gitHash = await resolveGitHash(projectRoot, options.gitHash);
   const progressLines = [];
   const warnings = [];
   const { deploymentId } = await runTask("Deploying site...", async (updateMessage) => await deployToDeployments({
     projectRoot,
-    outputDir: siteOutputDir(project),
+    outputDir,
     gitHash,
     concurrency: options.concurrency,
     progress: {
@@ -262110,33 +262191,24 @@ async function deployToDeploymentsApi(ctx, project, options) {
   for (const warning of warnings) {
     log.warn(warning);
   }
+  const published = options.publish ? await runTask("Publishing site...", async () => await publishDeployment(gitHash), { successMessage: "Site published", errorMessage: "Publish failed" }) : undefined;
+  if (published) {
+    log.message(`${theme.styles.header("App URL")}: ${theme.colors.links(published.appUrl)}`);
+  }
   return {
     outroMessage: `Deployment ${deploymentId} (commit ${gitHash.slice(0, 12)})`,
-    stdout: jsonMode ? `${JSON.stringify({ deploymentId, gitHash }, null, 2)}
+    stdout: jsonMode ? `${JSON.stringify({ deploymentId, gitHash, published: Boolean(published) }, null, 2)}
 ` : undefined
   };
 }
-async function deployTarball({ runTask }, project) {
-  const outputDir = siteOutputDir(project);
-  const { appUrl } = await runTask("Creating archive and deploying site...", async () => await deploySite(outputDir), {
-    successMessage: "Site deployed successfully",
-    errorMessage: "Deployment failed"
-  });
-  return { outroMessage: `Visit your site at: ${appUrl}` };
-}
 function siteOutputDir(project) {
   const { outputDirectory = DEFAULT_SITE.outputDirectory } = siteOrDefault(project);
   return resolve15(project.root, outputDirectory);
 }
 function getSiteDeployCommand() {
-  const command = new Base44Command("deploy").description("Deploy built site files to Base44 hosting").option("-y, --yes", "Skip confirmation prompt").option("--build", "Build the site before deploying (skips the prompt)").option("--no-build", "Deploy without building (skips the prompt)");
-  if (deploymentsApiEnabled()) {
-    command.addOption(new Option2("--git-hash <hash>", "Commit the build came from (defaults to the checkout's HEAD)").argParser(parseGitHash));
-    command.addOption(new Option2("--concurrency <n>", "Parallel asset uploads").default(DEFAULT_UPLOAD_CONCURRENCY).argParser(parseConcurrency));
-  }
-  return command.action(deployAction2);
+  return new Base44Command("deploy").description("Deploy built site files to Base44 hosting").option("-y, --yes", "Skip confirmation prompt").option("--build", "Build the site before deploying (skips the prompt)").option("--no-build", "Deploy without building (skips the prompt)").option("--publish", "Serve this build in production once it is deployed").addOption(new Option2("--git-hash <hash>", "Commit the build came from (defaults to the checkout's HEAD)").argParser(parseGitHash2)).addOption(new Option2("--concurrency <n>", "Parallel asset uploads").default(DEFAULT_UPLOAD_CONCURRENCY).argParser(parseConcurrency)).action(deployAction2);
 }
-function parseGitHash(value) {
+function parseGitHash2(value) {
   if (!isGitCommitHash(value)) {
     throw new InvalidArgumentError2("Expected a git commit hash (7-64 hex chars).");
   }
@@ -271284,4 +271356,4 @@ export {
   runCLI
 };
 
-//# debugId=7FB565796F6FC1AA64756E2164756E21
+//# debugId=67AAB05EA687C35164756E2164756E21