@base44-preview/cli 0.1.29-pr.656.a562be5 → 0.1.32-pr.658.bc0ac49

package/dist/cli/index.js

@@ -236769,6 +236769,27 @@ function siteOrDefault(project) {
   warnConfigFallback(`${project.configPath} has no 'site' block; using the default site commands.`);
   return DEFAULT_SITE;
 }
+var COMMAND_NOT_FOUND_EXIT_CODES = new Set([127, 9009]);
+async function runSiteCommandOrDefault(command, fallback, run) {
+  try {
+    return await run(command);
+  } catch (error) {
+    if (command === fallback || !isCommandNotFound(error)) {
+      throw error;
+    }
+    warnSiteCommandFallback(command, fallback);
+    return run(fallback);
+  }
+}
+function warnSiteCommandFallback(command, fallback) {
+  warnConfigFallback(`'${command}' could not start because its program is not installed; running '${fallback}' instead.`);
+}
+function isCommandNotFoundExit(code) {
+  return typeof code === "number" && COMMAND_NOT_FOUND_EXIT_CODES.has(code);
+}
+function isCommandNotFound(error) {
+  return typeof error === "object" && error !== null && "exitCode" in error && isCommandNotFoundExit(error.exitCode);
+}
 function withoutKey(record, key) {
   return Object.fromEntries(Object.entries(record).filter(([k]) => k !== key));
 }
@@ -239374,7 +239395,7 @@ import { join as join13 } from "node:path";
 // package.json
 var package_default = {
   name: "base44",
-  version: "0.1.29",
+  version: "0.1.32",
   description: "Base44 CLI - Unified interface for managing Base44 applications",
   type: "module",
   bin: {
@@ -249751,11 +249772,11 @@ function getFunctionsCommand() {
 
 // src/cli/commands/project/site-build.ts
 async function runSiteBuild({ runTask }, { root, buildCommand = DEFAULT_SITE.buildCommand, appId }) {
-  await runTask("Building site...", () => execa({
+  await runTask("Building site...", () => runSiteCommandOrDefault(buildCommand, DEFAULT_SITE.buildCommand, (command) => execa({
     cwd: root,
     shell: true,
     env: { VITE_BASE44_APP_ID: appId }
-  })`${buildCommand}`, {
+  })`${command}`), {
     successMessage: "Site built successfully",
     errorMessage: "Build failed"
   });
@@ -261311,7 +261332,7 @@ function shardOf(group, response, verdict, options) {
     gzipBytes: verdict.gzipBytes,
     ...response.activation ? { activation: response.activation } : {},
     wrapper: {
-      secrets: response.activation ? `blob-${response.activation}` : "binding",
+      secrets: response.activation ? `blob_${response.activation}` : "binding",
       postResponseTelemetry: options.postResponseTelemetry ?? false,
       staticEgress: STATIC_EGRESS_ARTIFACT_MARKER
     }
@@ -261394,8 +261415,9 @@ async function compilerInput(root, fn) {
   for (const filePath of fn.filePaths) {
     backendFiles[projectPath(root, filePath)] = await readTextFile(filePath);
   }
-  const { entry, files } = await cfwBundleInput(projectPath(root, fn.entryPath), await readTextFile(fn.entryPath), backendFiles);
-  return { name: fn.name, entry, files };
+  const source = await readTextFile(fn.entryPath);
+  const { entry, files } = await cfwBundleInput(projectPath(root, fn.entryPath), source, backendFiles);
+  return { input: { name: fn.name, entry, files }, source };
 }
 function describeFailure(failure) {
   const where = failure.function ? `${failure.function}: ` : "";
@@ -261413,11 +261435,14 @@ async function compileBackendBundles(root, functionsDir) {
   }
   await requireCompilerRuntime();
   const sorted = [...functions].sort((a, b) => a.name < b.name ? -1 : 1);
-  const inputs = await pMap(sorted, (fn) => compilerInput(root, fn), {
+  const compiled = await pMap(sorted, (fn) => compilerInput(root, fn), {
     concurrency: 8
   });
-  const entries = new Map(inputs.map((input) => [input.name, input.entry]));
-  const built = await compileFunctionShards(inputs, SHARD_POLICY, COMPILE_MODES);
+  const declared = new Map(compiled.map(({ input, source }) => [
+    input.name,
+    { name: input.name, entry: input.entry, source }
+  ]));
+  const built = await compileFunctionShards(compiled.map(({ input }) => input), SHARD_POLICY, COMPILE_MODES);
   if (!built.ok) {
     throw new InvalidInputError(`Backend functions failed to compile (${built.failures.length} error${built.failures.length === 1 ? "" : "s"}).`, { details: built.failures.map(describeFailure) });
   }
@@ -261427,10 +261452,7 @@ async function compileBackendBundles(root, functionsDir) {
       module,
       size: module.byteLength,
       digest: sha256(module),
-      functions: shard.functions.map((name) => ({
-        name,
-        entry: entries.get(name)
-      })),
+      functions: shard.functions.map((name) => declared.get(name)),
       wrapper: shard.wrapper
     };
   });
@@ -262326,14 +262348,25 @@ async function siteDevAction(ctx, forwarded) {
   const site = siteOrDefault(project);
   const serveCommand = site.serveCommand ?? DEFAULT_SERVE_COMMAND;
   const command = [serveCommand, ...forwarded].join(" ");
-  const runner = createServeCommandRunner({
-    serveCommand: command,
-    projectRoot: project.root,
-    appId: app.id
-  });
-  stopRunnerOnProcessSignals(runner);
-  runner.onExit((code) => process.exit(code ?? 1));
-  runner.start();
+  const fallback = [DEFAULT_SERVE_COMMAND, ...forwarded].join(" ");
+  const serve = (line) => {
+    const runner = createServeCommandRunner({
+      serveCommand: line,
+      projectRoot: project.root,
+      appId: app.id
+    });
+    stopRunnerOnProcessSignals(runner);
+    runner.onExit((code) => {
+      if (line !== fallback && isCommandNotFoundExit(code)) {
+        warnSiteCommandFallback(line, fallback);
+        serve(fallback);
+        return;
+      }
+      process.exit(code ?? 1);
+    });
+    runner.start();
+  };
+  serve(command);
   return { outroMessage: `Frontend dev server running '${command}'` };
 }
 function getSiteDevCommand() {
@@ -262346,12 +262379,16 @@ async function installAction({
 }) {
   const project = await readProjectSettingsOrDefaults();
   const { installCommand } = siteOrDefault(project);
-  await runTask("Installing site dependencies...", () => execa({ cwd: project.root, shell: true })`${installCommand}`, {
+  let ran = installCommand;
+  await runTask("Installing site dependencies...", () => runSiteCommandOrDefault(installCommand, DEFAULT_SITE.installCommand, (command) => {
+    ran = command;
+    return execa({ cwd: project.root, shell: true })`${command}`;
+  }), {
     successMessage: "Dependencies installed",
     errorMessage: "Install failed"
   });
   return {
-    outroMessage: `Installed with ${theme.styles.bold(installCommand)}`
+    outroMessage: `Installed with ${theme.styles.bold(ran)}`
   };
 }
 function getSiteInstallCommand() {
@@ -271283,4 +271320,4 @@ export {
   runCLI
 };
 
-//# debugId=F35542A3D74C85C064756E2164756E21
+//# debugId=61E073E485FD166064756E2164756E21