@thinhnguyencth1204/nextcli 0.4.2 → 0.6.0

package/dist/cli.js

@@ -137,7 +137,7 @@ async function replaceTokensInDirectory(directoryPath, replacements) {
     }
   }
 }
-async function mergeEnvFile(envFilePath, entries) {
+async function mergeEnvFile(envFilePath, entries, options = {}) {
   const envExists = await pathExists(envFilePath);
   const currentContent = envExists ? await readFile(envFilePath, "utf8") : "";
   const lines = currentContent ? currentContent.split("\n") : [];
@@ -161,6 +161,18 @@ async function mergeEnvFile(envFilePath, entries) {
   if (additions.length === 0) {
     return;
   }
+  if (options.header && currentContent.includes(options.header)) {
+    const nextContent2 = currentContent.replace(
+      options.header,
+      `${options.header}
+${additions.join("\n")}`
+    );
+    await writeFile(envFilePath, nextContent2, "utf8");
+    return;
+  }
+  if (options.header) {
+    additions.unshift(options.header);
+  }
   const separator = currentContent.endsWith("\n") || currentContent.length === 0 ? "" : "\n";
   const nextContent = `${currentContent}${separator}${additions.join("\n")}
 `;
@@ -202,10 +214,9 @@ var rootDir = path2.resolve(currentDir, "../");
 var templatePaths = {
   base: path2.join(rootDir, "templates/next-base"),
   chat: path2.join(rootDir, "templates/features/chat"),
-  supabase: path2.join(rootDir, "templates/features/supabase"),
   supabaseRealtime: path2.join(rootDir, "templates/features/supabase-realtime"),
   seo: path2.join(rootDir, "templates/features/seo"),
-  resend: path2.join(rootDir, "templates/features/resend")
+  email: path2.join(rootDir, "templates/features/email")
 };
 
 // src/core/modules.ts
@@ -223,25 +234,6 @@ var optionalModules = [
 | \`NEXT_PUBLIC_ENABLE_CHAT\` | Set \`true\` when chat module is enabled (auto on add) |
 
 Requires \`supabase-realtime\` (auto-added). Run \`db:migrate\` after add \u2014 chat Prisma models are appended.`
-  },
-  {
-    id: "supabase",
-    label: "Supabase",
-    description: "Adds Supabase client and storage upload helpers",
-    templatePath: templatePaths.supabase,
-    env: {
-      NEXT_PUBLIC_SUPABASE_URL: "",
-      NEXT_PUBLIC_SUPABASE_ANON_KEY: "",
-      NEXT_PUBLIC_SUPABASE_STORAGE_BUCKET: "public"
-    },
-    dependencies: {
-      "@supabase/supabase-js": "^2.44.2"
-    },
-    setupSection: `| Variable | Where to get |
-| -------- | ------------ |
-| \`NEXT_PUBLIC_SUPABASE_URL\` | Supabase Dashboard \u2192 Project Settings \u2192 API \u2192 Project URL |
-| \`NEXT_PUBLIC_SUPABASE_ANON_KEY\` | Same page \u2192 Project API keys \u2192 \`anon\` \`public\` |
-| \`NEXT_PUBLIC_SUPABASE_STORAGE_BUCKET\` | Storage \u2192 create bucket \u2192 use bucket name (default scaffold: \`public\`) |`
   },
   {
     id: "supabase-realtime",
@@ -255,7 +247,7 @@ Requires \`supabase-realtime\` (auto-added). Run \`db:migrate\` after add \u2014
     dependencies: {
       "@supabase/supabase-js": "^2.44.2"
     },
-    setupSection: `Uses same Supabase URL/anon key as \`supabase\` module. Enable Realtime on tables in Supabase Dashboard \u2192 Database \u2192 Replication.`
+    setupSection: `Uses the base Supabase URL/anon key. Enable Realtime on tables in Supabase Dashboard \u2192 Database \u2192 Replication.`
   },
   {
     id: "seo",
@@ -266,23 +258,17 @@ Requires \`supabase-realtime\` (auto-added). Run \`db:migrate\` after add \u2014
     setupSection: `No extra env keys. Edit \`src/app/robots.ts\`, \`sitemap.ts\`, and JSON-LD helpers after add.`
   },
   {
-    id: "resend",
-    label: "Resend email",
-    description: "Adds Resend client, send helper, and React Email welcome template",
-    templatePath: templatePaths.resend,
-    env: {
-      RESEND_API_KEY: "",
-      RESEND_FROM_EMAIL: ""
-    },
-    dependencies: {
-      resend: "^6.9.2",
-      "@react-email/components": "^1.0.12",
-      "react-email": "^4.0.0"
-    },
-    setupSection: `| Variable | Where to get |
-| -------- | ------------ |
-| \`RESEND_API_KEY\` | resend.com \u2192 API Keys \u2192 Create |
-| \`RESEND_FROM_EMAIL\` | resend.com \u2192 Domains \u2192 verify domain \u2192 use \`Name <you@domain.com>\` |`
+    id: "email",
+    label: "Email module (SMTP or Resend)",
+    description: "Adds provider-agnostic sendEmail helper with SMTP/Resend adapters",
+    templatePath: templatePaths.email,
+    env: {},
+    setupSection: `When you add this module, NexTCLI asks which provider to configure:
+
+- **Resend**: \`EMAIL_PROVIDER=resend\`, \`RESEND_API_KEY\`, \`RESEND_FROM_EMAIL\`
+- **SMTP**: \`EMAIL_PROVIDER=smtp\`, \`SMTP_HOST\`, \`SMTP_PORT\`, \`SMTP_USER\`, \`SMTP_PASSWORD\`, \`SMTP_FROM\`
+
+Only the selected provider keys are merged into your env files.`
   }
 ];
 function getModuleById(moduleId) {
@@ -456,6 +442,42 @@ async function ensureBetterAuthGenerate(cwd, options = {}) {
   }
 }
 
+// src/core/email-module.ts
+var EMAIL_PROVIDER_OPTIONS = ["resend", "smtp"];
+function isEmailProvider(value) {
+  return EMAIL_PROVIDER_OPTIONS.includes(value);
+}
+function getEmailProviderEnv(provider) {
+  if (provider === "smtp") {
+    return {
+      EMAIL_PROVIDER: "smtp",
+      SMTP_HOST: "",
+      SMTP_PORT: "587",
+      SMTP_USER: "",
+      SMTP_PASSWORD: "",
+      SMTP_FROM: ""
+    };
+  }
+  return {
+    EMAIL_PROVIDER: "resend",
+    RESEND_API_KEY: "",
+    RESEND_FROM_EMAIL: ""
+  };
+}
+function getEmailProviderDependencies(provider) {
+  if (provider === "smtp") {
+    return {
+      nodemailer: "^6.10.1",
+      "@types/nodemailer": "^6.4.17"
+    };
+  }
+  return {
+    resend: "^6.9.2",
+    "@react-email/components": "^1.0.12",
+    "react-email": "^4.0.0"
+  };
+}
+
 // src/core/chat-schema.ts
 import path3 from "path";
 import { readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
@@ -560,7 +582,7 @@ import { readdir as readdir3, readFile as readFile4, writeFile as writeFile4 } f
 import path4 from "path";
 import { readdir as readdir2, readFile as readFile3, writeFile as writeFile3 } from "fs/promises";
 var defaultManifest = {
-  cli: "0.4.2",
+  cli: "0.6.0",
   defaultLocale: "vi",
   locales: ["vi"],
   namespaces: ["common", "auth", "example"],
@@ -625,7 +647,7 @@ async function reconcileManifest(projectDir) {
     ]
   };
   merged.defaultLocale = merged.locales.includes(merged.defaultLocale) ? merged.defaultLocale : merged.locales[0] ?? "vi";
-  merged.modules = [...new Set(merged.modules)];
+  merged.modules = [...new Set(merged.modules)].map((moduleId) => moduleId === "resend" ? "email" : moduleId).filter((moduleId) => moduleId !== "supabase");
   merged.features = [...new Set(merged.features)];
   await writeManifest(projectDir, merged);
   return merged;
@@ -1307,24 +1329,6 @@ function normalizeModuleSelection(moduleIds) {
     autoAddedModules: autoAdded
   };
 }
-async function upsertEnvValue(envFilePath, key, value) {
-  if (!await pathExists(envFilePath)) {
-    return;
-  }
-  const content = await readFile6(envFilePath, "utf8");
-  const entry = `${key}=${value}`;
-  const pattern = new RegExp(`^${key}=.*$`, "m");
-  if (pattern.test(content)) {
-    const next = content.replace(pattern, entry);
-    if (next !== content) {
-      await writeFile6(envFilePath, next, "utf8");
-    }
-    return;
-  }
-  const separator = content.endsWith("\n") || content.length === 0 ? "" : "\n";
-  await writeFile6(envFilePath, `${content}${separator}${entry}
-`, "utf8");
-}
 function registerAddCommand(program2) {
   const add = program2.command("add").description("Add modules to an existing app");
   add.command("feature").description("Scaffold a feature folder under src/features").argument("<feature-name>", "Feature name").action(async (featureName) => {
@@ -1443,167 +1447,239 @@ function registerAddCommand(program2) {
       "No migration was executed. Run your migration command manually when ready."
     );
   });
-  add.command("module").description("Add optional modules using interactive multi-select").option("--module <module...>", "Preselect module ids").option("--yes", "Skip prompts").action(async (options) => {
-    const cwd = process.cwd();
-    const hasSrc = await pathExists(path7.join(cwd, "src"));
-    const hasPackageJson = await pathExists(path7.join(cwd, "package.json"));
-    if (!hasSrc || !hasPackageJson) {
-      log.error("Run this command from your generated Next.js project root.");
-      process.exitCode = 1;
-      return;
-    }
-    const validIds = new Set(optionalModules.map((module) => module.id));
-    const requestedIds = options.module ? options.module.flatMap((value) => value.split(",")).map((value) => value.trim()).filter(Boolean) : [];
-    for (const moduleId of requestedIds) {
-      if (!validIds.has(moduleId)) {
-        log.error(`Unknown module: ${moduleId}`);
+  add.command("module").description("Add optional modules using interactive multi-select").option("--module <module...>", "Preselect module ids").option(
+    "--email-provider <provider>",
+    "Email provider for email module: resend or smtp"
+  ).option("--yes", "Skip prompts").action(
+    async (options) => {
+      const cwd = process.cwd();
+      const hasSrc = await pathExists(path7.join(cwd, "src"));
+      const hasPackageJson = await pathExists(path7.join(cwd, "package.json"));
+      if (!hasSrc || !hasPackageJson) {
+        log.error(
+          "Run this command from your generated Next.js project root."
+        );
         process.exitCode = 1;
         return;
       }
-    }
-    startPrompt("NexTCLI optional modules");
-    const rawModules = requestedIds.length > 0 ? [...new Set(requestedIds)] : options.yes ? [] : await askMultiSelect(
-      "Select modules to add:",
-      optionalModules.map((module) => ({
-        value: module.id,
-        label: module.label,
-        hint: module.description
-      })),
-      []
-    );
-    const { selectedModules, autoAddedModules } = normalizeModuleSelection(rawModules);
-    if (selectedModules.length === 0) {
-      finishPrompt("No modules selected.");
-      return;
-    }
-    const skippedConflictsByModule = [];
-    let copiedFileCount = 0;
-    for (const moduleId of selectedModules) {
-      const module = getModuleById(moduleId);
-      const copyReport = await copyDirectorySafely(module.templatePath, cwd);
-      copiedFileCount += copyReport.copiedCount;
-      if (copyReport.skippedConflicts.length > 0) {
-        skippedConflictsByModule.push({
-          moduleId,
-          paths: copyReport.skippedConflicts
-        });
+      const validIds = new Set(
+        optionalModules.map((module) => module.id)
+      );
+      const requestedValues = options.module ? options.module.flatMap((value) => value.split(",")).map((value) => value.trim()).filter(Boolean) : [];
+      const requestedIds = [];
+      let emailProviderFromModuleAlias;
+      const optionEmailProvider = options.emailProvider ? options.emailProvider.trim().toLowerCase() : void 0;
+      if (optionEmailProvider && !isEmailProvider(optionEmailProvider)) {
+        log.error(`Unknown email provider: ${options.emailProvider}`);
+        process.exitCode = 1;
+        return;
       }
-    }
-    let chatSchemaStatus;
-    if (selectedModules.includes("chat")) {
-      chatSchemaStatus = await ensureChatSchemaInProject(cwd);
-    }
-    const envEntries = selectedModules.reduce(
-      (acc, moduleId) => {
+      for (const moduleId of requestedValues) {
+        if (validIds.has(moduleId)) {
+          requestedIds.push(moduleId);
+          continue;
+        }
+        if (moduleId === "supabase") {
+          log.info(
+            "Supabase is now part of the base template; only supabase-realtime is optional."
+          );
+          continue;
+        }
+        if (moduleId === "resend") {
+          log.info(
+            "Module 'resend' is now 'email'; selecting email with provider resend."
+          );
+          requestedIds.push("email");
+          emailProviderFromModuleAlias = "resend";
+          continue;
+        }
+        if (!validIds.has(moduleId)) {
+          log.error(`Unknown module: ${moduleId}`);
+          process.exitCode = 1;
+          return;
+        }
+      }
+      startPrompt("NexTCLI optional modules");
+      const rawModules = requestedIds.length > 0 ? [...new Set(requestedIds)] : options.yes ? [] : await askMultiSelect(
+        "Select modules to add:",
+        optionalModules.map((module) => ({
+          value: module.id,
+          label: module.label,
+          hint: module.description
+        })),
+        []
+      );
+      const { selectedModules, autoAddedModules } = normalizeModuleSelection(rawModules);
+      if (optionEmailProvider && !selectedModules.includes("email")) {
+        log.warn(
+          "Ignoring --email-provider because email module is not selected."
+        );
+      }
+      let emailProvider;
+      if (selectedModules.includes("email")) {
+        if (emailProviderFromModuleAlias) {
+          emailProvider = emailProviderFromModuleAlias;
+        } else if (optionEmailProvider && isEmailProvider(optionEmailProvider)) {
+          emailProvider = optionEmailProvider;
+        } else if (options.yes) {
+          emailProvider = "resend";
+          log.info(
+            "No --email-provider supplied in --yes mode; defaulting email provider to resend."
+          );
+        } else {
+          emailProvider = await askSelect(
+            "Select email provider:",
+            [
+              {
+                value: "resend",
+                label: "Resend",
+                hint: "Transactional email API with React Email support"
+              },
+              {
+                value: "smtp",
+                label: "SMTP",
+                hint: "Use your SMTP relay credentials"
+              }
+            ],
+            "resend"
+          );
+        }
+      }
+      if (selectedModules.length === 0) {
+        finishPrompt("No modules selected.");
+        return;
+      }
+      const skippedConflictsByModule = [];
+      let copiedFileCount = 0;
+      for (const moduleId of selectedModules) {
         const module = getModuleById(moduleId);
-        return {
-          ...acc,
-          ...module.env
-        };
-      },
-      {}
-    );
-    if (Object.keys(envEntries).length > 0) {
-      const envTargets = [".env", ".env.example", ".env.development"];
-      for (const envFile of envTargets) {
-        const envPath = path7.join(cwd, envFile);
-        if (await pathExists(envPath)) {
-          await mergeEnvFile(envPath, envEntries);
+        const copyReport = await copyDirectorySafely(
+          module.templatePath,
+          cwd
+        );
+        copiedFileCount += copyReport.copiedCount;
+        if (copyReport.skippedConflicts.length > 0) {
+          skippedConflictsByModule.push({
+            moduleId,
+            paths: copyReport.skippedConflicts
+          });
         }
       }
-    }
-    if (selectedModules.includes("chat")) {
+      let chatSchemaStatus;
+      if (selectedModules.includes("chat")) {
+        chatSchemaStatus = await ensureChatSchemaInProject(cwd);
+      }
       const envTargets = [".env", ".env.example", ".env.development"];
-      for (const envFile of envTargets) {
-        await upsertEnvValue(
-          path7.join(cwd, envFile),
-          "NEXT_PUBLIC_ENABLE_CHAT",
-          "true"
-        );
+      for (const moduleId of selectedModules) {
+        const module = getModuleById(moduleId);
+        const moduleEnv = moduleId === "email" && emailProvider ? getEmailProviderEnv(emailProvider) : module.env;
+        if (Object.keys(moduleEnv).length === 0) {
+          continue;
+        }
+        for (const envFile of envTargets) {
+          const envPath = path7.join(cwd, envFile);
+          if (await pathExists(envPath)) {
+            await mergeEnvFile(envPath, moduleEnv, {
+              header: `# --- module: ${module.id} ---`
+            });
+          }
+        }
       }
-    }
-    const dependencyEntries = selectedModules.reduce(
-      (acc, moduleId) => {
+      const dependencyEntries = selectedModules.reduce((acc, moduleId) => {
         const module = getModuleById(moduleId);
+        const emailDependencies = moduleId === "email" && emailProvider ? getEmailProviderDependencies(emailProvider) : {};
         return {
           ...acc,
+          ...emailDependencies,
           ...module.dependencies ?? {}
         };
-      },
-      {}
-    );
-    if (Object.keys(dependencyEntries).length > 0) {
-      await addDependencies(
-        path7.join(cwd, "package.json"),
-        dependencyEntries
-      );
-    }
-    const state = await detectProjectState(cwd);
-    const namespaceSet = new Set(state.namespaces);
-    for (const moduleId of selectedModules) {
-      const moduleTemplateMessages = path7.join(
-        getModuleById(moduleId).templatePath,
-        "messages/vi"
-      );
-      if (!await pathExists(moduleTemplateMessages)) {
-        continue;
+      }, {});
+      if (Object.keys(dependencyEntries).length > 0) {
+        await addDependencies(
+          path7.join(cwd, "package.json"),
+          dependencyEntries
+        );
       }
-      const files = await readdir4(moduleTemplateMessages, {
-        withFileTypes: true
-      });
-      for (const file of files) {
-        if (!file.isFile() || !file.name.endsWith(".json")) {
+      const state = await detectProjectState(cwd);
+      const namespaceSet = new Set(state.namespaces);
+      for (const moduleId of selectedModules) {
+        const moduleTemplateMessages = path7.join(
+          getModuleById(moduleId).templatePath,
+          "messages/vi"
+        );
+        if (!await pathExists(moduleTemplateMessages)) {
           continue;
         }
-        const namespace = file.name.replace(/\.json$/, "");
-        namespaceSet.add(namespace);
-        const templateData = JSON.parse(
-          await readFile6(
-            path7.join(moduleTemplateMessages, file.name),
-            "utf8"
+        const files = await readdir4(moduleTemplateMessages, {
+          withFileTypes: true
+        });
+        for (const file of files) {
+          if (!file.isFile() || !file.name.endsWith(".json")) {
+            continue;
+          }
+          const namespace = file.name.replace(/\.json$/, "");
+          namespaceSet.add(namespace);
+          const templateData = JSON.parse(
+            await readFile6(
+              path7.join(moduleTemplateMessages, file.name),
+              "utf8"
+            )
+          );
+          await writeNamespaceMessages(cwd, namespace, templateData);
+          await appendNamespace(cwd, namespace);
+        }
+      }
+      await writeManifest(cwd, {
+        ...state,
+        namespaces: [...namespaceSet],
+        modules: [
+          ...new Set(
+            [...state.modules, ...selectedModules].map(
+              (moduleId) => moduleId === "resend" ? "email" : moduleId
+            )
+          )
+        ]
+      });
+      const mergedModules = [
+        ...new Set(
+          [...state.modules, ...selectedModules].map(
+            (moduleId) => moduleId === "resend" ? "email" : moduleId
           )
+        )
+      ];
+      await mergeModuleSetupSections(cwd, selectedModules, mergedModules);
+      finishPrompt(`Added modules: ${selectedModules.join(", ")}`);
+      log.detail("Copied files", String(copiedFileCount));
+      if (autoAddedModules.length > 0) {
+        log.detail("Auto-added", autoAddedModules.join(", "));
+      }
+      if (emailProvider) {
+        log.detail("Email provider", emailProvider);
+      }
+      if (skippedConflictsByModule.length > 0) {
+        const totalSkipped = skippedConflictsByModule.reduce(
+          (total, item) => total + item.paths.length,
+          0
         );
-        await writeNamespaceMessages(cwd, namespace, templateData);
-        await appendNamespace(cwd, namespace);
+        log.warn(
+          `Skipped ${totalSkipped} existing file(s). Existing project files were kept unchanged.`
+        );
+        for (const conflict of skippedConflictsByModule) {
+          const preview = conflict.paths.slice(0, 3).join(", ");
+          const suffix = conflict.paths.length > 3 ? ", ..." : "";
+          log.detail(`Skipped (${conflict.moduleId})`, `${preview}${suffix}`);
+        }
       }
-    }
-    await writeManifest(cwd, {
-      ...state,
-      namespaces: [...namespaceSet],
-      modules: [.../* @__PURE__ */ new Set([...state.modules, ...selectedModules])]
-    });
-    const mergedModules = [
-      .../* @__PURE__ */ new Set([...state.modules, ...selectedModules])
-    ];
-    await mergeModuleSetupSections(cwd, selectedModules, mergedModules);
-    finishPrompt(`Added modules: ${selectedModules.join(", ")}`);
-    log.detail("Copied files", String(copiedFileCount));
-    if (autoAddedModules.length > 0) {
-      log.detail("Auto-added", autoAddedModules.join(", "));
-    }
-    if (skippedConflictsByModule.length > 0) {
-      const totalSkipped = skippedConflictsByModule.reduce(
-        (total, item) => total + item.paths.length,
-        0
-      );
-      log.warn(
-        `Skipped ${totalSkipped} existing file(s). Existing project files were kept unchanged.`
-      );
-      for (const conflict of skippedConflictsByModule) {
-        const preview = conflict.paths.slice(0, 3).join(", ");
-        const suffix = conflict.paths.length > 3 ? ", ..." : "";
-        log.detail(`Skipped (${conflict.moduleId})`, `${preview}${suffix}`);
+      if (chatSchemaStatus === "added") {
+        log.info(
+          "Optional chat schema block was appended to prisma/schema.prisma."
+        );
       }
-    }
-    if (chatSchemaStatus === "added") {
-      log.info(
-        "Optional chat schema block was appended to prisma/schema.prisma."
+      log.step(
+        "Next: run your package manager install to apply new dependencies."
       );
     }
-    log.step(
-      "Next: run your package manager install to apply new dependencies."
-    );
-  });
+  );
   add.command("language").description("Add locales and clone message files from Vietnamese").option("--locale <locale...>", "Preselect locales: en,ja,ko").option("--yes", "Skip prompts").action(async (options) => {
     const cwd = process.cwd();
     const hasMessages = await pathExists(path7.join(cwd, "messages"));
@@ -1735,7 +1811,9 @@ function registerAddCommand(program2) {
     for (const envFile of envTargets) {
       const envPath = path7.join(cwd, envFile);
       if (await pathExists(envPath)) {
-        await mergeEnvFile(envPath, envEntries);
+        await mergeEnvFile(envPath, envEntries, {
+          header: "# --- auth providers ---"
+        });
       }
     }
     finishPrompt(`Enabled providers: ${mergedProviders.join(", ")}`);
@@ -1844,6 +1922,25 @@ function registerCreateCommand(program2) {
       []
     );
     const { selectedModules, autoAddedModules } = normalizeModuleSelection2(rawModules);
+    let emailProvider;
+    if (selectedModules.includes("email")) {
+      emailProvider = await askSelect(
+        "Select email provider:",
+        [
+          {
+            value: "resend",
+            label: "Resend",
+            hint: "Transactional email API with React Email support"
+          },
+          {
+            value: "smtp",
+            label: "SMTP",
+            hint: "Use your SMTP relay credentials"
+          }
+        ],
+        "resend"
+      );
+    }
     const shouldInstall = await askConfirm("Install dependencies now?", true);
     await copyDirectory(templatePaths.base, targetPath);
     for (const moduleId of selectedModules) {
@@ -1854,30 +1951,29 @@ function registerCreateCommand(program2) {
     if (selectedModules.includes("chat")) {
       chatSchemaStatus = await ensureChatSchemaInProject(targetPath);
     }
-    const moduleEnvEntries = selectedModules.reduce(
-      (acc, moduleId) => {
-        const module = getModuleById(moduleId);
-        return {
-          ...acc,
-          ...module.env
-        };
-      },
-      {}
-    );
-    if (Object.keys(moduleEnvEntries).length > 0) {
-      const envTargets = [".env", ".env.example", ".env.development"];
+    const envTargets = [".env", ".env.example", ".env.development"];
+    for (const moduleId of selectedModules) {
+      const module = getModuleById(moduleId);
+      const moduleEnv = moduleId === "email" && emailProvider ? getEmailProviderEnv(emailProvider) : module.env;
+      if (Object.keys(moduleEnv).length === 0) {
+        continue;
+      }
       for (const envFile of envTargets) {
         const envPath = path8.join(targetPath, envFile);
         if (await pathExists(envPath)) {
-          await mergeEnvFile(envPath, moduleEnvEntries);
+          await mergeEnvFile(envPath, moduleEnv, {
+            header: `# --- module: ${module.id} ---`
+          });
         }
       }
     }
     const dependencyEntries = selectedModules.reduce(
       (acc, moduleId) => {
         const module = getModuleById(moduleId);
+        const emailDependencies = moduleId === "email" && emailProvider ? getEmailProviderDependencies(emailProvider) : {};
         return {
           ...acc,
+          ...emailDependencies,
           ...module.dependencies ?? {}
         };
       },
@@ -1892,9 +1988,8 @@ function registerCreateCommand(program2) {
     const betterAuthSecret = randomBytes(32).toString("base64url");
     await replaceTokensInDirectory(targetPath, {
       __PROJECT_NAME__: projectSlug,
-      __ENABLE_CHAT__: selectedModules.includes("chat") ? "true" : "false",
       __BETTER_AUTH_SECRET__: betterAuthSecret,
-      __NEXTCLI_VERSION__: "0.4.2"
+      __NEXTCLI_VERSION__: "0.6.0"
     });
     await mergeModuleSetupSections(
       targetPath,
@@ -1905,7 +2000,7 @@ function registerCreateCommand(program2) {
     if (manifest) {
       await writeManifest(targetPath, {
         ...manifest,
-        cli: "0.4.2",
+        cli: "0.6.0",
         modules: selectedModules
       });
     }
@@ -1925,6 +2020,9 @@ function registerCreateCommand(program2) {
     if (autoAddedModules.length > 0) {
       log.detail("Auto-added", autoAddedModules.join(", "));
     }
+    if (emailProvider) {
+      log.detail("Email provider", emailProvider);
+    }
     if (chatSchemaStatus === "added") {
       log.info(
         "Optional chat schema block was appended to prisma/schema.prisma."
@@ -2147,7 +2245,7 @@ var NexTCLICommand = class _NexTCLICommand extends Command {
 
 // src/cli.ts
 var program = new NexTCLICommand();
-program.name("nextcli").description("Scaffold outsource-ready Next.js projects").version("0.4.2");
+program.name("nextcli").description("Scaffold outsource-ready Next.js projects").version("0.6.0");
 registerCreateCommand(program);
 registerAddCommand(program);
 registerMigrateCommand(program);