@donotdev/cli 0.0.17 → 0.0.19

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

@@ -8795,34 +8795,67 @@ var APP_QUESTIONNAIRE = [
     ]
   },
   {
-    id: "needsBackend",
-    question: "Include backend functions?",
-    type: "confirm",
-    defaultValue: false
+    id: "host",
+    question: "Where will you host?",
+    type: "select",
+    condition: (answers) => answers.framework !== "expo",
+    defaultValue: (answers) => {
+      return answers.framework === "nextjs" ? "vercel" : "none";
+    },
+    choices: [
+      { title: "None \u2014 no hosting config", value: "none" },
+      { title: "Vercel \u2014 edge CDN + serverless", value: "vercel" },
+      { title: "Firebase Hosting \u2014 Google CDN", value: "firebase" }
+    ]
+  },
+  {
+    id: "functions",
+    question: "Serverless functions?",
+    type: "select",
+    defaultValue: "none",
+    // Choices filtered dynamically based on host
+    choices: [
+      { title: "None", value: "none" },
+      { title: "Vercel Functions \u2014 edge + node.js", value: "vercel" },
+      { title: "Firebase Functions \u2014 Google Cloud", value: "firebase" },
+      { title: "Supabase Edge Functions \u2014 Deno", value: "supabase" }
+    ],
+    choicesFilter: (answers) => {
+      const host = answers.host ?? "none";
+      const framework = answers.framework;
+      if (framework === "expo") return ["none", "firebase", "supabase"];
+      if (host === "firebase") return ["none", "firebase"];
+      if (host === "vercel") return ["none", "vercel", "supabase"];
+      return ["none", "vercel", "firebase", "supabase"];
+    }
   },
   {
-    id: "backendPlatform",
-    question: "Which backend platform?",
+    id: "backend",
+    question: "Backend / BaaS provider?",
     type: "select",
-    dependsOn: "needsBackend",
-    condition: (answers) => answers.needsBackend === true,
     defaultValue: (answers) => {
-      return answers.framework === "nextjs" ? "vercel" : "firebase";
+      if (answers.functions === "firebase") return "firebase";
+      if (answers.functions === "supabase") return "supabase";
+      return "none";
     },
     choices: [
+      { title: "None \u2014 frontend only", value: "none" },
       {
-        title: "Firebase \u2014 Full-stack platform (hosting + functions + auth + firestore)",
+        title: "Firebase \u2014 Auth + Firestore + Storage",
         value: "firebase"
       },
-      {
-        title: "Vercel \u2014 Serverless functions (edge + node.js)",
-        value: "vercel"
-      },
       {
         title: "Supabase \u2014 Postgres + Auth + Storage",
         value: "supabase"
       }
-    ]
+    ],
+    choicesFilter: (answers) => {
+      const functions = answers.functions ?? "none";
+      if (functions === "firebase") return ["none", "firebase"];
+      if (functions === "supabase") return ["none", "supabase"];
+      if (functions === "vercel") return ["none"];
+      return ["none", "firebase", "supabase"];
+    }
   }
 ];
 var PROJECT_QUESTIONNAIRE = [
@@ -8840,12 +8873,13 @@ var PROJECT_QUESTIONNAIRE = [
   }
 ];
 function aggregateRequirements(answers) {
+  const hasBackend = answers.backend && answers.backend !== "none" || answers.functions && answers.functions !== "none";
   const requirements = {
     entities: [],
     // Entities created in apps/<app>/entities/ (v1), root entities/ for v2
     billing: true,
     // Always on (useStripeBillingSafe handles missing package)
-    backend: answers.needsBackend || false,
+    backend: hasBackend,
     features: [],
     template: "vite",
     // Only Vite for now
@@ -8869,6 +8903,10 @@ async function runQuestionnaire(questions, initialAnswers, showWIP, askFor) {
         if (!showWIP) {
           choices = choices.filter((choice) => !choice.wip);
         }
+        if (question.choicesFilter) {
+          const allowed = question.choicesFilter(answers);
+          choices = choices.filter((c) => allowed.includes(c.value));
+        }
         if (choices.length === 0) continue;
         answer = await askFor.selection(question.question, choices);
         break;
@@ -8931,10 +8969,10 @@ function generateScripts(templateName, options) {
     scripts.lint = "eslint .";
     scripts["type-check"] = "tsc --noEmit";
   } else if (templateName === "consumer-root") {
-    scripts.dev = "turbo run dev";
+    scripts.dev = "dndev dev";
     scripts.build = "turbo run build";
     scripts.lint = "turbo run lint";
-    scripts["type-check"] = "turbo run type-check";
+    scripts["type-check"] = "dndev tc";
   } else if (templateName.includes("functions")) {
     scripts.build = "node build.mjs";
     scripts["build:tsc"] = "tsc";
@@ -8945,9 +8983,9 @@ function generateScripts(templateName, options) {
       scripts.dev = "vercel dev";
     }
   } else if (templateName === "demo") {
-    scripts.dev = "bunx vite";
-    scripts.build = "tsc --noEmit && bunx vite build";
-    scripts.preview = "bunx vite preview";
+    scripts.dev = "vite";
+    scripts.build = "tsc --noEmit && vite build --mode production";
+    scripts.preview = "vite preview";
     scripts["type-check"] = "tsc --noEmit";
   } else if (templateName === "entities") {
   }
@@ -9069,120 +9107,22 @@ init_pathResolver();
 
 // packages/tooling/src/scaffolding/scaffold-matrix.ts
 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: "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: "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: "functions-supabase"
-  },
-  {
-    builder: "demo",
-    backend: "none",
-    baseTemplate: "app-demo",
-    overlay: null,
-    deployConfig: null,
-    functionsTemplate: null
-  }
-];
-function comboKey(builder, backend) {
-  return `${builder}-${backend}`;
+function resolveDeployConfig(host, backend) {
+  if (host === "none") return null;
+  if (host === "firebase") return "firebase";
+  if (backend === "supabase") return "vercel-supabase";
+  return "vercel-vercel";
 }
-var ROWS_BY_KEY = /* @__PURE__ */ new Map();
-for (const row of MATRIX) {
-  ROWS_BY_KEY.set(comboKey(row.builder, row.backend), row);
-}
-function getScaffoldRow(builder, backend) {
-  const key = comboKey(builder, backend);
-  const row = ROWS_BY_KEY.get(key);
-  if (!row) {
-    throw new Error(
-      `Unsupported scaffold combo: ${key}. Supported: ${[...ROWS_BY_KEY.keys()].join(", ")}`
-    );
-  }
-  return row;
+function getScaffoldParts(builder, host, functions, backend) {
+  const baseTemplate = builder === "nextjs" ? "app-next" : builder === "demo" ? "app-demo" : `app-${builder}`;
+  return {
+    builder,
+    backend,
+    baseTemplate,
+    overlay: backend !== "none" ? `overlay-${backend}` : null,
+    deployConfig: resolveDeployConfig(host, backend),
+    functionsTemplate: functions !== "none" ? `functions-${functions}` : null
+  };
 }
 
 // packages/tooling/src/scaffolding/create-app.ts
@@ -9222,11 +9162,15 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
       input: askForInput
     });
     const requirements = aggregateRequirements(answers);
-    const defaultPlatform = answers.framework === "nextjs" ? "vercel" : "firebase";
+    const framework = answers.framework || "vite";
+    const host2 = answers.host || "none";
+    const functions2 = answers.functions || "none";
+    const backend2 = answers.backend || "none";
     appConfig = {
-      template: answers.framework || "vite",
-      needsBackend: answers.needsBackend || false,
-      backendPlatform: answers.needsBackend ? answers.backendPlatform || defaultPlatform : void 0,
+      template: framework,
+      host: host2,
+      functions: functions2,
+      backend: backend2,
       needsCRUD: true,
       // Always on
       selectedEntities: [],
@@ -9272,12 +9216,14 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
   s.start(`Creating app: ${appName}`);
   await ensureDir(appDir);
   const builder = appTemplate;
-  const backend = appConfig.needsBackend && appConfig.backendPlatform ? appConfig.backendPlatform : "none";
-  const row = getScaffoldRow(builder, backend);
+  const host = appConfig.host ?? "none";
+  const functions = appConfig.functions ?? "none";
+  const backend = appConfig.backend ?? "none";
+  const row = getScaffoldParts(builder, host, functions, backend);
   const templateDir = row.baseTemplate;
   const firebaseProjectId = (appConfig?.firebaseProjectId ?? "").trim() || appName.toLowerCase().replace(/\s+/g, "-");
   const firebaseRegion = appConfig?.firebaseRegion ?? "europe-west1";
-  const backendPlatform = appConfig.backendPlatform ?? "firebase";
+  const backendPlatform = backend !== "none" ? backend : "firebase";
   const deployConfig = row.deployConfig;
   const replacements = {
     projectName: appName,
@@ -9627,12 +9573,11 @@ async function collectAppConfig(appName) {
     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,
+    host: answers.host || "none",
+    functions: answers.functions || "none",
+    backend: answers.backend || "none",
     needsCRUD: false,
     selectedEntities: [],
     userAuth: "none",
@@ -9779,7 +9724,8 @@ async function main(options) {
       Me(`Configuring "${trimmedName}"...`, "\u2699\uFE0F");
       const config = await collectAppConfig(trimmedName);
       appConfigs[trimmedName] = config;
-      if (config.needsBackend) anyAppNeedsBackend = true;
+      if (config.backend !== "none" || config.functions !== "none")
+        anyAppNeedsBackend = true;
     }
     let installDemoApp = await askForConfirmation(
       "Would you like to install the demo app? (component showcase)",
@@ -9855,8 +9801,9 @@ async function main(options) {
         log.warn(`Missing config for app "${appName}", using defaults`);
         appConfigs[appName] = {
           template: "vite",
-          needsBackend: false,
-          backendPlatform: void 0,
+          host: "none",
+          functions: "none",
+          backend: "none",
           needsCRUD: false,
           selectedEntities: [],
           userAuth: "none",
@@ -9904,7 +9851,9 @@ async function main(options) {
         overwrite: true
       });
       const relativeMonorepoPath = executionMode === "development" ? calculateRelativePath(projectDirNormalized, monorepoRoot) : "";
-      const primaryPlatform = Object.values(appConfigs).find((c) => c.backendPlatform)?.backendPlatform ?? "firebase";
+      const primaryPlatform = Object.values(appConfigs).find(
+        (c) => c.backend !== "none"
+      )?.backend ?? "firebase";
       const rootPackageJson = generatePackageJson(
         "consumer-root",
         executionMode,

package/dist/bin/commands/deploy.js

@@ -7847,7 +7847,7 @@ import { fileURLToPath as fileURLToPath2 } from "node:url";
 function readdirSync2(dirPath, options) {
   return pathResolverInstance.readdirSync(dirPath, options);
 }
-var pathResolverInstance, resolvePackage, normalizePath, pathExists, readSync, write, writeSync, remove, removeSync, statSync2, ensureDir, ensureDirSync, getRelativePathBetween, getDirname, joinPath;
+var pathResolverInstance, resolvePackage, normalizePath, pathExists, readSync, writeSync, removeSync, statSync2, ensureDirSync, getRelativePathBetween, getDirname, joinPath;
 var init_pathResolver = __esm({
   "packages/tooling/src/utils/pathResolver.ts"() {
     "use strict";
@@ -7860,12 +7860,9 @@ var init_pathResolver = __esm({
     };
     pathExists = (filePath, silent = false) => pathResolverInstance.pathExists(filePath, silent);
     readSync = (filePath, options) => pathResolverInstance.readSync(filePath, options);
-    write = async (filePath, content, options) => pathResolverInstance.write(filePath, content, options);
     writeSync = (filePath, content, options) => pathResolverInstance.writeSync(filePath, content, options);
-    remove = async (path) => pathResolverInstance.remove(path);
     removeSync = (path) => pathResolverInstance.removeSync(path);
     statSync2 = (filePath) => pathResolverInstance.statSync(filePath);
-    ensureDir = async (dirPath) => pathResolverInstance.ensureDir(dirPath);
     ensureDirSync = (dirPath) => pathResolverInstance.ensureDirSync(dirPath);
     getRelativePathBetween = (from, to) => {
       return normalizePath(relative2(from, to));
@@ -8181,21 +8178,21 @@ function getCLIInstallInstructions(tool) {
       ]
     },
     [CLI_TOOLS.YARN]: {
-      win32: ["npm install -g yarn", "Or: choco install yarn"],
-      darwin: ["npm install -g yarn", "Or: brew install yarn"],
-      linux: ["npm install -g yarn", "Or check your package manager"]
+      win32: ["bun install -g yarn", "Or: choco install yarn"],
+      darwin: ["bun install -g yarn", "Or: brew install yarn"],
+      linux: ["bun install -g yarn", "Or check your package manager"]
     },
     [CLI_TOOLS.FIREBASE]: {
       win32: [
-        "npm install -g firebase-tools",
+        "bun install -g firebase-tools",
         "Or download standalone binary: https://firebase.google.com/docs/cli#windows-standalone-binary"
       ],
       darwin: [
-        "npm install -g firebase-tools",
+        "bun install -g firebase-tools",
         "Or: brew install firebase-cli"
       ],
       linux: [
-        "npm install -g firebase-tools",
+        "bun install -g firebase-tools",
         "Or check your package manager (dnf, apt, pacman, etc.)"
       ]
     },
@@ -8212,25 +8209,25 @@ function getCLIInstallInstructions(tool) {
       ]
     },
     [CLI_TOOLS.VERCEL]: {
-      win32: ["npm install -g vercel", "Or: npx vercel (no install)"],
+      win32: ["bun install -g vercel", "Or: bunx vercel (no install)"],
       darwin: [
-        "npm install -g vercel",
+        "bun install -g vercel",
         "Or: brew install vercel",
-        "Or: npx vercel"
+        "Or: bunx vercel"
       ],
-      linux: ["npm install -g vercel", "Or: npx vercel"]
+      linux: ["bun install -g vercel", "Or: bunx vercel"]
     },
     [CLI_TOOLS.SENTRY_CLI]: {
       win32: [
-        "npm install -g @sentry/cli",
+        "bun install -g @sentry/cli",
         "Or download from: https://github.com/getsentry/sentry-cli/releases"
       ],
       darwin: [
-        "npm install -g @sentry/cli",
+        "bun install -g @sentry/cli",
         "Or: brew install getsentry/tools/sentry-cli"
       ],
       linux: [
-        "npm install -g @sentry/cli",
+        "bun install -g @sentry/cli",
         "Or: curl -sL https://sentry.io/get-cli/ | bash"
       ]
     },
@@ -8259,9 +8256,9 @@ function getCLIInstallInstructions(tool) {
       ]
     },
     [CLI_TOOLS.TSX]: {
-      win32: ["npm install -g tsx"],
-      darwin: ["npm install -g tsx"],
-      linux: ["npm install -g tsx"]
+      win32: ["bun install -g tsx"],
+      darwin: ["bun install -g tsx"],
+      linux: ["bun install -g tsx"]
     }
   };
   const platformInstructions = instructions[tool]?.[platform] || instructions[tool]?.linux || [];
@@ -8356,14 +8353,27 @@ function readEnvVar(filePath, varName) {
   }
   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");
+function resolveVercelVar(appDir, varName) {
+  if (process.env[varName]) return process.env[varName];
+  const fromLocal = readEnvVar(joinPath(appDir, ".env.local"), varName);
   if (fromLocal) return fromLocal;
+  const fromEnv = readEnvVar(joinPath(appDir, ".env"), varName);
+  if (fromEnv) return fromEnv;
   return null;
 }
+function resolveVercelCredentials(appDir) {
+  const token = resolveVercelVar(appDir, "VERCEL_TOKEN");
+  const orgId = resolveVercelVar(appDir, "VERCEL_ORG_ID");
+  const projectId = resolveVercelVar(appDir, "VERCEL_PROJECT_ID");
+  const missing = [];
+  if (!token) missing.push("VERCEL_TOKEN");
+  if (!orgId) missing.push("VERCEL_ORG_ID");
+  if (!projectId) missing.push("VERCEL_PROJECT_ID");
+  if (missing.length > 0) return { missing };
+  return {
+    credentials: { token, orgId, projectId }
+  };
+}
 var init_vercel_token = __esm({
   "packages/tooling/src/cli/setup/vercel-token.ts"() {
     "use strict";
@@ -15943,10 +15953,7 @@ async function setFirebaseSecret(key, value, projectId, dryRun = false, cwd) {
   }
   try {
     log.info(`Setting Firebase secret: ${key} (project: ${finalProjectId})`);
-    const tempDir = joinPath(process.cwd(), ".tmp");
-    await ensureDir(tempDir);
-    const tempFile = joinPath(tempDir, `secret-${key}-${Date.now()}.txt`);
-    await write(tempFile, value);
+    const tempFile = "";
     try {
       const args = ["functions:secrets:set", key, "--project", finalProjectId];
       const firebaseCmd = process.platform === "win32" ? "firebase.cmd" : "firebase";
@@ -16021,9 +16028,6 @@ ${errorOutput}`
       }
       log.success(`Firebase secret ${key} set successfully`);
     } finally {
-      if (pathExists(tempFile)) {
-        await remove(tempFile);
-      }
     }
   } catch (err) {
     log.error(`Failed to set Firebase secret ${key}:`, err);
@@ -16601,33 +16605,39 @@ 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);
+  const result = resolveVercelCredentials(appDir);
+  if (result.missing) {
+    throw new Error(
+      `Missing Vercel credentials in .env.local: ${result.missing.join(", ")}
+Add them to apps/<app>/.env.local \u2014 see guides/dndev/SETUP_VERCEL.md`
+    );
   }
-  try {
-    const result = spawnSync3("bunx", args, {
+  const { token, orgId, projectId } = result.credentials;
+  log.debug("Using Vercel credentials from .env (token-based auth)");
+  log.info("Deploying to Vercel...");
+  const deployResult = spawnSync3(
+    "bunx",
+    ["vercel", "deploy", "--prod", "--yes", "--token", token],
+    {
       cwd: appDir,
-      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}`
-      );
+      // stdout piped to capture deployment URL, stderr inherits for progress
+      stdio: ["inherit", "pipe", "inherit"],
+      encoding: "utf-8",
+      env: {
+        ...process.env,
+        VERCEL_ORG_ID: orgId,
+        VERCEL_PROJECT_ID: projectId
+      }
     }
-    s.stop("Frontend deployed to Vercel");
-  } catch (err) {
-    s.stop("Vercel deployment failed");
-    throw err;
+  );
+  if (deployResult.status !== 0) {
+    throw new Error(`vercel deploy exited with code ${deployResult.status}`);
+  }
+  const deployUrl = deployResult.stdout?.trim();
+  if (deployUrl) {
+    log.success(`Production: ${deployUrl}`);
+  } else {
+    log.success("Frontend deployed to Vercel");
   }
 }
 
@@ -16989,7 +16999,7 @@ async function deployFunctions(appDir, serviceAccountPath, projectId, config) {
 
 To fix this, run:
   cd ${functionsDir}
-  npm install --production`,
+  bun install --production`,
       "file-not-found",
       { context: { missingPackages, functionsDir } }
     );
@@ -17354,7 +17364,19 @@ function detectProvider(appDir) {
   const supabaseFunctionsDir = joinPath(supabaseDir, "functions");
   const supabaseMigrationsDir = joinPath(supabaseDir, "migrations");
   const hasFirebase = pathExists(firebaseJsonPath);
-  const hasSupabase = pathExists(supabaseDir) || pathExists(supabaseConfigPath);
+  let hasSupabase = pathExists(supabaseDir) || pathExists(supabaseConfigPath);
+  if (!hasSupabase) {
+    try {
+      const envPath = joinPath(appDir, ".env");
+      if (pathExists(envPath)) {
+        const envContent = readSync(envPath);
+        if (envContent.match(/VITE_SUPABASE_URL=.+/)) {
+          hasSupabase = true;
+        }
+      }
+    } catch {
+    }
+  }
   let provider = "unknown";
   if (hasFirebase && hasSupabase) {
     provider = "both";
@@ -17718,7 +17740,7 @@ async function main2(options = {}) {
     if (shouldDeployVercelFrontend) {
       requireCLI(
         CLI_TOOLS.VERCEL,
-        "Vercel CLI is required to deploy the frontend.\nInstall: npm i -g vercel or use npx vercel"
+        "Vercel CLI is required to deploy the frontend.\nInstall: bun install -g vercel"
       );
     }
     if (shouldDeployFirebaseFrontend && serviceAccountPath && config.project) {