@donotdev/cli 0.0.15 → 0.0.17

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

@@ -8713,15 +8713,14 @@ 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 +8735,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 +9025,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`;
@@ -9071,18 +9070,102 @@ 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: null },
-  { 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: "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: "demo", backend: "none", baseTemplate: "app-demo", overlay: null, deployConfig: null, functionsTemplate: null }
+  {
+    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}`;
@@ -9095,7 +9178,9 @@ 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(", ")}`);
+    throw new Error(
+      `Unsupported scaffold combo: ${key}. Supported: ${[...ROWS_BY_KEY.keys()].join(", ")}`
+    );
   }
   return row;
 }
@@ -9251,13 +9336,16 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
           const variantFile = `src/config/providers.${appTemplate}.ts.example`;
           if (overlayFiles.includes(variantFile)) continue;
         }
-        const providersVariant = file.match(/^src\/config\/providers\.(\w+)\.ts\.example$/);
+        const providersVariant = file.match(
+          /^src\/config\/providers\.(\w+)\.ts\.example$/
+        );
         if (providersVariant) {
           if (providersVariant[1] !== appTemplate) continue;
           const destPath2 = joinPath(appDir, "src/config/providers.ts");
           await ensureDir(getDirname(destPath2));
-          await copy(joinPath(overlayDir, file), destPath2);
-          if (await isTextFile(destPath2)) await replacePlaceholders(destPath2, replacements);
+          await copy(joinPath(overlayDir, file), destPath2, { overwrite: true });
+          if (await isTextFile(destPath2))
+            await replacePlaceholders(destPath2, replacements);
           continue;
         }
         const sourcePath = joinPath(overlayDir, file);
@@ -9267,7 +9355,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);
         }
@@ -9282,16 +9370,28 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
       }
       if (deployConfig === "vercel-supabase") {
         const vercelPath = joinPath(appDir, "vercel.json");
-        const headersFragmentPath = joinPath(overlayDir, "vercel.headers.example");
+        const headersFragmentPath = joinPath(
+          overlayDir,
+          "vercel.headers.example"
+        );
         const fullVercelPath = joinPath(overlayDir, "vercel.json.example");
         if (pathExists(vercelPath) && pathExists(headersFragmentPath)) {
           const vercelJson = readSync(vercelPath, { format: "json" });
-          const headersFragment = readSync(headersFragmentPath, { format: "json" });
-          vercelJson.headers = [...vercelJson.headers ?? [], ...headersFragment];
-          await write(vercelPath, vercelJson, { format: "json", overwrite: true });
+          const headersFragment = readSync(headersFragmentPath, {
+            format: "json"
+          });
+          vercelJson.headers = [
+            ...vercelJson.headers ?? [],
+            ...headersFragment
+          ];
+          await write(vercelPath, vercelJson, {
+            format: "json",
+            overwrite: true
+          });
         } else if (pathExists(fullVercelPath)) {
           await copy(fullVercelPath, vercelPath);
-          if (await isTextFile(vercelPath)) await replacePlaceholders(vercelPath, replacements);
+          if (await isTextFile(vercelPath))
+            await replacePlaceholders(vercelPath, replacements);
         }
       }
     }
@@ -9310,23 +9410,33 @@ 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));
+    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-", "") }
+      log.warn(
+        `Functions template "${functionsTemplateName}" not found \u2014 skipping functions scaffolding.`
       );
-      const packageJsonPath2 = joinPath(functionsRootDir, "package.json");
-      await ensureDir(functionsRootDir);
-      await write(packageJsonPath2, functionsPackageJson, {
-        format: "json",
-        overwrite: true
-      });
+    } else {
+      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,
@@ -9354,20 +9464,49 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
   }
   const deploymentTemplateDir = joinPath(templatesRoot, "root-consumer");
   if (deployConfig === "firebase") {
-    const firebaseJsonSource = joinPath(deploymentTemplateDir, "firebase.json.example");
+    const firebaseJsonSource = joinPath(
+      deploymentTemplateDir,
+      "firebase.json.example"
+    );
     if (pathExists(firebaseJsonSource)) {
       await copy(firebaseJsonSource, joinPath(appDir, "firebase.json"));
       const firebaseJsonDest = joinPath(appDir, "firebase.json");
-      if (await isTextFile(firebaseJsonDest)) await replacePlaceholders(firebaseJsonDest, replacements);
+      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");
+    const firebasercSource = joinPath(
+      deploymentTemplateDir,
+      ".firebaserc.example"
+    );
     if (pathExists(firebasercSource)) {
       await copy(firebasercSource, joinPath(appDir, ".firebaserc"));
       const firebasercDest = joinPath(appDir, ".firebaserc");
-      if (await isTextFile(firebasercDest)) await replacePlaceholders(firebasercDest, replacements);
+      if (await isTextFile(firebasercDest))
+        await replacePlaceholders(firebasercDest, replacements);
     }
     if (row.functionsTemplate === "functions-firebase") {
-      for (const example of ["firestore.rules.example", "firestore.indexes.json.example", "storage.rules.example"]) {
+      for (const example of [
+        "firestore.rules.example",
+        "firestore.indexes.json.example",
+        "storage.rules.example"
+      ]) {
         const src = joinPath(deploymentTemplateDir, example);
         if (pathExists(src)) {
           await copy(src, joinPath(appDir, example.replace(".example", "")));
@@ -9375,12 +9514,76 @@ 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");
+    const vercelJsonSource = joinPath(
+      deploymentTemplateDir,
+      "vercel.json.example"
+    );
     if (pathExists(vercelJsonSource)) {
       await copy(vercelJsonSource, joinPath(appDir, "vercel.json"));
       const vercelJsonDest = joinPath(appDir, "vercel.json");
-      if (await isTextFile(vercelJsonDest)) await replacePlaceholders(vercelJsonDest, replacements);
+      if (await isTextFile(vercelJsonDest))
+        await replacePlaceholders(vercelJsonDest, replacements);
     }
   }
   const backendInfo = row.functionsTemplate ? ` with ${row.functionsTemplate.replace("functions-", "")} functions` : "";
@@ -9417,23 +9620,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 +9751,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 +9776,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)",