@base44-preview/cli 0.1.15-pr.626.d48e59b → 0.1.15-pr.626.db74099

package/dist/cli/index.js

@@ -239590,91 +239590,8 @@ async function createArchive(pathToArchive, targetArchivePath) {
 import { readFile as readFile3 } from "node:fs/promises";
 import { join as join18 } from "node:path";
 
-// src/core/site/manifest.ts
-import { createHash } from "node:crypto";
-import { createReadStream } from "node:fs";
-import { stat } from "node:fs/promises";
-import { basename as basename5, extname, join as join16 } from "node:path";
-var MAX_ASSET_COUNT = 1e5;
-var ASSETS_IGNORE_FILE = ".assetsignore";
-var ALWAYS_IGNORED = new Set([
-  ASSETS_IGNORE_FILE,
-  "wrangler.json",
-  ".dev.vars"
-]);
-var MIME_TYPES = {
-  ".html": "text/html",
-  ".htm": "text/html",
-  ".css": "text/css",
-  ".js": "text/javascript",
-  ".mjs": "text/javascript",
-  ".json": "application/json",
-  ".map": "application/json",
-  ".txt": "text/plain",
-  ".xml": "application/xml",
-  ".svg": "image/svg+xml",
-  ".png": "image/png",
-  ".jpg": "image/jpeg",
-  ".jpeg": "image/jpeg",
-  ".gif": "image/gif",
-  ".webp": "image/webp",
-  ".avif": "image/avif",
-  ".ico": "image/x-icon",
-  ".woff": "font/woff",
-  ".woff2": "font/woff2",
-  ".ttf": "font/ttf",
-  ".otf": "font/otf",
-  ".eot": "application/vnd.ms-fontobject",
-  ".mp3": "audio/mpeg",
-  ".mp4": "video/mp4",
-  ".webm": "video/webm",
-  ".pdf": "application/pdf",
-  ".wasm": "application/wasm",
-  ".webmanifest": "application/manifest+json"
-};
-function getAssetContentType(filePath) {
-  return MIME_TYPES[extname(filePath).toLowerCase()] ?? "application/octet-stream";
-}
-async function hashAssetFile(appId, absolutePath) {
-  const hash = createHash("sha256").update(Buffer.from(appId, "utf8"));
-  for await (const chunk of createReadStream(absolutePath)) {
-    hash.update(chunk);
-  }
-  return hash.digest("hex").slice(0, 32);
-}
-async function buildAssetManifest(assetsDir, appId) {
-  const manifest = {};
-  const filesByHash = new Map;
-  const found = await globby("**/*", {
-    cwd: assetsDir,
-    dot: true,
-    onlyFiles: true,
-    followSymbolicLinks: false,
-    ignoreFiles: [ASSETS_IGNORE_FILE]
-  });
-  const relativeFilePaths = found.filter((path) => !ALWAYS_IGNORED.has(basename5(path)));
-  if (relativeFilePaths.length > MAX_ASSET_COUNT) {
-    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 { size } = await stat(absolutePath);
-    const hash = await hashAssetFile(appId, absolutePath);
-    manifest[`/${relativePath}`] = { hash, size };
-    if (!filesByHash.has(hash)) {
-      filesByHash.set(hash, {
-        absolutePath,
-        hash,
-        size,
-        contentType: getAssetContentType(absolutePath)
-      });
-    }
-  }
-  return { manifest, filesByHash };
-}
-
 // src/core/site/modules.ts
-import { stat as stat2 } from "node:fs/promises";
+import { stat } from "node:fs/promises";
 import { relative as relative5, resolve as resolve3, sep } from "node:path";
 var MAX_TOTAL_MODULE_BYTES = 40 * 1024 * 1024;
 var MODULE_IGNORE = ["wrangler.json", ".dev.vars"];
@@ -239749,7 +239666,7 @@ async function collectModules(config) {
   const modules = [...modulesByName.values()];
   let totalBytes = 0;
   for (const module of modules) {
-    module.size = (await stat2(module.absolutePath)).size;
+    module.size = (await stat(module.absolutePath)).size;
     totalBytes += module.size;
   }
   if (totalBytes > MAX_TOTAL_MODULE_BYTES) {
@@ -239768,8 +239685,104 @@ function addSourcemap(modulesByName, configDir, name) {
   });
 }
 
-// src/core/site/upload.ts
-import { readFile as readFile2 } from "node:fs/promises";
+// src/core/site/wrangler-config.ts
+import { dirname as dirname12, join as join16, resolve as resolve4 } from "node:path";
+var WRANGLER_REDIRECT_PATH = join16(".wrangler", "deploy", "config.json");
+var RedirectConfigSchema = looseObject({
+  configPath: string2().min(1)
+});
+var WranglerConfigSchema = looseObject({
+  main: string2().min(1, "wrangler config is missing a 'main' entry module"),
+  no_bundle: boolean2().optional(),
+  rules: array(looseObject({ type: string2(), globs: array(string2()) })).optional(),
+  assets: looseObject({
+    directory: string2().optional(),
+    html_handling: string2().optional(),
+    not_found_handling: string2().optional(),
+    run_worker_first: union([boolean2(), array(string2())]).optional(),
+    headers: string2().optional(),
+    redirects: string2().optional()
+  }).optional(),
+  compatibility_date: string2().optional(),
+  compatibility_flags: array(string2()).optional(),
+  vars: record(string2(), unknown()).optional(),
+  upload_source_maps: boolean2().optional()
+});
+async function detectFullStackArtifact(projectRoot) {
+  const redirectPath = join16(projectRoot, WRANGLER_REDIRECT_PATH);
+  return await pathExists(redirectPath) ? redirectPath : null;
+}
+async function resolveWranglerConfig(redirectPath) {
+  const configPath = await resolveRedirectedConfigPath(redirectPath);
+  const parsed = await readJsonFile(configPath);
+  const result = WranglerConfigSchema.safeParse(parsed);
+  if (!result.success) {
+    throw new ConfigInvalidError(`Invalid wrangler config: ${prettifyError(result.error)}`, configPath);
+  }
+  const config = result.data;
+  if (config.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 = dirname12(configPath);
+  const assetsDirectory = config.assets?.directory ? resolve4(configDir, config.assets.directory) : null;
+  return {
+    configPath,
+    configDir,
+    main: config.main,
+    assetsDirectory,
+    assetsConfig: config.assets ? toResolvedAssetsConfig(config.assets) : null,
+    compatibilityDate: config.compatibility_date ?? null,
+    compatibilityFlags: config.compatibility_flags ?? [],
+    rules: (config.rules ?? []).map((rule) => ({
+      type: rule.type,
+      globs: rule.globs
+    })),
+    uploadSourceMaps: config.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: ${prettifyError(result.error)}`, redirectPath);
+  }
+  const configPath = resolve4(dirname12(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/full-stack.ts
+async function resolveFullStackBuild(projectRoot) {
+  const redirectPath = await detectFullStackArtifact(projectRoot);
+  if (!redirectPath) {
+    return null;
+  }
+  const config = await resolveWranglerConfig(redirectPath);
+  return {
+    config,
+    modules: await collectModules(config),
+    assetsDir: config.assetsDirectory && await pathExists(config.assetsDirectory) ? config.assetsDirectory : null
+  };
+}
+
+// src/core/site/manifest.ts
+import { createHash } from "node:crypto";
+import { createReadStream } from "node:fs";
+import { stat as stat2 } from "node:fs/promises";
+import { basename as basename5, extname, join as join17 } from "node:path";
 
 // ../../node_modules/p-map/index.js
 async function pMap(iterable, mapper, {
@@ -239895,7 +239908,99 @@ async function pMap(iterable, mapper, {
 }
 var pMapSkip = Symbol("skip");
 
+// src/core/site/manifest.ts
+var MAX_ASSET_COUNT = 1e5;
+var ASSETS_IGNORE_FILE = ".assetsignore";
+var ALWAYS_IGNORED = new Set([
+  ASSETS_IGNORE_FILE,
+  "wrangler.json",
+  ".dev.vars"
+]);
+var MIME_TYPES = {
+  ".html": "text/html",
+  ".htm": "text/html",
+  ".css": "text/css",
+  ".js": "text/javascript",
+  ".mjs": "text/javascript",
+  ".json": "application/json",
+  ".map": "application/json",
+  ".txt": "text/plain",
+  ".xml": "application/xml",
+  ".svg": "image/svg+xml",
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".webp": "image/webp",
+  ".avif": "image/avif",
+  ".ico": "image/x-icon",
+  ".woff": "font/woff",
+  ".woff2": "font/woff2",
+  ".ttf": "font/ttf",
+  ".otf": "font/otf",
+  ".eot": "application/vnd.ms-fontobject",
+  ".mp3": "audio/mpeg",
+  ".mp4": "video/mp4",
+  ".webm": "video/webm",
+  ".pdf": "application/pdf",
+  ".wasm": "application/wasm",
+  ".webmanifest": "application/manifest+json"
+};
+function getAssetContentType(filePath) {
+  return MIME_TYPES[extname(filePath).toLowerCase()] ?? "application/octet-stream";
+}
+async function walkBuildOutput(outputDir) {
+  const found = await globby("**/*", {
+    cwd: outputDir,
+    dot: true,
+    onlyFiles: true,
+    followSymbolicLinks: false,
+    ignoreFiles: [ASSETS_IGNORE_FILE]
+  });
+  return found.filter((path) => !ALWAYS_IGNORED.has(basename5(path))).sort();
+}
+var STAT_CONCURRENCY = 32;
+async function describeBuildOutput(outputDir) {
+  const relativePaths = await walkBuildOutput(outputDir);
+  return await pMap(relativePaths, async (path) => {
+    const absolutePath = join17(outputDir, ...path.split("/"));
+    return { path, absolutePath, size: (await stat2(absolutePath)).size };
+  }, { concurrency: STAT_CONCURRENCY });
+}
+async function hashFileInto(hash, absolutePath) {
+  for await (const chunk of createReadStream(absolutePath)) {
+    hash.update(chunk);
+  }
+  return hash;
+}
+async function hashAssetFile(appId, absolutePath) {
+  const hash = await hashFileInto(createHash("sha256").update(Buffer.from(appId, "utf8")), absolutePath);
+  return hash.digest("hex").slice(0, 32);
+}
+async function buildAssetManifest(assetsDir, appId) {
+  const manifest = {};
+  const filesByHash = new Map;
+  const files = await describeBuildOutput(assetsDir);
+  if (files.length > MAX_ASSET_COUNT) {
+    throw new InvalidInputError(`Too many static assets: found ${files.length}, the limit is ${MAX_ASSET_COUNT} files.`);
+  }
+  for (const { path: relativePath, absolutePath, size } of files) {
+    const hash = await hashAssetFile(appId, absolutePath);
+    manifest[`/${relativePath}`] = { hash, size };
+    if (!filesByHash.has(hash)) {
+      filesByHash.set(hash, {
+        absolutePath,
+        hash,
+        size,
+        contentType: getAssetContentType(absolutePath)
+      });
+    }
+  }
+  return { manifest, filesByHash };
+}
+
 // src/core/site/upload.ts
+import { readFile as readFile2 } from "node:fs/promises";
 var DEFAULT_UPLOAD_CONCURRENCY = 3;
 var MAX_UPLOAD_CONCURRENCY = 50;
 var MAX_UPLOAD_ATTEMPTS = 3;
@@ -239994,7 +240099,10 @@ async function uploadPresignedAsset(upload, assets) {
   if (!file) {
     throw new InternalError(`Server requested upload of unknown asset path: ${upload.path}`);
   }
-  const content = await readFile2(file.absolutePath);
+  await putPresigned(upload, file.absolutePath);
+}
+async function putPresigned(upload, absolutePath) {
+  const content = await readFile2(absolutePath);
   try {
     await distribution_default.put(upload.url, {
       body: new Uint8Array(content),
@@ -240010,85 +240118,6 @@ async function uploadPresignedAsset(upload, assets) {
   }
 }
 
-// src/core/site/wrangler-config.ts
-import { dirname as dirname12, join as join17, resolve as resolve4 } from "node:path";
-var WRANGLER_REDIRECT_PATH = join17(".wrangler", "deploy", "config.json");
-var RedirectConfigSchema = looseObject({
-  configPath: string2().min(1)
-});
-var WranglerConfigSchema = looseObject({
-  main: string2().min(1, "wrangler config is missing a 'main' entry module"),
-  no_bundle: boolean2().optional(),
-  rules: array(looseObject({ type: string2(), globs: array(string2()) })).optional(),
-  assets: looseObject({
-    directory: string2().optional(),
-    html_handling: string2().optional(),
-    not_found_handling: string2().optional(),
-    run_worker_first: union([boolean2(), array(string2())]).optional(),
-    headers: string2().optional(),
-    redirects: string2().optional()
-  }).optional(),
-  compatibility_date: string2().optional(),
-  compatibility_flags: array(string2()).optional(),
-  vars: record(string2(), unknown()).optional(),
-  upload_source_maps: boolean2().optional()
-});
-async function detectFullStackArtifact(projectRoot) {
-  const redirectPath = join17(projectRoot, WRANGLER_REDIRECT_PATH);
-  return await pathExists(redirectPath) ? redirectPath : null;
-}
-async function resolveWranglerConfig(redirectPath) {
-  const configPath = await resolveRedirectedConfigPath(redirectPath);
-  const parsed = await readJsonFile(configPath);
-  const result = WranglerConfigSchema.safeParse(parsed);
-  if (!result.success) {
-    throw new ConfigInvalidError(`Invalid wrangler config: ${prettifyError(result.error)}`, configPath);
-  }
-  const config = result.data;
-  if (config.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 = dirname12(configPath);
-  const assetsDirectory = config.assets?.directory ? resolve4(configDir, config.assets.directory) : null;
-  return {
-    configPath,
-    configDir,
-    main: config.main,
-    assetsDirectory,
-    assetsConfig: config.assets ? toResolvedAssetsConfig(config.assets) : null,
-    compatibilityDate: config.compatibility_date ?? null,
-    compatibilityFlags: config.compatibility_flags ?? [],
-    rules: (config.rules ?? []).map((rule) => ({
-      type: rule.type,
-      globs: rule.globs
-    })),
-    uploadSourceMaps: config.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: ${prettifyError(result.error)}`, redirectPath);
-  }
-  const configPath = resolve4(dirname12(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/deployment.ts
 var NO_ASSETS = { manifest: {}, filesByHash: new Map };
 var DEPLOYMENTS_API_ENV = "BASE44_DEPLOYMENTS_API";
@@ -240115,12 +240144,11 @@ async function deployToDeployments(options) {
   return { deploymentId: finalized.deploymentId, gitHash };
 }
 async function resolveWorkerBuild(projectRoot, progress) {
-  const redirectPath = await detectFullStackArtifact(projectRoot);
-  if (!redirectPath) {
+  const built = await resolveFullStackBuild(projectRoot);
+  if (!built) {
     return null;
   }
-  const config = await resolveWranglerConfig(redirectPath);
-  const assetsDir = config.assetsDirectory && await pathExists(config.assetsDirectory) ? config.assetsDirectory : null;
+  const { config, modules, assetsDir } = built;
   return {
     config: {
       main: config.main,
@@ -240128,7 +240156,7 @@ async function resolveWorkerBuild(projectRoot, progress) {
       compatibility_flags: config.compatibilityFlags,
       assets: buildAssetsConfig(config.assetsConfig, progress)
     },
-    modules: await collectModules(config),
+    modules,
     assetsDir
   };
 }
@@ -247048,6 +247076,12 @@ async function ensureAppContext(ctx, options = {}) {
   ctx.app = appContext;
   ctx.errorReporter.setContext({ appId: appContext.id });
 }
+function requireApp(ctx) {
+  if (!ctx.app) {
+    throw new InternalError("This command read an app context it never resolved — it is declared with requireAppContext: false.");
+  }
+  return ctx.app;
+}
 
 // src/cli/utils/version-check.ts
 async function checkForUpgrade() {
@@ -247244,17 +247278,24 @@ var CreateVersionResponseSchema = object({
   versionId: data.version_id,
   manifestHash: data.manifest_hash
 }));
-var DeployVersionResponseSchema = object({
-  deployment_id: string2(),
-  manifest_hash: string2()
+var EnvironmentResponseSchema = object({
+  name: string2(),
+  version_id: string2(),
+  manifest_hash: string2(),
+  deployment_id: string2()
 }).transform((data) => ({
-  deploymentId: data.deployment_id,
-  manifestHash: data.manifest_hash
+  name: data.name,
+  versionId: data.version_id,
+  manifestHash: data.manifest_hash,
+  deploymentId: data.deployment_id
 }));
 
 // src/core/version/api.ts
 var DEFAULT_VERSION_UPLOAD_CONCURRENCY = 8;
 var MAX_VERSION_UPLOAD_CONCURRENCY = 16;
+function declaredFile({ path, size, digest }) {
+  return { path, size, digest };
+}
 async function post(path, json, doing) {
   try {
     return await getAppClient().post(path, { json, timeout: 180000 });
@@ -247262,6 +247303,13 @@ async function post(path, json, doing) {
     throw await ApiError.fromHttpError(error, doing);
   }
 }
+async function patch(path, json, doing) {
+  try {
+    return await getAppClient().patch(path, { json, timeout: 180000 });
+  } catch (error) {
+    throw await ApiError.fromHttpError(error, doing);
+  }
+}
 function parse10(schema, body, what) {
   const result = schema.safeParse(body);
   if (!result.success) {
@@ -247271,49 +247319,51 @@ function parse10(schema, body, what) {
 }
 async function createVersion(artifacts, options = {}) {
   const declared = parse10(DeclareVersionResponseSchema, await (await post("versions", {
-    static_bundle: artifacts.files.map(({ path, size, digest }) => ({
-      path,
-      size,
-      digest
-    })),
+    static_bundle: artifacts.files.map(declaredFile),
+    ...artifacts.siteWorker ? {
+      site_worker: {
+        main: artifacts.siteWorker.main,
+        modules: artifacts.siteWorker.modules.map(declaredFile),
+        compatibility_date: artifacts.siteWorker.compatibilityDate,
+        compatibility_flags: artifacts.siteWorker.compatibilityFlags
+      }
+    } : {},
     entities: artifacts.entities,
     agents: artifacts.agents,
-    source_commit: options.sourceCommit,
-    frontend_commit: options.sourceCommit
+    source_commit: options.sourceCommit
   }, "declaring a version")).json(), "declare");
+  const declaredFiles = [
+    ...artifacts.files,
+    ...artifacts.siteWorker?.modules ?? []
+  ];
   options.progress?.onDeclared?.({
-    fileCount: artifacts.files.length,
+    fileCount: declaredFiles.length,
     owedFiles: declared.uploads.length
   });
-  await uploadPresignedAssets(declared.uploads, {
-    manifest: Object.fromEntries(artifacts.files.map((file) => [
-      file.path,
-      { hash: file.digest, size: file.size }
-    ])),
-    filesByHash: new Map(artifacts.files.map((file) => [
-      file.digest,
-      {
-        absolutePath: file.absolutePath,
-        hash: file.digest,
-        size: file.size,
-        contentType: "application/octet-stream"
-      }
-    ]))
-  }, {
-    concurrency: options.concurrency ?? DEFAULT_VERSION_UPLOAD_CONCURRENCY,
-    onProgress: options.progress?.onUpload
-  });
+  if (declared.uploads.length !== declaredFiles.length) {
+    throw new InternalError(`Declared ${declaredFiles.length} files but the server signed ${declared.uploads.length} upload URLs.`);
+  }
+  let uploadedFiles = 0;
+  await pMap(declared.uploads, async (upload, index) => {
+    await putPresigned(upload, declaredFiles[index].absolutePath);
+    uploadedFiles++;
+    options.progress?.onUpload?.({
+      uploadedFiles,
+      totalFiles: declared.uploads.length
+    });
+  }, { concurrency: options.concurrency ?? DEFAULT_VERSION_UPLOAD_CONCURRENCY });
   return parse10(CreateVersionResponseSchema, await (await post(`versions/${encodeURIComponent(declared.sessionId)}/finalize`, {}, "creating a version")).json(), "create version");
 }
-async function deployVersion(versionId, options = {}) {
-  return parse10(DeployVersionResponseSchema, await (await post(`versions/${encodeURIComponent(versionId)}/deployments`, {
-    ...options.target ? { target: options.target } : {},
+async function setEnvironmentVersion(environment, versionId, options = {}) {
+  return parse10(EnvironmentResponseSchema, await (await patch(`environments/${encodeURIComponent(environment)}`, {
+    version_id: versionId,
     ...options.idempotencyKey ? { idempotency_key: options.idempotencyKey } : {}
-  }, "deploying a version")).json(), "deploy");
+  }, "setting the environment's version")).json(), "environment");
 }
 
 // src/core/version/publish.ts
 var STEP = Symbol.for("base44.publishStep");
+var DEFAULT_ENVIRONMENT = "production";
 async function tagStep(step, run) {
   try {
     return await run();
@@ -247333,11 +247383,15 @@ async function publishVersion(artifacts, options = {}) {
     concurrency: options.concurrency,
     progress: options.progress
   }));
-  const deployment = await tagStep("deploy", () => deployVersion(version.versionId, {
-    target: options.target,
+  const environment = await tagStep("deploy", () => setEnvironmentVersion(options.target ?? DEFAULT_ENVIRONMENT, version.versionId, {
     idempotencyKey: randomUUID4()
   }));
-  return { ...version, ...deployment };
+  return {
+    environment: environment.name,
+    versionId: environment.versionId,
+    manifestHash: environment.manifestHash,
+    deploymentId: environment.deploymentId
+  };
 }
 
 // src/cli/utils/command/Base44Command.ts
@@ -249705,56 +249759,54 @@ async function maybeAskToBuild(isNonInteractive, buildCommand) {
 }
 // src/core/version/artifacts.ts
 import { createHash as createHash2 } from "node:crypto";
-import { createReadStream as createReadStream3 } from "node:fs";
-import { stat as stat3 } from "node:fs/promises";
-import { basename as basename6, join as join27 } from "node:path";
-var MAX_FILE_COUNT = 1e5;
-var ASSETS_IGNORE_FILE2 = ".assetsignore";
-var ALWAYS_IGNORED2 = new Set([
-  ASSETS_IGNORE_FILE2,
-  "wrangler.json",
-  ".dev.vars"
-]);
+import { join as join27, resolve as resolve10 } from "node:path";
+var MAX_FILE_COUNT = 50000;
+var HASH_CONCURRENCY = 32;
 var ENTRY2 = "index.html";
 async function digestFile(absolutePath) {
-  const hash = createHash2("sha256");
-  for await (const chunk of createReadStream3(absolutePath)) {
-    hash.update(chunk);
-  }
+  const hash = await hashFileInto(createHash2("sha256"), absolutePath);
   return `sha256:${hash.digest("hex")}`;
 }
-async function collectBuildOutput(outputDir) {
-  const found = await globby("**/*", {
-    cwd: outputDir,
-    dot: true,
-    onlyFiles: true,
-    followSymbolicLinks: false,
-    ignoreFiles: [ASSETS_IGNORE_FILE2]
-  });
-  const relativePaths = found.filter((path) => !ALWAYS_IGNORED2.has(basename6(path))).sort();
-  if (relativePaths.length === 0) {
+async function collectBuildOutput(outputDir, options = {}) {
+  const found = await describeBuildOutput(outputDir);
+  if (found.length === 0) {
     throw new InvalidInputError(`No files found in ${outputDir}. Build the site before creating a version.`, {
       hints: [
         { message: "Run 'base44 build' first", command: "base44 build" }
       ]
     });
   }
-  if (relativePaths.length > MAX_FILE_COUNT) {
-    throw new InvalidInputError(`Too many files: found ${relativePaths.length}, the limit is ${MAX_FILE_COUNT}.`);
+  if (found.length > MAX_FILE_COUNT) {
+    throw new InvalidInputError(`Too many files: found ${found.length}, the limit is ${MAX_FILE_COUNT}.`);
   }
-  if (!relativePaths.includes(ENTRY2)) {
+  if (options.requireEntry !== false && !found.some((f) => f.path === ENTRY2)) {
     throw new InvalidInputError(`${outputDir} has no ${ENTRY2}, so nothing could enter the site.`);
   }
-  return await Promise.all(relativePaths.map(async (path) => {
-    const absolutePath = join27(outputDir, ...path.split("/"));
-    const { size } = await stat3(absolutePath);
-    return {
-      path,
+  return await pMap(found, async (file) => ({ ...file, digest: await digestFile(file.absolutePath) }), { concurrency: HASH_CONCURRENCY });
+}
+async function collectSiteWorker(projectRoot) {
+  const built = await resolveFullStackBuild(projectRoot);
+  if (!built) {
+    return null;
+  }
+  const { config, modules, assetsDir } = built;
+  const entry = resolve10(config.configDir, config.main);
+  const main = modules.find((m) => m.absolutePath === entry)?.name;
+  if (!main) {
+    throw new InvalidInputError(`The Worker's entry module ${config.main} is not among the ${modules.length} modules collected from ${config.configDir}.`);
+  }
+  return {
+    main,
+    modules: await pMap(modules, async ({ name, absolutePath, size }) => ({
+      path: name,
       absolutePath,
       size,
       digest: await digestFile(absolutePath)
-    };
-  }));
+    }), { concurrency: HASH_CONCURRENCY }),
+    compatibilityDate: config.compatibilityDate,
+    compatibilityFlags: config.compatibilityFlags,
+    assetsDir
+  };
 }
 async function readRawResources(dir) {
   if (!await pathExists(dir)) {
@@ -249786,7 +249838,7 @@ function versionsApiEnabled(env = process.env) {
   return value === "1" || value === "true";
 }
 // src/core/version/project.ts
-import { dirname as dirname21, join as join28, resolve as resolve10 } from "node:path";
+import { dirname as dirname21, join as join28, resolve as resolve11 } from "node:path";
 var DEFAULT_BUILD_COMMAND = "npm run build";
 var DEFAULT_OUTPUT_DIRECTORY = "dist";
 async function resolvePublishTarget(projectRoot, overrides = {}) {
@@ -249803,7 +249855,7 @@ async function resolvePublishTarget(projectRoot, overrides = {}) {
 }
 function outputDirectory(project, root, override) {
   const configured = override ?? (project ? project.site?.outputDirectory : DEFAULT_OUTPUT_DIRECTORY);
-  return configured ? resolve10(root, configured) : null;
+  return configured ? resolve11(root, configured) : null;
 }
 function requireOutputDir(target) {
   if (target.outputDir === null) {
@@ -249830,15 +249882,15 @@ async function readSettingsIfPresent(projectRoot) {
 }
 // src/cli/commands/project/build.ts
 async function buildAction(ctx) {
-  const { app } = ctx;
-  const target = await resolvePublishTarget(app?.projectRoot);
+  const app = requireApp(ctx);
+  const target = await resolvePublishTarget(app.projectRoot);
   await runSiteBuild(ctx, {
     root: target.root,
     buildCommand: target.buildCommand,
-    appId: app?.id ?? ""
+    appId: app.id
   });
   return {
-    outroMessage: `Site built with app id ${theme.styles.bold(app?.id ?? "")}`
+    outroMessage: `Site built with app id ${theme.styles.bold(app.id)}`
   };
 }
 function getBuildCommand() {
@@ -249846,7 +249898,7 @@ function getBuildCommand() {
 }
 
 // src/cli/commands/project/create.ts
-import { basename as basename7, resolve as resolve11 } from "node:path";
+import { basename as basename6, resolve as resolve12 } from "node:path";
 var import_kebabCase = __toESM(require_kebabCase(), 1);
 
 // src/cli/commands/project/scaffold-shared.ts
@@ -250011,8 +250063,8 @@ async function createInteractive(options, ctx) {
     name: () => {
       return options.name ? Promise.resolve(options.name) : Ze({
         message: "What is the name of your project?",
-        placeholder: basename7(process.cwd()),
-        initialValue: basename7(process.cwd()),
+        placeholder: basename6(process.cwd()),
+        initialValue: basename6(process.cwd()),
         validate: (value) => {
           if (!value || value.trim().length === 0) {
             return "Every project deserves a name";
@@ -250042,7 +250094,7 @@ async function createInteractive(options, ctx) {
   }, ctx);
 }
 async function createNonInteractive(options, ctx) {
-  ctx.log.info(`Creating a new project at ${resolve11(options.path)}`);
+  ctx.log.info(`Creating a new project at ${resolve12(options.path)}`);
   const template = await getTemplateById(options.template ?? DEFAULT_TEMPLATE_ID);
   return await executeCreate({
     template,
@@ -250066,7 +250118,7 @@ async function executeCreate({
 }, ctx) {
   const { log, runTask } = ctx;
   const name = rawName.trim();
-  const resolvedPath = resolve11(projectPath);
+  const resolvedPath = resolve12(projectPath);
   const organizationId = await resolveWorkspaceId(ctx, flagWorkspaceId, isInteractive);
   const { projectId } = await runTask("Setting up your project...", async () => {
     return await createProjectFiles({
@@ -250707,7 +250759,7 @@ function getLogsCommand() {
 }
 
 // src/cli/commands/project/scaffold.ts
-import { basename as basename8, resolve as resolve12 } from "node:path";
+import { basename as basename7, resolve as resolve13 } from "node:path";
 function resolveAppId(options) {
   const appId = options.appId;
   if (!appId) {
@@ -250723,8 +250775,8 @@ function resolveAppId(options) {
 async function scaffoldAction(ctx, name, options, command) {
   const { log, runTask } = ctx;
   const appId = resolveAppId(command.optsWithGlobals());
-  const resolvedPath = resolve12("./");
-  const projectName = (name ?? basename8(resolvedPath)).trim();
+  const resolvedPath = resolve13("./");
+  const projectName = (name ?? basename7(resolvedPath)).trim();
   const template = await getTemplateById("backend-only");
   log.info(`Scaffolding project at ${resolvedPath}`);
   const { projectId } = await runTask("Setting up your project...", async () => {
@@ -250798,24 +250850,31 @@ function concurrencyOption() {
 
 // src/cli/commands/publish.ts
 async function publishAction(ctx, options) {
-  const { runTask, log, jsonMode, app } = ctx;
-  const target = await resolvePublishTarget(app?.projectRoot, {
+  const { runTask, log, jsonMode } = ctx;
+  const app = requireApp(ctx);
+  const target = await resolvePublishTarget(app.projectRoot, {
     outputDir: options.outputDir
   });
   if (options.build !== false) {
     await tagStep("build", () => runSiteBuild(ctx, {
       root: target.root,
       buildCommand: target.buildCommand,
-      appId: app?.id ?? ""
+      appId: app.id
     }));
   }
-  const outputDir = requireOutputDir(target);
   const gitHash = await resolveProvenanceCommit(target.root, options.gitHash);
   const result = await runTask("Publishing...", async (updateMessage) => {
-    const artifacts = {
-      files: await collectBuildOutput(outputDir),
-      ...await collectResources(target.configDir, target)
-    };
+    const artifacts = await tagStep("create_version", async () => {
+      const siteWorker = await collectSiteWorker(target.root);
+      const assetsDir = siteWorker ? siteWorker.assetsDir : requireOutputDir(target);
+      return {
+        files: assetsDir ? await collectBuildOutput(assetsDir, {
+          requireEntry: siteWorker === null
+        }) : [],
+        ...siteWorker ? { siteWorker } : {},
+        ...await collectResources(target.configDir, target)
+      };
+    });
     return await publishVersion(artifacts, {
       sourceCommit: gitHash,
       target: options.target,
@@ -250830,7 +250889,7 @@ async function publishAction(ctx, options) {
     log.message(theme.styles.dim(`version ${result.versionId}`));
   }
   return {
-    outroMessage: `Deployment ${result.deploymentId}`,
+    outroMessage: `${result.environment} now serves ${result.versionId}`,
     stdout: jsonMode ? `${JSON.stringify(result, null, 2)}
 ` : undefined
   };
@@ -251208,7 +251267,7 @@ function getSecretsListCommand() {
 }
 
 // src/cli/commands/secrets/set.ts
-import { resolve as resolve13 } from "node:path";
+import { resolve as resolve14 } from "node:path";
 function parseEntries(entries) {
   const secrets = {};
   for (const entry of entries) {
@@ -251239,7 +251298,7 @@ async function setSecretsAction({ log, runTask }, entries, options) {
   validateInput(entries, options);
   let secrets;
   if (options.envFile) {
-    secrets = await parseEnvFile(resolve13(options.envFile));
+    secrets = await parseEnvFile(resolve14(options.envFile));
     if (Object.keys(secrets).length === 0) {
       throw new InvalidInputError("The env file contains no valid KEY=VALUE entries.");
     }
@@ -251268,7 +251327,7 @@ function getSecretsCommand() {
 }
 
 // src/cli/commands/site/deploy.ts
-import { resolve as resolve14 } from "node:path";
+import { resolve as resolve15 } from "node:path";
 async function deployAction2(ctx, options) {
   const { isNonInteractive } = ctx;
   if (isNonInteractive && !options.yes) {
@@ -251346,7 +251405,7 @@ async function deployTarball({ runTask }, project) {
 }
 function siteOutputDir(project) {
   const outputDirectory = project.site?.outputDirectory;
-  return outputDirectory ? resolve14(project.root, outputDirectory) : null;
+  return outputDirectory ? resolve15(project.root, outputDirectory) : null;
 }
 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)");
@@ -251563,18 +251622,21 @@ function getVersionCreateCommand() {
 // src/cli/commands/versions/deploy.ts
 import { randomUUID as randomUUID5 } from "node:crypto";
 async function deployAction3({ runTask, jsonMode }, versionId, options) {
-  const deployment = await runTask(`Deploying version ${versionId}...`, async () => await deployVersion(versionId, {
-    target: options.target,
+  const environment = options.target ?? DEFAULT_ENVIRONMENT;
+  const result = await runTask(`Pointing ${environment} at ${versionId}...`, async () => await setEnvironmentVersion(environment, versionId, {
     idempotencyKey: randomUUID5()
-  }), { successMessage: "Version deployed", errorMessage: "Deploy failed" });
+  }), {
+    successMessage: "Environment updated",
+    errorMessage: "Could not update the environment"
+  });
   return {
-    outroMessage: `Deployment ${deployment.deploymentId}`,
-    stdout: jsonMode ? `${JSON.stringify(deployment, null, 2)}
+    outroMessage: `${result.name} now serves ${result.versionId}`,
+    stdout: jsonMode ? `${JSON.stringify(result, null, 2)}
 ` : undefined
   };
 }
 function getVersionDeployCommand() {
-  return new Base44Command("deploy").description("Serve an already-recorded version (also how a rollback is done)").argument("<version-id>", "The version to serve").addOption(targetOption()).action(deployAction3);
+  return new Base44Command("deploy").description("Point an environment at an already-recorded version (also the rollback)").argument("<version-id>", "The version to serve").option("--target <name>", "Environment to point at it").action(deployAction3);
 }
 
 // src/cli/commands/versions/index.ts
@@ -253905,11 +253967,11 @@ import { relative as relative9 } from "node:path";
 // ../../node_modules/chokidar/index.js
 import { EventEmitter as EventEmitter3 } from "node:events";
 import { stat as statcb, Stats } from "node:fs";
-import { readdir as readdir3, stat as stat7 } from "node:fs/promises";
+import { readdir as readdir3, stat as stat6 } from "node:fs/promises";
 import * as sp3 from "node:path";
 
 // ../../node_modules/readdirp/index.js
-import { lstat as lstat2, readdir as readdir2, realpath, stat as stat5 } from "node:fs/promises";
+import { lstat as lstat2, readdir as readdir2, realpath, stat as stat4 } from "node:fs/promises";
 import { join as pjoin, relative as prelative, resolve as presolve, sep as psep } from "node:path";
 import { Readable as Readable6 } from "node:stream";
 var EntryTypes = {
@@ -253991,7 +254053,7 @@ class ReaddirpStream extends Readable6 {
     const { root, type } = opts;
     this._fileFilter = normalizeFilter(opts.fileFilter);
     this._directoryFilter = normalizeFilter(opts.directoryFilter);
-    const statMethod = opts.lstat ? lstat2 : stat5;
+    const statMethod = opts.lstat ? lstat2 : stat4;
     if (wantBigintFsStats) {
       this._stat = (path) => statMethod(path, { bigint: true });
     } else {
@@ -254144,7 +254206,7 @@ function readdirp(root, options = {}) {
 
 // ../../node_modules/chokidar/handler.js
 import { watch as fs_watch, unwatchFile, watchFile } from "node:fs";
-import { realpath as fsrealpath, lstat as lstat3, open as open2, stat as stat6 } from "node:fs/promises";
+import { realpath as fsrealpath, lstat as lstat3, open as open2, stat as stat5 } from "node:fs/promises";
 import { type as osType } from "node:os";
 import * as sp2 from "node:path";
 var STR_DATA = "data";
@@ -254170,7 +254232,7 @@ var EVENTS = {
 };
 var EV = EVENTS;
 var THROTTLE_MODE_WATCH = "watch";
-var statMethods = { lstat: lstat3, stat: stat6 };
+var statMethods = { lstat: lstat3, stat: stat5 };
 var KEY_LISTENERS = "listeners";
 var KEY_ERR = "errHandlers";
 var KEY_RAW = "rawEmitters";
@@ -254641,7 +254703,7 @@ class NodeFsHandler {
         return;
       if (!newStats || newStats.mtimeMs === 0) {
         try {
-          const newStats = await stat6(file);
+          const newStats = await stat5(file);
           if (this.fsw.closed)
             return;
           const at = newStats.atimeMs;
@@ -255313,7 +255375,7 @@ class FSWatcher extends EventEmitter3 {
       const fullPath = opts.cwd ? sp3.join(opts.cwd, path) : path;
       let stats;
       try {
-        stats = await stat7(fullPath);
+        stats = await stat6(fullPath);
       } catch (err) {}
       if (!stats || this.closed)
         return;
@@ -256095,7 +256157,7 @@ Examples:
 }
 
 // src/cli/commands/project/eject.ts
-import { resolve as resolve18 } from "node:path";
+import { resolve as resolve19 } from "node:path";
 var import_kebabCase2 = __toESM(require_kebabCase(), 1);
 async function eject(ctx, options, command) {
   const { log, runTask, isNonInteractive } = ctx;
@@ -256159,7 +256221,7 @@ async function eject(ctx, options, command) {
     Ne("Operation cancelled.");
     throw new CLIExitError(0);
   }
-  const resolvedPath = resolve18(selectedPath);
+  const resolvedPath = resolve19(selectedPath);
   await runTask("Downloading your project's code...", async (updateMessage) => {
     await createProjectFilesForExistingProject({
       projectId,
@@ -258303,7 +258365,7 @@ class ReduceableCache {
   }
 }
 // ../../node_modules/posthog-node/dist/extensions/error-tracking/modifiers/context-lines.node.mjs
-import { createReadStream as createReadStream4 } from "node:fs";
+import { createReadStream as createReadStream3 } from "node:fs";
 import { createInterface as createInterface2 } from "node:readline";
 var LRU_FILE_CONTENTS_CACHE = new ReduceableCache(25);
 var LRU_FILE_CONTENTS_FS_READ_FAILED = new ReduceableCache(20);
@@ -258347,7 +258409,7 @@ async function addSourceContext(frames) {
 }
 function getContextLinesFromFile(path, ranges, output) {
   return new Promise((resolve) => {
-    const stream = createReadStream4(path);
+    const stream = createReadStream3(path);
     const lineReaded = createInterface2({
       input: stream
     });
@@ -260298,4 +260360,4 @@ export {
   runCLI
 };
 
-//# debugId=2D4CD02B7197620F64756E2164756E21
+//# debugId=049BFBB8889BAA6E64756E2164756E21