@base44-preview/cli 0.1.24-pr.646.09ee9f4 → 0.1.25-pr.643.86a7bb6

package/dist/cli/index.js

@@ -236596,6 +236596,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 = {
@@ -239265,7 +239274,7 @@ import { join as join13 } from "node:path";
 // package.json
 var package_default = {
   name: "base44",
-  version: "0.1.24",
+  version: "0.1.25",
   description: "Base44 CLI - Unified interface for managing Base44 applications",
   type: "module",
   bin: {
@@ -239568,6 +239577,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("**/*", {
@@ -240149,11 +240174,6 @@ async function putPresigned(upload, absolutePath) {
 
 // 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);
@@ -246759,7 +246779,7 @@ async function gitHead(projectRoot) {
   }
 }
 // src/core/project/deploy.ts
-function hasResourcesToDeploy(projectData) {
+async function hasResourcesToDeploy(projectData) {
   const {
     project,
     entities,
@@ -246770,7 +246790,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;
@@ -246829,12 +246849,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";
@@ -249991,7 +250058,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"
     };
@@ -250050,6 +250117,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}`);
     },
@@ -250085,7 +250157,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);
@@ -250106,6 +250178,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) {
@@ -251410,11 +251488,20 @@ 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;
+  if (!siteOutputDir(project) && !await detectFullStackArtifact(projectRoot)) {
+    throw new ConfigNotFoundError("No site configuration found.", {
+      hints: [
+        {
+          message: `Add 'site.outputDirectory' to your config.jsonc (e.g., "site": { "outputDirectory": "dist" })`
+        }
+      ]
+    });
+  }
   const gitHash = await resolveGitHash(projectRoot, options.gitHash);
   const progressLines = [];
   const warnings = [];
@@ -251446,42 +251533,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);
-  if (!outputDir) {
-    throw new ConfigNotFoundError("No site configuration found.", {
-      hints: [
-        {
-          message: `Add 'site.outputDirectory' to your config.jsonc (e.g., "site": { "outputDirectory": "dist" })`
-        }
-      ]
-    });
-  }
-  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 = project.site?.outputDirectory;
   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)");
-  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).");
   }
@@ -251535,12 +251604,17 @@ function createDevLogger(label, labelColor = theme.styles.dim) {
 // src/cli/dev/dev-server/serve-runner.ts
 import { spawn as spawn2 } from "node:child_process";
 import process21 from "node:process";
+var ANSI_PATTERN = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
+var LOCAL_ORIGIN_PATTERN = /https?:\/\/(?:localhost|127\.0\.0\.1|\[::1\]):(\d+)/g;
 
 class ServeRunner {
   command;
   cwd;
   env;
   logger;
+  onOrigin;
+  ignorePort;
+  originReported = false;
   child;
   stopping = false;
   stopPromise;
@@ -251550,6 +251624,8 @@ class ServeRunner {
     this.cwd = options.cwd;
     this.env = options.env;
     this.logger = options.logger;
+    this.onOrigin = options.onOrigin;
+    this.ignorePort = options.ignorePort;
   }
   start() {
     if (this.child) {
@@ -251626,6 +251702,7 @@ class ServeRunner {
     const lines = data.toString().trimEnd().split(`
 `);
     for (const line of lines) {
+      this.reportOrigin(line);
       if (type === "error") {
         this.logger.error(line);
       } else {
@@ -251633,6 +251710,20 @@ class ServeRunner {
       }
     }
   }
+  reportOrigin(line) {
+    if (this.originReported || !this.onOrigin) {
+      return;
+    }
+    const matches = line.replace(ANSI_PATTERN, "").matchAll(LOCAL_ORIGIN_PATTERN);
+    for (const [origin, port] of matches) {
+      if (Number(port) === this.ignorePort) {
+        continue;
+      }
+      this.originReported = true;
+      this.onOrigin(origin);
+      return;
+    }
+  }
 }
 
 // src/cli/dev/serve-command-runner.ts
@@ -251640,7 +251731,9 @@ function createServeCommandRunner({
   serveCommand,
   projectRoot,
   appId,
-  appBaseUrl
+  appBaseUrl,
+  onOrigin,
+  ignorePort
 }) {
   return new ServeRunner({
     command: serveCommand,
@@ -251649,7 +251742,9 @@ function createServeCommandRunner({
       VITE_BASE44_APP_ID: appId,
       ...appBaseUrl ? { VITE_BASE44_APP_BASE_URL: appBaseUrl } : {}
     },
-    logger: createDevLogger("frontend", theme.colors.base44Orange)
+    logger: createDevLogger("frontend", theme.colors.base44Orange),
+    onOrigin,
+    ignorePort
   });
 }
 
@@ -252428,7 +252523,7 @@ async function getPorts(options) {
 }
 
 // src/cli/dev/dev-server/main.ts
-var import_http_proxy_middleware2 = __toESM(require_dist2(), 1);
+var import_http_proxy_middleware3 = __toESM(require_dist2(), 1);
 
 // ../../node_modules/tmp-promise/index.js
 var { promisify: promisify11 } = __require("util");
@@ -252993,8 +253088,7 @@ async function createFunctionRuntime(functions, logger, denoWrapperPath) {
   return new FunctionManager(functions, logger, denoWrapperPath);
 }
 
-// src/cli/dev/dev-server/routes/functions.ts
-var import_express = __toESM(require_express(), 1);
+// src/cli/dev/dev-server/routes/app-server.ts
 var import_http_proxy_middleware = __toESM(require_dist2(), 1);
 import { ServerResponse } from "node:http";
 
@@ -253011,11 +253105,86 @@ var createServiceToken = () => createJwtToken(SERVICE_ROLE_EMAIL);
 var createServiceAuthorizationHeader = () => `Bearer ${createServiceToken()}`;
 var isServiceSubject = (subject) => subject === SERVICE_ROLE_EMAIL;
 
+// src/cli/dev/dev-server/routes/app-server.ts
+var PLATFORM_OWNED_SDK_HEADERS = [
+  "base44-app-id",
+  "base44-api-url",
+  "base44-service-authorization",
+  "base44-state",
+  "base44-functions-version",
+  "x-base44-app-url",
+  "x-data-env"
+];
+var FORWARDED_HEADER = "base44-dev-forwarded";
+var PROXY_LOOP_MESSAGE = [
+  "The app dev server sent this request back to the Base44 dev server instead of handling it.",
+  "Its Vite proxy is forwarding all of /api; only /api/apps belongs to the backend.",
+  "Update @base44/vite-plugin, or narrow the proxy in vite.config.js to /api/apps."
+].join(" ");
+function createAppServerProxy(target, logger) {
+  let origin = "http://127.0.0.1:0";
+  const proxy = import_http_proxy_middleware.createProxyMiddleware({
+    router: () => origin,
+    changeOrigin: true,
+    ws: true,
+    on: {
+      proxyReq: (proxyReq, req) => {
+        for (const header of PLATFORM_OWNED_SDK_HEADERS) {
+          proxyReq.removeHeader(header);
+        }
+        proxyReq.setHeader("Base44-App-Id", target.appId);
+        proxyReq.setHeader("Base44-Api-Url", `${req.protocol}://${req.headers.host}`);
+        proxyReq.setHeader("Base44-Service-Authorization", createServiceAuthorizationHeader());
+        proxyReq.setHeader(FORWARDED_HEADER, "1");
+      },
+      error: (err, _req, res) => {
+        logger.error("App dev server proxy error:", err);
+        if (res instanceof ServerResponse && !res.headersSent) {
+          res.writeHead(502, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({
+            error: "Failed to proxy request to the app dev server",
+            details: err.message
+          }));
+        }
+      }
+    }
+  });
+  const resolveOrigin = async () => {
+    origin = await target.waitForOrigin();
+  };
+  const middleware = async (req, res, next) => {
+    if (req.headers[FORWARDED_HEADER]) {
+      logger.error(PROXY_LOOP_MESSAGE);
+      res.status(508).json({ error: PROXY_LOOP_MESSAGE });
+      return;
+    }
+    try {
+      await resolveOrigin();
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      logger.error(message);
+      res.status(502).json({ error: message });
+      return;
+    }
+    await proxy(req, res, next);
+  };
+  const upgrade = (req, socket, head) => {
+    resolveOrigin().then(() => proxy.upgrade(req, socket, head), (error) => {
+      logger.error(error instanceof Error ? error.message : String(error));
+      socket.destroy();
+    });
+  };
+  return { middleware, upgrade };
+}
+
 // src/cli/dev/dev-server/routes/functions.ts
+var import_express = __toESM(require_express(), 1);
+var import_http_proxy_middleware2 = __toESM(require_dist2(), 1);
+import { ServerResponse as ServerResponse2 } from "node:http";
 function createFunctionRouter(manager, logger) {
   const router = import_express.Router({ mergeParams: true });
   const portsByRequest = new WeakMap;
-  const proxy = import_http_proxy_middleware.createProxyMiddleware({
+  const proxy = import_http_proxy_middleware2.createProxyMiddleware({
     router: (req) => `http://localhost:${portsByRequest.get(req)}`,
     changeOrigin: true,
     on: {
@@ -253029,7 +253198,7 @@ function createFunctionRouter(manager, logger) {
       },
       error: (err, _req, res) => {
         logger.error("Function proxy error:", err);
-        if (res instanceof ServerResponse && !res.headersSent) {
+        if (res instanceof ServerResponse2 && !res.headersSent) {
           res.writeHead(502, { "Content-Type": "application/json" });
           res.end(JSON.stringify({
             error: "Failed to proxy request to function",
@@ -253375,9 +253544,10 @@ var import_dist = __toESM(require_dist4(), 1);
 var { Server, Namespace, Socket } = import_dist.default;
 
 // src/cli/dev/dev-server/realtime.ts
+var REALTIME_PATH = "/ws-user-apps/socket.io/";
 function createRealtimeServer(httpServer) {
   const io = new Server(httpServer, {
-    path: "/ws-user-apps/socket.io/",
+    path: REALTIME_PATH,
     cors: {
       origin: /^http:\/\/localhost(:\d+)?$/,
       credentials: true
@@ -255910,6 +256080,7 @@ class WatchBase44 extends EventEmitter4 {
 // src/cli/dev/dev-server/main.ts
 var DEFAULT_PORT = 4400;
 var BASE44_APP_URL = "https://base44.app";
+var PLATFORM_PATH_PATTERN = /^\/api\/apps(\/|$)/;
 async function createDevServer(options) {
   const { port: userPort } = options;
   const port = userPort ?? await getPorts({
@@ -255918,7 +256089,7 @@ async function createDevServer(options) {
   const baseUrl = `http://localhost:${port}`;
   const { functions, entities, project, siteUrl } = await options.loadResources();
   const app = import_express6.default();
-  const remoteProxy = import_http_proxy_middleware2.createProxyMiddleware({
+  const remoteProxy = import_http_proxy_middleware3.createProxyMiddleware({
     target: BASE44_APP_URL,
     changeOrigin: true
   });
@@ -255980,7 +256151,11 @@ async function createDevServer(options) {
   app.use("/api/apps/:appId/integration-endpoints", integrationRoutes);
   const customIntegrationRoutes = createCustomIntegrationRoutes(remoteProxy, devLogger);
   app.use("/api/apps/:appId/integrations/custom", customIntegrationRoutes);
+  const appServerProxy = options.appServer ? createAppServerProxy(options.appServer, devLogger) : undefined;
   app.use((req, res, next) => {
+    if (appServerProxy && !PLATFORM_PATH_PATTERN.test(req.path)) {
+      return appServerProxy.middleware(req, res, next);
+    }
     if (siteUrl && (req.path === "/login" || req.path.startsWith("/login/"))) {
       const targetUrl = new URL(req.originalUrl, siteUrl);
       devLogger.warn(`"${req.originalUrl}" requires hosted login, redirecting to ${targetUrl.toString()}`);
@@ -256005,6 +256180,13 @@ async function createDevServer(options) {
       }
     });
   });
+  if (appServerProxy) {
+    server.on("upgrade", (req, socket, head) => {
+      if (!req.url?.startsWith(REALTIME_PATH)) {
+        appServerProxy.upgrade(req, socket, head);
+      }
+    });
+  }
   const io = createRealtimeServer(server);
   emitEntityEvent = (appId, entityName, event) => {
     broadcastEntityEvent(io, appId, entityName, event);
@@ -256078,9 +256260,24 @@ async function createDevServer(options) {
 }
 
 // src/cli/commands/dev.ts
+var APP_SERVER_START_TIMEOUT_MS = 120000;
 function localServerUrl(port) {
   return `http://localhost:${port}`;
 }
+function createAppServerOrigin() {
+  let report;
+  const announced = new Promise((resolve) => {
+    report = resolve;
+  });
+  const timedOut = new Promise((_, reject) => {
+    const timer = setTimeout(() => reject(new Error("The app dev server did not print a local URL, so requests cannot be forwarded to it.")), APP_SERVER_START_TIMEOUT_MS);
+    timer.unref();
+  });
+  return {
+    waitForOrigin: () => Promise.race([announced, timedOut]),
+    report
+  };
+}
 function validateDevOptions(command) {
   const { appId } = command.optsWithGlobals();
   if (appId !== undefined) {
@@ -256133,10 +256330,12 @@ async function localDevAction(ctx, app, options) {
   const siteUrlPromise = getSiteUrl().catch(() => {
     return;
   });
+  const appServerOrigin = createAppServerOrigin();
   const backend = await createDevServer({
     log: ctx.log,
     port: options.port ? Number(options.port) : undefined,
     denoWrapperPath: getDenoWrapperPath(),
+    appServer: site ? { appId: app.id, waitForOrigin: appServerOrigin.waitForOrigin } : undefined,
     loadResources: async () => {
       const { functions, entities, project } = await readProjectConfig();
       const siteUrl = await siteUrlPromise;
@@ -256148,11 +256347,13 @@ async function localDevAction(ctx, app, options) {
     const runner = createServeCommandRunner({
       ...site,
       appId: app.id,
-      appBaseUrl: backendUrl
+      appBaseUrl: backendUrl,
+      onOrigin: appServerOrigin.report,
+      ignorePort: backend.port
     });
     startServeCommand(runner, { url: backendUrl, shutdown: backend.shutdown });
   }
-  const outroMessage = site ? "Open your app using the frontend dev server URL" : `Dev server is available at ${theme.colors.links(backendUrl)}`;
+  const outroMessage = site ? `Your app is available at ${theme.colors.links(backendUrl)}` : `Dev server is available at ${theme.colors.links(backendUrl)}`;
   return { outroMessage };
 }
 async function devAction(ctx, options) {
@@ -260579,4 +260780,4 @@ export {
   runCLI
 };
 
-//# debugId=9978A4087157AD8F64756E2164756E21
+//# debugId=3589FFC17FD03B1464756E2164756E21