@donotdev/cli 0.0.18 → 0.0.20

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

@@ -8649,10 +8649,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";
@@ -8663,9 +8663,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") {
   }
@@ -9103,7 +9103,7 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
         const firebaseJson = readSync(firebaseJsonDest, {
           format: "json"
         });
-        if (firebaseJson.hosting?.rewrites) {
+        if (firebaseJson.hosting?.rewrites && Array.isArray(firebaseJson.hosting.rewrites)) {
           firebaseJson.hosting.rewrites = firebaseJson.hosting.rewrites.filter(
             (r2) => r2.destination !== "/index.html"
           );

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

@@ -8969,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";
@@ -8983,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") {
   }
@@ -9423,7 +9423,7 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
         const firebaseJson = readSync(firebaseJsonDest, {
           format: "json"
         });
-        if (firebaseJson.hosting?.rewrites) {
+        if (firebaseJson.hosting?.rewrites && Array.isArray(firebaseJson.hosting.rewrites)) {
           firebaseJson.hosting.rewrites = firebaseJson.hosting.rewrites.filter(
             (r2) => r2.destination !== "/index.html"
           );
@@ -9670,6 +9670,14 @@ async function main(options) {
         process.exit(0);
       }
       if (action === "replace") {
+        const confirmDelete = await askForConfirmation(
+          `This will permanently delete "${projectDirNormalized}". Are you sure?`,
+          false
+        );
+        if (!confirmDelete) {
+          Se("Project creation cancelled.");
+          process.exit(0);
+        }
         const s2 = Y2();
         s2.start("Removing existing project...");
         await remove(projectDirNormalized);
@@ -9724,7 +9732,8 @@ async function main(options) {
       Me(`Configuring "${trimmedName}"...`, "\u2699\uFE0F");
       const config = await collectAppConfig(trimmedName);
       appConfigs[trimmedName] = config;
-      if (config.backend !== "none" || config.functions !== "none") 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)",
@@ -9850,7 +9859,9 @@ async function main(options) {
         overwrite: true
       });
       const relativeMonorepoPath = executionMode === "development" ? calculateRelativePath(projectDirNormalized, monorepoRoot) : "";
-      const primaryPlatform = Object.values(appConfigs).find((c) => c.backend !== "none")?.backend ?? "firebase";
+      const primaryPlatform = Object.values(appConfigs).find(
+        (c) => c.backend !== "none"
+      )?.backend ?? "firebase";
       const rootPackageJson = generatePackageJson(
         "consumer-root",
         executionMode,
@@ -10025,7 +10036,10 @@ async function main(options) {
       await createApp(appName, appConfig, projectDirNormalized, templatesRoot);
     }
     s.start("Updating root package.json with scripts...");
-    await updateRootPackageJson(projectDirNormalized, appNames);
+    await updateRootPackageJson(
+      projectDirNormalized,
+      isMergeMode ? allAppNames : appNames
+    );
     s.stop("Root package.json updated");
     Se("\u{1F389} Project created successfully!");
     const cdCommand = executionMode === "development" ? `cd ../${projectName}` : `cd ${projectName}`;

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");
   }
 }
 
@@ -16691,6 +16701,14 @@ function generateCleanPackageJson(functionsDir) {
   }
   const cleanPackageJson = { ...packageJson };
   if (cleanPackageJson.dependencies) {
+    const removedDeps = Object.entries(cleanPackageJson.dependencies).filter(
+      ([, version]) => String(version).startsWith("file:") || String(version).startsWith("workspace:")
+    );
+    if (removedDeps.length > 0) {
+      log.warn(
+        `Filtering out ${removedDeps.length} workspace/file dep(s) from dependencies: ${removedDeps.map(([name]) => name).join(", ")}`
+      );
+    }
     cleanPackageJson.dependencies = Object.fromEntries(
       Object.entries(cleanPackageJson.dependencies).filter(
         ([, version]) => !String(version).startsWith("file:") && !String(version).startsWith("workspace:")
@@ -16698,6 +16716,16 @@ function generateCleanPackageJson(functionsDir) {
     );
   }
   if (cleanPackageJson.devDependencies) {
+    const removedDevDeps = Object.entries(
+      cleanPackageJson.devDependencies
+    ).filter(
+      ([, version]) => String(version).startsWith("file:") || String(version).startsWith("workspace:")
+    );
+    if (removedDevDeps.length > 0) {
+      log.warn(
+        `Filtering out ${removedDevDeps.length} workspace/file dep(s) from devDependencies: ${removedDevDeps.map(([name]) => name).join(", ")}`
+      );
+    }
     cleanPackageJson.devDependencies = Object.fromEntries(
       Object.entries(cleanPackageJson.devDependencies).filter(
         ([, version]) => !String(version).startsWith("file:") && !String(version).startsWith("workspace:")
@@ -16989,7 +17017,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 +17382,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 +17758,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) {