@donotdev/cli 0.0.15 → 0.0.17

package/dist/bin/commands/deploy.js

@@ -7951,7 +7951,14 @@ function readServiceAccountKey(filePath) {
     throw new DoNotDevError(
       `Invalid service account key: missing required fields`,
       DO_NOT_DEV_ERROR_CODES.CONFIG_INVALID,
-      { context: { filePath, missingFields: ["project_id", "private_key", "client_email"].filter((f) => !key[f]) } }
+      {
+        context: {
+          filePath,
+          missingFields: ["project_id", "private_key", "client_email"].filter(
+            (f) => !key[f]
+          )
+        }
+      }
     );
   }
   return content;
@@ -8194,21 +8201,23 @@ 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"
-      ],
+      darwin: ["brew install supabase/tap/supabase"],
       linux: [
-        "npm install -g supabase",
+        "brew install supabase/tap/supabase",
         "Or see: https://supabase.com/docs/guides/cli"
       ]
     },
     [CLI_TOOLS.VERCEL]: {
       win32: ["npm install -g vercel", "Or: npx vercel (no install)"],
-      darwin: ["npm install -g vercel", "Or: brew install vercel", "Or: npx vercel"],
+      darwin: [
+        "npm install -g vercel",
+        "Or: brew install vercel",
+        "Or: npx vercel"
+      ],
       linux: ["npm install -g vercel", "Or: npx vercel"]
     },
     [CLI_TOOLS.SENTRY_CLI]: {
@@ -8329,6 +8338,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 +15733,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 +15955,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 +16051,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 +16080,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 +16108,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,12 +16360,14 @@ 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");
   if (!pathExists(functionsDir)) {
-    log.warn("No supabase/functions/ directory found. Skipping Supabase functions deployment.");
+    log.warn(
+      "No supabase/functions/ directory found. Skipping Supabase functions deployment."
+    );
     return;
   }
   requireCLI(
@@ -16315,15 +16383,19 @@ async function deploySupabaseFunctions(appDir, config) {
     return pathExists(indexPath);
   });
   if (functionDirs.length === 0) {
-    log.warn("No Edge Functions found in supabase/functions/. Skipping deployment.");
+    log.warn(
+      "No Edge Functions found in supabase/functions/. Skipping deployment."
+    );
     return;
   }
-  log.info(`Found ${functionDirs.length} Edge Function(s): ${functionDirs.join(", ")}`);
+  log.info(
+    `Found ${functionDirs.length} Edge Function(s): ${functionDirs.join(", ")}`
+  );
   const s = Y2();
   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: {
@@ -16337,7 +16409,12 @@ async function deploySupabaseFunctions(appDir, config) {
       throw new DoNotDevError(
         `Failed to deploy Supabase Edge Function: ${functionName}`,
         "deployment-failed",
-        { context: { functionName, error: error2 instanceof Error ? error2.message : String(error2) } }
+        {
+          context: {
+            functionName,
+            error: error2 instanceof Error ? error2.message : String(error2)
+          }
+        }
       );
     }
   }
@@ -16484,14 +16561,19 @@ 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();
 async function deployFrontend(appDir, serviceAccountPath, projectId, config) {
   const s = Y2();
   s.start("Deploying frontend to Firebase Hosting...");
-  const args = buildFirebaseDeployArgs("hosting", projectId, config.debug, config.force ?? true);
+  const args = buildFirebaseDeployArgs(
+    "hosting",
+    projectId,
+    config.debug,
+    config.force ?? true
+  );
   const result = executeFirebaseCommand(args, {
     cwd: appDir,
     serviceAccountPath,
@@ -16515,15 +16597,33 @@ 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 +16634,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 +16803,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 +16921,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 +17003,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"
         });
@@ -16979,7 +17079,12 @@ async function deployRules(appDir, serviceAccountPath, projectId, config, option
   const targetNames = targets.join(", ");
   const s = Y2();
   s.start(`Deploying ${targetNames}...`);
-  const args = buildFirebaseDeployArgs(targets, projectId, config.debug, config.force ?? true);
+  const args = buildFirebaseDeployArgs(
+    targets,
+    projectId,
+    config.debug,
+    config.force ?? true
+  );
   const result = executeFirebaseCommand(args, {
     cwd: appDir,
     serviceAccountPath,
@@ -17003,29 +17108,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 +17296,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 +17367,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 +17376,6 @@ function detectProvider(appDir) {
           hasFirestoreRules: !!firebaseConfigObj.firestore?.rules,
           hasStorageRules: !!firebaseConfigObj.storage?.rules
         };
-      } else {
-        throw new Error("Invalid firebase.json structure");
       }
     } catch {
       firebaseConfig = {
@@ -17374,13 +17458,17 @@ async function main2(options = {}) {
       const availableApps = detectAvailableApps();
       if (availableApps.length === 0) {
         if (providerInfo.hasSupabase && !providerInfo.hasFirebase) {
-          log.info("Supabase project detected. Deploying Supabase resources...");
+          log.info(
+            "Supabase project detected. Deploying Supabase resources..."
+          );
         } else {
           log.info("No apps with firebase.json or supabase/ directory found.");
           log.info(
             "To deploy, ensure your app has a firebase.json or supabase/ configuration."
           );
-          log.info("Run from a DoNotDev project, or create one with: dndev init");
+          log.info(
+            "Run from a DoNotDev project, or create one with: dndev init"
+          );
           return;
         }
       }
@@ -17599,7 +17687,7 @@ async function main2(options = {}) {
           isStaging ? "Building (staging mode)..." : "Building application..."
         );
         try {
-          execSync5(buildCmd, {
+          execSync4(buildCmd, {
             cwd: appDir,
             stdio: "inherit",
             env: {
@@ -17660,12 +17748,7 @@ async function main2(options = {}) {
           }
         }
       }
-      await deployFunctions(
-        appDir,
-        serviceAccountPath,
-        config.project,
-        config
-      );
+      await deployFunctions(appDir, serviceAccountPath, config.project, config);
     }
     if (shouldDeployFirebaseRules && serviceAccountPath && config.project && appProviderInfo.firebaseConfig) {
       await deployRules(appDir, serviceAccountPath, config.project, config, {

package/dist/bin/commands/dev.js

@@ -7742,23 +7742,7 @@ var init_utils = __esm({
   }
 });
 
-// packages/cli/src/bin/commands/dev.ts
-init_utils();
-
-// packages/tooling/src/index.ts
-init_utils();
-
-// packages/tooling/src/cli/index.ts
-init_utils();
-
-// packages/tooling/src/utils/app-selector.ts
-init_utils();
-init_dist2();
-
 // packages/tooling/src/utils/app-detection.ts
-init_utils();
-init_pathResolver();
-init_typed_file_operations();
 function detectApps(projectRoot) {
   const apps = [];
   const appsDir = joinPath(projectRoot, "apps");
@@ -7818,12 +7802,21 @@ function analyzeApp(appPath, appName) {
   const functionsStat = statSync2(functionsPath);
   const hasFunctions = pathExists(functionsPath) && (functionsStat?.isDirectory() ?? false);
   let platform2;
-  if (hasFunctions) {
-    const firebaseJsonPath = joinPath(functionsPath, "firebase.json");
+  const firebaseJsonInFunctions = hasFunctions && pathExists(joinPath(functionsPath, "firebase.json"));
+  const firebaseJsonInApp = pathExists(joinPath(appPath, "firebase.json"));
+  if (firebaseJsonInFunctions || firebaseJsonInApp) {
+    platform2 = "firebase";
+  }
+  if (!platform2) {
+    const supabaseConfigPath = joinPath(appPath, "supabase", "config.toml");
+    const hasSupabaseDep = !!(packageJson.dependencies?.["@donotdev/supabase"] || packageJson.dependencies?.["@supabase/supabase-js"]);
+    if (pathExists(supabaseConfigPath) || hasSupabaseDep) {
+      platform2 = "supabase";
+    }
+  }
+  if (!platform2) {
     const vercelJsonPath = joinPath(appPath, "vercel.json");
-    if (pathExists(firebaseJsonPath)) {
-      platform2 = "firebase";
-    } else if (pathExists(vercelJsonPath)) {
+    if (pathExists(vercelJsonPath)) {
       platform2 = "vercel";
     }
   }
@@ -7838,9 +7831,16 @@ function analyzeApp(appPath, appName) {
     platform: platform2
   };
 }
+var init_app_detection = __esm({
+  "packages/tooling/src/utils/app-detection.ts"() {
+    "use strict";
+    init_utils();
+    init_pathResolver();
+    init_typed_file_operations();
+  }
+});
 
 // packages/tooling/src/utils/app-selector.ts
-init_cli_output();
 async function selectApp(projectRoot, appName) {
   const apps = detectApps(projectRoot);
   if (apps.length === 0) {
@@ -7874,14 +7874,33 @@ async function selectApp(projectRoot, appName) {
   }
   return apps.find((a) => a.name === selected) || null;
 }
+var init_app_selector = __esm({
+  "packages/tooling/src/utils/app-selector.ts"() {
+    "use strict";
+    init_utils();
+    init_dist2();
+    init_app_detection();
+    init_cli_output();
+  }
+});
+
+// packages/cli/src/bin/commands/dev.ts
+init_utils();
+
+// packages/tooling/src/index.ts
+init_utils();
+
+// packages/tooling/src/cli/index.ts
+init_utils();
 
 // packages/tooling/src/apps/dev.ts
 init_utils();
-import { spawn, execSync as execSync2 } from "node:child_process";
-import { platform } from "node:os";
+init_app_selector();
 init_cli_output();
 init_errors();
 init_pathResolver();
+import { spawn, execSync as execSync2 } from "node:child_process";
+import { platform } from "node:os";
 
 // packages/tooling/src/utils/spawn-utils.ts
 init_utils();

package/dist/bin/commands/doctor.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @fileoverview Doctor Command Wrapper
+ * @description Re-exports doctor from tooling for CLI bundling.
+ */
+export { doctor as main } from '@donotdev/tooling';
+//# sourceMappingURL=doctor.d.ts.map

package/dist/bin/commands/doctor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/doctor.ts"],"names":[],"mappings":"AACA;;;GAGG;AAEH,OAAO,EAAE,MAAM,IAAI,IAAI,EAAE,MAAM,mBAAmB,CAAC"}