create-web3cart-store 1.0.2 → 1.0.4

package/lib/config.js

@@ -112,14 +112,17 @@ INSTALL_DATE=${new Date().toISOString()}
     const envPath = path.join(targetDir, '.env');
     fs.writeFileSync(envPath, envContent, 'utf8');
 
-    // Create .installed file to skip web installer steps 1-3
+    /* 
+    // MOVED: The .installed file will be created by the web installer's Step 4 
+    // to prevent the "Installation Complete" lock from triggering prematurely.
     const installedPath = path.join(targetDir, '.installed');
     fs.writeFileSync(installedPath, JSON.stringify({
         installed_at: new Date().toISOString(),
         method: 'cli',
-        version: '1.0.0',
+        version: '1.4.0',
         skip_to_step: 4
     }), 'utf8');
+    */
 
     // Store admin credentials for step 4 to use
     if (admin) {

package/lib/download.js

@@ -117,34 +117,35 @@ async function extractPackage(zipPath, targetDir) {
     try {
         await extractZip(zipPath, { dir: targetDir });
 
-        // Check if files were extracted to a subdirectory
-        const items = fs.readdirSync(targetDir);
-        const extractedDir = items.find(item => {
-            const itemPath = path.join(targetDir, item);
-            return fs.statSync(itemPath).isDirectory() &&
-                item !== 'node_modules' &&
-                !item.startsWith('.');
-        });
-
-        // If extracted to subdirectory, move contents up
-        if (extractedDir && items.length <= 3) { // zip, extracted folder, maybe .DS_Store
-            const subDir = path.join(targetDir, extractedDir);
-            const subItems = fs.readdirSync(subDir);
-
-            for (const item of subItems) {
-                const srcPath = path.join(subDir, item);
-                const destPath = path.join(targetDir, item);
-
-                if (fs.existsSync(destPath)) {
-                    // Skip if already exists
-                    continue;
+        // Check if files were extracted to a single subdirectory
+        const items = fs.readdirSync(targetDir).filter(item => item !== 'web3cart-temp.zip' && item !== '.DS_Store');
+
+        if (items.length === 1) {
+            const potentialDir = path.join(targetDir, items[0]);
+            if (fs.statSync(potentialDir).isDirectory()) {
+                const subItems = fs.readdirSync(potentialDir);
+
+                for (const item of subItems) {
+                    const srcPath = path.join(potentialDir, item);
+                    const destPath = path.join(targetDir, item);
+
+                    // Force overwrite if it exists (CLI might have created some files)
+                    if (fs.existsSync(destPath)) {
+                        if (fs.statSync(destPath).isDirectory()) {
+                            // Merge directories if needed (basic version)
+                            continue;
+                        }
+                    }
+                    fs.renameSync(srcPath, destPath);
                 }
 
-                fs.renameSync(srcPath, destPath);
+                // Remove the now-empty subdirectory
+                try {
+                    fs.rmdirSync(potentialDir);
+                } catch (e) {
+                    // Ignore if not empty due to skipped items
+                }
             }
-
-            // Remove empty subdirectory
-            fs.rmdirSync(subDir);
         }
 
         return true;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-web3cart-store",
-    "version": "1.0.2",
+    "version": "1.0.4",
     "description": "Create a Web3Cart crypto payment store with one command",
     "author": "Web3Cart <hello@web3cart.site>",
     "license": "MIT",