@donotdev/cli 0.0.8 → 0.0.9

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

@@ -8834,7 +8834,7 @@ function generatePackageJson(templateName, mode, options = {}) {
       "dependencies-matrix.json not found. This command requires the matrix file."
     );
   }
-  const { matrix, cliVersion } = matrixResult;
+  const { matrix } = matrixResult;
   const template = matrix.templateMapping?.[templateName];
   if (!template) {
     throw new Error(`Template "${templateName}" not found in matrix`);
@@ -8898,6 +8898,7 @@ function generatePackageJson(templateName, mode, options = {}) {
     }
   }
   if (templateName.includes("functions")) {
+    result.main = "lib/index.js";
     result.engines = { node: "20" };
     if (options.appName) {
       const platform = templateName.includes("vercel") ? "Vercel" : "Firebase";
@@ -9025,6 +9026,8 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
   s.start(`Creating app: ${appName}`);
   await ensureDir(appDir);
   const templateDir = appTemplate === "demo" ? "app-demo" : appTemplate === "nextjs" ? "app-next" : "app-vite";
+  const firebaseProjectId = (appConfig?.firebaseProjectId ?? "").trim() || appName.toLowerCase().replace(/\s+/g, "-");
+  const firebaseRegion = appConfig?.firebaseRegion ?? "europe-west1";
   const replacements = {
     projectName: appName,
     appName,
@@ -9033,11 +9036,14 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
     needsCRUD: Boolean(appConfig.needsCRUD),
     setupGithubActions: false,
     appNames: [appName],
-    firebaseProjectId: appName.toLowerCase(),
+    firebaseProjectId,
+    firebaseRegion,
     firebaseSecretName: appName.toUpperCase().replace(/-/g, "_"),
     monorepoRelativePath: "../../packages/tooling",
     appTemplate,
-    isNextjs: appTemplate === "nextjs"
+    isNextjs: appTemplate === "nextjs",
+    YOUR_FIREBASE_PROJECT_ID: firebaseProjectId,
+    YOUR_REGION: firebaseRegion
   };
   const templateSourceDir = joinPath(templatesRoot, templateDir);
   const templateFiles = await glob("**/*", {
@@ -9130,6 +9136,32 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
       await replacePlaceholders(firebaseJsonDest, replacements);
     }
   }
+  const firebasercSource = joinPath(
+    deploymentTemplateDir,
+    ".firebaserc.example"
+  );
+  if (pathExists(firebasercSource)) {
+    const firebasercDest = joinPath(appDir, ".firebaserc");
+    await copy(firebasercSource, firebasercDest);
+    if (await isTextFile(firebasercDest)) {
+      await replacePlaceholders(firebasercDest, replacements);
+    }
+  }
+  if (appConfig.needsBackend && appConfig.backendPlatform === "firebase") {
+    const rulesFiles = [
+      "firestore.rules.example",
+      "firestore.indexes.json.example",
+      "storage.rules.example"
+    ];
+    for (const example of rulesFiles) {
+      const src = joinPath(deploymentTemplateDir, example);
+      if (pathExists(src)) {
+        const destName = example.replace(".example", "");
+        const dest = joinPath(appDir, destName);
+        await copy(src, dest);
+      }
+    }
+  }
   if (appTemplate === "nextjs" || appConfig.needsBackend && appConfig.backendPlatform === "vercel") {
     const vercelJsonSource = joinPath(
       deploymentTemplateDir,
@@ -9155,12 +9187,15 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
   }
   if (isInteractive) {
     Se("\u{1F389} App created successfully!");
+    const firebaseStep = appConfig.needsBackend && appConfig.backendPlatform === "firebase" ? `2. Set Firebase project: cd apps/${appName} && firebase use --add (or edit .firebase rc)
+3. bun install
+4. bun run dev` : `2. bun install
+3. bun run dev`;
     Me(
       `Next steps:
 
 1. cd apps/${appName}
-2. bun install
-3. bun run dev
+${firebaseStep}
 
 Happy coding!`,
       "\u{1F4CB} Next Steps"
@@ -9496,6 +9531,8 @@ async function main(options) {
         overwrite: true
       });
       const rootTemplateDir = joinPath(templatesRoot, "root-consumer");
+      const firebaseProjectId = projectName.toLowerCase().replace(/\s+/g, "-");
+      const firebaseRegion = "europe-west1";
       const rootReplacements = {
         projectName,
         appNames: isMergeMode ? allAppNames : appNames,
@@ -9504,12 +9541,22 @@ async function main(options) {
         monorepoRelativePath: relativeMonorepoPath,
         appTemplate: "vite",
         isNextjs: false,
-        firebaseProjectId: projectName.toLowerCase(),
+        firebaseProjectId,
+        firebaseRegion,
         firebaseSecretName: projectName.toUpperCase().replace(/-/g, "_"),
+        YOUR_FIREBASE_PROJECT_ID: firebaseProjectId,
+        YOUR_REGION: firebaseRegion,
         needsAuth,
         needsOAuth,
         needsBilling
       };
+      const firebaseRootFiles = /* @__PURE__ */ new Set([
+        "firebase.json.example",
+        ".firebaserc.example",
+        "firestore.rules.example",
+        "firestore.indexes.json.example",
+        "storage.rules.example"
+      ]);
       const files = await glob("**/*", {
         cwd: rootTemplateDir,
         dot: true,
@@ -9517,6 +9564,7 @@ async function main(options) {
       });
       for (const file of files) {
         if (file === "package.json.example") continue;
+        if (firebaseRootFiles.has(file)) continue;
         const sourcePath = joinPath(rootTemplateDir, file);
         let destFileName = file;
         if (destFileName.endsWith(".example")) {
@@ -9591,6 +9639,8 @@ async function main(options) {
         }
       }
       if (installDemoApp) {
+        const demoFirebaseProjectId = projectName.toLowerCase().replace(/\s+/g, "-");
+        const demoFirebaseRegion = "europe-west1";
         await copyTemplateFiles(demoTemplateDir, demoAppDir, {
           projectName,
           appName: "demo",
@@ -9598,8 +9648,11 @@ async function main(options) {
           needsCRUD: false,
           setupGithubActions: false,
           appNames,
-          firebaseProjectId: projectName.toLowerCase(),
+          firebaseProjectId: demoFirebaseProjectId,
+          firebaseRegion: demoFirebaseRegion,
           firebaseSecretName: projectName.toUpperCase().replace(/-/g, "_"),
+          YOUR_FIREBASE_PROJECT_ID: demoFirebaseProjectId,
+          YOUR_REGION: demoFirebaseRegion,
           monorepoRelativePath: executionMode === "development" ? calculateRelativePath(projectDirNormalized, monorepoRoot) : "",
           appTemplate: "demo"
         });

package/dist/bin/commands/deploy.js

@@ -7960,8 +7960,10 @@ function executeFirebaseCommand(args, options) {
     errorOutput
   };
 }
-function buildFirebaseDeployArgs(deployType, projectId, debug, force) {
-  const args = ["deploy", "--only", deployType, "--non-interactive"];
+function buildFirebaseDeployArgs(deployTargets, projectId, debug, force) {
+  const targets = Array.isArray(deployTargets) ? deployTargets : [deployTargets];
+  const targetString = targets.join(",");
+  const args = ["deploy", "--only", targetString, "--non-interactive"];
   if (projectId) {
     args.push("--project", projectId);
   }
@@ -8523,6 +8525,47 @@ To fix this, run:
   }
 }
 
+// packages/tooling/src/apps/deploy-rules.ts
+init_utils();
+async function deployRules(appDir, serviceAccountPath, projectId, config, options) {
+  const targets = [];
+  if (options.firestore) {
+    targets.push("firestore:rules");
+  }
+  if (options.firestoreIndexes) {
+    targets.push("firestore:indexes");
+  }
+  if (options.storage) {
+    targets.push("storage");
+  }
+  if (targets.length === 0) {
+    return;
+  }
+  const targetNames = targets.join(", ");
+  const s = Y2();
+  s.start(`Deploying ${targetNames}...`);
+  const args = buildFirebaseDeployArgs(targets, projectId, config.debug);
+  const result = executeFirebaseCommand(args, {
+    cwd: appDir,
+    serviceAccountPath,
+    projectId,
+    debug: config.debug
+  });
+  if (result.error) {
+    s.stop("Rules deployment failed");
+    throw result.error;
+  }
+  if (!result.success) {
+    s.stop("Rules deployment failed");
+    handleDeploymentFailure(
+      result,
+      `firebase ${args.join(" ")}`,
+      serviceAccountPath
+    );
+  }
+  s.stop(`${targetNames} deployed successfully`);
+}
+
 // packages/tooling/src/apps/deploy-utils.ts
 init_utils();
 import { spawnSync as spawnSync3 } from "node:child_process";
@@ -8643,6 +8686,9 @@ function validateFirebaseJson(appDir) {
       valid: false,
       hasHosting: false,
       hasFunctions: false,
+      hasFirestoreRules: false,
+      hasFirestoreIndexes: false,
+      hasStorageRules: false,
       errors: [`firebase.json not found at: ${firebaseJsonPath}`]
     };
   }
@@ -8655,11 +8701,17 @@ function validateFirebaseJson(appDir) {
     }
     const hasHosting = !!config.hosting;
     const hasFunctions = !!config.functions && Array.isArray(config.functions);
+    const hasFirestoreRules = !!config.firestore?.rules && pathExists(joinPath(appDir, config.firestore.rules));
+    const hasFirestoreIndexes = !!config.firestore?.indexes && pathExists(joinPath(appDir, config.firestore.indexes));
+    const hasStorageRules = !!config.storage?.rules && pathExists(joinPath(appDir, config.storage.rules));
     return {
       valid: true,
       projectId: config.projectId,
       hasHosting,
       hasFunctions,
+      hasFirestoreRules,
+      hasFirestoreIndexes,
+      hasStorageRules,
       errors: []
     };
   } catch (error2) {
@@ -8667,6 +8719,9 @@ function validateFirebaseJson(appDir) {
       valid: false,
       hasHosting: false,
       hasFunctions: false,
+      hasFirestoreRules: false,
+      hasFirestoreIndexes: false,
+      hasStorageRules: false,
       errors: [
         `Invalid JSON format: ${error2 instanceof DoNotDevError ? error2.message : error2 instanceof Error ? error2.message : String(error2)}`
       ]
@@ -8831,16 +8886,36 @@ async function main(options = {}) {
           hint: "Deploy cloud functions"
         });
       }
+      const hasRules = firebaseConfig2.hasFirestoreRules || firebaseConfig2.hasFirestoreIndexes || firebaseConfig2.hasStorageRules;
+      if (hasRules) {
+        choices.push({
+          title: "Rules only",
+          value: "rules",
+          hint: "Deploy Firestore/Storage rules"
+        });
+      }
       if (firebaseConfig2.hasHosting && firebaseConfig2.hasFunctions) {
         choices.push({
-          title: "Both frontend and functions",
+          title: "Frontend + Functions",
           value: "both",
-          hint: "Deploy everything"
+          hint: "Deploy hosting and functions"
+        });
+      }
+      const deployableKindsCount = [
+        firebaseConfig2.hasHosting,
+        firebaseConfig2.hasFunctions,
+        hasRules
+      ].filter(Boolean).length;
+      if (deployableKindsCount > 1) {
+        choices.push({
+          title: "All",
+          value: "all",
+          hint: "Deploy everything (hosting, functions, rules)"
         });
       }
       if (choices.length === 0) {
         log.error(
-          "No deployment targets found. firebase.json must have hosting or functions configuration."
+          "No deployment targets found. firebase.json must have hosting, functions, or rules configuration."
         );
         process.exit(1);
       }
@@ -8885,13 +8960,28 @@ async function main(options = {}) {
       showFirebaseJsonError(firebaseConfig.errors, appDir, deploymentType);
       process.exit(1);
     }
-    if (deploymentType === "frontend" || deploymentType === "both") {
-      if (!firebaseConfig.hasHosting) {
-        log.error(
-          "firebase.json does not contain hosting configuration, but frontend deployment was requested."
-        );
-        process.exit(1);
-      }
+    const shouldDeployFrontend = (deploymentType === "frontend" || deploymentType === "both" || deploymentType === "all") && firebaseConfig.hasHosting;
+    const shouldDeployFunctions = (deploymentType === "functions" || deploymentType === "both" || deploymentType === "all") && firebaseConfig.hasFunctions;
+    const shouldDeployRules = (deploymentType === "rules" || deploymentType === "all") && (firebaseConfig.hasFirestoreRules || firebaseConfig.hasFirestoreIndexes || firebaseConfig.hasStorageRules);
+    if (deploymentType === "frontend" && !firebaseConfig.hasHosting) {
+      log.error(
+        "firebase.json does not contain hosting configuration, but frontend deployment was requested."
+      );
+      process.exit(1);
+    }
+    if (deploymentType === "functions" && !firebaseConfig.hasFunctions) {
+      log.error(
+        "firebase.json does not contain functions configuration, but functions deployment was requested."
+      );
+      process.exit(1);
+    }
+    if (deploymentType === "rules" && !shouldDeployRules) {
+      log.error(
+        "firebase.json does not contain rules configuration, but rules deployment was requested."
+      );
+      process.exit(1);
+    }
+    if (shouldDeployFrontend) {
       const buildStatus = validateBuild(appDir);
       let shouldBuild = false;
       if (!buildStatus.exists || buildStatus.isEmpty) {
@@ -8934,14 +9024,6 @@ async function main(options = {}) {
         }
       }
     }
-    if (deploymentType === "functions" || deploymentType === "both") {
-      if (!firebaseConfig.hasFunctions) {
-        log.error(
-          "firebase.json does not contain functions configuration, but functions deployment was requested."
-        );
-        process.exit(1);
-      }
-    }
     clearFirebaseCache(appDir);
     Me(
       `App: ${appName}
@@ -8950,10 +9032,10 @@ Deployment: ${deploymentType}
 Service Account: ${serviceAccountResult.info.clientEmail}`,
       "Deployment Configuration"
     );
-    if (deploymentType === "frontend" || deploymentType === "both") {
+    if (shouldDeployFrontend) {
       await deployFrontend(appDir, serviceAccountPath, config.project, config);
     }
-    if (deploymentType === "functions" || deploymentType === "both") {
+    if (shouldDeployFunctions) {
       await deployFunctions(
         appDir,
         serviceAccountPath,
@@ -8961,6 +9043,13 @@ Service Account: ${serviceAccountResult.info.clientEmail}`,
         config
       );
     }
+    if (shouldDeployRules) {
+      await deployRules(appDir, serviceAccountPath, config.project, config, {
+        firestore: firebaseConfig.hasFirestoreRules,
+        firestoreIndexes: firebaseConfig.hasFirestoreIndexes,
+        storage: firebaseConfig.hasStorageRules
+      });
+    }
     Se("Deployment completed successfully!");
   } catch (error2) {
     if (error2 instanceof DoNotDevError) {

package/dist/bin/dndev.js

@@ -46,7 +46,7 @@ Usage: dndev <command>[:<app>] [options]
 
 Commands:
   init, create-project    Create a new DoNotDev project
-  create-app [name]       Add app to existing project (--builder vite|next, --functions)
+  create-app [name]       Add app (--builder vite|next, --functions, --project <id>)
   dev [app]               Start development server
   build [app]             Build for production
   preview [app]           Preview production build
@@ -66,7 +66,8 @@ Examples:
   dndev init my-project   Create a new project
   dndev create-app        Interactive app creation
   dndev create-app my-app Create 'my-app' with defaults (vite, no functions)
-  dndev create-app my-app --builder next --functions  Create Next.js app with functions
+  dndev create-app my-app --builder next --functions  Next.js + functions
+  dndev create-app my-app --functions --project my-fb-id  Set Firebase project (2-min setup)
   dndev dev               Start dev server
   dndev dev:web           Start dev server for 'web' app
   dndev wai               Output WAI-WAY activation prompt
@@ -90,14 +91,16 @@ program.command("init [name]").alias("create-project").description("Create a new
   const { main } = await import("./commands/create-project.js");
   await main({ projectName: name });
 });
-program.command("create-app [name]").description("Add a new app to existing project").option("--name <name>", "App name (non-interactive)").option("--builder <builder>", "Framework: vite or next (default: vite)").option("--functions", "Include Firebase functions").action(async (name, options) => {
+program.command("create-app [name]").description("Add a new app to existing project").option("--name <name>", "App name (non-interactive)").option("--builder <builder>", "Framework: vite or next (default: vite)").option("--functions", "Include Firebase functions").option("--project <id>", "Firebase project ID (default: app name)").option("--region <region>", "Firebase region (default: europe-west1)").action(async (name, options) => {
   const { main } = await import("./commands/create-app.js");
   const appName = name || options.name;
   if (appName) {
     await main({
       name: appName,
       builder: options.builder,
-      functions: options.functions
+      functions: options.functions,
+      firebaseProjectId: options.project,
+      firebaseRegion: options.region
     });
   } else {
     await main();

package/dist/bin/donotdev.js

@@ -46,7 +46,7 @@ Usage: dndev <command>[:<app>] [options]
 
 Commands:
   init, create-project    Create a new DoNotDev project
-  create-app [name]       Add app to existing project (--builder vite|next, --functions)
+  create-app [name]       Add app (--builder vite|next, --functions, --project <id>)
   dev [app]               Start development server
   build [app]             Build for production
   preview [app]           Preview production build
@@ -66,7 +66,8 @@ Examples:
   dndev init my-project   Create a new project
   dndev create-app        Interactive app creation
   dndev create-app my-app Create 'my-app' with defaults (vite, no functions)
-  dndev create-app my-app --builder next --functions  Create Next.js app with functions
+  dndev create-app my-app --builder next --functions  Next.js + functions
+  dndev create-app my-app --functions --project my-fb-id  Set Firebase project (2-min setup)
   dndev dev               Start dev server
   dndev dev:web           Start dev server for 'web' app
   dndev wai               Output WAI-WAY activation prompt
@@ -90,14 +91,16 @@ program.command("init [name]").alias("create-project").description("Create a new
   const { main } = await import("./commands/create-project.js");
   await main({ projectName: name });
 });
-program.command("create-app [name]").description("Add a new app to existing project").option("--name <name>", "App name (non-interactive)").option("--builder <builder>", "Framework: vite or next (default: vite)").option("--functions", "Include Firebase functions").action(async (name, options) => {
+program.command("create-app [name]").description("Add a new app to existing project").option("--name <name>", "App name (non-interactive)").option("--builder <builder>", "Framework: vite or next (default: vite)").option("--functions", "Include Firebase functions").option("--project <id>", "Firebase project ID (default: app name)").option("--region <region>", "Firebase region (default: europe-west1)").action(async (name, options) => {
   const { main } = await import("./commands/create-app.js");
   const appName = name || options.name;
   if (appName) {
     await main({
       name: appName,
       builder: options.builder,
-      functions: options.functions
+      functions: options.functions,
+      firebaseProjectId: options.project,
+      firebaseRegion: options.region
     });
   } else {
     await main();