@enfyra/create-app 0.1.37 → 0.1.39

package/README.md

@@ -15,17 +15,22 @@ npx @enfyra/create-server my-backend
 
 👉 **[Backend Setup Guide](https://www.npmjs.com/package/@enfyra/create-server)** - Complete instructions for setting up your Enfyra backend
 
+The frontend does not own backend secrets. For self-hosted backends, keep the server `SECRET_KEY` stable and backed up because it signs auth tokens and decrypts fields marked `isEncrypted=true`.
+
 ## Quick Start
 
 ```bash
-# Using npx (recommended)
+# Using npx
 npx @enfyra/create-app
 
+# Using npm
+npm exec @enfyra/create-app
+
 # Using yarn
-yarn create @enfyra/app
+yarn dlx @enfyra/create-app
 
 # Using pnpm  
-pnpm create @enfyra/app
+pnpm dlx @enfyra/create-app
 
 # Or install globally
 npm install -g @enfyra/create-app
@@ -49,7 +54,7 @@ create-app
 ## Requirements
 
 - **Node.js** 20.0.0 or higher
-- **Package manager**: npm (8+), yarn (1.22+), pnpm (7+), or bun (1+)
+- **Package manager**: npm, yarn, or pnpm
 
 ## Usage
 
@@ -102,25 +107,23 @@ npm run preview  # Preview production build
 
 ### Learn More
 
-📖 **[Complete Documentation](https://github.com/dothinh115/enfyra-app#readme)** - Full guide to building with Enfyra  
-🔧 **[API Reference](https://github.com/dothinh115/enfyra-app/blob/main/docs/API.md)** - Backend integration  
-🎨 **[UI Components](https://github.com/dothinh115/enfyra-app/blob/main/docs/COMPONENTS.md)** - Pre-built components  
-⚡ **[Best Practices](https://github.com/dothinh115/enfyra-app/blob/main/docs/BEST_PRACTICES.md)** - Development guidelines  
+📖 **[Complete Documentation](https://github.com/enfyra/documents)** - Full guide to building with Enfyra  
+🔧 **[Installation Guide](https://github.com/enfyra/documents/blob/main/getting-started/installation.md)** - Backend and frontend setup  
+🎨 **[App Documentation](https://github.com/enfyra/app#readme)** - Frontend application template  
 
 ## Support
 
 Having issues? We're here to help:
 
-- 🐛 [Report bugs](https://github.com/dothinh115/create-enfyra-app/issues)
-- 💬 [Ask questions](https://github.com/dothinh115/enfyra-app/discussions)
-- 📧 [Email support](mailto:dothinh115@gmail.com)
+- 🐛 [Report bugs](https://github.com/enfyra/create-enfyra-app/issues)
+- 💬 [Ask questions](https://github.com/enfyra/app/discussions)
 
 ## Related
 
-- **[Enfyra App](https://github.com/dothinh115/enfyra-app)** - The frontend template
-- **[Enfyra BE](https://github.com/dothinh115/enfyra_be)** - Backend framework
-- **[Create Enfyra Server](https://github.com/dothinh115/create-enfyra-server)** - Backend CLI
+- **[Enfyra App](https://github.com/enfyra/app)** - The frontend template
+- **[Enfyra Server](https://github.com/enfyra/server)** - Backend framework
+- **[Create Enfyra Server](https://github.com/enfyra/create-enfyra-server)** - Backend CLI
 
 ---
 
-Built by [dothinh115](https://github.com/dothinh115) • MIT License
+Built by Enfyra Team • MIT License

package/components/project-setup.js

@@ -6,50 +6,19 @@ const { spawn, execSync } = require('child_process');
 const { downloadTemplate } = require('giget');
 const { generateEnvFile } = require('./env-builder');
 
-// Check available package managers with version validation
 function detectPackageManagers() {
   const managers = [];
-  
-  // Check npm (minimum version 8.0.0)
-  try {
-    const npmVersion = execSync('npm --version', {
-      encoding: 'utf8',
-      stdio: 'pipe',
-      shell: true
-    }).trim();
-    const majorVersion = parseInt(npmVersion.split('.')[0]);
-    if (majorVersion >= 8) {
-      managers.push({ name: 'npm', value: 'npm', version: npmVersion });
-    }
-  } catch {}
-  
-  // Check yarn (minimum version 1.22.0)
-  try {
-    const yarnVersion = execSync('yarn --version', {
-      encoding: 'utf8',
-      stdio: 'pipe',
-      shell: true
-    }).trim();
-    const [major, minor] = yarnVersion.split('.').map(Number);
-    if (major > 1 || (major === 1 && minor >= 22)) {
-      managers.push({ name: 'yarn', value: 'yarn', version: yarnVersion });
-    }
-  } catch {}
-  
-  // Check pnpm (minimum version 7.0.0)
-  try {
-    const pnpmVersion = execSync('pnpm --version', {
-      encoding: 'utf8',
-      stdio: 'pipe',
-      shell: true
-    }).trim();
-    const majorVersion = parseInt(pnpmVersion.split('.')[0]);
-    if (majorVersion >= 7) {
-      managers.push({ name: 'pnpm', value: 'pnpm', version: pnpmVersion });
-    }
-  } catch {}
-  
-  // Note: bun is not supported due to native binding compatibility issues
+
+  for (const name of ['npm', 'yarn', 'pnpm']) {
+    try {
+      const version = execSync(`${name} --version`, {
+        encoding: 'utf8',
+        stdio: 'pipe',
+        shell: true
+      }).trim();
+      managers.push({ name, value: name, version });
+    } catch {}
+  }
   
   return managers;
 }
@@ -139,7 +108,6 @@ async function updatePackageJson(projectPath, config) {
 }
 
 async function cleanPackageManagerRestrictions(projectPath) {
-  // List of files that can restrict package manager usage
   const restrictionFiles = [
     '.npmrc',
     '.yarnrc',
@@ -147,8 +115,7 @@ async function cleanPackageManagerRestrictions(projectPath) {
     'pnpm-workspace.yaml',
     'package-lock.json',
     'yarn.lock',
-    'pnpm-lock.yaml',
-    'bun.lockb'
+    'pnpm-lock.yaml'
   ];
 
   for (const file of restrictionFiles) {
@@ -159,17 +126,25 @@ async function cleanPackageManagerRestrictions(projectPath) {
     }
   }
 
-  // Also check package.json for packageManager field and engines restrictions
   const packageJsonPath = path.join(projectPath, 'package.json');
   if (fs.existsSync(packageJsonPath)) {
     const packageJson = await fs.readJson(packageJsonPath);
 
-    // Remove packageManager field that locks to specific manager
     if (packageJson.packageManager) {
       delete packageJson.packageManager;
-      await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
       console.log(chalk.yellow('Removed packageManager restriction from package.json'));
     }
+
+    if (packageJson.engines) {
+      delete packageJson.engines.npm;
+      delete packageJson.engines.yarn;
+      delete packageJson.engines.pnpm;
+      if (Object.keys(packageJson.engines).length === 0) {
+        delete packageJson.engines;
+      }
+    }
+
+    await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
   }
 }
 
@@ -221,11 +196,9 @@ async function installDependencies(projectPath, config) {
 
 
 async function initializeGit(projectPath) {
-  // Check if git is available
   try {
     execSync('git --version', { stdio: 'pipe', shell: true });
   } catch {
-    // Git is not available, skip initialization
     return;
   }
 
@@ -235,43 +208,35 @@ async function initializeGit(projectPath) {
       stdio: 'pipe',
       shell: true
     });
-    
+
     gitInit.on('close', (code) => {
-      if (code === 0) {
-        // Add initial commit
-        const gitAdd = spawn('git', ['add', '.'], {
+      if (code !== 0) { resolve(); return; }
+
+      const gitAdd = spawn('git', ['add', '.'], {
+        cwd: projectPath,
+        stdio: 'pipe',
+        shell: true
+      });
+
+      gitAdd.on('close', (addCode) => {
+        if (addCode !== 0) { resolve(); return; }
+
+        const gitCommit = spawn('git', ['commit', '-m', 'Initial commit from create-app'], {
           cwd: projectPath,
           stdio: 'pipe',
           shell: true
         });
-        
-        gitAdd.on('close', (addCode) => {
-          if (addCode === 0) {
-            const gitCommit = spawn('git', ['commit', '-m', 'Initial commit from create-app'], {
-              cwd: projectPath,
-              stdio: 'pipe',
-              shell: true
-            });
-            
-            gitCommit.on('close', () => {
-              resolve();
-            });
-          } else {
-            resolve();
-          }
-        });
-      } else {
-        resolve();
-      }
-    });
-    
-    gitInit.on('error', () => {
-      resolve();
+
+        gitCommit.on('close', () => resolve());
+      });
     });
+
+    gitInit.on('error', () => resolve());
   });
 }
 
 module.exports = {
   setupProject,
-  detectPackageManagers
-};
+  detectPackageManagers,
+  cleanPackageManagerRestrictions
+};

package/components/prompts.js

@@ -48,8 +48,7 @@ function getPackageManagerIcon(name) {
   const icons = {
     npm: '📦',
     yarn: '🧶', 
-    pnpm: '⚡',
-    bun: '🚀'
+    pnpm: '⚡'
   };
   return icons[name] || '📦';
 }
@@ -66,4 +65,4 @@ async function promptForConfiguration(initialProjectName, availableManagers) {
 
 module.exports = {
   promptForConfiguration
-};
+};

package/index.js

@@ -4,6 +4,7 @@ const { Command } = require('commander');
 const chalk = require('chalk');
 const fs = require('fs-extra');
 const path = require('path');
+const { execSync } = require('child_process');
 const inquirer = require('inquirer');
 const { checkNodeVersion } = require('./components/validators');
 const { promptForConfiguration } = require('./components/prompts');
@@ -12,7 +13,8 @@ const { setupProject, detectPackageManagers } = require('./components/project-se
 const program = new Command();
 const packageJson = require('./package.json');
 
-// ASCII Art Banner
+const ENFYRA_UPSTREAM = 'https://github.com/enfyra/app.git';
+
 const banner = `
 ${chalk.cyan.bold('╔═══════════════════════════════════════╗')}
 ${chalk.cyan.bold('║')}  ${chalk.white.bold('🚀 Create Enfyra App')}                ${chalk.cyan.bold('║')}
@@ -20,32 +22,113 @@ ${chalk.cyan.bold('║')}  ${chalk.gray('Frontend scaffolding made easy')}
 ${chalk.cyan.bold('╚═══════════════════════════════════════╝')}
 `;
 
-async function main() {
+async function upgradeProject() {
   console.log(banner);
-  
+  console.log(chalk.blue.bold('⬆  Upgrade Enfyra App\n'));
+
+  checkNodeVersion();
+
+  const cwd = process.cwd();
+  const nuxtConfig = fs.existsSync(path.join(cwd, 'nuxt.config.ts')) || fs.existsSync(path.join(cwd, 'nuxt.config.js'));
+  if (!nuxtConfig) {
+    console.log(chalk.red('❌ Not an Enfyra app directory. Run this command inside your Enfyra project root.'));
+    process.exit(1);
+  }
+
+  try {
+    execSync('git --version', { stdio: 'pipe', shell: true });
+  } catch {
+    console.log(chalk.red('❌ Git is required for upgrade. Please install git first.'));
+    process.exit(1);
+  }
+
+  let hasUpstream = false;
+  try {
+    const remotes = execSync('git remote', { cwd, encoding: 'utf8', stdio: 'pipe', shell: true }).trim();
+    hasUpstream = remotes.split('\n').includes('upstream');
+  } catch {}
+
+  if (!hasUpstream) {
+    console.log(chalk.yellow('This project does not have an upstream remote configured.'));
+    console.log(chalk.gray(`Upstream points to the official Enfyra app repository (${ENFYRA_UPSTREAM}).`));
+    console.log(chalk.gray('Adding it allows you to pull the latest framework updates and merge them into your project.'));
+    console.log(chalk.gray('Your custom code will not be affected unless it conflicts with upstream changes.\n'));
+
+    const { confirmUpstream } = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'confirmUpstream',
+        message: 'Add upstream remote to this project?',
+        default: true
+      }
+    ]);
+
+    if (!confirmUpstream) {
+      console.log(chalk.gray('\nUpgrade cancelled.'));
+      process.exit(0);
+    }
+
+    execSync(`git remote add upstream ${ENFYRA_UPSTREAM}`, { cwd, stdio: 'pipe', shell: true });
+    console.log(chalk.green('✓ upstream remote added\n'));
+  }
+
+  console.log(chalk.gray('Fetching upstream...'));
+  execSync('git fetch upstream', { cwd, stdio: 'pipe', shell: true });
+  console.log(chalk.green('✓ upstream fetched'));
+
+  const currentBranch = execSync('git rev-parse --abbrev-ref HEAD', { cwd, encoding: 'utf8', shell: true }).trim();
+  console.log(chalk.gray(`Current branch: ${currentBranch}\n`));
+
+  console.log(chalk.gray('Merging upstream/main...'));
+  try {
+    execSync(`git merge upstream/main --no-edit`, { cwd, stdio: 'pipe', shell: true });
+    console.log(chalk.green.bold('\n🎉 Upgrade completed successfully!'));
+  } catch {
+    const status = execSync('git status --porcelain', { cwd, encoding: 'utf8', shell: true });
+    if (status.includes('UU') || status.includes('AA')) {
+      console.log(chalk.yellow.bold('\n⚠  Merge conflicts detected!'));
+      console.log(chalk.gray('Resolve the conflicts listed below, then commit:'));
+      console.log(chalk.gray('  git add .'));
+      console.log(chalk.gray('  git commit\n'));
+      const lines = status.split('\n').filter(l => l.trim());
+      lines.forEach(l => {
+        if (l.startsWith('UU') || l.startsWith('AA')) {
+          console.log(chalk.red(`  CONFLICT: ${l.slice(3)}`));
+        }
+      });
+    } else {
+      throw new Error('Merge failed');
+    }
+  }
+
+  try {
+    execSync('git remote remove upstream', { cwd, stdio: 'pipe', shell: true });
+    console.log(chalk.gray('\n✓ upstream remote removed'));
+  } catch {}
+}
+
+async function createProject() {
+  console.log(banner);
+
   try {
-    // Check Node.js version
     checkNodeVersion();
-    
-    // Detect available package managers
+
     const availableManagers = detectPackageManagers();
-    
+
     if (availableManagers.length === 0) {
       console.log(chalk.red('❌ No compatible package managers found!'));
-      console.log(chalk.yellow('Please install npm (v8+), yarn (v1.22+), pnpm (v7+), or bun (v1+)'));
+      console.log(chalk.yellow('Please install npm, yarn, or pnpm.'));
       process.exit(1);
     }
-    
-    // Show detected package managers with versions
+
     console.log(chalk.gray('Detected package managers:'));
     availableManagers.forEach(pm => {
       console.log(chalk.gray(`  • ${pm.name} v${pm.version}`));
     });
     console.log('');
-    
-    // Get project name from command line or prompt with default
+
     let projectName = program.args[0];
-    
+
     if (!projectName) {
       const { name } = await inquirer.prompt([
         {
@@ -64,42 +147,44 @@ async function main() {
       projectName = name;
     }
 
-    // Validate project name and directory
     const projectPath = path.resolve(projectName);
-    
+
     if (fs.existsSync(projectPath)) {
       console.log(chalk.red(`❌ Directory ${chalk.bold(projectName)} already exists!`));
       process.exit(1);
     }
 
-    // Prompt for configuration
     const config = await promptForConfiguration(projectName, availableManagers);
 
-    // Setup project
     await setupProject(config, projectPath);
-    
-    // Success message
+
     console.log(chalk.green.bold('\n🎉 Project created successfully!'));
     console.log(chalk.blue('\n📝 Next steps:'));
     console.log(chalk.gray(`  cd ${projectName}`));
     console.log(chalk.gray(`  ${config.packageManager} run dev`));
+    console.log(chalk.gray(`\n💡 To upgrade later: npx @enfyra/create-app@latest --upgrade`));
     console.log();
 
   } catch (error) {
     console.error(chalk.red.bold('\n❌ Error creating project:'));
     console.error(chalk.red(error.message));
     console.error(chalk.gray(error.stack));
-    
+
     process.exit(1);
   }
 }
 
-// Program setup
 program
   .name('create-app')
   .description('Create a new Enfyra frontend application')
   .version(packageJson.version)
+  .option('--upgrade', 'Upgrade existing Enfyra app from upstream')
   .argument('[project-name]', 'Name of the project to create')
-  .action(main);
+  .action((projectName, options) => {
+    if (options.upgrade) {
+      return upgradeProject();
+    }
+    return createProject();
+  });
 
-program.parse();
+program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enfyra/create-app",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "description": "Create Enfyra frontend applications with ease",
   "main": "index.js",
   "bin": {
@@ -34,12 +34,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/dothinh115/create-enfyra-app.git"
+    "url": "https://github.com/enfyra/create-enfyra-app.git"
   },
   "bugs": {
-    "url": "https://github.com/dothinh115/create-enfyra-app/issues"
+    "url": "https://github.com/enfyra/create-enfyra-app/issues"
   },
-  "homepage": "https://github.com/dothinh115/create-enfyra-app#readme",
+  "homepage": "https://github.com/enfyra/create-enfyra-app#readme",
   "publishConfig": {
     "access": "public"
   }