gladvn 0.2.31 → 0.2.33

package/bin/cli.js

@@ -456,23 +456,45 @@ async function main() {
     
     if (tsconfigPath) {
       let content = fs.readFileSync(tsconfigPath, 'utf8');
-      if (!content.includes('@gladvn/*')) {
+      let modified = false;
+
+      // 3a. Ensure baseUrl is set (required for paths to work)
+      if (!content.includes('"baseUrl"')) {
+        if (content.match(/"compilerOptions"\s*:\s*\{/)) {
+          content = content.replace(/"compilerOptions"\s*:\s*\{/, `"compilerOptions": {\n    "baseUrl": ".",`);
+          modified = true;
+        }
+      }
+
+      // 3b. Add path aliases: both @gladvn (barrel) and @gladvn/* (deep imports)
+      if (!content.includes('@gladvn')) {
+        const pathsBlock = `"paths": {\n      "@gladvn": ["./${userDest}/index.ts"],\n      "@gladvn/*": ["./${userDest}/*"]\n    }`;
         const pathsEmptyRegex = /"paths"\s*:\s*\{\s*\}/;
         const compilerOptionsEmptyRegex = /"compilerOptions"\s*:\s*\{\s*\}/;
 
         if (pathsEmptyRegex.test(content)) {
-          content = content.replace(pathsEmptyRegex, `"paths": {\n      "@gladvn/*": ["./${userDest}/*"]\n    }`);
+          content = content.replace(pathsEmptyRegex, pathsBlock);
         } else if (content.match(/"paths"\s*:\s*\{/)) {
-          content = content.replace(/"paths"\s*:\s*\{/, `"paths": {\n      "@gladvn/*": ["./${userDest}/*"],`);
+          content = content.replace(/"paths"\s*:\s*\{/, `"paths": {\n      "@gladvn": ["./${userDest}/index.ts"],\n      "@gladvn/*": ["./${userDest}/*"],`);
         } else if (compilerOptionsEmptyRegex.test(content)) {
-          content = content.replace(compilerOptionsEmptyRegex, `"compilerOptions": {\n    "paths": {\n      "@gladvn/*": ["./${userDest}/*"]\n    }\n  }`);
+          content = content.replace(compilerOptionsEmptyRegex, `"compilerOptions": {\n    ${pathsBlock}\n  }`);
         } else if (content.match(/"compilerOptions"\s*:\s*\{/)) {
-          content = content.replace(/"compilerOptions"\s*:\s*\{/, `"compilerOptions": {\n    "paths": {\n      "@gladvn/*": ["./${userDest}/*"]\n    },`);
+          content = content.replace(/"compilerOptions"\s*:\s*\{/, `"compilerOptions": {\n    ${pathsBlock},`);
         } else if (!content.includes('"compilerOptions"')) {
-          content = content.replace(/\{/, `{\n  "compilerOptions": {\n    "paths": {\n      "@gladvn/*": ["./${userDest}/*"]\n    }\n  },`);
+          content = content.replace(/\{/, `{\n  "compilerOptions": {\n    ${pathsBlock}\n  },`);
         }
+        modified = true;
+      }
+
+      // 3c. Add destination folder to "include" so TS can see files outside src/
+      if (content.includes('"include"') && !content.includes(`"${userDest}"`)) {
+        content = content.replace(/"include"\s*:\s*\[/, `"include": [\n    "${userDest}",`);
+        modified = true;
+      }
+
+      if (modified) {
         fs.writeFileSync(tsconfigPath, content);
-        console.log(`\x1b[32m✔ Configured path alias @gladvn/* in ${path.basename(tsconfigPath)}\x1b[0m`);
+        console.log(`\x1b[32m✔ Configured path alias @gladvn in ${path.basename(tsconfigPath)}\x1b[0m`);
       }
     }
 
@@ -489,6 +511,8 @@ async function main() {
 
     if (viteConfigPath) {
       let content = fs.readFileSync(viteConfigPath, 'utf8');
+      let modified = false;
+
       if (!content.includes('@gladvn')) {
         // Add `import path from "path"` if missing
         if (!content.includes('import path from') && !content.includes('require("path")')) {
@@ -516,9 +540,35 @@ async function main() {
         } else {
            content = content.replace(/defineConfig\s*\(\s*\{/, `defineConfig({${resolveAlias}`);
         }
+        modified = true;
+      }
+      
+      if (!content.includes('@tailwindcss/vite')) {
+        if (content.includes('import ')) {
+          const lastImportIndex = content.lastIndexOf('import ');
+          const endOfLine = content.indexOf('\n', lastImportIndex);
+          if (endOfLine !== -1) {
+            content = content.slice(0, endOfLine + 1) + 'import tailwindcss from "@tailwindcss/vite"\n' + content.slice(endOfLine + 1);
+          } else {
+            content = 'import tailwindcss from "@tailwindcss/vite"\n' + content;
+          }
+        } else {
+          content = 'import tailwindcss from "@tailwindcss/vite"\n' + content;
+        }
         
+        if (content.includes('plugins: [')) {
+          content = content.replace(/plugins:\s*\[/, `plugins: [\n    tailwindcss(),`);
+        } else if (content.match(/plugins:\s*\[/)) {
+          content = content.replace(/plugins:\s*\[/, `plugins: [\n    tailwindcss(),`);
+        } else if (content.includes('defineConfig({')) {
+          content = content.replace(/defineConfig\s*\(\s*\{/, `defineConfig({\n  plugins: [tailwindcss()],`);
+        }
+        modified = true;
+      }
+      
+      if (modified) {
         fs.writeFileSync(viteConfigPath, content);
-        console.log(`\x1b[32m✔ Configured resolve.alias in ${path.basename(viteConfigPath)}\x1b[0m`);
+        console.log(`\x1b[32m✔ Configured resolve.alias & tailwindcss plugin in ${path.basename(viteConfigPath)}\x1b[0m`);
       }
     }
 
@@ -530,15 +580,25 @@ async function main() {
 
   // Check if we need @types/node (Vite + TypeScript)
   const viteConfigExists = ['vite.config.ts', 'vite.config.mts'].some(f => fs.existsSync(path.join(process.cwd(), f)));
-  if (viteConfigExists) {
+  if (viteConfigExists || viteConfigPath) {
     try {
       const userPkgPath = path.resolve(process.cwd(), 'package.json');
       if (fs.existsSync(userPkgPath)) {
         const userPkg = JSON.parse(fs.readFileSync(userPkgPath, 'utf8'));
         const allUserDeps = { ...userPkg.dependencies, ...userPkg.devDependencies };
-        if (!allUserDeps['@types/node']) {
+        if (viteConfigExists && !allUserDeps['@types/node']) {
           extraDepsToInstall.push('@types/node@"^20.0.0"');
         }
+        if (!allUserDeps['tailwindcss']) {
+          extraDepsToInstall.push('tailwindcss@"^4.0.0"');
+        }
+        if (!allUserDeps['@tailwindcss/vite']) {
+          extraDepsToInstall.push('@tailwindcss/vite@"^4.0.0"');
+        }
+      } else {
+        // If no package.json, just push them to be safe
+        extraDepsToInstall.push('tailwindcss@"^4.0.0"');
+        extraDepsToInstall.push('@tailwindcss/vite@"^4.0.0"');
       }
     } catch (e) {}
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gladvn",
-  "version": "0.2.31",
+  "version": "0.2.33",
   "type": "module",
   "packageManager": "pnpm@10.11.0",
   "description": "A CLI to scaffold beautiful, accessible React components into your project. Powered by Tailwind CSS v4 and Base UI.",