@base44-preview/cli 0.1.33-pr.643.5285041 → 0.1.33-pr.643.706636f

package/dist/cli/index.js

@@ -246850,22 +246850,21 @@ function isGitCommitHash(value) {
 }
 
 // src/core/site/git-hash.ts
-async function resolveGitHash(projectRoot, explicit) {
-  const hash = explicit ?? await gitHead(projectRoot);
-  if (!hash || !isGitCommitHash(hash)) {
-    throw new InvalidInputError(explicit ? `'${explicit}' is not a git commit hash.` : "Deployments are addressed by the commit that produced the build, and no git commit was found.", {
-      hints: [
-        {
-          message: "Run the deploy from a git checkout, or pass the commit explicitly with --git-hash."
-        }
-      ]
-    });
-  }
-  return hash;
+function workerBuildNeedsGitHashError() {
+  return new InvalidInputError("A full-stack build deploys by the commit that produced it, and none was given.", {
+    hints: [
+      {
+        message: "Pass it with --git-hash, e.g. --git-hash $(git rev-parse HEAD)."
+      }
+    ]
+  });
 }
 async function resolveProvenanceCommit(projectRoot, explicit) {
   if (explicit) {
-    return await resolveGitHash(projectRoot, explicit);
+    if (!isGitCommitHash(explicit)) {
+      throw new InvalidInputError(`'${explicit}' is not a git commit hash.`);
+    }
+    return explicit;
   }
   const hash = await gitHead(projectRoot);
   return hash && isGitCommitHash(hash) ? hash : undefined;
@@ -246914,6 +246913,9 @@ async function deployAll(projectData, options) {
     connectors,
     authConfig
   } = projectData;
+  if (!options?.gitHash && await detectFullStackArtifact(project.root)) {
+    throw workerBuildNeedsGitHashError();
+  }
   await setAppVisibility(project.visibility);
   if (project.visibility) {
     options?.onVisibilitySet?.(project.visibility);
@@ -246957,22 +246959,15 @@ async function deployAll(projectData, options) {
 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 = options?.gitHash;
+  if (gitHash && (outputDir || await detectFullStackArtifact(project.root))) {
+    return shipCommit(project.root, outputDir, gitHash, options);
   }
-  const gitHash = await resolveGitHash(project.root, options?.gitHash).catch(() => {
+  if (!outputDir) {
     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;
   }
-  return shipCommit(project.root, outputDir, gitHash, options);
+  const { appUrl } = await deploySite(outputDir);
+  return appUrl;
 }
 async function shipCommit(projectRoot, outputDir, gitHash, options) {
   await deployToDeployments({
@@ -246984,9 +246979,6 @@ async function shipCommit(projectRoot, outputDir, gitHash, options) {
       onAssets: ({ totalAssets, newAssets }) => options?.onSiteProgress?.(`Found ${totalAssets} static assets (${newAssets} new)`)
     }
   });
-  if (options?.publish === false) {
-    return;
-  }
   try {
     const { appUrl } = await publishDeployment(gitHash);
     return appUrl;
@@ -252063,7 +252055,6 @@ ${summaryLines.join(`
   let actorCompleted = 0;
   const result = await deployAll(projectData, {
     gitHash: options.gitHash,
-    publish: options.publish,
     onSiteProgress: (message) => {
       log.message(theme.styles.dim(message));
     },
@@ -252102,7 +252093,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)").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);
+  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)").addOption(new Option2("--git-hash <hash>", "Deploy by the commit the build came from, through the deployments API").argParser(parseGitHash)).action(deployAction);
 }
 async function handleOAuthConnectors(connectorResults, isNonInteractive, options, log) {
   const needsOAuth = filterPendingOAuth(connectorResults);
@@ -264805,7 +264796,13 @@ 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 gitHash = options.gitHash;
+  if (!gitHash) {
+    if (await detectFullStackArtifact(projectRoot)) {
+      throw workerBuildNeedsGitHashError();
+    }
+    return deployArchive(ctx, outputDir);
+  }
   const progressLines = [];
   const warnings = [];
   const { deploymentId } = await runTask("Deploying site...", async (updateMessage) => await deployToDeployments({
@@ -264839,6 +264836,8 @@ async function deployToDeploymentsApi(ctx, project, options) {
   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)}`);
+  } else {
+    log.info("Not published: production still serves its previous build. Run again with --publish to serve this one.");
   }
   return {
     outroMessage: `Deployment ${deploymentId} (commit ${gitHash.slice(0, 12)})`,
@@ -264846,12 +264845,23 @@ async function deployToDeploymentsApi(ctx, project, options) {
 ` : undefined
   };
 }
+async function deployArchive({ runTask, jsonMode }, outputDir) {
+  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}`,
+    stdout: jsonMode ? `${JSON.stringify({ appUrl, published: true }, null, 2)}
+` : undefined
+  };
+}
 function siteOutputDir(project) {
   const { outputDirectory = DEFAULT_SITE.outputDirectory } = siteOrDefault(project);
   return resolve16(project.root, outputDirectory);
 }
 function getSiteDeployCommand() {
-  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(parseGitHash)).addOption(new Option2("--concurrency <n>", "Parallel asset uploads").default(DEFAULT_UPLOAD_CONCURRENCY).argParser(parseConcurrency)).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>", "Deploy by the commit the build came from, through the deployments API").argParser(parseGitHash)).addOption(new Option2("--concurrency <n>", "Parallel asset uploads").default(DEFAULT_UPLOAD_CONCURRENCY).argParser(parseConcurrency)).action(deployAction2);
 }
 function parseConcurrency(value) {
   const parsed = Number(value);
@@ -273996,4 +274006,4 @@ export {
   runCLI
 };
 
-//# debugId=D4E502AA1650121164756E2164756E21
+//# debugId=5C430C51A4BFB55664756E2164756E21