Merge pull request #8 from YashVerma-code/conflictfix

Conflictfix

Author: AlgoFoe

.gitignore

@@ -9,4 +9,4 @@ test2/
 test3/
 test4/
 test5/
-backend/
+/backend/

lib/createViteProject/ui/daisyui.js

@@ -21,7 +21,7 @@ export async function setupDaisyUI(projectName, languageChoice, opts = {}) {
       console.log(`Already in project directory: ${currentDir}`);
     }
 
-    await ensureTailwindIsInstalled();
+    await ensureTailwindIsInstalled(languageChoice);
     console.log(chalk.blue('Installing daisyUI...'));
     await execa('npm', ['install', 'daisyui', '--save-dev'], {
       stdio: 'inherit'
@@ -71,7 +71,7 @@ export default defineConfig({
   }
 }
 
-async function ensureTailwindIsInstalled() {
+async function ensureTailwindIsInstalled(language) {
   try {
     console.log(chalk.blue('Checking Tailwind CSS installation...'));
 
@@ -83,7 +83,7 @@ async function ensureTailwindIsInstalled() {
 
     if (!hasTailwind) {
       console.log(chalk.yellow('Tailwind CSS not found in dependencies. Installing Tailwind CSS...'));
-      await installTailwindCSS();
+      await installTailwindCSS(language);
     } else {
       console.log(chalk.green('Tailwind CSS found in dependencies.'));
       try {
@@ -98,13 +98,11 @@ async function ensureTailwindIsInstalled() {
     }
   } catch (error) {
     console.error(chalk.red('Error checking Tailwind installation:'), error.message);
-    await installTailwindCSS();
+    await installTailwindCSS(language);
   }
 }
 
-async function installTailwindCSS() {
-  console.log(chalk.blue('Installing Tailwind CSS v3 and dependencies...'));
-
+async function installTailwindCSS(language) {
   try {
     //   await execa('npm', ['install', '-D', 'tailwindcss@3', 'postcss', 'autoprefixer'], { 
     //     stdio: 'inherit' 
@@ -131,25 +129,25 @@ async function installTailwindCSS() {
       ],
       { stdio: "inherit" }
     );
-    const nuxtConfigPath = path.join(process.cwd(), "vite.config.ts");
+    const configPath = path.join(process.cwd(), `vite.config.${language}`);
 
     // Read existing file
-    let nuxtConfig = await fs.readFile(nuxtConfigPath, "utf8");
+    let config = await fs.readFile(configPath, "utf8");
 
     // Tailwind config snippet to insert
     const tailwindSnippet = `import tailwindcss from "@tailwindcss/vite";\n`;
 
     // If tailwindcss import not already there, add it
-    if (!nuxtConfig.includes('@tailwindcss/vite')) {
-      nuxtConfig = tailwindSnippet + nuxtConfig;
+    if (!config.includes('@tailwindcss/vite')) {
+      config = tailwindSnippet + config;
     }
 
     // Add css and vite config if not present
-    if (!nuxtConfig.includes("tailwindcss()")) {
+    if (!config.includes("tailwindcss()")) {
       // If plugins array already exists
-      if (nuxtConfig.match(/plugins\s*:\s*\[/)) {
+      if (config.match(/plugins\s*:\s*\[/)) {
         // Add tailwindcss() inside the plugins array
-        nuxtConfig = nuxtConfig.replace(
+        config = config.replace(
           /plugins\s*:\s*\[\s*([^\]]*)\]/,
           (match, p1) => {
             // Trim trailing commas and add tailwindcss()
@@ -159,14 +157,14 @@ async function installTailwindCSS() {
         );
       } else {
         // If no plugins array exists, create one
-        nuxtConfig = nuxtConfig.replace(
+        config = config.replace(
           /defineConfig\s*\(\s*\{\s*/,
           `defineConfig({ plugins: [tailwindcss()], `
         );
       }
     }
     // Write the updated config back
-    await fs.writeFile(nuxtConfigPath, nuxtConfig, "utf8");
+    await fs.writeFile(configPath, config, "utf8");
 
     const cssDir = path.join(process.cwd(), "src");
     const cssFilePath = path.join(cssDir, "index.css");