@base44-preview/cli 0.1.12-pr.584.81e385d → 0.1.12-pr.584.d15e5fc

package/dist/cli/index.js

@@ -248211,19 +248211,23 @@ async function createDeployment(request) {
   }
   return result.data;
 }
-async function finalizeDeployment(deploymentId, sessionId, payload) {
+async function finalizeDeployment(deploymentId, completionJwt, modules, sessionId) {
   const formData = new FormData;
-  if ("indexHtml" in payload) {
-    formData.append("index.html", new File([payload.indexHtml], "index.html", { type: "text/html" }));
-  } else {
-    formData.append("payload", JSON.stringify({ completion_jwt: payload.completionJwt }));
-    for (const module of payload.modules) {
-      const content = await readFile(module.absolutePath);
-      formData.append(module.name, new File([new Uint8Array(content)], module.name, {
-        type: MODULE_CONTENT_TYPES[module.type]
-      }));
-    }
+  formData.append("payload", JSON.stringify({ completion_jwt: completionJwt }));
+  for (const module of modules) {
+    const content = await readFile(module.absolutePath);
+    formData.append(module.name, new File([new Uint8Array(content)], module.name, {
+      type: MODULE_CONTENT_TYPES[module.type]
+    }));
   }
+  return await postFinalize(deploymentId, formData, sessionId);
+}
+async function finalizeStaticDeployment(deploymentId, indexHtml, sessionId) {
+  const formData = new FormData;
+  formData.append("index.html", new File([indexHtml], "index.html", { type: "text/html" }));
+  return await postFinalize(deploymentId, formData, sessionId);
+}
+async function postFinalize(deploymentId, formData, sessionId) {
   const appClient = getAppClient();
   let response;
   try {
@@ -248291,117 +248295,14 @@ async function createArchive(pathToArchive, targetArchivePath) {
 // src/core/site/deploy-app.ts
 import { resolve as resolve4 } from "node:path";
 
-// src/core/site/wrangler-config.ts
-import { dirname as dirname10, join as join15, resolve as resolve3 } from "node:path";
-var WRANGLER_REDIRECT_PATH = join15(".wrangler", "deploy", "config.json");
-var RedirectConfigSchema = exports_external.looseObject({
-  configPath: exports_external.string().min(1)
-});
-var WranglerConfigSchema = exports_external.looseObject({
-  main: exports_external.string().min(1, "wrangler config is missing a 'main' entry module"),
-  no_bundle: exports_external.boolean().optional(),
-  rules: exports_external.array(exports_external.looseObject({ type: exports_external.string(), globs: exports_external.array(exports_external.string()) })).optional(),
-  assets: exports_external.looseObject({
-    directory: exports_external.string().optional(),
-    html_handling: exports_external.string().optional(),
-    not_found_handling: exports_external.string().optional(),
-    run_worker_first: exports_external.union([exports_external.boolean(), exports_external.array(exports_external.string())]).optional(),
-    headers: exports_external.string().optional(),
-    redirects: exports_external.string().optional()
-  }).optional(),
-  compatibility_date: exports_external.string().optional(),
-  compatibility_flags: exports_external.array(exports_external.string()).optional(),
-  vars: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
-  upload_source_maps: exports_external.boolean().optional()
-});
-async function detectFullStackArtifact(projectRoot) {
-  const redirectPath = join15(projectRoot, WRANGLER_REDIRECT_PATH);
-  return await pathExists(redirectPath) ? redirectPath : null;
-}
-async function resolveWranglerConfig(projectRoot) {
-  const redirectPath = await detectFullStackArtifact(projectRoot);
-  if (!redirectPath) {
-    throw new InvalidInputError("No Workers build artifact found. Expected a .wrangler/deploy/config.json redirect file.", {
-      hints: [{ message: "Run your framework's build command first" }]
-    });
-  }
-  const configPath = await resolveRedirectedConfigPath(redirectPath);
-  const parsed = await readJsonFile(configPath);
-  const result = WranglerConfigSchema.safeParse(parsed);
-  if (!result.success) {
-    throw new ConfigInvalidError(`Invalid wrangler config: ${exports_external.prettifyError(result.error)}`, configPath);
-  }
-  const config9 = result.data;
-  if (config9.no_bundle !== true) {
-    throw new InvalidInputError("This framework's output requires bundling; not yet supported. Base44 only deploys pre-bundled Workers output (no_bundle: true).");
-  }
-  const configDir = dirname10(configPath);
-  const assetsDirectory = config9.assets?.directory ? resolve3(configDir, config9.assets.directory) : null;
-  return {
-    configPath,
-    configDir,
-    main: config9.main,
-    assetsDirectory,
-    assetsConfig: config9.assets ? toResolvedAssetsConfig(config9.assets) : null,
-    compatibilityDate: config9.compatibility_date ?? null,
-    compatibilityFlags: config9.compatibility_flags ?? [],
-    vars: config9.vars ?? {},
-    rules: (config9.rules ?? []).map((rule) => ({
-      type: rule.type,
-      globs: rule.globs
-    })),
-    uploadSourceMaps: config9.upload_source_maps ?? false
-  };
-}
-async function resolveRedirectedConfigPath(redirectPath) {
-  const parsed = await readJsonFile(redirectPath);
-  const result = RedirectConfigSchema.safeParse(parsed);
-  if (!result.success) {
-    throw new ConfigInvalidError(`Invalid deploy redirect file: ${exports_external.prettifyError(result.error)}`, redirectPath);
-  }
-  const configPath = resolve3(dirname10(redirectPath), result.data.configPath);
-  if (!await pathExists(configPath)) {
-    throw new ConfigInvalidError(`Wrangler config referenced by ${redirectPath} does not exist: ${configPath}`, redirectPath, {
-      hints: [{ message: "Rebuild the project to regenerate the artifact" }]
-    });
-  }
-  return configPath;
-}
-function toResolvedAssetsConfig(assets) {
-  return {
-    htmlHandling: assets.html_handling,
-    notFoundHandling: assets.not_found_handling,
-    runWorkerFirst: assets.run_worker_first,
-    headers: assets.headers,
-    redirects: assets.redirects
-  };
-}
-
-// src/core/site/deploy-app.ts
-var STATIC_DEPLOYMENTS_ENV = "BASE44_STATIC_DEPLOYMENTS";
-function staticDeploymentsEnabled(env2 = process.env) {
-  const value = env2[STATIC_DEPLOYMENTS_ENV];
-  return value === "1" || value === "true";
-}
-async function planAppDeploy(target) {
-  const outputDirectory = target.site?.outputDirectory;
-  const outputDir = outputDirectory ? resolve4(target.root, outputDirectory) : null;
-  if (await detectFullStackArtifact(target.root)) {
-    return { kind: "deployment", outputDir };
-  }
-  if (!outputDir) {
-    return { kind: "none" };
-  }
-  return staticDeploymentsEnabled() ? { kind: "deployment", outputDir } : { kind: "tarball", outputDir };
-}
-// src/core/site/deployment.ts
+// src/core/site/static-site.ts
 import { readFile as readFile4 } from "node:fs/promises";
-import { join as join17 } from "node:path";
+import { join as join16 } from "node:path";
 
 // src/core/site/manifest.ts
 import { createHash } from "node:crypto";
 import { readFile as readFile2, stat } from "node:fs/promises";
-import { basename as basename4, extname, join as join16 } from "node:path";
+import { basename as basename4, extname, join as join15 } from "node:path";
 var MAX_ASSET_SIZE_BYTES = 25 * 1024 * 1024;
 var MAX_ASSET_COUNT = 1e5;
 var ASSETS_IGNORE_FILE = ".assetsignore";
@@ -248461,7 +248362,7 @@ async function buildAssetManifest(assetsDir, appId) {
     throw new InvalidInputError(`Too many static assets: found ${relativeFilePaths.length}, the limit is ${MAX_ASSET_COUNT} files.`);
   }
   for (const relativePath of relativeFilePaths.sort()) {
-    const absolutePath = join16(assetsDir, ...relativePath.split("/"));
+    const absolutePath = join15(assetsDir, ...relativePath.split("/"));
     const { size } = await stat(absolutePath);
     if (size > MAX_ASSET_SIZE_BYTES) {
       throw new InvalidInputError(`Static asset "${relativePath}" is ${size} bytes, which exceeds the 25 MiB per-file limit.`);
@@ -248481,101 +248382,6 @@ async function buildAssetManifest(assetsDir, appId) {
   return { manifest, filesByHash };
 }
 
-// src/core/site/modules.ts
-import { stat as stat2 } from "node:fs/promises";
-import { relative as relative3, resolve as resolve5, sep } from "node:path";
-var MAX_TOTAL_MODULE_BYTES = 40 * 1024 * 1024;
-var MODULE_IGNORE = ["wrangler.json", ".dev.vars"];
-var RULE_TYPE_TO_MODULE_TYPE = {
-  ESModule: "esm",
-  CompiledWasm: "wasm",
-  Text: "text",
-  Data: "data"
-};
-function toPosix(path11) {
-  return path11.split(sep).join("/");
-}
-async function collectModules(config9) {
-  const entryPath = resolve5(config9.configDir, config9.main);
-  if (!await pathExists(entryPath)) {
-    throw new InvalidInputError(`Worker entry module does not exist: ${entryPath} (from "main" in ${config9.configPath})`, {
-      hints: [{ message: "Rebuild the project to regenerate the artifact" }]
-    });
-  }
-  const modulesByName = new Map;
-  const entryName = toPosix(relative3(config9.configDir, entryPath));
-  modulesByName.set(entryName, {
-    name: entryName,
-    absolutePath: entryPath,
-    size: 0,
-    type: "esm"
-  });
-  const ignore = [...MODULE_IGNORE];
-  if (config9.assetsDirectory?.startsWith(config9.configDir + sep)) {
-    ignore.push(`${toPosix(relative3(config9.configDir, config9.assetsDirectory))}/**`);
-  }
-  for (const rule of config9.rules) {
-    const type = RULE_TYPE_TO_MODULE_TYPE[rule.type];
-    if (!type) {
-      throw new InvalidInputError(`Unsupported module rule type "${rule.type}" in ${config9.configPath}. Supported: ${Object.keys(RULE_TYPE_TO_MODULE_TYPE).join(", ")}.`);
-    }
-    const matches = await globby(rule.globs, {
-      cwd: config9.configDir,
-      onlyFiles: true,
-      dot: true,
-      ignore
-    });
-    for (const match of matches.sort()) {
-      if (!modulesByName.has(match)) {
-        modulesByName.set(match, {
-          name: match,
-          absolutePath: resolve5(config9.configDir, match),
-          size: 0,
-          type
-        });
-      }
-    }
-  }
-  if (config9.uploadSourceMaps) {
-    const maps = await globby("**/*.map", {
-      cwd: config9.configDir,
-      onlyFiles: true,
-      dot: true,
-      ignore
-    });
-    for (const map2 of maps.sort()) {
-      addSourcemap(modulesByName, config9.configDir, map2);
-    }
-  } else {
-    for (const name2 of [...modulesByName.keys()]) {
-      const mapName = `${name2}.map`;
-      if (await pathExists(resolve5(config9.configDir, mapName))) {
-        addSourcemap(modulesByName, config9.configDir, mapName);
-      }
-    }
-  }
-  const modules = [...modulesByName.values()];
-  let totalBytes = 0;
-  for (const module of modules) {
-    module.size = (await stat2(module.absolutePath)).size;
-    totalBytes += module.size;
-  }
-  if (totalBytes > MAX_TOTAL_MODULE_BYTES) {
-    throw new InvalidInputError(`Worker modules total ${totalBytes} bytes, which exceeds the 40 MB limit for a Base44 deploy.`);
-  }
-  return modules;
-}
-function addSourcemap(modulesByName, configDir, name2) {
-  if (modulesByName.has(name2))
-    return;
-  modulesByName.set(name2, {
-    name: name2,
-    absolutePath: resolve5(configDir, name2),
-    size: 0,
-    type: "sourcemap"
-  });
-}
-
 // src/core/site/upload.ts
 import { readFile as readFile3 } from "node:fs/promises";
 
@@ -248610,7 +248416,7 @@ async function pMap(iterable, mapper, {
     const cleanup = () => {
       signal?.removeEventListener("abort", signalListener);
     };
-    const resolve6 = (value) => {
+    const resolve3 = (value) => {
       resolve_(value);
       cleanup();
     };
@@ -248643,7 +248449,7 @@ async function pMap(iterable, mapper, {
           }
           isResolved = true;
           if (skippedIndexesMap.size === 0) {
-            resolve6(result);
+            resolve3(result);
             return;
           }
           const pureResult = [];
@@ -248653,7 +248459,7 @@ async function pMap(iterable, mapper, {
             }
             pureResult.push(value);
           }
-          resolve6(pureResult);
+          resolve3(pureResult);
         }
         return;
       }
@@ -248712,27 +248518,6 @@ var UPLOAD_RETRY = {
   limit: MAX_UPLOAD_ATTEMPTS - 1,
   delay: (attempt) => RETRY_BASE_DELAY_MS * 2 ** (attempt - 1)
 };
-async function uploadDeploymentAssets(assetUploads, assets, options = {}) {
-  const { concurrency, progress } = options;
-  progress?.onAssets?.({
-    totalAssets: Object.keys(assets.manifest).length,
-    newAssets: countOwedAssets(assetUploads)
-  });
-  if (!assetUploads) {
-    return null;
-  }
-  const uploadOptions = { concurrency, onProgress: progress?.onAssetUpload };
-  if (assetUploads.type === "cf") {
-    return await uploadAssetBuckets(assetUploads, assets.filesByHash, uploadOptions);
-  }
-  await uploadPresignedAssets(assetUploads.uploads, assets, uploadOptions);
-  return null;
-}
-function countOwedAssets(assetUploads) {
-  if (!assetUploads)
-    return 0;
-  return assetUploads.type === "cf" ? new Set(assetUploads.buckets.flat()).size : assetUploads.uploads.length;
-}
 async function uploadAssetBuckets(target, filesByHash, options = {}) {
   const { concurrency = DEFAULT_UPLOAD_CONCURRENCY, onProgress } = options;
   const { buckets } = target;
@@ -248813,54 +248598,271 @@ async function uploadPresignedAsset(upload, assets) {
   }
 }
 
-// src/core/site/deployment.ts
-var NO_ASSETS = { manifest: {}, filesByHash: new Map };
-async function deployToDeployments(options) {
-  const { projectRoot, outputDir, gitHash, concurrency, progress } = options;
-  const worker = await resolveWorkerBuild(projectRoot, progress);
-  const assetsDir = worker ? worker.assetsDir : outputDir;
-  const assets = assetsDir ? await buildAssetManifest(assetsDir, getAppContext().id) : NO_ASSETS;
-  const completion = worker ? { modules: worker.modules } : { indexHtml: await readIndexHtml(assetsDir, assets) };
+// src/core/site/static-site.ts
+var STATIC_DEPLOYMENTS_ENV = "BASE44_STATIC_DEPLOYMENTS";
+function staticDeploymentsEnabled(env2 = process.env) {
+  const value = env2[STATIC_DEPLOYMENTS_ENV];
+  return value === "1" || value === "true";
+}
+async function deployStaticSite(options) {
+  const { outputDir, gitHash, concurrency, progress } = options;
+  const assets = await buildAssetManifest(outputDir, getAppContext().id);
+  if (!assets.manifest["/index.html"]) {
+    throw new InvalidInputError(`No index.html found in "${outputDir}" — a static site needs one at the output directory root.`);
+  }
   const created = await createDeployment({
     git_hash: gitHash,
-    config: worker?.config,
     asset_manifest: assets.manifest
   });
-  const completionJwt = await uploadDeploymentAssets(created.assetUploads, assets, { concurrency, progress });
-  if ("modules" in completion) {
-    progress?.onWorker?.({ moduleCount: completion.modules.length });
+  if (created.assetUploads && created.assetUploads.type !== "s3") {
+    throw new ApiError(`The server answered a static-site deploy with the "${created.assetUploads.type}" upload target.`);
+  }
+  progress?.onAssets?.({
+    totalAssets: Object.keys(assets.manifest).length,
+    newAssets: created.assetUploads?.uploads.length ?? 0
+  });
+  if (created.assetUploads) {
+    await uploadPresignedAssets(created.assetUploads.uploads, assets, {
+      concurrency,
+      onProgress: progress?.onAssetUpload
+    });
   }
-  const finalized = await finalizeDeployment(created.deploymentId, created.sessionId, "modules" in completion ? { ...completion, completionJwt } : completion);
+  const indexHtml = await readFile4(join16(outputDir, "index.html"));
+  const finalized = await finalizeStaticDeployment(created.deploymentId, new Uint8Array(indexHtml), created.sessionId);
   return { deploymentId: finalized.deploymentId, gitHash };
 }
-async function resolveWorkerBuild(projectRoot, progress) {
-  if (!await detectFullStackArtifact(projectRoot)) {
-    return null;
+
+// src/core/site/wrangler-config.ts
+import { dirname as dirname10, join as join17, resolve as resolve3 } from "node:path";
+var WRANGLER_REDIRECT_PATH = join17(".wrangler", "deploy", "config.json");
+var RedirectConfigSchema = exports_external.looseObject({
+  configPath: exports_external.string().min(1)
+});
+var WranglerConfigSchema = exports_external.looseObject({
+  main: exports_external.string().min(1, "wrangler config is missing a 'main' entry module"),
+  no_bundle: exports_external.boolean().optional(),
+  rules: exports_external.array(exports_external.looseObject({ type: exports_external.string(), globs: exports_external.array(exports_external.string()) })).optional(),
+  assets: exports_external.looseObject({
+    directory: exports_external.string().optional(),
+    html_handling: exports_external.string().optional(),
+    not_found_handling: exports_external.string().optional(),
+    run_worker_first: exports_external.union([exports_external.boolean(), exports_external.array(exports_external.string())]).optional(),
+    headers: exports_external.string().optional(),
+    redirects: exports_external.string().optional()
+  }).optional(),
+  compatibility_date: exports_external.string().optional(),
+  compatibility_flags: exports_external.array(exports_external.string()).optional(),
+  vars: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
+  upload_source_maps: exports_external.boolean().optional()
+});
+async function detectFullStackArtifact(projectRoot) {
+  const redirectPath = join17(projectRoot, WRANGLER_REDIRECT_PATH);
+  return await pathExists(redirectPath) ? redirectPath : null;
+}
+async function resolveWranglerConfig(projectRoot) {
+  const redirectPath = await detectFullStackArtifact(projectRoot);
+  if (!redirectPath) {
+    throw new InvalidInputError("No full-stack build artifact found. Expected a .wrangler/deploy/config.json redirect file.", {
+      hints: [{ message: "Run your framework's build command first" }]
+    });
+  }
+  const configPath = await resolveRedirectedConfigPath(redirectPath);
+  const parsed = await readJsonFile(configPath);
+  const result = WranglerConfigSchema.safeParse(parsed);
+  if (!result.success) {
+    throw new ConfigInvalidError(`Invalid wrangler config: ${exports_external.prettifyError(result.error)}`, configPath);
+  }
+  const config9 = result.data;
+  if (config9.no_bundle !== true) {
+    throw new InvalidInputError("This framework's output requires bundling; not yet supported. Base44 full-stack deploys only support pre-bundled Workers output (no_bundle: true).");
+  }
+  const configDir = dirname10(configPath);
+  const assetsDirectory = config9.assets?.directory ? resolve3(configDir, config9.assets.directory) : null;
+  return {
+    configPath,
+    configDir,
+    main: config9.main,
+    assetsDirectory,
+    assetsConfig: config9.assets ? toResolvedAssetsConfig(config9.assets) : null,
+    compatibilityDate: config9.compatibility_date ?? null,
+    compatibilityFlags: config9.compatibility_flags ?? [],
+    vars: config9.vars ?? {},
+    rules: (config9.rules ?? []).map((rule) => ({
+      type: rule.type,
+      globs: rule.globs
+    })),
+    uploadSourceMaps: config9.upload_source_maps ?? false
+  };
+}
+async function resolveRedirectedConfigPath(redirectPath) {
+  const parsed = await readJsonFile(redirectPath);
+  const result = RedirectConfigSchema.safeParse(parsed);
+  if (!result.success) {
+    throw new ConfigInvalidError(`Invalid deploy redirect file: ${exports_external.prettifyError(result.error)}`, redirectPath);
   }
+  const configPath = resolve3(dirname10(redirectPath), result.data.configPath);
+  if (!await pathExists(configPath)) {
+    throw new ConfigInvalidError(`Wrangler config referenced by ${redirectPath} does not exist: ${configPath}`, redirectPath, {
+      hints: [{ message: "Rebuild the project to regenerate the artifact" }]
+    });
+  }
+  return configPath;
+}
+function toResolvedAssetsConfig(assets) {
+  return {
+    htmlHandling: assets.html_handling,
+    notFoundHandling: assets.not_found_handling,
+    runWorkerFirst: assets.run_worker_first,
+    headers: assets.headers,
+    redirects: assets.redirects
+  };
+}
+
+// src/core/site/deploy-app.ts
+async function planAppDeploy(target) {
+  if (await detectFullStackArtifact(target.root)) {
+    return { kind: "full-stack" };
+  }
+  const outputDirectory = target.site?.outputDirectory;
+  if (!outputDirectory) {
+    return { kind: "none" };
+  }
+  const outputDir = resolve4(target.root, outputDirectory);
+  return staticDeploymentsEnabled() ? { kind: "static-deployment", outputDir } : { kind: "static", outputDir };
+}
+// src/core/site/modules.ts
+import { stat as stat2 } from "node:fs/promises";
+import { relative as relative3, resolve as resolve5, sep } from "node:path";
+var MAX_TOTAL_MODULE_BYTES = 40 * 1024 * 1024;
+var MODULE_IGNORE = ["wrangler.json", ".dev.vars"];
+var RULE_TYPE_TO_MODULE_TYPE = {
+  ESModule: "esm",
+  CompiledWasm: "wasm",
+  Text: "text",
+  Data: "data"
+};
+function toPosix(path11) {
+  return path11.split(sep).join("/");
+}
+async function collectModules(config9) {
+  const entryPath = resolve5(config9.configDir, config9.main);
+  if (!await pathExists(entryPath)) {
+    throw new InvalidInputError(`Worker entry module does not exist: ${entryPath} (from "main" in ${config9.configPath})`, {
+      hints: [{ message: "Rebuild the project to regenerate the artifact" }]
+    });
+  }
+  const modulesByName = new Map;
+  const entryName = toPosix(relative3(config9.configDir, entryPath));
+  modulesByName.set(entryName, {
+    name: entryName,
+    absolutePath: entryPath,
+    size: 0,
+    type: "esm"
+  });
+  const ignore = [...MODULE_IGNORE];
+  if (config9.assetsDirectory?.startsWith(config9.configDir + sep)) {
+    ignore.push(`${toPosix(relative3(config9.configDir, config9.assetsDirectory))}/**`);
+  }
+  for (const rule of config9.rules) {
+    const type = RULE_TYPE_TO_MODULE_TYPE[rule.type];
+    if (!type) {
+      throw new InvalidInputError(`Unsupported module rule type "${rule.type}" in ${config9.configPath}. Supported: ${Object.keys(RULE_TYPE_TO_MODULE_TYPE).join(", ")}.`);
+    }
+    const matches = await globby(rule.globs, {
+      cwd: config9.configDir,
+      onlyFiles: true,
+      dot: true,
+      ignore
+    });
+    for (const match of matches.sort()) {
+      if (!modulesByName.has(match)) {
+        modulesByName.set(match, {
+          name: match,
+          absolutePath: resolve5(config9.configDir, match),
+          size: 0,
+          type
+        });
+      }
+    }
+  }
+  if (config9.uploadSourceMaps) {
+    const maps = await globby("**/*.map", {
+      cwd: config9.configDir,
+      onlyFiles: true,
+      dot: true,
+      ignore
+    });
+    for (const map2 of maps.sort()) {
+      addSourcemap(modulesByName, config9.configDir, map2);
+    }
+  } else {
+    for (const name2 of [...modulesByName.keys()]) {
+      const mapName = `${name2}.map`;
+      if (await pathExists(resolve5(config9.configDir, mapName))) {
+        addSourcemap(modulesByName, config9.configDir, mapName);
+      }
+    }
+  }
+  const modules = [...modulesByName.values()];
+  let totalBytes = 0;
+  for (const module of modules) {
+    module.size = (await stat2(module.absolutePath)).size;
+    totalBytes += module.size;
+  }
+  if (totalBytes > MAX_TOTAL_MODULE_BYTES) {
+    throw new InvalidInputError(`Worker modules total ${totalBytes} bytes, which exceeds the 40 MB limit for Base44 full-stack deploys.`);
+  }
+  return modules;
+}
+function addSourcemap(modulesByName, configDir, name2) {
+  if (modulesByName.has(name2))
+    return;
+  modulesByName.set(name2, {
+    name: name2,
+    absolutePath: resolve5(configDir, name2),
+    size: 0,
+    type: "sourcemap"
+  });
+}
+
+// src/core/site/full-stack.ts
+async function deployFullStack(options) {
+  const { projectRoot, gitHash, concurrency, progress } = options;
   const config9 = await resolveWranglerConfig(projectRoot);
   if (!config9.compatibilityFlags.includes("nodejs_compat")) {
     progress?.onWarning?.("The wrangler config has no 'nodejs_compat' compatibility flag; Node.js built-ins will be unavailable at runtime. Enable it in your framework's Cloudflare adapter settings if your server code needs Node APIs.");
   }
-  if (Object.keys(config9.vars).length > 0) {
+  if (config9.vars && Object.keys(config9.vars).length > 0) {
     progress?.onWarning?.("wrangler 'vars' are not supported and were ignored — a worker's environment comes from the app's secrets (base44 secrets set).");
   }
-  const assetsDir = config9.assetsDirectory && await pathExists(config9.assetsDirectory) ? config9.assetsDirectory : null;
-  return {
+  const modules = await collectModules(config9);
+  let assets = { manifest: {}, filesByHash: new Map };
+  if (config9.assetsDirectory && await pathExists(config9.assetsDirectory)) {
+    assets = await buildAssetManifest(config9.assetsDirectory, getAppContext().id);
+  }
+  const created = await createDeployment({
+    git_hash: gitHash,
     config: {
       main: config9.main,
       compatibility_date: config9.compatibilityDate,
       compatibility_flags: config9.compatibilityFlags,
       assets: buildAssetsConfig(config9.assetsConfig, progress)
     },
-    modules: await collectModules(config9),
-    assetsDir
-  };
-}
-async function readIndexHtml(assetsDir, assets) {
-  if (!assetsDir || !assets.manifest["/index.html"]) {
-    throw new InvalidInputError(`No index.html found in "${assetsDir ?? "the site output directory"}" — a static site needs one at the output directory root.`);
+    asset_manifest: assets.manifest
+  });
+  if (created.assetUploads && created.assetUploads.type !== "cf") {
+    throw new ApiError(`The server answered a full-stack deploy with the "${created.assetUploads.type}" upload target.`);
   }
-  return new Uint8Array(await readFile4(join17(assetsDir, "index.html")));
+  const totalAssets = Object.keys(assets.manifest).length;
+  const newAssets = created.assetUploads ? new Set(created.assetUploads.buckets.flat()).size : 0;
+  progress?.onAssets?.({ totalAssets, newAssets });
+  const completionJwt = created.assetUploads ? await uploadAssetBuckets(created.assetUploads, assets.filesByHash, {
+    concurrency,
+    onProgress: progress?.onAssetUpload
+  }) : null;
+  progress?.onWorker?.({ moduleCount: modules.length });
+  const finalized = await finalizeDeployment(created.deploymentId, completionJwt, modules, created.sessionId);
+  return { deploymentId: finalized.deploymentId, gitHash };
 }
 function buildAssetsConfig(assetsConfig, progress) {
   if (!assetsConfig)
@@ -259357,19 +259359,22 @@ async function deployAction2(ctx, options) {
     throw new InvalidInputError("--yes is required in non-interactive mode");
   }
   const project2 = await readProjectSettings();
-  const outputDirectory = project2.site?.outputDirectory;
-  if ((await planAppDeploy(project2)).kind === "none") {
+  const planned = await planAppDeploy(project2);
+  if (planned.kind === "none") {
     throw new ConfigNotFoundError("No site configuration found.", {
       hints: [
         {
           message: `Add 'site.outputDirectory' to your config.jsonc (e.g., "site": { "outputDirectory": "dist" })`
+        },
+        {
+          message: "Full-stack apps ship from their build artifact — run your framework's build first"
         }
       ]
     });
   }
   if (!options.yes) {
     const shouldDeploy = await Re({
-      message: outputDirectory ? `Deploy site from ${outputDirectory}?` : "Deploy site?"
+      message: planned.kind === "full-stack" ? "Deploy full-stack app?" : `Deploy site from ${project2.site?.outputDirectory}?`
     });
     if (Ct(shouldDeploy) || !shouldDeploy) {
       return { outroMessage: "Deployment cancelled" };
@@ -259378,47 +259383,42 @@ async function deployAction2(ctx, options) {
   await maybeBuildBeforeDeploy(ctx, project2, options.build);
   const plan = await planAppDeploy(project2);
   switch (plan.kind) {
-    case "deployment":
+    case "full-stack":
+      return await deployFullStackApp(ctx, project2.root, options);
+    case "static-deployment":
       return await deployToDeploymentsApi(ctx, project2.root, plan.outputDir, options);
-    case "tarball":
+    case "static":
       return await deployTarball(ctx, plan.outputDir);
     case "none":
       return { outroMessage: "Nothing to deploy" };
   }
 }
-async function deployToDeploymentsApi(ctx, projectRoot, outputDir, options) {
-  const { runTask: runTask2, log } = ctx;
+async function deployFullStackApp(ctx, projectRoot, options) {
   const gitHash = await resolveGitHash(projectRoot, options.gitHash);
-  const progressLines = [];
-  const warnings = [];
-  const { deploymentId } = await runTask2("Deploying site...", async (updateMessage) => await deployToDeployments({
+  const { deploymentId } = await runDeployTask(ctx, {
+    start: "Deploying full-stack app...",
+    success: theme.colors.base44Orange("Full-stack app deployed"),
+    error: "Full-stack deploy failed"
+  }, async (progress) => await deployFullStack({
     projectRoot,
+    gitHash,
+    concurrency: options.concurrency,
+    progress
+  }));
+  return deploymentResult(ctx, deploymentId, gitHash);
+}
+async function deployToDeploymentsApi(ctx, projectRoot, outputDir, options) {
+  const gitHash = await resolveGitHash(projectRoot, options.gitHash);
+  const { deploymentId } = await runDeployTask(ctx, {
+    start: "Deploying site...",
+    success: "Site deployed",
+    error: "Site deploy failed"
+  }, async (progress) => await deployStaticSite({
     outputDir,
     gitHash,
     concurrency: options.concurrency,
-    progress: {
-      onWarning: (message) => {
-        warnings.push(message);
-      },
-      onAssets: ({ totalAssets, newAssets }) => {
-        const line = `Found ${totalAssets} static assets (${newAssets} new)`;
-        progressLines.push(line);
-        updateMessage(line);
-      },
-      onAssetUpload: ({ uploadedFiles, totalFiles }) => {
-        updateMessage(`Uploaded ${uploadedFiles} of ${totalFiles} assets`);
-      },
-      onWorker: ({ moduleCount }) => {
-        updateMessage(`Deploying worker (${moduleCount} modules)…`);
-      }
-    }
-  }), { successMessage: "Site deployed", errorMessage: "Site deploy failed" });
-  for (const line of progressLines) {
-    log.message(theme.styles.dim(line));
-  }
-  for (const warning of warnings) {
-    log.warn(warning);
-  }
+    progress
+  }));
   return deploymentResult(ctx, deploymentId, gitHash);
 }
 async function deployTarball({ runTask: runTask2 }, outputDir) {
@@ -259428,6 +259428,33 @@ async function deployTarball({ runTask: runTask2 }, outputDir) {
   });
   return { outroMessage: `Visit your site at: ${appUrl}` };
 }
+async function runDeployTask({ runTask: runTask2, log }, labels, deploy5) {
+  const progressLines = [];
+  const warnings = [];
+  const result = await runTask2(labels.start, async (updateMessage) => await deploy5({
+    onWarning: (message) => {
+      warnings.push(message);
+    },
+    onAssets: ({ totalAssets, newAssets }) => {
+      const line = `Found ${totalAssets} static assets (${newAssets} new)`;
+      progressLines.push(line);
+      updateMessage(line);
+    },
+    onAssetUpload: ({ uploadedFiles, totalFiles }) => {
+      updateMessage(`Uploaded ${uploadedFiles} of ${totalFiles} assets`);
+    },
+    onWorker: ({ moduleCount }) => {
+      updateMessage(`Deploying worker (${moduleCount} modules)…`);
+    }
+  }), { successMessage: labels.success, errorMessage: labels.error });
+  for (const line of progressLines) {
+    log.message(theme.styles.dim(line));
+  }
+  for (const warning of warnings) {
+    log.warn(warning);
+  }
+  return result;
+}
 function deploymentResult({ jsonMode }, deploymentId, gitHash) {
   return {
     outroMessage: `Deployment ${deploymentId} (commit ${gitHash.slice(0, 12)})`,
@@ -259436,7 +259463,7 @@ function deploymentResult({ jsonMode }, deploymentId, gitHash) {
   };
 }
 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)").addOption(new Option("--git-hash <hash>", "Commit the build came from (defaults to the checkout's HEAD)").argParser(parseGitHash)).addOption(new Option("--concurrency <n>", "Parallel asset uploads").default(DEFAULT_UPLOAD_CONCURRENCY).argParser(parseConcurrency)).action(deployAction2);
+  return new Base44Command("deploy").description("Deploy the built site to Base44 hosting (full-stack apps deploy their Workers build)").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 Option("--git-hash <hash>", "Commit the build came from (defaults to the checkout's HEAD)").argParser(parseGitHash)).addOption(new Option("--concurrency <n>", "Parallel asset uploads").default(DEFAULT_UPLOAD_CONCURRENCY).argParser(parseConcurrency)).action(deployAction2);
 }
 function parseGitHash(value) {
   if (!isGitCommitHash(value)) {
@@ -268517,4 +268544,4 @@ export {
   runCLI
 };
 
-//# debugId=9741A962D703AE2864756E2164756E21
+//# debugId=38E334A0515CDEB464756E2164756E21