@devvistatech/devvista-kit 0.0.10 → 0.0.13

package/bin/init.js

@@ -1,220 +1,208 @@
-#!/usr/bin/env node
-const fs = require('fs');
-const path = require('path');
-const { execSync } = require('child_process');
-
-const projectDir = process.cwd();
-const templateDir = path.join(__dirname, '..');
-
-try {
-  // Check if directory is mostly empty, but proceed with caution
-  const allowedFiles = ['node_modules', 'package.json', 'package-lock.json', '.git', '.gitignore'];
-  const files = fs.readdirSync(projectDir).filter(file => !allowedFiles.includes(file));
-  if (files.length > 0) {
-    console.warn('Warning: Directory contains existing files. Local files in excluded directories will be preserved.');
-  }
-
-  // Copy all template directories and files, overwriting unless excluded
-  const excludeFiles = ['node_modules', '.git', '.DS_Store', 'dist', 'build', '.next', '.github', 'scripts', 'package.json', 'package-lock.json'];
-  const directoriesToCopy = ['components', 'lib', 'public', 'src', 'hooks', 'utils', 'app', 'netlify.toml'];
-
-  // Recursive function to copy files, overwriting existing ones unless excluded
-  const copyFiles = (source, dest) => {
-    fs.readdirSync(source).forEach(item => {
-      const sourceItemPath = path.join(source, item);
-      const destItemPath = path.join(dest, item);
-      if (fs.statSync(sourceItemPath).isDirectory()) {
-        if (!fs.existsSync(destItemPath)) {
-          fs.mkdirSync(destItemPath, { recursive: true });
-        }
-        copyFiles(sourceItemPath, destItemPath);
-      } else {
-        fs.copyFileSync(sourceItemPath, destItemPath);
-        console.log(`Copied ${path.relative(projectDir, destItemPath)}`);
-      }
-    });
-  };
-
-  // Copy directories and files, excluding those in excludeFiles
-  fs.readdirSync(templateDir).forEach(file => {
-    if (!excludeFiles.includes(file) && directoriesToCopy.includes(file)) {
-      const sourcePath = path.join(templateDir, file);
-      const destPath = path.join(projectDir, file);
-      if (!fs.existsSync(destPath)) {
-        fs.cpSync(sourcePath, destPath, { recursive: true });
-        console.log(`Copied new directory ${file}`);
-      } else {
-        copyFiles(sourcePath, destPath);
-      }
-    }
-  });
-
-  // Copy configuration files, skipping if they exist
-  const configFiles = [
-    'next.config.js',
-    'tsconfig.json',
-    'tailwind.config.ts',
-    'postcss.config.js',
-    'globals.css',
-    'layout.tsx',
-    'middleware.ts',
-    '.env.example'
-  ];
-  configFiles.forEach(file => {
-    const sourcePath = path.join(templateDir, file);
-    if (fs.existsSync(sourcePath)) {
-      const destPath = path.join(projectDir, file);
-      if (!fs.existsSync(destPath)) {
-        fs.copyFileSync(sourcePath, destPath);
-        console.log(`Copied new file ${file}`);
-      } else {
-        console.log(`Skipping ${file} (already exists)`);
-      }
-    }
-  });
-
-  // Merge package.json
-  const pkgPath = path.join(projectDir, 'package.json');
-  let pkg = fs.existsSync(pkgPath) ? JSON.parse(fs.readFileSync(pkgPath, 'utf8')) : {};
-  const libPkg = JSON.parse(fs.readFileSync(path.join(templateDir, 'package.json'), 'utf8'));
-  pkg.name = path.basename(projectDir).toLowerCase().replace(/[^a-z0-9-]/g, '-');
-  pkg.version = pkg.version || '1.0.0';
-  pkg.scripts = {
-    ...pkg.scripts,
-    dev: 'next dev',
-    build: 'next build',
-    start: 'next start',
-    lint: 'next lint',
-    update: 'node ./scripts/update.js',
-  };
-  pkg.dependencies = {
-    ...pkg.dependencies,
-    '@devvistatech/devvista-kit': '^' + libPkg.version,
-    next: libPkg.dependencies.next,
-    react: libPkg.dependencies.react,
-    'react-dom': libPkg.dependencies['react-dom'],
-  };
-  pkg.devDependencies = {
-    ...pkg.devDependencies,
-    typescript: libPkg.dependencies.typescript,
-    tailwindcss: libPkg.dependencies.tailwindcss,
-    postcss: libPkg.dependencies.postcss,
-    autoprefixer: libPkg.dependencies.autoprefixer,
-  };
-  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
-
-  // Create scripts directory and write update.js
-  const scriptsDir = path.join(projectDir, 'scripts');
-  if (!fs.existsSync(scriptsDir)) {
-    fs.mkdirSync(scriptsDir, { recursive: true });
-  }
-  const updateScriptContent = `const fs = require('fs');
-const path = require('path');
-const deepmerge = require('deepmerge');
-const readline = require('readline').createInterface({
-  input: process.stdin,
-  output: process.stdout
-});
-
-const projectDir = process.cwd();
-const libDir = path.join(projectDir, 'node_modules', '@devvistatech', 'devvista-kit');
-
-readline.question('Proceed with update? (y/n): ', answer => {
-  if (answer.toLowerCase() !== 'y') {
-    readline.close();
-    process.exit(0);
-  }
-
-  try {
-    const excludeFiles = ['node_modules', '.git', '.DS_Store', 'dist', 'build', '.next', '.github', 'scripts', 'package.json', 'package-lock.json'];
-    const directoriesToCopy = ['components', 'lib', 'public', 'src', 'hooks', 'utils', 'app'];
-
-    // Recursive function to copy files, overwriting existing ones unless excluded
-    const copyFiles = (source, dest) => {
-      fs.readdirSync(source).forEach(item => {
-        const sourceItemPath = path.join(source, item);
-        const destItemPath = path.join(dest, item);
-        if (fs.statSync(sourceItemPath).isDirectory()) {
-          if (!fs.existsSync(destItemPath)) {
-            fs.mkdirSync(destItemPath, { recursive: true });
-          }
-          copyFiles(sourceItemPath, destItemPath);
-        } else {
-          fs.copyFileSync(sourceItemPath, destItemPath);
-          console.log(\`Updated \${path.relative(projectDir, destItemPath)}\`);
-        }
-      });
-    };
-
-    // Copy directories and files, excluding those in excludeFiles
-    fs.readdirSync(libDir).forEach(file => {
-      if (!excludeFiles.includes(file) && directoriesToCopy.includes(file)) {
-        const sourcePath = path.join(libDir, file);
-        const destPath = path.join(projectDir, file);
-        if (!fs.existsSync(destPath)) {
-          fs.cpSync(sourcePath, destPath, { recursive: true });
-          console.log(\`Copied new directory \${file}\`);
-        } else {
-          copyFiles(sourcePath, destPath);
-        }
-      }
-    });
-
-    // Handle configuration files, skipping modified files
-    const configFiles = ['next.config.js', 'tsconfig.json', 'tailwind.config.ts', 'postcss.config.js', 'globals.css', 'layout.tsx', 'middleware.ts', '.env.example'];
-    configFiles.forEach(file => {
-      const sourcePath = path.join(libDir, file);
-      if (fs.existsSync(sourcePath)) {
-        const destPath = path.join(projectDir, file);
-        if (fs.existsSync(destPath)) {
-          const sourceContent = fs.readFileSync(sourcePath, 'utf8');
-          const destContent = fs.readFileSync(destPath, 'utf8');
-          if (sourceContent !== destContent) {
-            console.log(\`Skipping \${file} (modified locally)\`);
-          } else {
-            fs.copyFileSync(sourcePath, destPath);
-            console.log(\`Updated \${file}\`);
-          }
-        } else {
-          fs.copyFileSync(sourcePath, destPath);
-          console.log(\`Copied new file \${file}\`);
-        }
-      }
-    });
-
-    // Merge package.json
-    const pkgPath = path.join(projectDir, 'package.json');
-    let pkg = fs.existsSync(pkgPath) ? JSON.parse(fs.readFileSync(pkgPath, 'utf8')) : {};
-    const libPkg = JSON.parse(fs.readFileSync(path.join(libDir, 'package.json'), 'utf8'));
-    pkg.dependencies = deepmerge(pkg.dependencies || {}, {
-      '@devvistatech/devvista-kit': '^' + libPkg.version,
-      next: libPkg.dependencies.next,
-      react: libPkg.dependencies.react,
-      'react-dom': libPkg.dependencies['react-dom']
-    });
-    pkg.devDependencies = deepmerge(pkg.devDependencies || {}, {
-      typescript: libPkg.dependencies.typescript,
-      tailwindcss: libPkg.dependencies.tailwindcss,
-      postcss: libPkg.dependencies.postcss,
-      autoprefixer: libPkg.dependencies.autoprefixer
-    });
-    fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
-
-    console.log('Project updated successfully.');
-  } catch (error) {
-    console.error('Error updating project:', error.message);
-    process.exit(1);
-  }
-  readline.close();
-});
-`;
-  fs.writeFileSync(path.join(scriptsDir, 'update.js'), updateScriptContent);
-
-  // Run npm install to ensure dependencies are installed
-  execSync('npm install', { stdio: 'inherit', cwd: projectDir });
-
-  console.log('Project initialized successfully.');
-} catch (error) {
-  console.error('Error initializing project:', error.message);
-  process.exit(1);
+#!/usr/bin/env node
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+const projectDir = process.cwd();
+const templateDir = path.join(__dirname, '..');
+
+try {
+  // Check if directory is mostly empty, but proceed with caution
+  const allowedFiles = ['node_modules', 'package.json', 'package-lock.json', '.git', '.gitignore'];
+  const files = fs.readdirSync(projectDir).filter(file => !allowedFiles.includes(file));
+  if (files.length > 0) {
+    console.warn('Warning: Directory contains existing files. Local files in excluded directories will be preserved.');
+  }
+
+  // Copy all template directories and files, overwriting unless excluded
+  const excludeFiles = ['node_modules', '.git', '.DS_Store', 'dist', 'build', '.next', '.github', 'scripts', 'package.json', 'package-lock.json'];
+  const directoriesToCopy = ['components', 'lib', 'public', 'src', 'hooks', 'utils', 'app', 'netlify.toml'];
+
+  // Recursive function to copy files, overwriting existing ones unless excluded
+  const copyFiles = (source, dest) => {
+    fs.readdirSync(source).forEach(item => {
+      const sourceItemPath = path.join(source, item);
+      const destItemPath = path.join(dest, item);
+      if (fs.statSync(sourceItemPath).isDirectory()) {
+        if (!fs.existsSync(destItemPath)) {
+          fs.mkdirSync(destItemPath, { recursive: true });
+        }
+        copyFiles(sourceItemPath, destItemPath);
+      } else {
+        fs.copyFileSync(sourceItemPath, destItemPath);
+      }
+    });
+  };
+
+  // Copy directories and files, excluding those in excludeFiles
+  fs.readdirSync(templateDir).forEach(file => {
+    if (!excludeFiles.includes(file) && directoriesToCopy.includes(file)) {
+      const sourcePath = path.join(templateDir, file);
+      const destPath = path.join(projectDir, file);
+      if (!fs.existsSync(destPath)) {
+        fs.cpSync(sourcePath, destPath, { recursive: true });
+      } else {
+        copyFiles(sourcePath, destPath);
+      }
+    }
+  });
+
+  // Copy configuration files, skipping if they exist
+  const configFiles = [
+    'next.config.js',
+    'tsconfig.json',
+    'tailwind.config.ts',
+    'postcss.config.js',
+    'globals.css',
+    'layout.tsx',
+    'middleware.ts',
+    '.env.example'
+  ];
+  configFiles.forEach(file => {
+    const sourcePath = path.join(templateDir, file);
+    if (fs.existsSync(sourcePath)) {
+      const destPath = path.join(projectDir, file);
+      if (!fs.existsSync(destPath)) {
+        fs.copyFileSync(sourcePath, destPath);
+      } else {
+      }
+    }
+  });
+
+  // Merge package.json
+  const pkgPath = path.join(projectDir, 'package.json');
+  let pkg = fs.existsSync(pkgPath) ? JSON.parse(fs.readFileSync(pkgPath, 'utf8')) : {};
+  const libPkg = JSON.parse(fs.readFileSync(path.join(templateDir, 'package.json'), 'utf8'));
+  pkg.name = path.basename(projectDir).toLowerCase().replace(/[^a-z0-9-]/g, '-');
+  pkg.version = pkg.version || '1.0.0';
+  pkg.scripts = {
+    ...pkg.scripts,
+    dev: 'next dev',
+    build: 'next build',
+    start: 'next start',
+    lint: 'next lint',
+    update: 'node ./scripts/update.js',
+  };
+  pkg.dependencies = {
+    ...pkg.dependencies,
+    '@devvistatech/devvista-kit': '^' + libPkg.version,
+    next: libPkg.dependencies.next,
+    react: libPkg.dependencies.react,
+    'react-dom': libPkg.dependencies['react-dom'],
+  };
+  pkg.devDependencies = {
+    ...pkg.devDependencies,
+    typescript: libPkg.dependencies.typescript,
+    tailwindcss: libPkg.dependencies.tailwindcss,
+    postcss: libPkg.dependencies.postcss,
+    autoprefixer: libPkg.dependencies.autoprefixer,
+  };
+  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
+
+  // Create scripts directory and write update.js
+  const scriptsDir = path.join(projectDir, 'scripts');
+  if (!fs.existsSync(scriptsDir)) {
+    fs.mkdirSync(scriptsDir, { recursive: true });
+  }
+  const updateScriptContent = `const fs = require('fs');
+const path = require('path');
+const deepmerge = require('deepmerge');
+const readline = require('readline').createInterface({
+  input: process.stdin,
+  output: process.stdout
+});
+
+const projectDir = process.cwd();
+const libDir = path.join(projectDir, 'node_modules', '@devvistatech', 'devvista-kit');
+
+readline.question('Proceed with update? (y/n): ', answer => {
+  if (answer.toLowerCase() !== 'y') {
+    readline.close();
+    process.exit(0);
+  }
+
+  try {
+    const excludeFiles = ['node_modules', '.git', '.DS_Store', 'dist', 'build', '.next', '.github', 'scripts', 'package.json', 'package-lock.json'];
+    const directoriesToCopy = ['components', 'lib', 'public', 'src', 'hooks', 'utils', 'app'];
+
+    // Recursive function to copy files, overwriting existing ones unless excluded
+    const copyFiles = (source, dest) => {
+      fs.readdirSync(source).forEach(item => {
+        const sourceItemPath = path.join(source, item);
+        const destItemPath = path.join(dest, item);
+        if (fs.statSync(sourceItemPath).isDirectory()) {
+          if (!fs.existsSync(destItemPath)) {
+            fs.mkdirSync(destItemPath, { recursive: true });
+          }
+          copyFiles(sourceItemPath, destItemPath);
+        } else {
+          fs.copyFileSync(sourceItemPath, destItemPath);
+        }
+      });
+    };
+
+    // Copy directories and files, excluding those in excludeFiles
+    fs.readdirSync(libDir).forEach(file => {
+      if (!excludeFiles.includes(file) && directoriesToCopy.includes(file)) {
+        const sourcePath = path.join(libDir, file);
+        const destPath = path.join(projectDir, file);
+        if (!fs.existsSync(destPath)) {
+          fs.cpSync(sourcePath, destPath, { recursive: true });
+        } else {
+          copyFiles(sourcePath, destPath);
+        }
+      }
+    });
+
+    // Handle configuration files, skipping modified files
+    const configFiles = ['next.config.js', 'tsconfig.json', 'tailwind.config.ts', 'postcss.config.js', 'globals.css', 'layout.tsx', 'middleware.ts', '.env.example'];
+    configFiles.forEach(file => {
+      const sourcePath = path.join(libDir, file);
+      if (fs.existsSync(sourcePath)) {
+        const destPath = path.join(projectDir, file);
+        if (fs.existsSync(destPath)) {
+          const sourceContent = fs.readFileSync(sourcePath, 'utf8');
+          const destContent = fs.readFileSync(destPath, 'utf8');
+          if (sourceContent !== destContent) {
+          } else {
+            fs.copyFileSync(sourcePath, destPath);
+          }
+        } else {
+          fs.copyFileSync(sourcePath, destPath);
+        }
+      }
+    });
+
+    // Merge package.json
+    const pkgPath = path.join(projectDir, 'package.json');
+    let pkg = fs.existsSync(pkgPath) ? JSON.parse(fs.readFileSync(pkgPath, 'utf8')) : {};
+    const libPkg = JSON.parse(fs.readFileSync(path.join(libDir, 'package.json'), 'utf8'));
+    pkg.dependencies = deepmerge(pkg.dependencies || {}, {
+      '@devvistatech/devvista-kit': '^' + libPkg.version,
+      next: libPkg.dependencies.next,
+      react: libPkg.dependencies.react,
+      'react-dom': libPkg.dependencies['react-dom']
+    });
+    pkg.devDependencies = deepmerge(pkg.devDependencies || {}, {
+      typescript: libPkg.dependencies.typescript,
+      tailwindcss: libPkg.dependencies.tailwindcss,
+      postcss: libPkg.dependencies.postcss,
+      autoprefixer: libPkg.dependencies.autoprefixer
+    });
+    fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
+  } catch (error) {
+    console.error('Error updating project:', error.message);
+    process.exit(1);
+  }
+  readline.close();
+});
+`;
+  fs.writeFileSync(path.join(scriptsDir, 'update.js'), updateScriptContent);
+
+  // Run npm install to ensure dependencies are installed
+  execSync('npm install', { stdio: 'inherit', cwd: projectDir });
+
+} catch (error) {
+  console.error('Error initializing project:', error.message);
+  process.exit(1);
 }