@donotdev/cli 0.0.15 → 0.0.16

package/dist/bin/commands/create-project.js

@@ -8713,15 +8713,10 @@ function getMatrixPath(mode) {
   }
   const executionMode = mode || detectExecutionMode();
   if (executionMode === "development") {
-    const repoRoot = getRepoRoot();
-    if (repoRoot) {
-      const devPath = normalizePath(
-        repoRoot,
-        "packages/cli/dependencies-matrix.json"
-      );
-      if (pathExists(devPath)) {
-        return devPath;
-      }
+    const templatesRoot = getTemplatesRoot();
+    const devPath = normalizePath(templatesRoot, "..", "dependencies-matrix.json");
+    if (pathExists(devPath)) {
+      return devPath;
     }
   }
   return null;
@@ -8736,8 +8731,8 @@ function getCliVersion(mode) {
   }
   const executionMode = mode || detectExecutionMode();
   if (executionMode === "development") {
-    const repoRoot = getRepoRoot();
-    const cliPackageJson = joinPath(repoRoot, "packages/cli/package.json");
+    const templatesRoot = getTemplatesRoot();
+    const cliPackageJson = normalizePath(templatesRoot, "..", "package.json");
     if (pathExists(cliPackageJson)) {
       const pkg = readSync(cliPackageJson, { format: "json" });
       return String(pkg?.version || "0.0.0");
@@ -9026,7 +9021,7 @@ function generatePackageJson(templateName, mode, options = {}) {
   }
   if (templateName.includes("functions")) {
     result.main = "lib/index.js";
-    result.engines = { node: "20" };
+    result.engines = { node: "22" };
     if (options.appName) {
       const platform = templateName.includes("vercel") ? "Vercel" : "Firebase";
       result.description = `${options.appName} ${platform} Functions`;
@@ -9073,15 +9068,15 @@ init_utils();
 var MATRIX = [
   { builder: "vite", backend: "none", baseTemplate: "app-vite", overlay: null, deployConfig: null, functionsTemplate: null },
   { builder: "vite", backend: "firebase", baseTemplate: "app-vite", overlay: "overlay-firebase", deployConfig: "firebase", functionsTemplate: "functions-firebase" },
-  { builder: "vite", backend: "supabase", baseTemplate: "app-vite", overlay: "overlay-supabase", deployConfig: "vercel-supabase", functionsTemplate: null },
+  { builder: "vite", backend: "supabase", baseTemplate: "app-vite", overlay: "overlay-supabase", deployConfig: "vercel-supabase", functionsTemplate: "functions-supabase" },
   { builder: "vite", backend: "vercel", baseTemplate: "app-vite", overlay: "overlay-vercel", deployConfig: "vercel-vercel", functionsTemplate: "functions-vercel" },
   { builder: "nextjs", backend: "none", baseTemplate: "app-next", overlay: null, deployConfig: null, functionsTemplate: null },
   { builder: "nextjs", backend: "firebase", baseTemplate: "app-next", overlay: "overlay-firebase", deployConfig: "firebase", functionsTemplate: "functions-firebase" },
-  { builder: "nextjs", backend: "supabase", baseTemplate: "app-next", overlay: "overlay-supabase", deployConfig: "vercel-supabase", functionsTemplate: null },
+  { builder: "nextjs", backend: "supabase", baseTemplate: "app-next", overlay: "overlay-supabase", deployConfig: "vercel-supabase", functionsTemplate: "functions-supabase" },
   { builder: "nextjs", backend: "vercel", baseTemplate: "app-next", overlay: "overlay-vercel", deployConfig: "vercel-vercel", functionsTemplate: "functions-vercel" },
   { builder: "expo", backend: "none", baseTemplate: "app-expo", overlay: null, deployConfig: null, functionsTemplate: null },
   { builder: "expo", backend: "firebase", baseTemplate: "app-expo", overlay: "overlay-firebase", deployConfig: null, functionsTemplate: "functions-firebase" },
-  { builder: "expo", backend: "supabase", baseTemplate: "app-expo", overlay: "overlay-supabase", deployConfig: null, functionsTemplate: null },
+  { builder: "expo", backend: "supabase", baseTemplate: "app-expo", overlay: "overlay-supabase", deployConfig: null, functionsTemplate: "functions-supabase" },
   { builder: "demo", backend: "none", baseTemplate: "app-demo", overlay: null, deployConfig: null, functionsTemplate: null }
 ];
 function comboKey(builder, backend) {
@@ -9256,7 +9251,7 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
           if (providersVariant[1] !== appTemplate) continue;
           const destPath2 = joinPath(appDir, "src/config/providers.ts");
           await ensureDir(getDirname(destPath2));
-          await copy(joinPath(overlayDir, file), destPath2);
+          await copy(joinPath(overlayDir, file), destPath2, { overwrite: true });
           if (await isTextFile(destPath2)) await replacePlaceholders(destPath2, replacements);
           continue;
         }
@@ -9267,7 +9262,7 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
         }
         const destPath = joinPath(appDir, destFileName);
         await ensureDir(getDirname(destPath));
-        await copy(sourcePath, destPath);
+        await copy(sourcePath, destPath, { overwrite: true });
         if (await isTextFile(destPath)) {
           await replacePlaceholders(destPath, replacements);
         }
@@ -9310,23 +9305,26 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
     overwrite: true
   });
   if (row.functionsTemplate) {
-    const functionsRootDir = joinPath(appDir, "functions");
     const functionsTemplateName = row.functionsTemplate;
     const functionsTemplateExists = pathExists(joinPath(templatesRoot, functionsTemplateName));
     if (!functionsTemplateExists) {
       log.warn(`Functions template "${functionsTemplateName}" not found \u2014 skipping functions scaffolding.`);
     } else {
-      const functionsPackageJson = generatePackageJson(
-        functionsTemplateName,
-        executionMode,
-        { appName, platform: row.functionsTemplate.replace("functions-", "") }
-      );
-      const packageJsonPath2 = joinPath(functionsRootDir, "package.json");
-      await ensureDir(functionsRootDir);
-      await write(packageJsonPath2, functionsPackageJson, {
-        format: "json",
-        overwrite: true
-      });
+      const isSupabaseFunctions = functionsTemplateName === "functions-supabase";
+      const functionsRootDir = isSupabaseFunctions ? appDir : joinPath(appDir, "functions");
+      if (!isSupabaseFunctions) {
+        const functionsPackageJson = generatePackageJson(
+          functionsTemplateName,
+          executionMode,
+          { appName, platform: row.functionsTemplate.replace("functions-", "") }
+        );
+        const packageJsonPath2 = joinPath(functionsRootDir, "package.json");
+        await ensureDir(functionsRootDir);
+        await write(packageJsonPath2, functionsPackageJson, {
+          format: "json",
+          overwrite: true
+        });
+      }
       const templateDir2 = joinPath(templatesRoot, functionsTemplateName);
       const templateFiles2 = await glob("**/*", {
         cwd: templateDir2,
@@ -9359,6 +9357,18 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
       await copy(firebaseJsonSource, joinPath(appDir, "firebase.json"));
       const firebaseJsonDest = joinPath(appDir, "firebase.json");
       if (await isTextFile(firebaseJsonDest)) await replacePlaceholders(firebaseJsonDest, replacements);
+      if (appTemplate === "nextjs") {
+        const firebaseJson = readSync(firebaseJsonDest, { format: "json" });
+        if (firebaseJson.hosting?.rewrites) {
+          firebaseJson.hosting.rewrites = firebaseJson.hosting.rewrites.filter(
+            (r2) => r2.destination !== "/index.html"
+          );
+        }
+        if (firebaseJson.hosting) {
+          firebaseJson.hosting.public = "out";
+        }
+        await write(firebaseJsonDest, firebaseJson, { format: "json", overwrite: true });
+      }
     }
     const firebasercSource = joinPath(deploymentTemplateDir, ".firebaserc.example");
     if (pathExists(firebasercSource)) {
@@ -9375,6 +9385,44 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
       }
     }
   }
+  if (!deployConfig && backend === "firebase" && row.functionsTemplate) {
+    const firebaseJsonPath = joinPath(appDir, "firebase.json");
+    if (!pathExists(firebaseJsonPath)) {
+      const expoFirebaseJson = {
+        functions: [
+          {
+            source: "functions",
+            codebase: "default",
+            ignore: ["node_modules", ".git", "firebase-debug.log", "firebase-debug.*.log", "**/.*", "**/*.test.ts", "**/__tests__/**"],
+            runtime: "nodejs22"
+          }
+        ],
+        firestore: { rules: "firestore.rules", indexes: "firestore.indexes.json" },
+        storage: { rules: "storage.rules" },
+        emulators: {
+          auth: { port: 9099 },
+          functions: { port: 5001 },
+          firestore: { port: 8080 },
+          storage: { port: 9199 },
+          ui: { enabled: true, port: 4e3 }
+        }
+      };
+      await write(firebaseJsonPath, expoFirebaseJson, { format: "json", overwrite: true });
+    }
+    const firebasercSource = joinPath(deploymentTemplateDir, ".firebaserc.example");
+    const firebasercDest = joinPath(appDir, ".firebaserc");
+    if (pathExists(firebasercSource) && !pathExists(firebasercDest)) {
+      await copy(firebasercSource, firebasercDest);
+      if (await isTextFile(firebasercDest)) await replacePlaceholders(firebasercDest, replacements);
+    }
+    for (const example of ["firestore.rules.example", "firestore.indexes.json.example", "storage.rules.example"]) {
+      const src = joinPath(deploymentTemplateDir, example);
+      const dest = joinPath(appDir, example.replace(".example", ""));
+      if (pathExists(src) && !pathExists(dest)) {
+        await copy(src, dest);
+      }
+    }
+  }
   if (deployConfig === "vercel-vercel") {
     const vercelJsonSource = joinPath(deploymentTemplateDir, "vercel.json.example");
     if (pathExists(vercelJsonSource)) {
@@ -9417,23 +9465,25 @@ init_cli_input();
 init_cli_output();
 init_pathResolver();
 var SHOW_WIP2 = process.env.SHOW_WIP === "true" || process.argv.includes("--wip");
-var BACKEND_CHOICES = [
-  { title: "None", value: "none" },
-  {
-    title: "Firebase \u2014 Full platform (Auth, Firestore, Storage, Functions, Hosting)",
-    value: "firebase"
-  },
-  {
-    title: "Supabase \u2014 Auth, Postgres, Storage, Functions",
-    value: "supabase"
-  },
-  {
-    title: "Vercel \u2014 Serverless functions + Hosting (e.g. Next.js API routes)",
-    value: "vercel"
-  }
-];
-function getDefaultBackendIndex(framework) {
-  return framework === "nextjs" ? 3 : 1;
+async function collectAppConfig(appName) {
+  const answers = await runQuestionnaire(APP_QUESTIONNAIRE, {}, SHOW_WIP2, {
+    selection: askForSelection,
+    confirmation: askForConfirmation,
+    input: askForInput
+  });
+  const framework = answers.framework || "vite";
+  const needsBackend = answers.needsBackend || false;
+  const defaultPlatform = framework === "nextjs" ? "vercel" : "firebase";
+  return {
+    template: framework,
+    needsBackend,
+    backendPlatform: needsBackend ? answers.backendPlatform || defaultPlatform : void 0,
+    needsCRUD: false,
+    selectedEntities: [],
+    userAuth: "none",
+    billing: false,
+    features: []
+  };
 }
 function calculateRelativePath(from, to) {
   try {
@@ -9546,71 +9596,22 @@ async function main(options) {
     let appNames = [];
     const appConfigs = {};
     let anyAppNeedsBackend = false;
-    const firstAppName = await askForInput(
-      "What's your first app name? (press Enter to skip)",
-      ""
-    );
-    if (firstAppName && firstAppName.trim() !== "") {
-      const trimmedName = firstAppName.trim();
-      if (isReservedAppName(trimmedName)) {
-        log.warn(`'${trimmedName}' is reserved for framework demos.`);
-      } else if (!isValidFileName(trimmedName)) {
-        log.warn(
-          `Invalid app name. Use only letters, numbers, dashes (-), and underscores (_).`
-        );
-      } else {
-        appNames.push(trimmedName);
-        const framework = await askForSelection(
-          `Builder for "${trimmedName}"?`,
-          [
-            {
-              title: "Vite \u2014 SPA/SaaS (client-side rendering, fast dev)",
-              value: "vite"
-            },
-            {
-              title: "Next.js \u2014 Static content/SEO (SSR, SSG) \u2014 DoNotDev support: BETA",
-              value: "nextjs"
-            },
-            {
-              title: "Expo \u2014 Mobile app (iOS + Android, single codebase)",
-              value: "expo"
-            }
-          ],
-          0
-        );
-        const backendValue = await askForSelection(
-          `Backend for "${trimmedName}"?`,
-          [...BACKEND_CHOICES],
-          getDefaultBackendIndex(framework)
-        );
-        const needsBackend = backendValue !== "none";
-        if (needsBackend) anyAppNeedsBackend = true;
-        appConfigs[trimmedName] = {
-          template: framework,
-          needsBackend,
-          backendPlatform: needsBackend ? backendValue : void 0,
-          needsCRUD: false,
-          selectedEntities: [],
-          userAuth: "none",
-          billing: false,
-          features: []
-        };
-      }
-    }
-    while (appNames.length > 0) {
-      const appName = await askForInput("App name (press Enter to finish)", "");
-      if (!appName || appName.trim() === "") {
+    let isFirstApp = true;
+    while (true) {
+      const prompt = isFirstApp ? "What's your first app name? (press Enter to skip)" : "App name (press Enter to finish)";
+      const appNameInput = await askForInput(prompt, "");
+      if (!appNameInput || appNameInput.trim() === "") {
+        if (isFirstApp) break;
         break;
       }
-      const trimmedName = appName.trim();
+      const trimmedName = appNameInput.trim();
+      isFirstApp = false;
       if (appNames.includes(trimmedName)) {
         log.warn(`'${trimmedName}' already exists. Choose a different name.`);
         continue;
       }
       if (isReservedAppName(trimmedName)) {
-        log.warn(
-          `'${trimmedName}' is reserved for framework demos. Choose a different name.`
-        );
+        log.warn(`'${trimmedName}' is reserved for framework demos.`);
         continue;
       }
       if (!isValidFileName(trimmedName)) {
@@ -9620,37 +9621,10 @@ async function main(options) {
         continue;
       }
       appNames.push(trimmedName);
-      const framework = await askForSelection(
-        `Builder for "${trimmedName}"?`,
-        [
-          {
-            title: "Vite \u2014 SPA/SaaS (client-side rendering, fast dev)",
-            value: "vite"
-          },
-          {
-            title: "Next.js \u2014 Static content/SEO (SSR, SSG) \u2014 DoNotDev support: BETA",
-            value: "nextjs"
-          }
-        ],
-        0
-      );
-      const backendValue = await askForSelection(
-        `Backend for "${trimmedName}"?`,
-        [...BACKEND_CHOICES],
-        getDefaultBackendIndex(framework)
-      );
-      const needsBackend = backendValue !== "none";
-      if (needsBackend) anyAppNeedsBackend = true;
-      appConfigs[trimmedName] = {
-        template: framework,
-        needsBackend,
-        backendPlatform: needsBackend ? backendValue : void 0,
-        needsCRUD: false,
-        selectedEntities: [],
-        userAuth: "none",
-        billing: false,
-        features: []
-      };
+      Me(`Configuring "${trimmedName}"...`, "\u2699\uFE0F");
+      const config = await collectAppConfig(trimmedName);
+      appConfigs[trimmedName] = config;
+      if (config.needsBackend) anyAppNeedsBackend = true;
     }
     let installDemoApp = await askForConfirmation(
       "Would you like to install the demo app? (component showcase)",

package/dist/bin/commands/deploy.js

@@ -8194,15 +8194,15 @@ function getCLIInstallInstructions(tool) {
     },
     [CLI_TOOLS.SUPABASE]: {
       win32: [
-        "npm install -g supabase",
+        "scoop install supabase",
+        "Or: winget install Supabase.CLI",
         "Or download from: https://github.com/supabase/cli/releases"
       ],
       darwin: [
-        "brew install supabase/tap/supabase",
-        "Or: npm install -g supabase"
+        "brew install supabase/tap/supabase"
       ],
       linux: [
-        "npm install -g supabase",
+        "brew install supabase/tap/supabase",
         "Or see: https://supabase.com/docs/guides/cli"
       ]
     },
@@ -8329,6 +8329,40 @@ var init_cli_tools = __esm({
   }
 });
 
+// packages/tooling/src/cli/setup/vercel-token.ts
+function readEnvVar(filePath, varName) {
+  if (!pathExists(filePath)) return null;
+  const content = readSync(filePath, { format: "text" });
+  if (typeof content !== "string") return null;
+  for (const line of content.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    if (trimmed.startsWith(`${varName}=`)) {
+      const val = trimmed.substring(`${varName}=`.length).trim();
+      if (val.startsWith('"') && val.endsWith('"') || val.startsWith("'") && val.endsWith("'")) {
+        return val.slice(1, -1);
+      }
+      return val || null;
+    }
+  }
+  return null;
+}
+function resolveVercelToken(appDir) {
+  if (process.env.VERCEL_TOKEN) return process.env.VERCEL_TOKEN;
+  const fromEnv = readEnvVar(joinPath(appDir, ".env"), "VERCEL_TOKEN");
+  if (fromEnv) return fromEnv;
+  const fromLocal = readEnvVar(joinPath(appDir, ".env.local"), "VERCEL_TOKEN");
+  if (fromLocal) return fromLocal;
+  return null;
+}
+var init_vercel_token = __esm({
+  "packages/tooling/src/cli/setup/vercel-token.ts"() {
+    "use strict";
+    init_utils();
+    init_pathResolver();
+  }
+});
+
 // node_modules/.bun/yaml@2.8.2/node_modules/yaml/dist/nodes/identity.js
 var require_identity = __commonJS({
   "node_modules/.bun/yaml@2.8.2/node_modules/yaml/dist/nodes/identity.js"(exports) {
@@ -15690,13 +15724,36 @@ var require_dist = __commonJS({
   }
 });
 
+// packages/tooling/src/utils/error-handling.ts
+function isError(error2) {
+  return error2 instanceof Error;
+}
+function getErrorMessage(error2) {
+  if (isError(error2)) {
+    return error2.message;
+  }
+  if (typeof error2 === "string") {
+    return error2;
+  }
+  if (error2 && typeof error2 === "object" && "message" in error2) {
+    return String(error2.message);
+  }
+  return String(error2);
+}
+var init_error_handling = __esm({
+  "packages/tooling/src/utils/error-handling.ts"() {
+    "use strict";
+    init_utils();
+  }
+});
+
 // packages/tooling/src/apps/sync-secrets.ts
 var sync_secrets_exports = {};
 __export(sync_secrets_exports, {
   default: () => sync_secrets_default,
   main: () => main
 });
-import { spawnSync as spawnSync5 } from "node:child_process";
+import { spawnSync as spawnSync6 } from "node:child_process";
 function parseEnvFile(filePath) {
   if (!pathExists(filePath)) {
     throw new DoNotDevError(
@@ -15889,7 +15946,7 @@ async function setFirebaseSecret(key, value, projectId, dryRun = false, cwd) {
         NODE_OPTIONS: ""
         // Clear to avoid conflicts
       };
-      const result = spawnSync5(firebaseCmd, args, {
+      const result = spawnSync6(firebaseCmd, args, {
         input: value,
         encoding: "utf8",
         stdio: ["pipe", "pipe", "pipe"],
@@ -15985,7 +16042,7 @@ function setVercelSecret(key, value, projectId, dryRun = false) {
     if (projectId) {
       args.push("--project", projectId);
     }
-    const result = spawnSync5("vercel", args, {
+    const result = spawnSync6("vercel", args, {
       input: value,
       encoding: "utf8",
       stdio: ["pipe", "inherit", "inherit"]
@@ -16014,7 +16071,7 @@ function setVercelSecret(key, value, projectId, dryRun = false) {
 }
 function detectGitHubRepo() {
   try {
-    const result = spawnSync5("git", ["remote", "get-url", "origin"], {
+    const result = spawnSync6("git", ["remote", "get-url", "origin"], {
       encoding: "utf8",
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -16042,7 +16099,7 @@ function setGitHubSecret(key, value, repo, dryRun = false) {
     if (repo) {
       args.push("--repo", repo);
     }
-    const result = spawnSync5("gh", args, {
+    const result = spawnSync6("gh", args, {
       input: value,
       encoding: "utf8",
       stdio: ["pipe", "pipe", "pipe"]
@@ -16294,7 +16351,7 @@ var deploy_supabase_functions_exports = {};
 __export(deploy_supabase_functions_exports, {
   deploySupabaseFunctions: () => deploySupabaseFunctions
 });
-import { execSync as execSync4 } from "node:child_process";
+import { execSync as execSync3 } from "node:child_process";
 async function deploySupabaseFunctions(appDir, config) {
   const supabaseDir = joinPath(appDir, "supabase");
   const functionsDir = joinPath(supabaseDir, "functions");
@@ -16323,7 +16380,7 @@ async function deploySupabaseFunctions(appDir, config) {
   for (const functionName of functionDirs) {
     s.start(`Deploying Edge Function: ${functionName}...`);
     try {
-      execSync4(`supabase functions deploy ${functionName}`, {
+      execSync3(`supabase functions deploy ${functionName}`, {
         cwd: supabaseDir,
         stdio: config.verbose ? "inherit" : "pipe",
         env: {
@@ -16484,7 +16541,7 @@ function safeRemove(path, options = {}) {
 
 // packages/tooling/src/apps/deploy.ts
 init_utils();
-import { execSync as execSync5 } from "node:child_process";
+import { execSync as execSync4 } from "node:child_process";
 
 // packages/tooling/src/apps/deploy-frontend.ts
 init_utils();
@@ -16515,15 +16572,31 @@ async function deployFrontend(appDir, serviceAccountPath, projectId, config) {
 
 // packages/tooling/src/apps/deploy-vercel-frontend.ts
 init_utils();
-import { execSync as execSync2 } from "node:child_process";
+init_cli_output();
+init_vercel_token();
+import { spawnSync as spawnSync3 } from "node:child_process";
 async function deployVercelFrontend(appDir, _config) {
   const s = Y2();
   s.start("Deploying frontend to Vercel...");
+  const token = resolveVercelToken(appDir);
+  if (token) {
+    log.debug("Using VERCEL_TOKEN from .env (token-based auth)");
+  }
+  const args = ["vercel", "--prod", "--yes"];
+  if (token) {
+    args.push("--token", token);
+  }
   try {
-    execSync2("npx vercel --prod --yes", {
+    const result = spawnSync3("bunx", args, {
       cwd: appDir,
-      stdio: "inherit"
+      stdio: "pipe",
+      encoding: "utf-8"
     });
+    if (result.status !== 0) {
+      s.stop("Vercel deployment failed");
+      const errOutput = result.stderr?.trim();
+      throw new Error(errOutput || `Vercel deploy exited with code ${result.status}`);
+    }
     s.stop("Frontend deployed to Vercel");
   } catch (err) {
     s.stop("Vercel deployment failed");
@@ -16534,7 +16607,7 @@ async function deployVercelFrontend(appDir, _config) {
 // packages/tooling/src/apps/deploy-functions.ts
 init_utils();
 var import_yaml = __toESM(require_dist(), 1);
-import { execSync as execSync3, spawnSync as spawnSync3 } from "node:child_process";
+import { execSync as execSync2, spawnSync as spawnSync4 } from "node:child_process";
 init_pathResolver();
 init_cli_tools();
 init_typed_file_operations();
@@ -16703,7 +16776,7 @@ function updateCloudRunIAM(functionNames, projectId, region, serviceAccountPath,
   let failCount = 0;
   for (const funcName of functionNames) {
     try {
-      const result = spawnSync3(
+      const result = spawnSync4(
         "gcloud",
         [
           "run",
@@ -16821,7 +16894,7 @@ async function autoSyncSecrets(functionsDir, projectId, config) {
     let failCount = 0;
     for (const { key, value } of secrets) {
       try {
-        const result = spawnSync3(
+        const result = spawnSync4(
           firebaseCmd,
           ["functions:secrets:set", key, "--project", projectId],
           {
@@ -16903,7 +16976,7 @@ To fix this, run:
       const s2 = Y2();
       s2.start("Building functions...");
       try {
-        execSync3("bun run build", {
+        execSync2("bun run build", {
           cwd: functionsDir,
           stdio: config.verbose ? "inherit" : "pipe"
         });
@@ -17003,29 +17076,10 @@ async function deployRules(appDir, serviceAccountPath, projectId, config, option
 
 // packages/tooling/src/apps/deploy-utils.ts
 init_utils();
-import { spawnSync as spawnSync4 } from "node:child_process";
+import { spawnSync as spawnSync5 } from "node:child_process";
 init_pathResolver();
 init_typed_file_operations();
-
-// packages/tooling/src/utils/error-handling.ts
-init_utils();
-function isError(error2) {
-  return error2 instanceof Error;
-}
-function getErrorMessage(error2) {
-  if (isError(error2)) {
-    return error2.message;
-  }
-  if (typeof error2 === "string") {
-    return error2;
-  }
-  if (error2 && typeof error2 === "object" && "message" in error2) {
-    return String(error2.message);
-  }
-  return String(error2);
-}
-
-// packages/tooling/src/apps/deploy-utils.ts
+init_error_handling();
 function detectAvailableApps() {
   const currentDir = process.cwd();
   const appsDir = joinPath(currentDir, "apps");
@@ -17210,7 +17264,7 @@ How to fix:
     if (shouldOpen) {
       try {
         const openCommand = process.platform === "win32" ? "start" : process.platform === "darwin" ? "open" : "xdg-open";
-        spawnSync4(openCommand, [consoleUrl], { shell: true });
+        spawnSync5(openCommand, [consoleUrl], { shell: true });
         log.success("Opening Firebase Console...");
       } catch {
         log.warn("Could not open browser. Please open the URL manually.");
@@ -17281,7 +17335,7 @@ function detectProvider(appDir) {
   if (hasFirebase) {
     try {
       const config = readSync(firebaseJsonPath, { format: "json" });
-      if (config && typeof config === "object" && "projectId" in config) {
+      if (config && typeof config === "object") {
         const firebaseConfigObj = config;
         firebaseConfig = {
           projectId: firebaseConfigObj.projectId,
@@ -17290,8 +17344,6 @@ function detectProvider(appDir) {
           hasFirestoreRules: !!firebaseConfigObj.firestore?.rules,
           hasStorageRules: !!firebaseConfigObj.storage?.rules
         };
-      } else {
-        throw new Error("Invalid firebase.json structure");
       }
     } catch {
       firebaseConfig = {
@@ -17599,7 +17651,7 @@ async function main2(options = {}) {
           isStaging ? "Building (staging mode)..." : "Building application..."
         );
         try {
-          execSync5(buildCmd, {
+          execSync4(buildCmd, {
             cwd: appDir,
             stdio: "inherit",
             env: {