@marvs13/marvinel-nextjs-supabase-starting-kit 1.0.12 → 1.0.14

package/cli.js

@@ -72,48 +72,46 @@ try {
   });
 
   // 5. Copy Template Files
-  console.log(`📂 Injecting Marvinel's Template files...`);
+  console.log("🛠️ Injecting Marvinel Template files...");
 
-  const copyFolderSync = (from, to) => {
+  const mergeFolderSync = (from, to) => {
+    // Ensure the destination folder exists
     if (!fs.existsSync(to)) fs.mkdirSync(to, { recursive: true });
 
-    // Read the items INSIDE the folder
+    // Read the items INSIDE the folder (not the folder itself)
     const items = fs.readdirSync(from);
 
-    items.forEach((item) => {
+    for (const item of items) {
       const fromPath = path.join(from, item);
       const toPath = path.join(to, item);
 
-      if (fs.lstatSync(fromPath).isFile()) {
-        fs.copyFileSync(fromPath, toPath);
-      } else {
+      if (fs.lstatSync(fromPath).isDirectory()) {
         // Recursive call for subdirectories
-        copyFolderSync(fromPath, toPath);
+        mergeFolderSync(fromPath, toPath);
+      } else {
+        // Direct file copy
+        fs.copyFileSync(fromPath, toPath);
       }
-    });
+    }
   };
 
-  // Define the Source (your CLI's template)
+  // Define your paths
   const rootTemplateDir = path.join(templatePath, "root-files");
   const srcTemplateDir = path.join(templatePath, "src-files");
 
-  // Define the Destination (the user's new project)
-  const rootDestination = projectPath;
-  const srcDestination = path.join(projectPath, "src");
-
-  // 1. Copy contents of root-files to project root
+  // 1. Copy CONTENTS of root-files to project root (e.g., .env.local.example)
   if (fs.existsSync(rootTemplateDir)) {
-    copyFolderSync(rootTemplateDir, rootDestination);
-    console.log("✅ Root configuration files merged.");
+    mergeFolderSync(rootTemplateDir, projectPath);
+    console.log("✅ Root configuration merged.");
   }
 
-  // 2. Copy contents of src-files to project/src
+  // 2. Copy CONTENTS of src-files to project/src (e.g., middleware.ts)
   if (fs.existsSync(srcTemplateDir)) {
-    copyFolderSync(srcTemplateDir, srcDestination);
+    mergeFolderSync(srcTemplateDir, path.join(projectPath, "src"));
     console.log("✅ Source logic merged into /src.");
   }
 
-  copyFolderSync(templatePath, path.join(projectPath, "src"));
+  // copyFolderSync(templatePath, path.join(projectPath, "src"));
 
   console.log(`\n✅ Setup complete! Project is ready.`);
   console.log(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marvs13/marvinel-nextjs-supabase-starting-kit",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "A modern Next.js + Supabase starting kit with Tailwind, Zod, and shadcn/ui.",
   "main": "cli.js",
   "bin": {