create-vault-cms 1.0.7 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-vault-cms",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Installer for Vault CMS",
   "main": "src/cli.js",
   "bin": {
@@ -32,4 +32,4 @@
     "fs-extra": "^11.3.3",
     "inquirer": "^8.2.7"
   }
-}
+}

package/src/cli.js

@@ -24,7 +24,7 @@ program
       console.log('🚀 Initializing Vault CMS Installer...');
 
       const availableTemplates = await fetchTemplates();
-      
+
       let template = options.template;
       let targetPath = target;
 
@@ -67,11 +67,12 @@ program
       const targetDir = path.resolve(targetPath);
       const tempZip = path.join(targetDir, 'vault-cms-temp.zip');
       const extractDir = path.join(targetDir, '.vault-cms-temp-extract');
-      
+
       const repoName = template ? 'vault-cms-presets' : 'vault-cms';
       const zipUrl = `https://github.com/davidvkimball/${repoName}/archive/refs/heads/master.zip`;
 
       console.log(`\n🚀 Installing Vault CMS${template ? ` (template: ${template})` : ''}...`);
+      console.log(`  📍 Target directory: ${targetDir}`);
 
       await fs.ensureDir(targetDir);
 
@@ -82,7 +83,13 @@ program
       const zip = new AdmZip(tempZip);
       zip.extractAllTo(extractDir, true);
 
-      const folders = await fs.readdir(extractDir);
+      const items = await fs.readdir(extractDir);
+      const folders = items.filter(item => fs.statSync(path.join(extractDir, item)).isDirectory());
+
+      if (folders.length === 0) {
+        throw new Error('Could not find content in the downloaded archive.');
+      }
+
       const innerFolder = path.join(extractDir, folders[0]);
       const sourcePath = template ? path.join(innerFolder, template) : innerFolder;
 
@@ -94,7 +101,7 @@ program
       for (const item of toKeep) {
         const src = path.join(sourcePath, item);
         const dest = path.join(targetDir, item);
-        
+
         if (await fs.pathExists(src)) {
           await fs.copy(src, dest, { overwrite: true });
           console.log(`  ✓ Added ${item}`);
@@ -105,21 +112,30 @@ program
       const projectRoot = await findProjectRoot(targetDir);
       const gitignorePath = path.join(projectRoot, '.gitignore');
       const ignores = '\n# Vault CMS / Obsidian\n.obsidian/workspace.json\n.obsidian/workspace-mobile.json\n.ref/\n';
-      
+
+      const isExternalRoot = projectRoot !== targetDir && !targetDir.startsWith(projectRoot);
+
       if (await fs.pathExists(gitignorePath)) {
         const content = await fs.readFile(gitignorePath, 'utf8');
         if (!content.includes('.obsidian/workspace.json')) {
           await fs.appendFile(gitignorePath, ignores);
           console.log(`  ✓ Updated .gitignore at ${path.relative(process.cwd(), gitignorePath)}`);
         }
-      } else {
+      } else if (!isExternalRoot) {
         await fs.writeFile(gitignorePath, ignores.trim() + '\n');
         console.log(`  ✓ Created .gitignore at ${path.relative(process.cwd(), gitignorePath)}`);
+      } else {
+        console.log(`  ⚠️  Skipped .gitignore (could not find a safe project root)`);
       }
 
       await fs.remove(tempZip);
       await fs.remove(extractDir);
 
+      if (projectRoot === targetDir) {
+        console.log('\n  ⚠️  Note: No Astro project or package.json found in parent directories.');
+        console.log('     Installation completed, but you may need to move these files into your content folder manually.');
+      }
+
       console.log('\n✨ Vault CMS is ready!');
       process.exit(0);
     } catch (err) {
@@ -129,14 +145,20 @@ program
   });
 
 async function findProjectRoot(startDir) {
-    let current = startDir;
-    while (current !== path.parse(current).root) {
-        const hasPkg = await fs.pathExists(path.join(current, 'package.json'));
-        const hasAstro = await fs.pathExists(path.join(current, 'astro.config.mjs')) || await fs.pathExists(path.join(current, 'astro.config.ts'));
-        if (hasPkg || hasAstro) return current;
-        current = path.dirname(current);
-    }
-    return startDir; // Fallback to target dir
+  let current = startDir;
+  // Look up to 6 levels up for a project root (Astro config, package.json, or .git)
+  let depth = 0;
+  while (current !== path.parse(current).root && depth < 6) {
+    const hasPkg = await fs.pathExists(path.join(current, 'package.json'));
+    const hasAstro = await fs.pathExists(path.join(current, 'astro.config.mjs')) || await fs.pathExists(path.join(current, 'astro.config.ts'));
+    const hasGit = await fs.pathExists(path.join(current, '.git'));
+
+    if (hasPkg || hasAstro || hasGit) return current;
+
+    current = path.dirname(current);
+    depth++;
+  }
+  return startDir; // Fallback to target dir
 }
 
 function downloadFile(url, dest) {
@@ -172,7 +194,7 @@ function fetchTemplates() {
             .map(item => item.name);
           resolve(dirs);
         } catch (e) {
-          resolve(['starlight', 'slate', 'chiri']); 
+          resolve(['starlight', 'slate', 'chiri']);
         }
       });
     }).on('error', () => resolve(['starlight', 'slate', 'chiri']));