@raftlabs/raftstack 1.4.2 → 1.6.0

package/dist/cli.js

@@ -27,6 +27,7 @@ var PACKAGE_MANAGERS = {
     exec: "npx",
     lockfile: "package-lock.json",
     installFrozen: "npm ci",
+    addDev: "install -D",
     needsSetupAction: false,
     cacheKey: "npm-${{ hashFiles('**/package-lock.json') }}"
   },
@@ -37,6 +38,7 @@ var PACKAGE_MANAGERS = {
     exec: "pnpm dlx",
     lockfile: "pnpm-lock.yaml",
     installFrozen: "pnpm install --frozen-lockfile",
+    addDev: "add -D",
     needsSetupAction: true,
     cacheKey: "pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}"
   },
@@ -47,6 +49,7 @@ var PACKAGE_MANAGERS = {
     exec: "yarn",
     lockfile: "yarn.lock",
     installFrozen: "yarn install --frozen-lockfile",
+    addDev: "add -D",
     needsSetupAction: false,
     cacheKey: "yarn-${{ hashFiles('**/yarn.lock') }}"
   },
@@ -57,6 +60,7 @@ var PACKAGE_MANAGERS = {
     exec: "yarn dlx",
     lockfile: "yarn.lock",
     installFrozen: "yarn install --immutable",
+    addDev: "add -D",
     needsSetupAction: false,
     cacheKey: "yarn-${{ hashFiles('**/yarn.lock') }}"
   }
@@ -484,35 +488,19 @@ function fileExists(filePath) {
 }
 
 // src/generators/husky.ts
-function getPreCommitHook(projectType, pm) {
-  if (projectType === "nx") {
-    return `#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-${pm.exec} lint-staged
-`;
-  }
-  return `#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-${pm.exec} lint-staged
+function getPreCommitHook(_projectType) {
+  return `lint-staged
 `;
 }
-function getCommitMsgHook(pm) {
-  return `#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-${pm.exec} --no -- commitlint --edit "$1"
+function getCommitMsgHook() {
+  return `commitlint --edit "$1"
 `;
 }
-function getPrePushHook(pm) {
-  return `#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-${pm.exec} validate-branch-name
+function getPrePushHook() {
+  return `validate-branch-name
 `;
 }
-async function generateHuskyHooks(targetDir, projectType, pm) {
+async function generateHuskyHooks(targetDir, projectType, _pm) {
   const result = {
     created: [],
     modified: [],
@@ -524,7 +512,7 @@ async function generateHuskyHooks(targetDir, projectType, pm) {
   const preCommitPath = join4(huskyDir, "pre-commit");
   const preCommitResult = await writeFileSafe(
     preCommitPath,
-    getPreCommitHook(projectType, pm),
+    getPreCommitHook(projectType),
     { executable: true, backup: true }
   );
   if (preCommitResult.created) {
@@ -536,7 +524,7 @@ async function generateHuskyHooks(targetDir, projectType, pm) {
   const commitMsgPath = join4(huskyDir, "commit-msg");
   const commitMsgResult = await writeFileSafe(
     commitMsgPath,
-    getCommitMsgHook(pm),
+    getCommitMsgHook(),
     { executable: true, backup: true }
   );
   if (commitMsgResult.created) {
@@ -546,7 +534,7 @@ async function generateHuskyHooks(targetDir, projectType, pm) {
     }
   }
   const prePushPath = join4(huskyDir, "pre-push");
-  const prePushResult = await writeFileSafe(prePushPath, getPrePushHook(pm), {
+  const prePushResult = await writeFileSafe(prePushPath, getPrePushHook(), {
     executable: true,
     backup: true
   });
@@ -562,10 +550,8 @@ async function generateHuskyHooks(targetDir, projectType, pm) {
 // src/generators/commitlint.ts
 import { join as join5 } from "path";
 function getCommitlintConfig(asanaBaseUrl) {
-  const baseConfig = `// @ts-check
-
-/** @type {import('@commitlint/types').UserConfig} */
-const config = {
+  const baseConfig = `/** @type {import('@commitlint/types').UserConfig} */
+export default {
   extends: ['@commitlint/config-conventional'],
   rules: {
     // Type must be one of the conventional types
@@ -593,10 +579,12 @@ const config = {
     // Subject should be lowercase
     'subject-case': [2, 'always', 'lower-case'],
     // Header max length
-    'header-max-length': [2, 'always', 100],
-  },`;
+    'header-max-length': [2, 'always', 100],`;
   if (asanaBaseUrl) {
     return `${baseConfig}
+    // Asana task link (warning only - won't block commits)
+    'asana-task-link': [1, 'always'],
+  },
   plugins: [
     {
       rules: {
@@ -615,18 +603,11 @@ const config = {
     },
   ],
 };
-
-// Enable the Asana task link rule as a WARNING (level 1)
-// Change to level 2 if you want to BLOCK commits without Asana links
-config.rules['asana-task-link'] = [1, 'always'];
-
-module.exports = config;
 `;
   }
   return `${baseConfig}
+  },
 };
-
-module.exports = config;
 `;
 }
 async function generateCommitlint(targetDir, asanaBaseUrl) {
@@ -763,92 +744,37 @@ async function generateCzGit(targetDir, asanaBaseUrl) {
 }
 
 // src/generators/lint-staged.ts
-import { join as join7 } from "path";
-function getLintStagedConfig(projectType, usesEslint, usesPrettier, usesTypeScript) {
-  const rules = {};
+function getLintStagedConfig(usesEslint, usesPrettier, usesTypeScript) {
+  const config = {};
+  const codePatterns = [];
   if (usesTypeScript) {
-    const tsCommands = [];
-    if (usesEslint) {
-      tsCommands.push("eslint --fix");
-    }
-    if (usesPrettier) {
-      tsCommands.push("prettier --write");
-    }
-    if (tsCommands.length > 0) {
-      rules["*.{ts,tsx}"] = tsCommands;
-    }
+    codePatterns.push("ts", "mts", "cts", "tsx");
   }
-  const jsCommands = [];
+  codePatterns.push("js", "mjs", "cjs", "jsx");
+  const codeCommands = [];
   if (usesEslint) {
-    jsCommands.push("eslint --fix");
+    codeCommands.push("eslint --fix");
   }
   if (usesPrettier) {
-    jsCommands.push("prettier --write");
+    codeCommands.push("prettier --write");
   }
-  if (jsCommands.length > 0) {
-    rules["*.{js,jsx,mjs,cjs}"] = jsCommands;
+  if (codeCommands.length > 0) {
+    const pattern = `*.{${codePatterns.join(",")}}`;
+    config[pattern] = codeCommands;
   }
   if (usesPrettier) {
-    rules["*.{json,md,yaml,yml}"] = "prettier --write";
-  }
-  if (usesPrettier) {
-    rules["*.{css,scss,less}"] = "prettier --write";
-  }
-  if (projectType === "nx") {
-    return `// @ts-check
-
-/**
- * @type {import('lint-staged').Config}
- */
-module.exports = {
-${Object.entries(rules).map(([pattern, commands]) => {
-      const cmdStr = Array.isArray(commands) ? JSON.stringify(commands) : JSON.stringify([commands]);
-      return `  '${pattern}': ${cmdStr},`;
-    }).join("\n")}
-};
-`;
-  }
-  return `// @ts-check
-
-/**
- * @type {import('lint-staged').Config}
- */
-module.exports = {
-${Object.entries(rules).map(([pattern, commands]) => {
-    const cmdStr = Array.isArray(commands) ? JSON.stringify(commands) : JSON.stringify([commands]);
-    return `  '${pattern}': ${cmdStr},`;
-  }).join("\n")}
-};
-`;
-}
-async function generateLintStaged(targetDir, projectType, usesEslint, usesPrettier, usesTypeScript) {
-  const result = {
-    created: [],
-    modified: [],
-    skipped: [],
-    backedUp: []
-  };
-  const configPath = join7(targetDir, ".lintstagedrc.js");
-  const writeResult = await writeFileSafe(
-    configPath,
-    getLintStagedConfig(projectType, usesEslint, usesPrettier, usesTypeScript),
-    { backup: true }
-  );
-  if (writeResult.created) {
-    result.created.push(".lintstagedrc.js");
-    if (writeResult.backedUp) {
-      result.backedUp.push(writeResult.backedUp);
-    }
+    config["*.{json,css,md}"] = ["prettier --write"];
   }
-  return result;
+  return config;
 }
 
 // src/utils/package-json.ts
 import { readFile as readFile3, writeFile as writeFile2 } from "fs/promises";
 import { existsSync as existsSync4 } from "fs";
-import { join as join8 } from "path";
+import { join as join7 } from "path";
+import { spawn } from "child_process";
 async function readPackageJson(targetDir = process.cwd()) {
-  const pkgPath = join8(targetDir, "package.json");
+  const pkgPath = join7(targetDir, "package.json");
   if (!existsSync4(pkgPath)) {
     throw new Error(`No package.json found in ${targetDir}`);
   }
@@ -856,7 +782,7 @@ async function readPackageJson(targetDir = process.cwd()) {
   return JSON.parse(content);
 }
 async function writePackageJson(pkg, targetDir = process.cwd()) {
-  const pkgPath = join8(targetDir, "package.json");
+  const pkgPath = join7(targetDir, "package.json");
   const content = JSON.stringify(pkg, null, 2) + "\n";
   await writeFile2(pkgPath, content, "utf-8");
 }
@@ -873,16 +799,6 @@ function mergeScripts(pkg, scripts, overwrite = false) {
     scripts: newScripts
   };
 }
-function mergeDevDependencies(pkg, deps) {
-  const existingDeps = pkg.devDependencies || {};
-  return {
-    ...pkg,
-    devDependencies: {
-      ...existingDeps,
-      ...deps
-    }
-  };
-}
 function addPackageJsonConfig(pkg, key, config, overwrite = false) {
   if (!overwrite && pkg[key]) {
     return pkg;
@@ -892,15 +808,62 @@ function addPackageJsonConfig(pkg, key, config, overwrite = false) {
     [key]: config
   };
 }
-var RAFTSTACK_DEV_DEPENDENCIES = {
-  "@commitlint/cli": "^18.0.0",
-  "@commitlint/config-conventional": "^18.0.0",
-  "cz-git": "^1.8.0",
-  czg: "^1.8.0",
-  husky: "^9.0.0",
-  "lint-staged": "^15.0.0",
-  "validate-branch-name": "^1.3.0"
-};
+var RAFTSTACK_PACKAGES = [
+  // Commit tooling
+  "@commitlint/cli",
+  "@commitlint/config-conventional",
+  "cz-git",
+  "czg",
+  "husky",
+  "lint-staged",
+  "validate-branch-name",
+  // Linting & formatting
+  "eslint",
+  "@eslint/js",
+  "typescript-eslint",
+  "eslint-config-prettier",
+  "prettier",
+  "globals"
+];
+var REACT_ESLINT_PACKAGES = [
+  "eslint-plugin-react",
+  "eslint-plugin-react-hooks"
+];
+async function installPackages(pm, packages, targetDir) {
+  if (packages.length === 0) {
+    return { success: true };
+  }
+  return new Promise((resolve) => {
+    const addDevArgs = pm.addDev.split(" ");
+    const pmCommand = pm.name === "npm" ? "npm" : pm.name.replace("-berry", "");
+    const args = [...addDevArgs, ...packages];
+    const child = spawn(pmCommand, args, {
+      cwd: targetDir,
+      stdio: ["ignore", "pipe", "pipe"],
+      shell: process.platform === "win32"
+    });
+    let stderr = "";
+    child.stderr?.on("data", (data) => {
+      stderr += data.toString();
+    });
+    child.on("close", (code) => {
+      if (code === 0) {
+        resolve({ success: true });
+      } else {
+        resolve({
+          success: false,
+          error: stderr || `Installation failed with exit code ${code}`
+        });
+      }
+    });
+    child.on("error", (err) => {
+      resolve({
+        success: false,
+        error: err.message
+      });
+    });
+  });
+}
 
 // src/generators/branch-validation.ts
 function getBranchValidationConfig() {
@@ -939,7 +902,7 @@ async function generateBranchValidation(targetDir) {
 }
 
 // src/generators/pr-template.ts
-import { join as join9 } from "path";
+import { join as join8 } from "path";
 function getPRTemplate(hasAsana) {
   const asanaSection = hasAsana ? `## Asana Task
 <!-- Link to the Asana task -->
@@ -991,9 +954,9 @@ async function generatePRTemplate(targetDir, hasAsana) {
     skipped: [],
     backedUp: []
   };
-  const githubDir = join9(targetDir, ".github");
+  const githubDir = join8(targetDir, ".github");
   await ensureDir(githubDir);
-  const templatePath = join9(githubDir, "PULL_REQUEST_TEMPLATE.md");
+  const templatePath = join8(githubDir, "PULL_REQUEST_TEMPLATE.md");
   const writeResult = await writeFileSafe(
     templatePath,
     getPRTemplate(hasAsana),
@@ -1009,7 +972,7 @@ async function generatePRTemplate(targetDir, hasAsana) {
 }
 
 // src/generators/github-workflows.ts
-import { join as join10 } from "path";
+import { join as join9 } from "path";
 function getPRChecksWorkflow(projectType, usesTypeScript, usesEslint, pm) {
   const steps = [];
   steps.push(`      - name: Checkout
@@ -1090,9 +1053,9 @@ async function generateGitHubWorkflows(targetDir, projectType, usesTypeScript, u
     skipped: [],
     backedUp: []
   };
-  const workflowsDir = join10(targetDir, ".github", "workflows");
+  const workflowsDir = join9(targetDir, ".github", "workflows");
   await ensureDir(workflowsDir);
-  const prChecksPath = join10(workflowsDir, "pr-checks.yml");
+  const prChecksPath = join9(workflowsDir, "pr-checks.yml");
   const writeResult = await writeFileSafe(
     prChecksPath,
     getPRChecksWorkflow(projectType, usesTypeScript, usesEslint, pm),
@@ -1108,7 +1071,7 @@ async function generateGitHubWorkflows(targetDir, projectType, usesTypeScript, u
 }
 
 // src/generators/codeowners.ts
-import { join as join11 } from "path";
+import { join as join10 } from "path";
 function getCodeownersContent(owners) {
   if (owners.length === 0) {
     return `# CODEOWNERS file
@@ -1140,9 +1103,9 @@ async function generateCodeowners(targetDir, owners) {
     skipped: [],
     backedUp: []
   };
-  const githubDir = join11(targetDir, ".github");
+  const githubDir = join10(targetDir, ".github");
   await ensureDir(githubDir);
-  const codeownersPath = join11(githubDir, "CODEOWNERS");
+  const codeownersPath = join10(githubDir, "CODEOWNERS");
   const writeResult = await writeFileSafe(
     codeownersPath,
     getCodeownersContent(owners),
@@ -1158,7 +1121,7 @@ async function generateCodeowners(targetDir, owners) {
 }
 
 // src/generators/ai-review.ts
-import { join as join12 } from "path";
+import { join as join11 } from "path";
 function getCodeRabbitConfig() {
   return `# CodeRabbit Configuration
 # Learn more: https://docs.coderabbit.ai/guides/configure-coderabbit
@@ -1222,7 +1185,7 @@ async function generateAIReview(targetDir, tool) {
     return result;
   }
   if (tool === "coderabbit") {
-    const configPath = join12(targetDir, ".coderabbit.yaml");
+    const configPath = join11(targetDir, ".coderabbit.yaml");
     const writeResult = await writeFileSafe(configPath, getCodeRabbitConfig(), {
       backup: true
     });
@@ -1234,9 +1197,9 @@ async function generateAIReview(targetDir, tool) {
     }
   }
   if (tool === "copilot") {
-    const workflowsDir = join12(targetDir, ".github", "workflows");
+    const workflowsDir = join11(targetDir, ".github", "workflows");
     await ensureDir(workflowsDir);
-    const workflowPath = join12(workflowsDir, "copilot-review.yml");
+    const workflowPath = join11(workflowsDir, "copilot-review.yml");
     const writeResult = await writeFileSafe(workflowPath, getCopilotWorkflow(), {
       backup: true
     });
@@ -1251,7 +1214,7 @@ async function generateAIReview(targetDir, tool) {
 }
 
 // src/generators/branch-protection.ts
-import { join as join13 } from "path";
+import { join as join12 } from "path";
 function getBranchProtectionDocs() {
   return `# Branch Protection Setup Guide
 
@@ -1368,9 +1331,9 @@ async function generateBranchProtectionDocs(targetDir) {
     skipped: [],
     backedUp: []
   };
-  const docsDir = join13(targetDir, ".github");
+  const docsDir = join12(targetDir, ".github");
   await ensureDir(docsDir);
-  const docsPath = join13(docsDir, "BRANCH_PROTECTION_SETUP.md");
+  const docsPath = join12(docsDir, "BRANCH_PROTECTION_SETUP.md");
   const writeResult = await writeFileSafe(docsPath, getBranchProtectionDocs(), {
     backup: true
   });
@@ -1384,7 +1347,7 @@ async function generateBranchProtectionDocs(targetDir) {
 }
 
 // src/generators/contributing.ts
-import { join as join14 } from "path";
+import { join as join13 } from "path";
 function getContributingContent(hasAsana, pm) {
   const asanaSection = hasAsana ? `
 ## Linking to Asana
@@ -1523,7 +1486,7 @@ async function generateContributing(targetDir, hasAsana, pm) {
     skipped: [],
     backedUp: []
   };
-  const contributingPath = join14(targetDir, "CONTRIBUTING.md");
+  const contributingPath = join13(targetDir, "CONTRIBUTING.md");
   const writeResult = await writeFileSafe(
     contributingPath,
     getContributingContent(hasAsana, pm),
@@ -1539,16 +1502,16 @@ async function generateContributing(targetDir, hasAsana, pm) {
 }
 
 // src/generators/prettier.ts
-import { join as join15 } from "path";
+import { join as join14 } from "path";
 function getPrettierConfig() {
   return JSON.stringify(
     {
       semi: true,
-      singleQuote: true,
-      tabWidth: 2,
       trailingComma: "es5",
-      printWidth: 100,
-      bracketSpacing: true,
+      singleQuote: false,
+      printWidth: 80,
+      tabWidth: 2,
+      useTabs: false,
       arrowParens: "always",
       endOfLine: "lf"
     },
@@ -1557,31 +1520,14 @@ function getPrettierConfig() {
   ) + "\n";
 }
 function getPrettierIgnore() {
-  return `# Dependencies
-node_modules/
-
-# Build output
-dist/
-build/
-.next/
-out/
-
-# Coverage
-coverage/
-
-# IDE
-.idea/
-.vscode/
-
-# Generated files
-*.min.js
-*.min.css
-package-lock.json
+  return `node_modules
+dist
+build
+.turbo
+.next
+*.lock
 pnpm-lock.yaml
-yarn.lock
-
-# Other
-.git/
+coverage
 `;
 }
 function hasPrettierConfig(targetDir) {
@@ -1597,7 +1543,7 @@ function hasPrettierConfig(targetDir) {
     "prettier.config.cjs",
     "prettier.config.mjs"
   ];
-  return prettierFiles.some((file) => fileExists(join15(targetDir, file)));
+  return prettierFiles.some((file) => fileExists(join14(targetDir, file)));
 }
 async function generatePrettier(targetDir) {
   const result = {
@@ -1610,7 +1556,7 @@ async function generatePrettier(targetDir) {
     result.skipped.push(".prettierrc (already exists)");
     return result;
   }
-  const configPath = join15(targetDir, ".prettierrc");
+  const configPath = join14(targetDir, ".prettierrc");
   const configResult = await writeFileSafe(configPath, getPrettierConfig(), {
     backup: true
   });
@@ -1620,7 +1566,7 @@ async function generatePrettier(targetDir) {
       result.backedUp.push(configResult.backedUp);
     }
   }
-  const ignorePath = join15(targetDir, ".prettierignore");
+  const ignorePath = join14(targetDir, ".prettierignore");
   const ignoreResult = await writeFileSafe(ignorePath, getPrettierIgnore(), {
     backup: true,
     overwrite: false
@@ -1640,19 +1586,19 @@ async function generatePrettier(targetDir) {
 // src/generators/claude-skills.ts
 import { existsSync as existsSync5 } from "fs";
 import { readdir, copyFile as copyFile2 } from "fs/promises";
-import { join as join16, dirname as dirname2 } from "path";
+import { join as join15, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
 function getPackageSkillsDir() {
   const currentFilePath = fileURLToPath(import.meta.url);
-  const packageRoot = join16(dirname2(currentFilePath), "..");
-  return join16(packageRoot, ".claude", "skills");
+  const packageRoot = join15(dirname2(currentFilePath), "..");
+  return join15(packageRoot, ".claude", "skills");
 }
 async function copyDirectory(srcDir, destDir, result, baseDir) {
   await ensureDir(destDir);
   const entries = await readdir(srcDir, { withFileTypes: true });
   for (const entry of entries) {
-    const srcPath = join16(srcDir, entry.name);
-    const destPath = join16(destDir, entry.name);
+    const srcPath = join15(srcDir, entry.name);
+    const destPath = join15(destDir, entry.name);
     const relativePath = destPath.replace(baseDir + "/", "");
     if (entry.isDirectory()) {
       await copyDirectory(srcPath, destPath, result, baseDir);
@@ -1676,14 +1622,14 @@ async function generateClaudeSkills(targetDir) {
     backedUp: []
   };
   const packageSkillsDir = getPackageSkillsDir();
-  const targetSkillsDir = join16(targetDir, ".claude", "skills");
+  const targetSkillsDir = join15(targetDir, ".claude", "skills");
   if (!existsSync5(packageSkillsDir)) {
     console.warn(
       "Warning: Skills directory not found in package. Skipping skills generation."
     );
     return result;
   }
-  await ensureDir(join16(targetDir, ".claude"));
+  await ensureDir(join15(targetDir, ".claude"));
   await copyDirectory(packageSkillsDir, targetSkillsDir, result, targetDir);
   return result;
 }
@@ -1691,10 +1637,229 @@ async function generateClaudeSkills(targetDir) {
 // src/generators/eslint.ts
 import { existsSync as existsSync6 } from "fs";
 import { readFile as readFile4 } from "fs/promises";
-import { join as join17 } from "path";
+import { join as join16 } from "path";
+async function hasReact(targetDir) {
+  try {
+    const pkgPath = join16(targetDir, "package.json");
+    if (existsSync6(pkgPath)) {
+      const content = await readFile4(pkgPath, "utf-8");
+      const pkg = JSON.parse(content);
+      const deps = { ...pkg.dependencies, ...pkg.devDependencies };
+      return "react" in deps || "react-dom" in deps;
+    }
+  } catch {
+  }
+  return false;
+}
+function generateTsConfig(hasReactDep) {
+  if (hasReactDep) {
+    return `import eslint from "@eslint/js";
+import tseslint from "typescript-eslint";
+import eslintConfigPrettier from "eslint-config-prettier";
+import reactPlugin from "eslint-plugin-react";
+import reactHooksPlugin from "eslint-plugin-react-hooks";
+import globals from "globals";
+
+export default tseslint.config(
+  eslint.configs.recommended,
+  ...tseslint.configs.strict,
+  eslintConfigPrettier,
+  {
+    files: ["**/*.{ts,tsx}"],
+    languageOptions: {
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+      },
+    },
+    plugins: {
+      react: reactPlugin,
+      "react-hooks": reactHooksPlugin,
+    },
+    rules: {
+      // TypeScript rules
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        { argsIgnorePattern: "^_", varsIgnorePattern: "^_" },
+      ],
+      "@typescript-eslint/no-explicit-any": "warn",
+      "@typescript-eslint/consistent-type-imports": [
+        "warn",
+        { prefer: "type-imports" },
+      ],
+
+      // React rules
+      "react/react-in-jsx-scope": "off",
+      "react/prop-types": "off",
+      "react-hooks/rules-of-hooks": "error",
+      "react-hooks/exhaustive-deps": "warn",
+
+      // General rules
+      "no-console": ["warn", { allow: ["warn", "error"] }],
+    },
+    settings: {
+      react: {
+        version: "detect",
+      },
+    },
+  },
+  {
+    ignores: ["node_modules/", "dist/", "build/", ".next/", "coverage/", ".turbo/"],
+  }
+);
+`;
+  }
+  return `import eslint from "@eslint/js";
+import tseslint from "typescript-eslint";
+import eslintConfigPrettier from "eslint-config-prettier";
+import globals from "globals";
+
+export default tseslint.config(
+  eslint.configs.recommended,
+  ...tseslint.configs.strict,
+  eslintConfigPrettier,
+  {
+    files: ["**/*.{ts,tsx}"],
+    languageOptions: {
+      globals: {
+        ...globals.node,
+      },
+    },
+    rules: {
+      // TypeScript rules
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        { argsIgnorePattern: "^_", varsIgnorePattern: "^_" },
+      ],
+      "@typescript-eslint/no-explicit-any": "warn",
+      "@typescript-eslint/consistent-type-imports": [
+        "warn",
+        { prefer: "type-imports" },
+      ],
+
+      // General rules
+      "no-console": ["warn", { allow: ["warn", "error"] }],
+    },
+  },
+  {
+    ignores: ["node_modules/", "dist/", "build/", "coverage/", ".turbo/"],
+  }
+);
+`;
+}
+function generateJsConfig(hasReactDep) {
+  if (hasReactDep) {
+    return `import eslint from "@eslint/js";
+import eslintConfigPrettier from "eslint-config-prettier";
+import reactPlugin from "eslint-plugin-react";
+import reactHooksPlugin from "eslint-plugin-react-hooks";
+import globals from "globals";
+
+export default [
+  eslint.configs.recommended,
+  eslintConfigPrettier,
+  {
+    files: ["**/*.{js,jsx}"],
+    languageOptions: {
+      ecmaVersion: "latest",
+      sourceType: "module",
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+      },
+    },
+    plugins: {
+      react: reactPlugin,
+      "react-hooks": reactHooksPlugin,
+    },
+    rules: {
+      // React rules
+      "react/react-in-jsx-scope": "off",
+      "react/prop-types": "warn",
+      "react-hooks/rules-of-hooks": "error",
+      "react-hooks/exhaustive-deps": "warn",
+
+      // General rules
+      "no-console": ["warn", { allow: ["warn", "error"] }],
+      "no-unused-vars": ["error", { argsIgnorePattern: "^_", varsIgnorePattern: "^_" }],
+    },
+    settings: {
+      react: {
+        version: "detect",
+      },
+    },
+  },
+  {
+    ignores: ["node_modules/", "dist/", "build/", ".next/", "coverage/", ".turbo/"],
+  },
+];
+`;
+  }
+  return `import eslint from "@eslint/js";
+import eslintConfigPrettier from "eslint-config-prettier";
+import globals from "globals";
+
+export default [
+  eslint.configs.recommended,
+  eslintConfigPrettier,
+  {
+    files: ["**/*.js"],
+    languageOptions: {
+      ecmaVersion: "latest",
+      sourceType: "module",
+      globals: {
+        ...globals.node,
+      },
+    },
+    rules: {
+      // General rules
+      "no-console": ["warn", { allow: ["warn", "error"] }],
+      "no-unused-vars": ["error", { argsIgnorePattern: "^_", varsIgnorePattern: "^_" }],
+    },
+  },
+  {
+    ignores: ["node_modules/", "dist/", "build/", "coverage/", ".turbo/"],
+  },
+];
+`;
+}
+async function detectReact(targetDir) {
+  return hasReact(targetDir);
+}
+async function generateEslint(targetDir, usesTypeScript, force = false) {
+  const result = {
+    created: [],
+    modified: [],
+    skipped: [],
+    backedUp: []
+  };
+  if (!force && await hasEslint(targetDir)) {
+    result.skipped.push("eslint.config.js (ESLint already configured)");
+    return result;
+  }
+  const usesReact = await hasReact(targetDir);
+  const config = usesTypeScript ? generateTsConfig(usesReact) : generateJsConfig(usesReact);
+  const configPath = join16(targetDir, "eslint.config.js");
+  const writeResult = await writeFileSafe(configPath, config);
+  if (writeResult.backedUp) {
+    result.backedUp.push("eslint.config.js");
+  }
+  result.created.push("eslint.config.js");
+  return result;
+}
 
 // src/generators/quick-reference.ts
-import { join as join18 } from "path";
+import { join as join17 } from "path";
 async function generateQuickReference(targetDir, pm) {
   const result = {
     created: [],
@@ -1702,7 +1867,7 @@ async function generateQuickReference(targetDir, pm) {
     skipped: [],
     backedUp: []
   };
-  const quickRefPath = join18(targetDir, ".github", "QUICK_REFERENCE.md");
+  const quickRefPath = join17(targetDir, ".github", "QUICK_REFERENCE.md");
   const content = `# RaftStack Quick Reference
 
 > One-page guide for the RaftStack Git workflow
@@ -1838,9 +2003,9 @@ ${pm.run} test
 // src/utils/git.ts
 import { execa } from "execa";
 import { existsSync as existsSync7 } from "fs";
-import { join as join19 } from "path";
+import { join as join18 } from "path";
 async function isGitRepo(targetDir = process.cwd()) {
-  if (existsSync7(join19(targetDir, ".git"))) {
+  if (existsSync7(join18(targetDir, ".git"))) {
     return true;
   }
   try {
@@ -1885,7 +2050,7 @@ function mergeResults(results) {
     { created: [], modified: [], skipped: [], backedUp: [] }
   );
 }
-async function updateProjectPackageJson(targetDir, _config) {
+async function updateProjectPackageJson(targetDir, config) {
   const result = {
     created: [],
     modified: [],
@@ -1899,7 +2064,14 @@ async function updateProjectPackageJson(targetDir, _config) {
       commit: "czg"
     };
     pkg = mergeScripts(pkg, scripts, false);
-    pkg = mergeDevDependencies(pkg, RAFTSTACK_DEV_DEPENDENCIES);
+    const lintStagedConfig = getLintStagedConfig(
+      true,
+      // usesEslint - always true now since we install it
+      true,
+      // usesPrettier - always true now since we install it
+      config.usesTypeScript
+    );
+    pkg = addPackageJsonConfig(pkg, "lint-staged", lintStagedConfig, true);
     await writePackageJson(pkg, targetDir);
     result.modified.push("package.json");
   } catch (error) {
@@ -1928,6 +2100,32 @@ async function runInit(targetDir = process.cwd()) {
   if (!config) {
     return;
   }
+  const usesReact = await detectReact(targetDir);
+  const installSpinner = p2.spinner();
+  const packagesToInstall = usesReact ? [...RAFTSTACK_PACKAGES, ...REACT_ESLINT_PACKAGES] : RAFTSTACK_PACKAGES;
+  installSpinner.start("Installing dependencies...");
+  const installResult = await installPackages(
+    config.packageManager,
+    packagesToInstall,
+    targetDir
+  );
+  let installFailed = false;
+  if (installResult.success) {
+    installSpinner.stop("Dependencies installed!");
+  } else {
+    installSpinner.stop("Failed to install dependencies");
+    p2.log.warn(
+      pc2.yellow(
+        `Could not install dependencies automatically: ${installResult.error || "Unknown error"}`
+      )
+    );
+    p2.log.info(
+      pc2.dim(
+        `You can install them manually with: ${config.packageManager.name} ${config.packageManager.addDev} ${packagesToInstall.join(" ")}`
+      )
+    );
+    installFailed = true;
+  }
   const spinner4 = p2.spinner();
   spinner4.start("Generating configuration files...");
   const results = [];
@@ -1937,26 +2135,17 @@ async function runInit(targetDir = process.cwd()) {
     );
     results.push(await generateCommitlint(targetDir, config.asanaBaseUrl));
     results.push(await generateCzGit(targetDir, config.asanaBaseUrl));
-    results.push(
-      await generateLintStaged(
-        targetDir,
-        config.projectType,
-        config.usesEslint,
-        config.usesPrettier,
-        config.usesTypeScript
-      )
-    );
     results.push(await generateBranchValidation(targetDir));
-    if (!config.usesPrettier) {
-      results.push(await generatePrettier(targetDir));
-    }
+    results.push(await generateEslint(targetDir, config.usesTypeScript, false));
+    results.push(await generatePrettier(targetDir));
     results.push(await generatePRTemplate(targetDir, !!config.asanaBaseUrl));
     results.push(
       await generateGitHubWorkflows(
         targetDir,
         config.projectType,
         config.usesTypeScript,
-        config.usesEslint,
+        true,
+        // usesEslint - always true now
         config.packageManager
       )
     );
@@ -2009,15 +2198,17 @@ async function runInit(targetDir = process.cwd()) {
     }
   }
   console.log();
-  p2.note(
-    [
-      `${pc2.cyan("1.")} Run ${pc2.yellow(config.packageManager.install)} to install dependencies`,
-      `${pc2.cyan("2.")} Review the generated configuration files`,
-      `${pc2.cyan("3.")} Use ${pc2.yellow(`${config.packageManager.run} commit`)} for interactive commits`,
-      `${pc2.cyan("4.")} Set up branch protection rules (see .github/BRANCH_PROTECTION_SETUP.md)`
-    ].join("\n"),
-    "Next Steps"
-  );
+  const nextSteps = installFailed ? [
+    `${pc2.cyan("1.")} Run ${pc2.yellow(config.packageManager.install)} to install dependencies`,
+    `${pc2.cyan("2.")} Review the generated configuration files`,
+    `${pc2.cyan("3.")} Use ${pc2.yellow(`${config.packageManager.run} commit`)} for interactive commits`,
+    `${pc2.cyan("4.")} Set up branch protection rules (see .github/BRANCH_PROTECTION_SETUP.md)`
+  ] : [
+    `${pc2.cyan("1.")} Review the generated configuration files`,
+    `${pc2.cyan("2.")} Use ${pc2.yellow(`${config.packageManager.run} commit`)} for interactive commits`,
+    `${pc2.cyan("3.")} Set up branch protection rules (see .github/BRANCH_PROTECTION_SETUP.md)`
+  ];
+  p2.note(nextSteps.join("\n"), "Next Steps");
   p2.outro(pc2.green("RaftStack setup complete! Happy coding! \u{1F680}"));
 }
 
@@ -2426,7 +2617,7 @@ ${pc4.bold("Branches")}
 // package.json
 var package_default = {
   name: "@raftlabs/raftstack",
-  version: "1.4.2",
+  version: "1.6.0",
   description: "CLI tool for setting up Git hooks, commit conventions, and GitHub integration",
   type: "module",
   main: "./dist/index.js",