stackpatch 1.1.1 → 1.1.2

package/bin/stackpatch.ts

@@ -1911,24 +1911,95 @@ async function main() {
       }
     }
 
-    // Step 3: Restore modified files from backups
+    // Step 3: Restore modified files from originalContent in manifest
+    // This is more reliable than backups since it contains the true original content
     console.log(chalk.white("\n📝 Restoring modified files..."));
     for (const modified of manifest.files.modified) {
-      const backupPath = path.join(target, ".stackpatch", "backups", modified.path.replace(/\//g, "_").replace(/\\/g, "_"));
       const originalPath = path.join(target, modified.path);
 
-      if (fs.existsSync(backupPath)) {
+      if (modified.originalContent !== undefined) {
         try {
-          restoreFile(backupPath, originalPath);
+          // Restore from originalContent in manifest (most reliable)
+          const originalDir = path.dirname(originalPath);
+          if (!fs.existsSync(originalDir)) {
+            fs.mkdirSync(originalDir, { recursive: true });
+          }
+          fs.writeFileSync(originalPath, modified.originalContent, "utf-8");
           console.log(chalk.green(`   ✓ Restored: ${modified.path}`));
           restoredCount++;
         } catch (error) {
-          console.log(chalk.yellow(`   ⚠ Could not restore: ${modified.path}`));
-          failedRestorations.push(modified.path);
+          // Fallback to backup file if originalContent restore fails
+          const backupPath = path.join(target, ".stackpatch", "backups", modified.path.replace(/\//g, "_").replace(/\\/g, "_"));
+          if (fs.existsSync(backupPath)) {
+            try {
+              restoreFile(backupPath, originalPath);
+              console.log(chalk.green(`   ✓ Restored (from backup): ${modified.path}`));
+              restoredCount++;
+            } catch (backupError) {
+              console.log(chalk.yellow(`   ⚠ Could not restore: ${modified.path}`));
+              failedRestorations.push(modified.path);
+            }
+          } else {
+            console.log(chalk.yellow(`   ⚠ Could not restore: ${modified.path} (no backup found)`));
+            failedRestorations.push(modified.path);
+          }
         }
       } else {
-        console.log(chalk.yellow(`   ⚠ Backup not found: ${modified.path}`));
-        failedRestorations.push(modified.path);
+        // Fallback: try to restore from backup file
+        const backupPath = path.join(target, ".stackpatch", "backups", modified.path.replace(/\//g, "_").replace(/\\/g, "_"));
+        if (fs.existsSync(backupPath)) {
+          try {
+            restoreFile(backupPath, originalPath);
+            console.log(chalk.green(`   ✓ Restored (from backup): ${modified.path}`));
+            restoredCount++;
+          } catch (error) {
+            console.log(chalk.yellow(`   ⚠ Could not restore: ${modified.path}`));
+            failedRestorations.push(modified.path);
+          }
+        } else {
+          console.log(chalk.yellow(`   ⚠ Backup not found and no originalContent: ${modified.path}`));
+          failedRestorations.push(modified.path);
+        }
+      }
+
+      // Safety check: If file still contains StackPatch components after restore, manually remove them
+      if (fs.existsSync(originalPath) && modified.path.includes("layout.tsx")) {
+        try {
+          let content = fs.readFileSync(originalPath, "utf-8");
+          let needsUpdate = false;
+
+          // Remove AuthSessionProvider import
+          if (content.includes("AuthSessionProvider") && content.includes("session-provider")) {
+            content = content.replace(/import\s*{\s*AuthSessionProvider\s*}\s*from\s*["'][^"']*session-provider[^"']*["'];\s*\n?/g, "");
+            needsUpdate = true;
+          }
+
+          // Remove Toaster import
+          if (content.includes("Toaster") && content.includes("toaster")) {
+            content = content.replace(/import\s*{\s*Toaster\s*}\s*from\s*["'][^"']*toaster[^"']*["'];\s*\n?/g, "");
+            needsUpdate = true;
+          }
+
+          // Remove AuthSessionProvider wrapper
+          if (content.includes("<AuthSessionProvider>") && content.includes("</AuthSessionProvider>")) {
+            content = content.replace(/<AuthSessionProvider>\s*/g, "");
+            content = content.replace(/\s*<\/AuthSessionProvider>/g, "");
+            needsUpdate = true;
+          }
+
+          // Remove Toaster component
+          if (content.includes("<Toaster")) {
+            content = content.replace(/<Toaster\s*\/?>\s*\n?\s*/g, "");
+            needsUpdate = true;
+          }
+
+          if (needsUpdate) {
+            fs.writeFileSync(originalPath, content, "utf-8");
+            console.log(chalk.green(`   ✓ Cleaned up StackPatch components from: ${modified.path}`));
+          }
+        } catch (error) {
+          // Ignore errors in cleanup
+        }
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stackpatch",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Composable frontend features for modern React & Next.js apps - Add authentication, UI components, and more with zero configuration",
   "main": "bin/stackpatch.ts",
   "type": "module",