@configjs/cli 1.0.3 → 1.0.5

package/dist/{chunk-7ZLAP62L.js → chunk-UB6NBZEM.js}

@@ -1,59 +1,14 @@
-// src/utils/logger.ts
-import pc from "picocolors";
-var Logger = class {
-  level = 1 /* INFO */;
-  setLevel(level) {
-    this.level = level;
-  }
-  debug(message, ...args) {
-    if (this.level <= 0 /* DEBUG */) {
-      console.log(pc.gray(`[DEBUG] ${message}`), ...args);
-    }
-  }
-  info(message, ...args) {
-    if (this.level <= 1 /* INFO */) {
-      console.log(pc.blue(`\u2139 ${message}`), ...args);
-    }
-  }
-  success(message, ...args) {
-    if (this.level <= 1 /* INFO */) {
-      console.log(pc.green(`\u2713 ${message}`), ...args);
-    }
-  }
-  warn(message, ...args) {
-    if (this.level <= 2 /* WARN */) {
-      console.warn(pc.yellow(`\u26A0 ${message}`), ...args);
-    }
-  }
-  error(message, ...args) {
-    if (this.level <= 3 /* ERROR */) {
-      console.error(pc.red(`\u2716 ${message}`), ...args);
-    }
-  }
-  step(message) {
-    if (this.level <= 1 /* INFO */) {
-      console.log(pc.cyan(`
-\u2192 ${message}`));
-    }
-  }
-  box(title, content) {
-    if (this.level <= 1 /* INFO */) {
-      const maxLength = Math.max(
-        title.length,
-        ...content.map((line) => line.length)
-      );
-      const border = "\u2500".repeat(maxLength + 4);
-      console.log(pc.cyan(`\u250C${border}\u2510`));
-      console.log(pc.cyan(`\u2502  ${title.padEnd(maxLength)}  \u2502`));
-      console.log(pc.cyan(`\u251C${border}\u2524`));
-      content.forEach((line) => {
-        console.log(pc.cyan(`\u2502  ${line.padEnd(maxLength)}  \u2502`));
-      });
-      console.log(pc.cyan(`\u2514${border}\u2518`));
-    }
-  }
-};
-var logger = new Logger();
+import {
+  checkPathExists,
+  ensureDirectory,
+  installPackages,
+  logger,
+  normalizePath,
+  readFileContent,
+  readPackageJson,
+  writeFileContent,
+  writePackageJson
+} from "./chunk-5S5KGCVY.js";
 
 // src/types/index.ts
 var Category = /* @__PURE__ */ ((Category2) => {
@@ -72,109 +27,7 @@ var Category = /* @__PURE__ */ ((Category2) => {
 })(Category || {});
 
 // src/core/config-writer.ts
-import { resolve as resolve2, dirname as dirname2 } from "path";
-
-// src/utils/fs-helpers.ts
-import fs from "fs-extra";
-import { resolve, dirname, extname } from "path";
-function normalizePath(path) {
-  return path.replace(/\\/g, "/");
-}
-async function readPackageJson(root) {
-  const packageJsonPath = resolve(root, "package.json");
-  if (!await fs.pathExists(packageJsonPath)) {
-    throw new Error(`package.json not found at ${packageJsonPath}`);
-  }
-  try {
-    const pkg = await fs.readJson(packageJsonPath);
-    logger.debug(`Read package.json from ${packageJsonPath}`);
-    return pkg;
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    throw new Error(
-      `Failed to read package.json: ${errorMessage}. File may be invalid JSON.`
-    );
-  }
-}
-async function writePackageJson(root, pkg) {
-  const packageJsonPath = resolve(root, "package.json");
-  try {
-    await fs.writeJson(packageJsonPath, pkg, {
-      spaces: 2,
-      EOL: "\n"
-    });
-    logger.debug(`Wrote package.json to ${packageJsonPath}`);
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    throw new Error(`Failed to write package.json: ${errorMessage}`);
-  }
-}
-async function readTsConfig(root) {
-  const possiblePaths = [
-    resolve(root, "tsconfig.json"),
-    resolve(root, "tsconfig.app.json"),
-    resolve(root, "tsconfig.node.json")
-  ];
-  for (const tsconfigPath of possiblePaths) {
-    if (await fs.pathExists(tsconfigPath)) {
-      try {
-        const config = await fs.readJson(tsconfigPath);
-        logger.debug(`Read tsconfig.json from ${tsconfigPath}`);
-        return config;
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        logger.warn(
-          `Failed to parse tsconfig.json at ${tsconfigPath}: ${errorMessage}`
-        );
-        return null;
-      }
-    }
-  }
-  logger.debug("No tsconfig.json found");
-  return null;
-}
-async function checkPathExists(path) {
-  const fullPath = resolve(path);
-  return fs.pathExists(fullPath);
-}
-async function ensureDirectory(path) {
-  const fullPath = resolve(path);
-  try {
-    await fs.ensureDir(fullPath);
-    logger.debug(`Ensured directory exists: ${fullPath}`);
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    throw new Error(`Failed to create directory ${fullPath}: ${errorMessage}`);
-  }
-}
-async function readFileContent(filePath, encoding = "utf-8") {
-  const fullPath = resolve(filePath);
-  if (!await fs.pathExists(fullPath)) {
-    throw new Error(`File not found: ${fullPath}`);
-  }
-  try {
-    const content = await fs.readFile(fullPath, encoding);
-    logger.debug(`Read file: ${fullPath}`);
-    return content;
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    throw new Error(`Failed to read file ${fullPath}: ${errorMessage}`);
-  }
-}
-async function writeFileContent(filePath, content, encoding = "utf-8") {
-  const fullPath = resolve(filePath);
-  const parentDir = dirname(fullPath);
-  await ensureDirectory(parentDir);
-  try {
-    await fs.writeFile(fullPath, content, encoding);
-    logger.debug(`Wrote file: ${fullPath}`);
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    throw new Error(`Failed to write file ${fullPath}: ${errorMessage}`);
-  }
-}
-
-// src/core/config-writer.ts
+import { resolve, dirname } from "path";
 var ConfigWriter = class {
   /**
    * @param backupManager - Gestionnaire de backups à utiliser
@@ -198,7 +51,7 @@ var ConfigWriter = class {
    */
   async writeFile(path, content, options = {}) {
     const { backup = true, ensureDir: shouldEnsureDir = true } = options;
-    const fullPath = resolve2(path);
+    const fullPath = resolve(path);
     const fileExists = await checkPathExists(fullPath);
     if (fileExists && backup) {
       try {
@@ -212,7 +65,7 @@ var ConfigWriter = class {
       }
     }
     if (shouldEnsureDir) {
-      const parentDir = dirname2(fullPath);
+      const parentDir = dirname(fullPath);
       await ensureDirectory(parentDir);
     }
     try {
@@ -238,7 +91,7 @@ var ConfigWriter = class {
    * ```
    */
   async createFile(path, content, options = {}) {
-    const fullPath = resolve2(path);
+    const fullPath = resolve(path);
     if (await checkPathExists(fullPath)) {
       throw new Error(`File already exists: ${fullPath}`);
     }
@@ -268,7 +121,7 @@ var ConfigWriter = class {
    * ```
    */
   async modifyPackageJson(projectRoot, modifier) {
-    const fullPath = resolve2(projectRoot);
+    const fullPath = resolve(projectRoot);
     let pkg;
     try {
       pkg = await readPackageJson(fullPath);
@@ -278,7 +131,7 @@ var ConfigWriter = class {
         `Failed to read package.json: ${errorMessage}. Make sure you're in a valid project directory.`
       );
     }
-    const packageJsonPath = resolve2(fullPath, "package.json");
+    const packageJsonPath = resolve(fullPath, "package.json");
     if (this.backupManager.hasBackup(packageJsonPath)) {
     } else {
       try {
@@ -317,7 +170,7 @@ var ConfigWriter = class {
    * ```
    */
   async appendToFile(path, content, options = {}) {
-    const fullPath = resolve2(path);
+    const fullPath = resolve(path);
     const { backup = true } = options;
     let existingContent = "";
     const fileExists = await checkPathExists(fullPath);
@@ -361,7 +214,7 @@ var ConfigWriter = class {
    * ```
    */
   async injectImport(filePath, importStatement, options = {}) {
-    const fullPath = resolve2(filePath);
+    const fullPath = resolve(filePath);
     if (!await checkPathExists(fullPath)) {
       throw new Error(`File not found: ${fullPath}`);
     }
@@ -398,7 +251,7 @@ var ConfigWriter = class {
 };
 
 // src/core/backup-manager.ts
-import { resolve as resolve3 } from "path";
+import { resolve as resolve2 } from "path";
 var BackupManager = class {
   /**
    * Map des backups : filePath -> content
@@ -417,7 +270,7 @@ var BackupManager = class {
    * ```
    */
   backup(filePath, content) {
-    const fullPath = resolve3(filePath);
+    const fullPath = resolve2(filePath);
     if (this.backups.has(fullPath)) {
       logger.debug(`Backup already exists for ${fullPath}, overwriting`);
     }
@@ -437,7 +290,7 @@ var BackupManager = class {
    * ```
    */
   async backupFromDisk(filePath) {
-    const fullPath = resolve3(filePath);
+    const fullPath = resolve2(filePath);
     if (!await checkPathExists(fullPath)) {
       throw new Error(`File not found for backup: ${fullPath}`);
     }
@@ -457,7 +310,7 @@ var BackupManager = class {
    * ```
    */
   async restore(filePath) {
-    const fullPath = resolve3(filePath);
+    const fullPath = resolve2(filePath);
     const backupContent = this.backups.get(fullPath);
     if (!backupContent) {
       throw new Error(
@@ -527,7 +380,7 @@ var BackupManager = class {
    * ```
    */
   hasBackup(filePath) {
-    const fullPath = resolve3(filePath);
+    const fullPath = resolve2(filePath);
     return this.backups.has(fullPath);
   }
   /**
@@ -545,7 +398,7 @@ var BackupManager = class {
    * ```
    */
   getBackup(filePath) {
-    const fullPath = resolve3(filePath);
+    const fullPath = resolve2(filePath);
     return this.backups.get(fullPath);
   }
   /**
@@ -560,7 +413,7 @@ var BackupManager = class {
    * ```
    */
   removeBackup(filePath) {
-    const fullPath = resolve3(filePath);
+    const fullPath = resolve2(filePath);
     const removed = this.backups.delete(fullPath);
     if (removed) {
       logger.debug(`Removed backup for: ${fullPath}`);
@@ -613,115 +466,7 @@ var BackupManager = class {
 };
 
 // src/plugins/routing/react-router.ts
-import { resolve as resolve5, join as join2 } from "path";
-
-// src/utils/package-manager.ts
-import { execa } from "execa";
-import fs2 from "fs-extra";
-import { resolve as resolve4, join } from "path";
-async function detectPackageManager(projectRoot) {
-  const root = resolve4(projectRoot);
-  const lockfiles = [
-    { file: "pnpm-lock.yaml", manager: "pnpm" },
-    { file: "yarn.lock", manager: "yarn" },
-    { file: "package-lock.json", manager: "npm" },
-    { file: "bun.lockb", manager: "bun" }
-  ];
-  for (const { file, manager } of lockfiles) {
-    const lockfilePath = join(root, file);
-    if (await fs2.pathExists(lockfilePath)) {
-      logger.debug(`Detected package manager: ${manager} (found ${file})`);
-      return manager;
-    }
-  }
-  logger.debug("No lockfile found, defaulting to npm");
-  return "npm";
-}
-async function installPackages(packages, options) {
-  if (packages.length === 0) {
-    logger.warn("No packages to install");
-    return { success: true, packages: [] };
-  }
-  const {
-    packageManager,
-    projectRoot,
-    dev = false,
-    exact = false,
-    silent = false
-  } = options;
-  logger.info(
-    `Installing ${packages.length} package(s) with ${packageManager}...`
-  );
-  try {
-    const command = getInstallCommand(packageManager, packages, { dev, exact });
-    const cwd = resolve4(projectRoot);
-    logger.debug(`Executing: ${command.join(" ")} in ${cwd}`);
-    const [cmd, ...args] = command;
-    if (!cmd) {
-      throw new Error("Command is empty");
-    }
-    const result = await execa(cmd, args, {
-      cwd,
-      stdio: silent ? "pipe" : "inherit",
-      env: {
-        ...process.env,
-        // Désactiver les prompts interactifs
-        npm_config_yes: "true",
-        YARN_ENABLE_IMMUTABLE_INSTALLS: "false"
-      }
-    });
-    if (result.exitCode !== 0) {
-      throw new Error(`Installation failed with exit code ${result.exitCode}`);
-    }
-    logger.success(`Successfully installed ${packages.length} package(s)`);
-    return {
-      success: true,
-      packages
-    };
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    logger.error(`Failed to install packages: ${errorMessage}`);
-    return {
-      success: false,
-      packages,
-      error: errorMessage
-    };
-  }
-}
-function getInstallCommand(packageManager, packages, options) {
-  const { dev, exact } = options;
-  switch (packageManager) {
-    case "pnpm":
-      return [
-        "pnpm",
-        "add",
-        ...dev ? ["-D"] : [],
-        ...exact ? ["--save-exact"] : [],
-        ...packages
-      ];
-    case "yarn":
-      return [
-        "yarn",
-        "add",
-        ...dev ? ["--dev"] : [],
-        ...exact ? ["--exact"] : [],
-        ...packages
-      ];
-    case "bun":
-      return ["bun", "add", ...dev ? ["--dev"] : [], ...packages];
-    case "npm":
-    default:
-      return [
-        "npm",
-        "install",
-        ...dev ? ["--save-dev"] : [],
-        ...exact ? ["--save-exact"] : [],
-        ...packages
-      ];
-  }
-}
-
-// src/plugins/routing/react-router.ts
+import { resolve as resolve3, join } from "path";
 var reactRouterPlugin = {
   name: "react-router-dom",
   displayName: "React Router",
@@ -791,12 +536,12 @@ var reactRouterPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = resolve5(ctx.projectRoot, ctx.srcDir);
+    const srcDir = resolve3(ctx.projectRoot, ctx.srcDir);
     const extension = ctx.typescript ? "tsx" : "jsx";
     try {
-      const routesDir = join2(srcDir, "routes");
+      const routesDir = join(srcDir, "routes");
       await ensureDirectory(routesDir);
-      const routerPath = join2(srcDir, `router.${extension}`);
+      const routerPath = join(srcDir, `router.${extension}`);
       const routerContent = ctx.typescript ? getRouterContentTS() : getRouterContentJS();
       await writer.createFile(routerPath, routerContent);
       files.push({
@@ -806,7 +551,7 @@ var reactRouterPlugin = {
         backup: false
       });
       logger.info(`Created router configuration: ${routerPath}`);
-      const homeRoutePath = join2(routesDir, `Home.${extension}`);
+      const homeRoutePath = join(routesDir, `Home.${extension}`);
       const homeRouteContent = ctx.typescript ? getHomeRouteContentTS() : getHomeRouteContentJS();
       await writer.createFile(homeRoutePath, homeRouteContent);
       files.push({
@@ -816,7 +561,7 @@ var reactRouterPlugin = {
         backup: false
       });
       logger.info(`Created example route: ${homeRoutePath}`);
-      const appPath = join2(srcDir, `App.${extension}`);
+      const appPath = join(srcDir, `App.${extension}`);
       const appExists = await checkPathExists(appPath);
       if (appExists) {
         const appContent = await readFileContent(appPath);
@@ -999,13 +744,31 @@ function injectRouterProvider(content, isTypeScript) {
     importLines.splice(lastImportIndex + 1, 0, routerImport.trim());
     modifiedContent = importLines.join("\n");
   }
-  const appFunctionRegex = /(export\s+default\s+)?function\s+App\s*\([^)]*\)\s*\{[\s\S]*?\n\s*return\s+\([\s\S]*?\)\s*;?\s*\n\s*\}/m;
+  const hasProvider = modifiedContent.includes("<Provider");
+  const appFunctionRegex = /(export\s+default\s+)?function\s+App\s*\([^)]*\)\s*\{[\s\S]*?return\s+\([\s\S]*?\)\s*;?\s*\n\s*\}/m;
   if (appFunctionRegex.test(modifiedContent)) {
     modifiedContent = modifiedContent.replace(appFunctionRegex, (match) => {
       const signatureMatch = match.match(
         /((export\s+default\s+)?function\s+App\s*\([^)]*\))/
       );
       if (signatureMatch) {
+        if (hasProvider) {
+          const providerMatch = match.match(
+            /<Provider[\s\S]*?>([\s\S]*?)<\/Provider>/m
+          );
+          if (providerMatch) {
+            const providerOpening = match.match(/<Provider[^>]*>/)?.[0] || "";
+            const returnStatement2 = `  return (
+    ${providerOpening}
+      <RouterProvider router={router} />
+    </Provider>
+  )
+`;
+            return `${signatureMatch[1]} {
+${returnStatement2}}
+`;
+          }
+        }
         const returnStatement = isTypeScript ? "  return <RouterProvider router={router} />\n" : "  return <RouterProvider router={router} />\n";
         return `${signatureMatch[1]} {
 ${returnStatement}}
@@ -1014,16 +777,32 @@ ${returnStatement}}
       return match;
     });
   } else {
-    const returnRegex = /return\s+\([\s\S]*?\)\s*;?/m;
-    if (returnRegex.test(modifiedContent)) {
-      modifiedContent = modifiedContent.replace(
-        returnRegex,
-        isTypeScript ? "  return <RouterProvider router={router} />" : "  return <RouterProvider router={router} />"
-      );
+    const arrowFunctionRegex = /(const|let|var)\s+App\s*=\s*\([^)]*\)\s*=>\s*\{?[\s\S]*?return\s+[\s\S]*?\}?/m;
+    if (arrowFunctionRegex.test(modifiedContent)) {
+      modifiedContent = modifiedContent.replace(arrowFunctionRegex, (match) => {
+        if (hasProvider) {
+          const providerMatch = match.match(
+            /<Provider[\s\S]*?>([\s\S]*?)<\/Provider>/m
+          );
+          if (providerMatch) {
+            const providerOpening = match.match(/<Provider[^>]*>/)?.[0] || "";
+            return `const App = () => {
+  return (
+    ${providerOpening}
+      <RouterProvider router={router} />
+    </Provider>
+  )
+}`;
+          }
+        }
+        return `const App = () => {
+  return <RouterProvider router={router} />
+}`;
+      });
     } else {
       modifiedContent += `
 
-function App() {
+const App = () => {
   return <RouterProvider router={router} />
 }
 
@@ -1035,7 +814,7 @@ export default App
 }
 
 // src/plugins/routing/tanstack-router.ts
-import { resolve as resolve6, join as join3 } from "path";
+import { resolve as resolve4, join as join2 } from "path";
 var tanstackRouterPlugin = {
   name: "@tanstack/react-router",
   displayName: "TanStack Router",
@@ -1106,12 +885,12 @@ var tanstackRouterPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = resolve6(ctx.projectRoot, ctx.srcDir);
+    const srcDir = resolve4(ctx.projectRoot, ctx.srcDir);
     const extension = ctx.typescript ? "tsx" : "jsx";
     try {
-      const routesDir = join3(srcDir, "routes");
+      const routesDir = join2(srcDir, "routes");
       await ensureDirectory(routesDir);
-      const rootRoutePath = join3(routesDir, `__root.${extension}`);
+      const rootRoutePath = join2(routesDir, `__root.${extension}`);
       const rootRouteContent = ctx.typescript ? getRootRouteContentTS() : getRootRouteContentJS();
       await writer.createFile(rootRoutePath, rootRouteContent);
       files.push({
@@ -1121,7 +900,7 @@ var tanstackRouterPlugin = {
         backup: false
       });
       logger.info(`Created root route: ${rootRoutePath}`);
-      const indexRoutePath = join3(routesDir, `index.${extension}`);
+      const indexRoutePath = join2(routesDir, `index.${extension}`);
       const indexRouteContent = ctx.typescript ? getIndexRouteContentTS() : getIndexRouteContentJS();
       await writer.createFile(indexRoutePath, indexRouteContent);
       files.push({
@@ -1131,7 +910,7 @@ var tanstackRouterPlugin = {
         backup: false
       });
       logger.info(`Created index route: ${indexRoutePath}`);
-      const aboutRoutePath = join3(routesDir, `about.${extension}`);
+      const aboutRoutePath = join2(routesDir, `about.${extension}`);
       const aboutRouteContent = ctx.typescript ? getAboutRouteContentTS() : getAboutRouteContentJS();
       await writer.createFile(aboutRoutePath, aboutRouteContent);
       files.push({
@@ -1141,7 +920,7 @@ var tanstackRouterPlugin = {
         backup: false
       });
       logger.info(`Created about route: ${aboutRoutePath}`);
-      const routerPath = join3(srcDir, `router.${extension}`);
+      const routerPath = join2(srcDir, `router.${extension}`);
       const routerContent = ctx.typescript ? getRouterContentTS2() : getRouterContentJS2();
       await writer.createFile(routerPath, routerContent);
       files.push({
@@ -1151,7 +930,7 @@ var tanstackRouterPlugin = {
         backup: false
       });
       logger.info(`Created router configuration: ${routerPath}`);
-      const appPath = join3(srcDir, `App.${extension}`);
+      const appPath = join2(srcDir, `App.${extension}`);
       const appExists = await checkPathExists(appPath);
       if (appExists) {
         const appContent = await readFileContent(appPath);
@@ -1467,6 +1246,7 @@ function injectRouterProvider2(content, isTypeScript) {
     importLines.splice(lastImportIndex + 1, 0, routerImport.trim());
     modifiedContent = importLines.join("\n");
   }
+  const hasProvider = modifiedContent.includes("<Provider");
   const appFunctionRegex = /(export\s+default\s+)?function\s+App\s*\([^)]*\)\s*\{[\s\S]*?\n\s*return\s+\([\s\S]*?\)\s*;?\s*\n\s*\}/m;
   if (appFunctionRegex.test(modifiedContent)) {
     modifiedContent = modifiedContent.replace(appFunctionRegex, (match) => {
@@ -1474,6 +1254,23 @@ function injectRouterProvider2(content, isTypeScript) {
         /((export\s+default\s+)?function\s+App\s*\([^)]*\))/
       );
       if (signatureMatch) {
+        if (hasProvider) {
+          const providerMatch = match.match(
+            /<Provider[\s\S]*?>([\s\S]*?)<\/Provider>/m
+          );
+          if (providerMatch) {
+            const providerOpening = match.match(/<Provider[^>]*>/)?.[0] || "";
+            const returnStatement2 = `  return (
+    ${providerOpening}
+      <RouterProvider router={router} />
+    </Provider>
+  )
+`;
+            return `${signatureMatch[1]} {
+${returnStatement2}}
+`;
+          }
+        }
         const returnStatement = isTypeScript ? "  return <RouterProvider router={router} />\n" : "  return <RouterProvider router={router} />\n";
         return `${signatureMatch[1]} {
 ${returnStatement}}
@@ -1482,16 +1279,32 @@ ${returnStatement}}
       return match;
     });
   } else {
-    const returnRegex = /return\s+\([\s\S]*?\)\s*;?/m;
-    if (returnRegex.test(modifiedContent)) {
-      modifiedContent = modifiedContent.replace(
-        returnRegex,
-        isTypeScript ? "  return <RouterProvider router={router} />" : "  return <RouterProvider router={router} />"
-      );
+    const arrowFunctionRegex = /(const|let|var)\s+App\s*=\s*\([^)]*\)\s*=>\s*\{?[\s\S]*?return\s+[\s\S]*?\}?/m;
+    if (arrowFunctionRegex.test(modifiedContent)) {
+      modifiedContent = modifiedContent.replace(arrowFunctionRegex, (match) => {
+        if (hasProvider) {
+          const providerMatch = match.match(
+            /<Provider[\s\S]*?>([\s\S]*?)<\/Provider>/m
+          );
+          if (providerMatch) {
+            const providerOpening = match.match(/<Provider[^>]*>/)?.[0] || "";
+            return `const App = () => {
+  return (
+    ${providerOpening}
+      <RouterProvider router={router} />
+    </Provider>
+  )
+}`;
+          }
+        }
+        return `const App = () => {
+  return <RouterProvider router={router} />
+}`;
+      });
     } else {
       modifiedContent += `
 
-function App() {
+const App = () => {
   return <RouterProvider router={router} />
 }
 
@@ -1503,7 +1316,7 @@ export default App
 }
 
 // src/plugins/state/zustand.ts
-import { resolve as resolve7, join as join4 } from "path";
+import { resolve as resolve5, join as join3 } from "path";
 var zustandPlugin = {
   name: "zustand",
   displayName: "Zustand",
@@ -1569,12 +1382,12 @@ var zustandPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = resolve7(ctx.projectRoot, ctx.srcDir);
+    const srcDir = resolve5(ctx.projectRoot, ctx.srcDir);
     const extension = ctx.typescript ? "ts" : "js";
     try {
-      const storeDir = join4(srcDir, "store");
+      const storeDir = join3(srcDir, "store");
       await ensureDirectory(storeDir);
-      const storePath = join4(storeDir, `index.${extension}`);
+      const storePath = join3(storeDir, `index.${extension}`);
       const storeContent = ctx.typescript ? getStoreContentTS() : getStoreContentJS();
       await writer.createFile(storePath, storeContent);
       files.push({
@@ -1585,7 +1398,7 @@ var zustandPlugin = {
       });
       logger.info(`Created Zustand store: ${storePath}`);
       if (ctx.typescript) {
-        const hookPath = join4(storeDir, "useStore.ts");
+        const hookPath = join3(storeDir, "useStore.ts");
         const hookContent = getTypedHookContentTS();
         await writer.createFile(hookPath, hookContent);
         files.push({
@@ -1713,7 +1526,7 @@ export const useRemoveAllBears = () =>
 }
 
 // src/plugins/state/jotai.ts
-import { resolve as resolve8, join as join5 } from "path";
+import { resolve as resolve6, join as join4 } from "path";
 var jotaiPlugin = {
   name: "jotai",
   displayName: "Jotai",
@@ -1782,12 +1595,12 @@ var jotaiPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = resolve8(ctx.projectRoot, ctx.srcDir);
+    const srcDir = resolve6(ctx.projectRoot, ctx.srcDir);
     const extension = ctx.typescript ? "ts" : "js";
     try {
-      const storeDir = join5(srcDir, "store");
+      const storeDir = join4(srcDir, "store");
       await ensureDirectory(storeDir);
-      const atomsPath = join5(storeDir, `atoms.${extension}`);
+      const atomsPath = join4(storeDir, `atoms.${extension}`);
       const atomsContent = ctx.typescript ? getAtomsContentTS() : getAtomsContentJS();
       await writer.createFile(atomsPath, atomsContent);
       files.push({
@@ -1797,7 +1610,7 @@ var jotaiPlugin = {
         backup: false
       });
       logger.info(`Created atoms file: ${atomsPath}`);
-      const indexPath = join5(storeDir, `index.${extension}`);
+      const indexPath = join4(storeDir, `index.${extension}`);
       const indexContent = ctx.typescript ? getIndexContentTS() : getIndexContentJS();
       await writer.createFile(indexPath, indexContent);
       files.push({
@@ -1807,7 +1620,7 @@ var jotaiPlugin = {
         backup: false
       });
       logger.info(`Created store index: ${indexPath}`);
-      const appPath = join5(srcDir, `App.${ctx.typescript ? "tsx" : "jsx"}`);
+      const appPath = join4(srcDir, `App.${ctx.typescript ? "tsx" : "jsx"}`);
       const appExists = await checkPathExists(appPath);
       if (appExists) {
         const appContent = await readFileContent(appPath);
@@ -2058,7 +1871,7 @@ export default App
 }
 
 // src/plugins/state/redux-toolkit.ts
-import { resolve as resolve9, join as join6 } from "path";
+import { resolve as resolve7, join as join5 } from "path";
 var reduxToolkitPlugin = {
   name: "@reduxjs/toolkit",
   displayName: "Redux Toolkit",
@@ -2130,14 +1943,14 @@ var reduxToolkitPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = resolve9(ctx.projectRoot, ctx.srcDir);
+    const srcDir = resolve7(ctx.projectRoot, ctx.srcDir);
     const extension = ctx.typescript ? "ts" : "js";
     try {
-      const storeDir = join6(srcDir, "store");
+      const storeDir = join5(srcDir, "store");
       await ensureDirectory(storeDir);
-      const slicesDir = join6(storeDir, "slices");
+      const slicesDir = join5(storeDir, "slices");
       await ensureDirectory(slicesDir);
-      const slicePath = join6(slicesDir, `counterSlice.${extension}`);
+      const slicePath = join5(slicesDir, `counterSlice.${extension}`);
       const sliceContent = ctx.typescript ? getCounterSliceContentTS() : getCounterSliceContentJS();
       await writer.createFile(slicePath, sliceContent);
       files.push({
@@ -2147,7 +1960,7 @@ var reduxToolkitPlugin = {
         backup: false
       });
       logger.info(`Created counter slice: ${slicePath}`);
-      const storePath = join6(storeDir, `index.${extension}`);
+      const storePath = join5(storeDir, `index.${extension}`);
       const storeContent = ctx.typescript ? getStoreContentTS2() : getStoreContentJS2();
       await writer.createFile(storePath, storeContent);
       files.push({
@@ -2158,7 +1971,7 @@ var reduxToolkitPlugin = {
       });
       logger.info(`Created Redux store: ${storePath}`);
       if (ctx.typescript) {
-        const hooksPath = join6(storeDir, "hooks.ts");
+        const hooksPath = join5(storeDir, "hooks.ts");
         const hooksContent = getTypedHooksContentTS();
         await writer.createFile(hooksPath, hooksContent);
         files.push({
@@ -2169,7 +1982,7 @@ var reduxToolkitPlugin = {
         });
         logger.info(`Created typed hooks: ${hooksPath}`);
       }
-      const appPath = join6(srcDir, `App.${ctx.typescript ? "tsx" : "jsx"}`);
+      const appPath = join5(srcDir, `App.${ctx.typescript ? "tsx" : "jsx"}`);
       const appExists = await checkPathExists(appPath);
       if (appExists) {
         const appContent = await readFileContent(appPath);
@@ -2460,15 +2273,20 @@ function injectProvider2(content, isTypeScript) {
     importLines.splice(lastImportIndex + 1, 0, storeImport.trim());
     modifiedContent = importLines.join("\n");
   }
-  const appFunctionRegex = /(export\s+default\s+)?function\s+App\s*\([^)]*\)\s*\{[\s\S]*?\n\s*return\s+\([\s\S]*?\)\s*;?\s*\n\s*\}/m;
+  const appFunctionRegex = /(export\s+default\s+)?function\s+App\s*\([^)]*\)\s*\{[\s\S]*?\n\s*return\s+[\s\S]*?\n\s*\}/m;
+  const normalizeReturn = (returnBlock) => {
+    const raw = returnBlock.replace(/return\s+/, "").trim();
+    const withoutParens = raw.startsWith("(") && raw.endsWith(")") ? raw.slice(1, -1).trim() : raw;
+    return withoutParens;
+  };
   if (appFunctionRegex.test(modifiedContent)) {
     modifiedContent = modifiedContent.replace(appFunctionRegex, (match) => {
       const signatureMatch = match.match(
         /((export\s+default\s+)?function\s+App\s*\([^)]*\))/
       );
       if (signatureMatch) {
-        const returnMatch = match.match(/return\s+\(([\s\S]*?)\)/m);
-        const innerContent = returnMatch?.[1] || "<div>App</div>";
+        const returnMatch = match.match(/return[\s\S]*?\n\s*\}/m);
+        const innerContent = returnMatch ? normalizeReturn(returnMatch[0].replace(/\}\s*$/, "")) : "<div>App</div>";
         const returnStatement = isTypeScript ? `  return (
     <Provider store={store}>
       ${innerContent.trim()}
@@ -2487,19 +2305,18 @@ ${returnStatement}}
       return match;
     });
   } else {
-    const returnRegex = /return\s+\([\s\S]*?\)\s*;?/m;
-    if (returnRegex.test(modifiedContent)) {
-      modifiedContent = modifiedContent.replace(returnRegex, (match) => {
-        const innerContent = match.replace(/return\s+\(|\)\s*;?/g, "").trim();
-        return isTypeScript ? `return (
-    <Provider store={store}>
-      ${innerContent}
-    </Provider>
-  )` : `return (
+    const arrowFunctionRegex = /(const|let|var)\s+App\s*=\s*\([^)]*\)\s*=>\s*\{?[\s\S]*?return\s+[\s\S]*?\}?/m;
+    if (arrowFunctionRegex.test(modifiedContent)) {
+      modifiedContent = modifiedContent.replace(arrowFunctionRegex, (match) => {
+        const returnMatch = match.match(/return[\s\S]*/m);
+        const innerContent = returnMatch ? normalizeReturn(returnMatch[0].replace(/\}?\s*$/, "")) : "<div>App</div>";
+        return `const App = () => {
+  return (
     <Provider store={store}>
-      ${innerContent}
+      ${innerContent.trim()}
     </Provider>
-  )`;
+  )
+}`;
       });
     } else {
       modifiedContent += `
@@ -2520,7 +2337,7 @@ export default App
 }
 
 // src/plugins/http/axios.ts
-import { resolve as resolve10, join as join7 } from "path";
+import { resolve as resolve8, join as join6 } from "path";
 var axiosPlugin = {
   name: "axios",
   displayName: "Axios",
@@ -2585,12 +2402,12 @@ var axiosPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = resolve10(ctx.projectRoot, ctx.srcDir);
+    const srcDir = resolve8(ctx.projectRoot, ctx.srcDir);
     const extension = ctx.typescript ? "ts" : "js";
     try {
-      const libDir = join7(srcDir, "lib");
+      const libDir = join6(srcDir, "lib");
       await ensureDirectory(libDir);
-      const apiPath = join7(libDir, `api.${extension}`);
+      const apiPath = join6(libDir, `api.${extension}`);
       const apiContent = ctx.typescript ? getApiContentTS() : getApiContentJS();
       await writer.createFile(apiPath, apiContent);
       files.push({
@@ -2601,7 +2418,7 @@ var axiosPlugin = {
       });
       logger.info(`Created Axios instance: ${apiPath}`);
       if (ctx.typescript) {
-        const typesPath = join7(libDir, "api-types.ts");
+        const typesPath = join6(libDir, "api-types.ts");
         const typesContent = getApiTypesContentTS();
         await writer.createFile(typesPath, typesContent);
         files.push({
@@ -2855,7 +2672,7 @@ export interface ApiError {
 }
 
 // src/plugins/http/tanstack-query.ts
-import { resolve as resolve11, join as join8 } from "path";
+import { resolve as resolve9, join as join7 } from "path";
 var tanstackQueryPlugin = {
   name: "@tanstack/react-query",
   displayName: "TanStack Query",
@@ -2924,12 +2741,12 @@ var tanstackQueryPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = resolve11(ctx.projectRoot, ctx.srcDir);
+    const srcDir = resolve9(ctx.projectRoot, ctx.srcDir);
     const extension = ctx.typescript ? "ts" : "js";
     try {
-      const libDir = join8(srcDir, "lib");
+      const libDir = join7(srcDir, "lib");
       await ensureDirectory(libDir);
-      const queryClientPath = join8(libDir, `query-client.${extension}`);
+      const queryClientPath = join7(libDir, `query-client.${extension}`);
       const queryClientContent = ctx.typescript ? getQueryClientContentTS() : getQueryClientContentJS();
       await writer.createFile(queryClientPath, queryClientContent);
       files.push({
@@ -2939,9 +2756,9 @@ var tanstackQueryPlugin = {
         backup: false
       });
       logger.info(`Created query client: ${queryClientPath}`);
-      const queriesDir = join8(libDir, "queries");
+      const queriesDir = join7(libDir, "queries");
       await ensureDirectory(queriesDir);
-      const exampleQueryPath = join8(queriesDir, `example.${extension}`);
+      const exampleQueryPath = join7(queriesDir, `example.${extension}`);
       const exampleQueryContent = ctx.typescript ? getExampleQueryContentTS() : getExampleQueryContentJS();
       await writer.createFile(exampleQueryPath, exampleQueryContent);
       files.push({
@@ -2951,9 +2768,9 @@ var tanstackQueryPlugin = {
         backup: false
       });
       logger.info(`Created example query: ${exampleQueryPath}`);
-      const mutationsDir = join8(libDir, "mutations");
+      const mutationsDir = join7(libDir, "mutations");
       await ensureDirectory(mutationsDir);
-      const exampleMutationPath = join8(mutationsDir, `example.${extension}`);
+      const exampleMutationPath = join7(mutationsDir, `example.${extension}`);
       const exampleMutationContent = ctx.typescript ? getExampleMutationContentTS() : getExampleMutationContentJS();
       await writer.createFile(exampleMutationPath, exampleMutationContent);
       files.push({
@@ -2963,7 +2780,7 @@ var tanstackQueryPlugin = {
         backup: false
       });
       logger.info(`Created example mutation: ${exampleMutationPath}`);
-      const appPath = join8(srcDir, `App.${ctx.typescript ? "tsx" : "jsx"}`);
+      const appPath = join7(srcDir, `App.${ctx.typescript ? "tsx" : "jsx"}`);
       const appExists = await checkPathExists(appPath);
       if (appExists) {
         const appContent = await readFileContent(appPath);
@@ -3405,7 +3222,7 @@ export default App
 }
 
 // src/plugins/css/tailwindcss.ts
-import { resolve as resolve12, join as join9 } from "path";
+import { resolve as resolve10, join as join8 } from "path";
 var tailwindcssPlugin = {
   name: "tailwindcss",
   displayName: "TailwindCSS",
@@ -3471,10 +3288,10 @@ var tailwindcssPlugin = {
     const writer = new ConfigWriter(backupManager);
     const files = [];
     const projectRoot = ctx.projectRoot;
-    const srcDir = resolve12(projectRoot, ctx.srcDir);
+    const srcDir = resolve10(projectRoot, ctx.srcDir);
     const extension = ctx.typescript ? "ts" : "js";
     try {
-      const viteConfigPath = join9(projectRoot, `vite.config.${extension}`);
+      const viteConfigPath = join8(projectRoot, `vite.config.${extension}`);
       const viteConfigExists = await checkPathExists(viteConfigPath);
       if (viteConfigExists) {
         const viteConfigContent = await readFileContent(viteConfigPath);
@@ -3504,10 +3321,10 @@ var tailwindcssPlugin = {
         logger.info(`Created vite.config.${extension} with TailwindCSS plugin`);
       }
       const cssFiles = [
-        join9(srcDir, "index.css"),
-        join9(srcDir, "main.css"),
-        join9(srcDir, "app.css"),
-        join9(srcDir, "styles.css")
+        join8(srcDir, "index.css"),
+        join8(srcDir, "main.css"),
+        join8(srcDir, "app.css"),
+        join8(srcDir, "styles.css")
       ];
       let cssFileModified = false;
       for (const cssPath of cssFiles) {
@@ -3528,7 +3345,7 @@ var tailwindcssPlugin = {
         }
       }
       if (!cssFileModified) {
-        const cssPath = join9(srcDir, "index.css");
+        const cssPath = join8(srcDir, "index.css");
         const cssContent = getCssContent();
         await writer.createFile(cssPath, cssContent);
         files.push({
@@ -3663,7 +3480,7 @@ ${content}`;
 }
 
 // src/plugins/css/styled-components.ts
-import { resolve as resolve13, join as join10 } from "path";
+import { resolve as resolve11, join as join9 } from "path";
 var styledComponentsPlugin = {
   name: "styled-components",
   displayName: "Styled Components",
@@ -3741,12 +3558,12 @@ var styledComponentsPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = resolve13(ctx.projectRoot, ctx.srcDir);
+    const srcDir = resolve11(ctx.projectRoot, ctx.srcDir);
     const extension = ctx.typescript ? "tsx" : "jsx";
     try {
-      const styledDir = join10(srcDir, "components", "styled");
+      const styledDir = join9(srcDir, "components", "styled");
       await ensureDirectory(styledDir);
-      const buttonPath = join10(styledDir, `Button.${extension}`);
+      const buttonPath = join9(styledDir, `Button.${extension}`);
       const buttonContent = ctx.typescript ? getButtonContentTS() : getButtonContentJS();
       await writer.createFile(buttonPath, buttonContent);
       files.push({
@@ -3756,7 +3573,7 @@ var styledComponentsPlugin = {
         backup: false
       });
       logger.info(`Created Button component: ${buttonPath}`);
-      const cardPath = join10(styledDir, `Card.${extension}`);
+      const cardPath = join9(styledDir, `Card.${extension}`);
       const cardContent = ctx.typescript ? getCardContentTS() : getCardContentJS();
       await writer.createFile(cardPath, cardContent);
       files.push({
@@ -3766,7 +3583,7 @@ var styledComponentsPlugin = {
         backup: false
       });
       logger.info(`Created Card component: ${cardPath}`);
-      const indexPath = join10(styledDir, `index.${ctx.typescript ? "ts" : "js"}`);
+      const indexPath = join9(styledDir, `index.${ctx.typescript ? "ts" : "js"}`);
       const indexContent = getIndexContent();
       await writer.createFile(indexPath, indexContent);
       files.push({
@@ -3987,7 +3804,7 @@ export { Card } from './Card'
 }
 
 // src/plugins/css/emotion.ts
-import { resolve as resolve14, join as join11 } from "path";
+import { resolve as resolve12, join as join10 } from "path";
 var emotionPlugin = {
   name: "@emotion/react",
   displayName: "Emotion",
@@ -4060,12 +3877,12 @@ var emotionPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = resolve14(ctx.projectRoot, ctx.srcDir);
+    const srcDir = resolve12(ctx.projectRoot, ctx.srcDir);
     const extension = ctx.typescript ? "tsx" : "jsx";
     try {
-      const emotionDir = join11(srcDir, "components", "emotion");
+      const emotionDir = join10(srcDir, "components", "emotion");
       await ensureDirectory(emotionDir);
-      const buttonPath = join11(emotionDir, `Button.${extension}`);
+      const buttonPath = join10(emotionDir, `Button.${extension}`);
       const buttonContent = ctx.typescript ? getButtonContentTS2() : getButtonContentJS2();
       await writer.createFile(buttonPath, buttonContent);
       files.push({
@@ -4075,7 +3892,7 @@ var emotionPlugin = {
         backup: false
       });
       logger.info(`Created Button component: ${buttonPath}`);
-      const cardPath = join11(emotionDir, `Card.${extension}`);
+      const cardPath = join10(emotionDir, `Card.${extension}`);
       const cardContent = ctx.typescript ? getCardContentTS2() : getCardContentJS2();
       await writer.createFile(cardPath, cardContent);
       files.push({
@@ -4085,7 +3902,7 @@ var emotionPlugin = {
         backup: false
       });
       logger.info(`Created Card component: ${cardPath}`);
-      const indexPath = join11(
+      const indexPath = join10(
         emotionDir,
         `index.${ctx.typescript ? "ts" : "js"}`
       );
@@ -4318,7 +4135,7 @@ export { Card } from './Card'
 }
 
 // src/plugins/css/react-bootstrap.ts
-import { resolve as resolve15, join as join12 } from "path";
+import { resolve as resolve13, join as join11 } from "path";
 var reactBootstrapPlugin = {
   name: "react-bootstrap",
   displayName: "React Bootstrap",
@@ -4387,12 +4204,12 @@ var reactBootstrapPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = resolve15(ctx.projectRoot, ctx.srcDir);
+    const srcDir = resolve13(ctx.projectRoot, ctx.srcDir);
     const extension = ctx.typescript ? "tsx" : "jsx";
     try {
-      const bootstrapDir = join12(srcDir, "components", "bootstrap");
+      const bootstrapDir = join11(srcDir, "components", "bootstrap");
       await ensureDirectory(bootstrapDir);
-      const examplePath = join12(bootstrapDir, `Example.${extension}`);
+      const examplePath = join11(bootstrapDir, `Example.${extension}`);
       const exampleContent = ctx.typescript ? getExampleContentTS() : getExampleContentJS();
       await writer.createFile(examplePath, exampleContent);
       files.push({
@@ -4402,7 +4219,7 @@ var reactBootstrapPlugin = {
         backup: false
       });
       logger.info(`Created Bootstrap example: ${examplePath}`);
-      const indexPath = join12(srcDir, `index.${ctx.typescript ? "tsx" : "jsx"}`);
+      const indexPath = join11(srcDir, `index.${ctx.typescript ? "tsx" : "jsx"}`);
       const indexExists = await checkPathExists(indexPath);
       if (indexExists) {
         const indexContent = await readFileContent(indexPath);
@@ -4597,7 +4414,7 @@ function injectBootstrapCSS(content) {
 }
 
 // src/plugins/forms/react-hook-form.ts
-import { resolve as resolve16, join as join13 } from "path";
+import { resolve as resolve14, join as join12 } from "path";
 var reactHookFormPlugin = {
   name: "react-hook-form",
   displayName: "React Hook Form",
@@ -4661,12 +4478,12 @@ var reactHookFormPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = resolve16(ctx.projectRoot, ctx.srcDir);
+    const srcDir = resolve14(ctx.projectRoot, ctx.srcDir);
     const extension = ctx.typescript ? "tsx" : "jsx";
     try {
-      const formsDir = join13(srcDir, "components", "forms");
+      const formsDir = join12(srcDir, "components", "forms");
       await ensureDirectory(formsDir);
-      const exampleFormPath = join13(formsDir, `ExampleForm.${extension}`);
+      const exampleFormPath = join12(formsDir, `ExampleForm.${extension}`);
       const exampleFormContent = ctx.typescript ? getExampleFormContentTS() : getExampleFormContentJS();
       await writer.createFile(exampleFormPath, exampleFormContent);
       files.push({
@@ -4676,7 +4493,7 @@ var reactHookFormPlugin = {
         backup: false
       });
       logger.info(`Created example form: ${exampleFormPath}`);
-      const validatedFormPath = join13(formsDir, `ValidatedForm.${extension}`);
+      const validatedFormPath = join12(formsDir, `ValidatedForm.${extension}`);
       const validatedFormContent = ctx.typescript ? getValidatedFormContentTS() : getValidatedFormContentJS();
       await writer.createFile(validatedFormPath, validatedFormContent);
       files.push({
@@ -4686,7 +4503,7 @@ var reactHookFormPlugin = {
         backup: false
       });
       logger.info(`Created validated form: ${validatedFormPath}`);
-      const indexPath = join13(formsDir, `index.${ctx.typescript ? "ts" : "js"}`);
+      const indexPath = join12(formsDir, `index.${ctx.typescript ? "ts" : "js"}`);
       const indexContent = ctx.typescript ? getIndexContentTS3() : getIndexContentJS3();
       await writer.createFile(indexPath, indexContent);
       files.push({
@@ -5122,7 +4939,7 @@ export { ValidatedForm } from './ValidatedForm'
 }
 
 // src/plugins/forms/zod.ts
-import { join as join14 } from "path";
+import { join as join13 } from "path";
 var zodPlugin = {
   name: "zod",
   displayName: "Zod",
@@ -5187,11 +5004,11 @@ var zodPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = join14(ctx.projectRoot, ctx.srcDir);
+    const srcDir = join13(ctx.projectRoot, ctx.srcDir);
     try {
-      const schemasDir = join14(srcDir, "lib", "schemas");
+      const schemasDir = join13(srcDir, "lib", "schemas");
       await ensureDirectory(schemasDir);
-      const userSchemaPath = join14(
+      const userSchemaPath = join13(
         schemasDir,
         `user.${ctx.typescript ? "ts" : "js"}`
       );
@@ -5204,7 +5021,7 @@ var zodPlugin = {
         backup: false
       });
       logger.info(`Created user schema: ${userSchemaPath}`);
-      const indexPath = join14(
+      const indexPath = join13(
         schemasDir,
         `index.${ctx.typescript ? "ts" : "js"}`
       );
@@ -5314,7 +5131,7 @@ function getIndexContentJS4() {
 }
 
 // src/plugins/ui/shadcn-ui.ts
-import { join as join15 } from "path";
+import { join as join14 } from "path";
 var shadcnUiPlugin = {
   name: "shadcn-ui",
   displayName: "Shadcn/ui",
@@ -5401,7 +5218,7 @@ var shadcnUiPlugin = {
     const writer = new ConfigWriter(backupManager);
     const files = [];
     const projectRoot = ctx.projectRoot;
-    const srcDir = join15(projectRoot, ctx.srcDir);
+    const srcDir = join14(projectRoot, ctx.srcDir);
     try {
       const tailwindInstalled = ctx.dependencies["tailwindcss"] !== void 0 || ctx.devDependencies["tailwindcss"] !== void 0;
       if (!tailwindInstalled) {
@@ -5414,7 +5231,7 @@ var shadcnUiPlugin = {
           message: "TailwindCSS is required for Shadcn/ui. Please install TailwindCSS first."
         };
       }
-      const componentsJsonPath = join15(projectRoot, "components.json");
+      const componentsJsonPath = join14(projectRoot, "components.json");
       const componentsJsonExists = await checkPathExists(componentsJsonPath);
       if (componentsJsonExists) {
         logger.warn("components.json already exists, skipping creation");
@@ -5429,9 +5246,9 @@ var shadcnUiPlugin = {
         });
         logger.info(`Created components.json: ${componentsJsonPath}`);
       }
-      const libDir = join15(srcDir, "lib");
+      const libDir = join14(srcDir, "lib");
       await ensureDirectory(libDir);
-      const utilsPath = join15(libDir, `utils.${ctx.typescript ? "ts" : "js"}`);
+      const utilsPath = join14(libDir, `utils.${ctx.typescript ? "ts" : "js"}`);
       const utilsExists = await checkPathExists(utilsPath);
       if (utilsExists) {
         logger.warn(
@@ -5461,9 +5278,9 @@ var shadcnUiPlugin = {
         });
         logger.info(`Created utils file: ${utilsPath}`);
       }
-      const uiDir = join15(srcDir, "components", "ui");
+      const uiDir = join14(srcDir, "components", "ui");
       await ensureDirectory(uiDir);
-      const buttonPath = join15(uiDir, `button.${ctx.typescript ? "tsx" : "jsx"}`);
+      const buttonPath = join14(uiDir, `button.${ctx.typescript ? "tsx" : "jsx"}`);
       const buttonExists = await checkPathExists(buttonPath);
       if (!buttonExists) {
         const buttonContent = ctx.typescript ? getButtonContentTS3() : getButtonContentJS3();
@@ -5476,7 +5293,7 @@ var shadcnUiPlugin = {
         });
         logger.info(`Created Button component: ${buttonPath}`);
       }
-      const cssPath = join15(srcDir, "index.css");
+      const cssPath = join14(srcDir, "index.css");
       const cssExists = await checkPathExists(cssPath);
       if (cssExists) {
         const cssContent = await readFileContent(cssPath);
@@ -5786,7 +5603,7 @@ function getShadcnCSSVariables() {
 }
 
 // src/plugins/ui/radix-ui.ts
-import { join as join16 } from "path";
+import { join as join15 } from "path";
 var radixUiPlugin = {
   name: "radix-ui",
   displayName: "Radix UI",
@@ -5863,12 +5680,12 @@ var radixUiPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = join16(ctx.projectRoot, ctx.srcDir);
+    const srcDir = join15(ctx.projectRoot, ctx.srcDir);
     const extension = ctx.typescript ? "tsx" : "jsx";
     try {
-      const radixDir = join16(srcDir, "components", "radix");
+      const radixDir = join15(srcDir, "components", "radix");
       await ensureDirectory(radixDir);
-      const dialogPath = join16(radixDir, `Dialog.${extension}`);
+      const dialogPath = join15(radixDir, `Dialog.${extension}`);
       const dialogContent = ctx.typescript ? getDialogContentTS() : getDialogContentJS();
       await writer.createFile(dialogPath, dialogContent);
       files.push({
@@ -5878,7 +5695,7 @@ var radixUiPlugin = {
         backup: false
       });
       logger.info(`Created Dialog component: ${dialogPath}`);
-      const dropdownMenuPath = join16(radixDir, `DropdownMenu.${extension}`);
+      const dropdownMenuPath = join15(radixDir, `DropdownMenu.${extension}`);
       const dropdownMenuContent = ctx.typescript ? getDropdownMenuContentTS() : getDropdownMenuContentJS();
       await writer.createFile(dropdownMenuPath, dropdownMenuContent);
       files.push({
@@ -5888,7 +5705,7 @@ var radixUiPlugin = {
         backup: false
       });
       logger.info(`Created DropdownMenu component: ${dropdownMenuPath}`);
-      const indexPath = join16(radixDir, `index.${ctx.typescript ? "ts" : "js"}`);
+      const indexPath = join15(radixDir, `index.${ctx.typescript ? "ts" : "js"}`);
       const indexContent = ctx.typescript ? getIndexContentTS5() : getIndexContentJS5();
       await writer.createFile(indexPath, indexContent);
       files.push({
@@ -6516,7 +6333,7 @@ export {
 }
 
 // src/plugins/ui/react-icons.ts
-import { join as join17 } from "path";
+import { join as join16 } from "path";
 var reactIconsPlugin = {
   name: "react-icons",
   displayName: "React Icons",
@@ -6581,11 +6398,11 @@ var reactIconsPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = join17(ctx.projectRoot, ctx.srcDir);
+    const srcDir = join16(ctx.projectRoot, ctx.srcDir);
     try {
-      const iconsDir = join17(srcDir, "components", "icons");
+      const iconsDir = join16(srcDir, "components", "icons");
       await ensureDirectory(iconsDir);
-      const iconExamplePath = join17(
+      const iconExamplePath = join16(
         iconsDir,
         `IconExample.${ctx.typescript ? "tsx" : "jsx"}`
       );
@@ -6598,7 +6415,7 @@ var reactIconsPlugin = {
         backup: false
       });
       logger.info(`Created icon example: ${iconExamplePath}`);
-      const indexPath = join17(iconsDir, `index.${ctx.typescript ? "ts" : "js"}`);
+      const indexPath = join16(iconsDir, `index.${ctx.typescript ? "ts" : "js"}`);
       const indexContent = ctx.typescript ? getIndexContentTS6() : getIndexContentJS6();
       await writer.createFile(indexPath, indexContent);
       files.push({
@@ -6714,7 +6531,7 @@ export { MdHome, MdSettings, MdSearch } from 'react-icons/md'
 }
 
 // src/plugins/ui/react-hot-toast.ts
-import { join as join18 } from "path";
+import { join as join17 } from "path";
 var reactHotToastPlugin = {
   name: "react-hot-toast",
   displayName: "React Hot Toast",
@@ -6778,12 +6595,12 @@ var reactHotToastPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = join18(ctx.projectRoot, ctx.srcDir);
+    const srcDir = join17(ctx.projectRoot, ctx.srcDir);
     const extension = ctx.typescript ? "tsx" : "jsx";
     try {
-      const appPath = join18(srcDir, `App.${extension}`);
-      const mainPath = join18(srcDir, `main.${extension}`);
-      const indexPath = join18(srcDir, `index.${extension}`);
+      const appPath = join17(srcDir, `App.${extension}`);
+      const mainPath = join17(srcDir, `main.${extension}`);
+      const indexPath = join17(srcDir, `index.${extension}`);
       let targetPath = null;
       let targetContent = "";
       if (await checkPathExists(appPath)) {
@@ -6813,7 +6630,7 @@ var reactHotToastPlugin = {
           logger.warn("Toaster already configured in the app");
         }
       } else {
-        const newAppPath = join18(srcDir, `App.${extension}`);
+        const newAppPath = join17(srcDir, `App.${extension}`);
         const newAppContent = ctx.typescript ? getAppContentTS6() : getAppContentJS6();
         await writer.createFile(newAppPath, newAppContent);
         files.push({
@@ -6910,7 +6727,7 @@ export default App
 }
 
 // src/plugins/animation/framer-motion.ts
-import { join as join19 } from "path";
+import { join as join18 } from "path";
 var framerMotionPlugin = {
   name: "framer-motion",
   displayName: "Framer Motion",
@@ -6975,11 +6792,11 @@ var framerMotionPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = join19(ctx.projectRoot, ctx.srcDir);
+    const srcDir = join18(ctx.projectRoot, ctx.srcDir);
     try {
-      const animationDir = join19(srcDir, "components", "animation");
+      const animationDir = join18(srcDir, "components", "animation");
       await ensureDirectory(animationDir);
-      const animatedBoxPath = join19(
+      const animatedBoxPath = join18(
         animationDir,
         `AnimatedBox.${ctx.typescript ? "tsx" : "jsx"}`
       );
@@ -6992,7 +6809,7 @@ var framerMotionPlugin = {
         backup: false
       });
       logger.info(`Created animated box example: ${animatedBoxPath}`);
-      const indexPath = join19(
+      const indexPath = join18(
         animationDir,
         `index.${ctx.typescript ? "ts" : "js"}`
       );
@@ -7141,7 +6958,7 @@ function getIndexContentJS7() {
 }
 
 // src/plugins/tooling/eslint.ts
-import { join as join20 } from "path";
+import { join as join19 } from "path";
 var eslintPlugin = {
   name: "eslint",
   displayName: "ESLint",
@@ -7217,7 +7034,7 @@ var eslintPlugin = {
     const files = [];
     const projectRoot = ctx.projectRoot;
     try {
-      const eslintConfigPath = join20(projectRoot, "eslint.config.js");
+      const eslintConfigPath = join19(projectRoot, "eslint.config.js");
       const eslintConfigExists = await checkPathExists(eslintConfigPath);
       if (eslintConfigExists) {
         logger.warn("eslint.config.js already exists, skipping creation");
@@ -7232,7 +7049,7 @@ var eslintPlugin = {
         });
         logger.info(`Created ESLint config: ${eslintConfigPath}`);
       }
-      const packageJsonPath = join20(projectRoot, "package.json");
+      const packageJsonPath = join19(projectRoot, "package.json");
       const packageJsonExists = await checkPathExists(packageJsonPath);
       if (packageJsonExists) {
         const packageJsonContent = await readFileContent(packageJsonPath);
@@ -7391,7 +7208,7 @@ export default [
 }
 
 // src/plugins/tooling/prettier.ts
-import { join as join21 } from "path";
+import { join as join20 } from "path";
 var prettierPlugin = {
   name: "prettier",
   displayName: "Prettier",
@@ -7457,7 +7274,7 @@ var prettierPlugin = {
     const files = [];
     const projectRoot = ctx.projectRoot;
     try {
-      const prettierrcPath = join21(projectRoot, ".prettierrc.json");
+      const prettierrcPath = join20(projectRoot, ".prettierrc.json");
       const prettierrcExists = await checkPathExists(prettierrcPath);
       if (prettierrcExists) {
         logger.warn(".prettierrc.json already exists, skipping creation");
@@ -7472,7 +7289,7 @@ var prettierPlugin = {
         });
         logger.info(`Created Prettier config: ${prettierrcPath}`);
       }
-      const prettierignorePath = join21(projectRoot, ".prettierignore");
+      const prettierignorePath = join20(projectRoot, ".prettierignore");
       const prettierignoreExists = await checkPathExists(prettierignorePath);
       if (prettierignoreExists) {
         logger.warn(".prettierignore already exists, skipping creation");
@@ -7487,7 +7304,7 @@ var prettierPlugin = {
         });
         logger.info(`Created .prettierignore: ${prettierignorePath}`);
       }
-      const packageJsonPath = join21(projectRoot, "package.json");
+      const packageJsonPath = join20(projectRoot, "package.json");
       const packageJsonExists = await checkPathExists(packageJsonPath);
       if (packageJsonExists) {
         const packageJsonContent = await readFileContent(packageJsonPath);
@@ -7581,8 +7398,8 @@ pnpm-lock.yaml
 }
 
 // src/plugins/tooling/husky.ts
-import { join as join22 } from "path";
-import { execa as execa2 } from "execa";
+import { join as join21 } from "path";
+import { execa } from "execa";
 var huskyPlugin = {
   name: "husky",
   displayName: "Husky",
@@ -7649,7 +7466,7 @@ var huskyPlugin = {
     const files = [];
     const projectRoot = ctx.projectRoot;
     try {
-      const gitDir = join22(projectRoot, ".git");
+      const gitDir = join21(projectRoot, ".git");
       const gitExists = await checkPathExists(gitDir);
       if (!gitExists) {
         logger.warn(
@@ -7661,9 +7478,9 @@ var huskyPlugin = {
           message: "Git repository not found. Please initialize Git first."
         };
       }
-      const huskyDir = join22(projectRoot, ".husky");
+      const huskyDir = join21(projectRoot, ".husky");
       await ensureDirectory(huskyDir);
-      const preCommitPath = join22(huskyDir, "pre-commit");
+      const preCommitPath = join21(huskyDir, "pre-commit");
       const preCommitExists = await checkPathExists(preCommitPath);
       if (!preCommitExists) {
         const preCommitContent = getPreCommitContent();
@@ -7676,7 +7493,7 @@ var huskyPlugin = {
         });
         logger.info(`Created pre-commit hook: ${preCommitPath}`);
       }
-      const prePushPath = join22(huskyDir, "pre-push");
+      const prePushPath = join21(huskyDir, "pre-push");
       const prePushExists = await checkPathExists(prePushPath);
       if (!prePushExists) {
         const prePushContent = getPrePushContent();
@@ -7689,7 +7506,7 @@ var huskyPlugin = {
         });
         logger.info(`Created pre-push hook: ${prePushPath}`);
       }
-      const packageJsonPath = join22(projectRoot, "package.json");
+      const packageJsonPath = join21(projectRoot, "package.json");
       const packageJsonExists = await checkPathExists(packageJsonPath);
       if (packageJsonExists) {
         const packageJsonContent = await readFileContent(packageJsonPath);
@@ -7713,7 +7530,7 @@ var huskyPlugin = {
         }
       }
       try {
-        await execa2("npx", ["husky", "init"], {
+        await execa("npx", ["husky", "init"], {
           cwd: projectRoot,
           stdio: "inherit"
         });
@@ -7769,7 +7586,7 @@ npm run test:unit
 }
 
 // src/plugins/utils/date-fns.ts
-import { join as join23 } from "path";
+import { join as join22 } from "path";
 var dateFnsPlugin = {
   name: "date-fns",
   displayName: "date-fns",
@@ -7833,11 +7650,11 @@ var dateFnsPlugin = {
     const backupManager = new BackupManager();
     const writer = new ConfigWriter(backupManager);
     const files = [];
-    const srcDir = join23(ctx.projectRoot, ctx.srcDir);
+    const srcDir = join22(ctx.projectRoot, ctx.srcDir);
     try {
-      const utilsDir = join23(srcDir, "lib", "utils");
+      const utilsDir = join22(srcDir, "lib", "utils");
       await ensureDirectory(utilsDir);
-      const dateUtilsPath = join23(
+      const dateUtilsPath = join22(
         utilsDir,
         `date.${ctx.typescript ? "ts" : "js"}`
       );
@@ -8053,7 +7870,7 @@ export function getMinutesDifference(date1, date2) {
 }
 
 // src/plugins/testing/react-testing-library.ts
-import { join as join24 } from "path";
+import { join as join23 } from "path";
 var reactTestingLibraryPlugin = {
   name: "react-testing-library",
   displayName: "React Testing Library",
@@ -8123,9 +7940,9 @@ var reactTestingLibraryPlugin = {
     const writer = new ConfigWriter(backupManager);
     const files = [];
     const projectRoot = ctx.projectRoot;
-    const srcDir = join24(projectRoot, ctx.srcDir);
+    const srcDir = join23(projectRoot, ctx.srcDir);
     try {
-      const setupTestsPath = join24(
+      const setupTestsPath = join23(
         projectRoot,
         `setupTests.${ctx.typescript ? "ts" : "js"}`
       );
@@ -8141,9 +7958,9 @@ var reactTestingLibraryPlugin = {
         });
         logger.info(`Created setupTests file: ${setupTestsPath}`);
       }
-      const testDir = join24(srcDir, "components", "__tests__");
+      const testDir = join23(srcDir, "components", "__tests__");
       await ensureDirectory(testDir);
-      const exampleTestPath = join24(
+      const exampleTestPath = join23(
         testDir,
         `Example.test.${ctx.typescript ? "tsx" : "jsx"}`
       );
@@ -8159,7 +7976,7 @@ var reactTestingLibraryPlugin = {
         });
         logger.info(`Created example test: ${exampleTestPath}`);
       }
-      const vitestConfigPath = join24(projectRoot, "vitest.config.ts");
+      const vitestConfigPath = join23(projectRoot, "vitest.config.ts");
       const vitestConfigExists = await checkPathExists(vitestConfigPath);
       if (vitestConfigExists) {
         logger.info(
@@ -8379,12 +8196,6 @@ if (validatedRegistry.length !== pluginRegistry.length) {
 }
 
 export {
-  logger,
-  readPackageJson,
-  readTsConfig,
-  checkPathExists,
-  detectPackageManager,
-  installPackages,
   ConfigWriter,
   BackupManager,
   pluginRegistry,