@shipindays/shipindays 0.1.12 → 0.1.13

package/index.js

@@ -36,9 +36,9 @@ const EMAIL_PROVIDERS = {
     label: "Resend",
     hint: "resend.com — best DX, generous free tier",
   },
-  nodemailer: {
-    label: "Nodemailer",
-    hint: "SMTP — works with Gmail, Outlook, any mail server",
+  mailgun: {
+    label: "Mailgun",
+    hint: "mailgun.com — powerful API, great for scaling",
   },
 };
 
@@ -77,14 +77,10 @@ const ENV_VARS = {
         "RESEND_API_KEY=",
       ],
     },
-    nodemailer: {
-      "# SMTP / Nodemailer": [
-        "SMTP_HOST=smtp.gmail.com",
-        "SMTP_PORT=587",
-        "SMTP_SECURE=false",
-        "SMTP_USER=",
-        "SMTP_PASS=",
-        "SMTP_FROM=you@yourdomain.com",
+    mailgun: {
+      "# Mailgun (mailgun.com → Sending → Domains)": [
+        "MAILGUN_API_KEY=",
+        "MAILGUN_DOMAIN=",
       ],
     },
   },
@@ -97,13 +93,19 @@ const ENV_VARS = {
 async function copyDir(src, dest, skipNames = []) {
   await fs.ensureDir(dest);
   const entries = await fs.readdir(src, { withFileTypes: true });
+
   for (const entry of entries) {
     if (skipNames.includes(entry.name)) continue;
+
     const srcPath = path.join(src, entry.name);
     const destPath = path.join(dest, entry.name);
+
     if (entry.isDirectory()) {
+      // Create sub-directory in destination and recurse
+      await fs.ensureDir(destPath);
       await copyDir(srcPath, destPath, skipNames);
     } else {
+      // Copy the file
       await fs.copy(srcPath, destPath, { overwrite: true });
     }
   }
@@ -119,20 +121,26 @@ async function injectBlock(feature, provider, targetPath) {
   const blockSrcDir = path.join(blockRoot, "src");
 
   if (!await fs.pathExists(blockRoot)) {
-    throw new Error(
-      `Block not found: ${blockRoot}\n` +
-      `Make sure templates/blocks/${feature}/${provider}/ exists.`
-    );
+    throw new Error(`Block not found: ${blockRoot}`);
   }
 
-  if (!await fs.pathExists(blockSrcDir)) {
-    throw new Error(
-      `Block src/ folder missing: ${blockSrcDir}\n` +
-      `Structure: templates/blocks/${feature}/${provider}/src/...`
-    );
+  // 1. Copy everything inside block/src/ to target/src/
+  if (await fs.pathExists(blockSrcDir)) {
+    // We skip node_modules and .next if they accidentally exist in the block
+    await copyDir(blockSrcDir, path.join(targetPath, "src"), ["node_modules", ".next"]);
   }
 
-  await copyDir(blockSrcDir, path.join(targetPath, "src"), ["node_modules", ".next"]);
+  // 2. Handle non-src files (like public/ or drizzle/ if the block has them)
+  // Check if there are other folders in the block root that aren't 'src' or 'package.json'
+  const blockEntries = await fs.readdir(blockRoot, { withFileTypes: true });
+  for (const entry of blockEntries) {
+    if (entry.isDirectory() && entry.name !== "src" && entry.name !== "node_modules") {
+      await copyDir(
+        path.join(blockRoot, entry.name),
+        path.join(targetPath, entry.name)
+      );
+    }
+  }
 }
 
 // Reads the block's package.json and merges its deps into the project's package.json.
@@ -147,10 +155,13 @@ async function mergePackageJson(targetPath, feature, provider) {
   const targetPkg = await fs.readJson(targetPkgPath);
   const blockPkg = await fs.readJson(blockPkgPath);
 
+  // Merge dependencies
   targetPkg.dependencies = {
     ...(targetPkg.dependencies ?? {}),
     ...(blockPkg.dependencies ?? {}),
   };
+
+  // Merge devDependencies
   targetPkg.devDependencies = {
     ...(targetPkg.devDependencies ?? {}),
     ...(blockPkg.devDependencies ?? {}),
@@ -377,7 +388,7 @@ async function main() {
       run(`git commit -m "chore: scaffold from shipindays"`, targetPath);
       spin.stop("Git initialised.");
     } catch {
-      spin.stop(chalk.yellow("Git skipped — run manually."));
+      spin.stop(chalk.yellow("Git skipped — please run manually."));
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipindays/shipindays",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "Open source CLI to scaffold a Next.js SaaS. Pick your auth, email, and payments wired up and ready to ship.",
   "type": "module",
   "bin": {

package/templates/blocks/email/mailgun/package.json

@@ -0,0 +1,6 @@
+{
+    "dependencies": {
+        "form-data": "^4.0.1",
+        "mailgun": "^0.5.0"
+    }
+}

package/templates/blocks/email/nodemailer/index.ts

@@ -1,62 +0,0 @@
-// FILE: src/lib/email/index.ts
-// ROUTE: not a route — imported anywhere that sends email
-// ROLE: Nodemailer provider implementation
-//
-// INJECTED BY CLI when user picks "Nodemailer" as their email provider.
-// Replaces templates/base/src/lib/email/index.ts
-// ─────────────────────────────────────────────────────────────────────────────
-
-import nodemailer from "nodemailer";
-
-// Nodemailer transport — reads SMTP config from env
-// Works with Gmail, Outlook, Mailgun SMTP, any SMTP server
-const transporter = nodemailer.createTransport({
-    host: process.env.SMTP_HOST,
-    port: Number(process.env.SMTP_PORT ?? 587),
-    secure: process.env.SMTP_SECURE === "true",
-    auth: {
-        user: process.env.SMTP_USER,
-        pass: process.env.SMTP_PASS,
-    },
-});
-
-const FROM = process.env.SMTP_FROM ?? "you@yourdomain.com";
-
-// ─── sendWelcomeEmail ─────────────────────────────────────────────────────────
-export async function sendWelcomeEmail({ to, name }: { to: string; name: string }) {
-    await transporter.sendMail({
-        from: FROM,
-        to,
-        subject: "Welcome! 🎉",
-        html: `
-      <div style="font-family:sans-serif;max-width:560px;margin:0 auto;padding:40px 20px">
-        <h1 style="font-size:24px;color:#111">Hey ${name}, welcome aboard!</h1>
-        <p style="color:#555;line-height:1.7">Your account is ready. Click below to get started.</p>
-        <a href="${process.env.NEXT_PUBLIC_APP_URL}/dashboard"
-           style="display:inline-block;margin-top:20px;padding:12px 24px;background:#111;color:#fff;border-radius:6px;text-decoration:none">
-          Go to Dashboard →
-        </a>
-      </div>
-    `,
-    });
-}
-
-// ─── sendPasswordResetEmail ───────────────────────────────────────────────────
-export async function sendPasswordResetEmail({ to, resetUrl }: { to: string; resetUrl: string }) {
-    await transporter.sendMail({
-        from: FROM,
-        to,
-        subject: "Reset your password",
-        html: `
-      <div style="font-family:sans-serif;max-width:560px;margin:0 auto;padding:40px 20px">
-        <h1 style="font-size:24px;color:#111">Reset your password</h1>
-        <p style="color:#555;line-height:1.7">Click below to reset your password. Link expires in 1 hour.</p>
-        <a href="${resetUrl}"
-           style="display:inline-block;margin-top:20px;padding:12px 24px;background:#111;color:#fff;border-radius:6px;text-decoration:none">
-          Reset Password →
-        </a>
-        <p style="margin-top:24px;color:#999;font-size:12px">If you didn't request this, ignore this email.</p>
-      </div>
-    `,
-    });
-}

package/templates/blocks/email/nodemailer/package.json

@@ -1,8 +0,0 @@
-{
-    "dependencies": {
-        "nodemailer": "^6.9.9"
-    },
-    "devDependencies": {
-        "@types/nodemailer": "^6.4.16"
-    }
-}