my-code-style 1.2.0 → 1.4.0

package/bin/init

@@ -62,42 +62,165 @@ function getProjectPkg() {
 }
 
 function getDependencyVersion(pkg, depName) {
-    return (pkg.dependencies && pkg.dependencies[depName])
-        || (pkg.devDependencies && pkg.devDependencies[depName])
-        || null
+    return (
+        (pkg.dependencies && pkg.dependencies[depName]) ||
+        (pkg.devDependencies && pkg.devDependencies[depName]) ||
+        (pkg.peerDependencies && pkg.peerDependencies[depName]) ||
+        null
+    )
 }
 
 // --- Detection helpers ---
 
 /**
- * Detect ESLint major version from package.json
- * Returns 8, 9, or null (not installed)
+ * Detect if project is configured as ECMAScript Module (ESM)
  */
-function detectEslintVersion() {
-    const pkg = getProjectPkg()
+function isEsmProject(pkg = getProjectPkg()) {
+    return pkg?.type === "module"
+}
+
+/**
+ * Detect ESLint major version from package.json or installed node_modules
+ * Returns 8, 9, or null (not installed or ambiguous)
+ */
+function detectEslintVersion(pkg = getProjectPkg(), rootDir = PROJECT_ROOT) {
     if (!pkg) return null
-    const version = getDependencyVersion(pkg, "eslint")
-    if (!version) return null
-    // Handle range specifiers like "^9.0.0", ">=8.0.0", "9.x"
+
+    // 1. If eslint is installed in node_modules, read its actual major version directly
+    try {
+        const installedPkgPath = path.resolve(rootDir, "node_modules", "eslint", "package.json")
+        if (fs.existsSync(installedPkgPath)) {
+            const installedPkg = JSON.parse(fs.readFileSync(installedPkgPath, "utf8"))
+            const installedMajor = parseInt(installedPkg.version?.split(".")[0], 10)
+            if (!Number.isNaN(installedMajor)) {
+                return installedMajor
+            }
+        }
+    } catch {
+        // Fall through to package.json dependency declaration
+    }
+
+    // 2. Parse package.json dependency declaration
+    let version = getDependencyVersion(pkg, "eslint")
+    if (!version || typeof version !== "string") return null
+
+    version = version.trim()
+
+    // Handle npm alias: e.g. "npm:eslint@^8.57.0"
+    if (version.startsWith("npm:")) {
+        const atIdx = version.lastIndexOf("@")
+        if (atIdx > 3) {
+            version = version.slice(atIdx + 1).trim()
+        }
+    }
+
+    // Handle workspace protocol: e.g. "workspace:^8.0.0", "workspace:*"
+    if (version.startsWith("workspace:")) {
+        version = version.slice("workspace:".length).trim()
+        if (version === "*" || version === "^" || version === "~") {
+            return null
+        }
+    }
+
+    // Unspecified or dynamic ranges
+    if (
+        version === "*" ||
+        version === "" ||
+        version.startsWith("catalog:") ||
+        version.startsWith("file:") ||
+        version.startsWith("link:")
+    ) {
+        return null
+    }
+
+    // npm tag: latest
+    if (version === "latest") {
+        return 9
+    }
+
+    // Range spanning both 8 and 9 (e.g. "^8.57.0 || ^9.0.0")
+    if (version.includes("||")) {
+        const parts = version.split("||").map((s) => s.trim())
+        const has8 = parts.some((p) => /\b8(?:\.\d+)?/.test(p))
+        const has9 = parts.some((p) => /\b9(?:\.\d+)?/.test(p))
+        if (has8 && has9) {
+            log("ESLint 依赖同时支持 8 与 9 且未安装本地副本，默认采用 ESLint 9 Flat Config")
+            return 9
+        }
+    }
+
+    // Explicit major 8 vs 9
+    const isMajor8 = /\b8(?:\.|\.x|\b)/.test(version) && !/^\s*(?:>=|\^)\s*9/.test(version)
+    const isMajor9 = /\b9(?:\.|\.x|\b)/.test(version) && !/<\s*9/.test(version)
+
+    if (isMajor8 && !isMajor9) return 8
+    if (isMajor9 && !isMajor8) return 9
+
+    // Fallback: check leading digit if available
     const match = version.match(/(\d+)/)
-    return match ? parseInt(match[1], 10) : null
+    if (match) {
+        return parseInt(match[1], 10)
+    }
+
+    return null
+}
+
+/**
+ * Detect if project is a uni-app project
+ */
+function isUniAppProject() {
+    const pkg = getProjectPkg()
+    if (!pkg) return false
+    const allDeps = {
+        ...(pkg.dependencies || {}),
+        ...(pkg.devDependencies || {}),
+        ...(pkg.peerDependencies || {}),
+    }
+    return !!(allDeps["@dcloudio/uni-app"] || allDeps["uni-app"])
+}
+
+/**
+ * Detect if project is a Vue project
+ */
+function isVueProject() {
+    const pkg = getProjectPkg()
+    if (!pkg) return false
+    const allDeps = {
+        ...(pkg.dependencies || {}),
+        ...(pkg.devDependencies || {}),
+        ...(pkg.peerDependencies || {}),
+    }
+    return !!(allDeps["vue"] || allDeps["@dcloudio/uni-app"] || allDeps["uni-app"])
+}
+
+/**
+ * Detect project type: "uniapp", "vue", or "base"
+ */
+function detectProjectType() {
+    if (isUniAppProject()) return "uniapp"
+    if (isVueProject()) return "vue"
+    return "base"
 }
 
 /**
  * Detect CSS preprocessor in use
- * Returns "scss", "less", or "none"
+ * Returns "scss", "less", "both", or "none"
  */
 function detectCssPreprocessor() {
     const pkg = getProjectPkg()
     if (!pkg) return "scss"
-    const allDeps = { ...(pkg.dependencies || {}), ...(pkg.devDependencies || {}) }
+    const allDeps = {
+        ...(pkg.dependencies || {}),
+        ...(pkg.devDependencies || {}),
+        ...(pkg.peerDependencies || {}),
+    }
 
     const hasSass = allDeps["sass"] || allDeps["node-sass"] || allDeps["sass-loader"]
     const hasLess = allDeps["less"] || allDeps["less-loader"]
 
+    if (hasSass && hasLess) return "both"
     if (hasLess && !hasSass) return "less"
     if (hasSass) return "scss"
-    if (hasLess) return "less"
 
     // Fallback: check for existing stylelint config
     if (fileExists(".stylelintrc.cjs") || fileExists(".stylelintrc.js")) {
@@ -105,33 +228,33 @@ function detectCssPreprocessor() {
             const stylelintFile = fileExists(".stylelintrc.cjs")
                 ? ".stylelintrc.cjs"
                 : ".stylelintrc.js"
-            const content = fs.readFileSync(
-                path.resolve(PROJECT_ROOT, stylelintFile),
-                "utf8"
-            )
-            if (content.includes("postcss-less")) return "less"
+            const content = fs.readFileSync(path.resolve(PROJECT_ROOT, stylelintFile), "utf8")
+            const hasPostcssLess = content.includes("postcss-less")
+            const hasPostcssScss =
+                content.includes("postcss-scss") || content.includes("my-code-style/stylelint")
+            if (hasPostcssLess && hasPostcssScss) return "both"
+            if (hasPostcssLess) return "less"
         } catch {}
+        return "scss"
     }
 
-    return "scss" // default
-}
+    // If not a Vue/uni-app project and no css preprocessor found, skip stylelint
+    if (!isVueProject()) {
+        return "none"
+    }
 
-/**
- * Detect if project is a uni-app project
- */
-function isUniAppProject() {
-    const pkg = getProjectPkg()
-    if (!pkg) return false
-    const allDeps = { ...(pkg.dependencies || {}), ...(pkg.devDependencies || {}) }
-    return !!(allDeps["@dcloudio/uni-app"] || allDeps["uni-app"])
+    return "scss" // default for Vue/uni-app projects
 }
 
 // --- Config templates ---
 
-function eslintrcContent(isUniApp) {
-    const importPath = isUniApp
-        ? "my-code-style/eslint/uniapp"
-        : "my-code-style/eslint/vue3"
+function eslintrcContent(projectType) {
+    let importPath = "my-code-style/eslint"
+    if (projectType === "uniapp") {
+        importPath = "my-code-style/eslint/uniapp"
+    } else if (projectType === "vue") {
+        importPath = "my-code-style/eslint/vue3"
+    }
 
     return `// ESLint config — powered by my-code-style
 // https://www.npmjs.com/package/my-code-style
@@ -144,19 +267,22 @@ module.exports = config
 `
 }
 
-function eslintFlatConfigContent(isUniApp) {
-    const importPath = isUniApp
-        ? "my-code-style/eslint/flat/uniapp"
-        : "my-code-style/eslint/flat/vue3"
-    const varName = isUniApp ? "uniappConfig" : "vue3Config"
+function eslintFlatConfigContent(projectType) {
+    let importPath = "my-code-style/eslint/flat"
+    let varName = "baseConfig"
+    if (projectType === "uniapp") {
+        importPath = "my-code-style/eslint/flat/uniapp"
+        varName = "uniappConfig"
+    } else if (projectType === "vue") {
+        importPath = "my-code-style/eslint/flat/vue3"
+        varName = "vue3Config"
+    }
 
     return `// ESLint Flat Config — powered by my-code-style
 // https://www.npmjs.com/package/my-code-style
 import ${varName} from "${importPath}"
 
-export default [
-    ...${varName},
-]
+export default [...${varName}]
 `
 }
 
@@ -171,9 +297,8 @@ function prettierignoreContent() {
 }
 
 function stylelintrcContent(cssPreprocessor) {
-    const importPath = cssPreprocessor === "less"
-        ? "my-code-style/stylelint/less"
-        : "my-code-style/stylelint"
+    const importPath =
+        cssPreprocessor === "less" ? "my-code-style/stylelint/less" : "my-code-style/stylelint"
 
     return `// Stylelint config — powered by my-code-style
 module.exports = require("${importPath}")
@@ -209,19 +334,11 @@ module.exports = require("my-code-style/versionrc")
 }
 
 function huskyCommitMsg() {
-    return `#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx --no-install commitlint --edit
-`
+    return `npx --no-install commitlint --edit "\${1}"\n`
 }
 
 function huskyPreCommit() {
-    return `#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx --no-install -- lint-staged
-`
+    return `npx --no-install -- lint-staged\n`
 }
 
 function editorconfigContent() {
@@ -232,26 +349,59 @@ function gitattributesContent() {
     return readTemplate("src/gitattributes")
 }
 
+function gitignoreContent() {
+    return readTemplate("src/gitignore")
+}
+
 /**
  * Generate the lint-staged config based on detected CSS preprocessor
  */
 function getLintStagedConfig(cssPreprocessor) {
-    const styleFiles = cssPreprocessor === "less"
-        ? "**/*.{vue,css,less,html}"
-        : cssPreprocessor === "none"
-            ? "**/*.{vue,html}"
-            : "**/*.{vue,css,scss,html}"
-
-    return {
-        "**/*.{html,vue,ts,cjs,json,md}": ["prettier --write"],
-        "**/*.{vue,js,ts,jsx,tsx}": ["eslint --cache --fix"],
-        [styleFiles]: ["stylelint --fix"],
+    // Disjoint groups: a file is owned by exactly one task array.
+    // lint-staged runs each array in order, while unrelated groups may run concurrently.
+    const componentTasks = ["prettier --write", "eslint --fix"]
+    const styleTasks = ["prettier --write"]
+    if (cssPreprocessor !== "none") {
+        componentTasks.push("stylelint --fix")
+        styleTasks.push("stylelint --fix")
+    }
+    const styleFiles =
+        cssPreprocessor === "both"
+            ? "**/*.{html,css,scss,less}"
+            : cssPreprocessor === "less"
+              ? "**/*.{html,css,less}"
+              : cssPreprocessor === "scss"
+                ? "**/*.{html,css,scss}"
+                : "**/*.{html,css}"
+    const config = {
+        "**/*.{vue,nvue}": componentTasks,
+        "**/*.{js,ts,jsx,tsx,cjs,mjs,mts,cts}": ["prettier --write", "eslint --fix"],
+        [styleFiles]: styleTasks,
+        "**/*.{json,json5,md,yml,yaml}": ["prettier --write"],
     }
+
+    return config
 }
 
 // --- Main ---
 
 function main() {
+    const args = process.argv.slice(2)
+    const supported = new Set(["--dry-run", "--backup", "--version", "-v", "--help", "-h"])
+    const unknown = args.filter((arg) => !supported.has(arg))
+    if (unknown.length) {
+        console.error(`未知参数: ${unknown.join(", ")}；使用 --help 查看帮助`)
+        process.exitCode = 1
+        return
+    }
+    if (args.includes("--help") || args.includes("-h")) {
+        console.log("Usage: my-code-style-init [--dry-run] [--backup] [--version|-v] [--help|-h]")
+        console.log("  --backup   覆盖已有配置前将其备份到 .my-code-style-backup/ 目录")
+        console.log("  --dry-run  试运行，仅输出将执行的变更，不写入任何文件")
+        console.log("初始化会覆盖部分配置和 hooks；请先备份并运行 --dry-run。")
+        return
+    }
+
     // Handle --version / -v
     if (process.argv.includes("--version") || process.argv.includes("-v")) {
         const pkg = require("../package.json")
@@ -259,6 +409,34 @@ function main() {
         return
     }
 
+    // Validate before detection or any filesystem writes. Missing package.json
+    // remains supported, but malformed manifests must never be treated as empty.
+    if (fileExists("package.json")) {
+        try {
+            const pkg = JSON.parse(
+                fs.readFileSync(path.resolve(PROJECT_ROOT, "package.json"), "utf8"),
+            )
+            if (!pkg || typeof pkg !== "object" || Array.isArray(pkg)) {
+                throw new Error("package.json 必须是 JSON 对象")
+            }
+            for (const key of ["dependencies", "devDependencies", "peerDependencies", "scripts"]) {
+                if (pkg[key] === undefined) continue
+                if (
+                    !pkg[key] ||
+                    typeof pkg[key] !== "object" ||
+                    Array.isArray(pkg[key]) ||
+                    Object.values(pkg[key]).some((value) => typeof value !== "string")
+                ) {
+                    throw new Error(`${key} 必须是值为字符串的对象`)
+                }
+            }
+        } catch (error) {
+            console.error(`无法读取有效的 package.json：${error.message}；未修改任何文件`)
+            process.exitCode = 1
+            return
+        }
+    }
+
     const dryRun = process.argv.includes("--dry-run")
     const label = dryRun ? "[DRY RUN] " : ""
 
@@ -274,31 +452,77 @@ function main() {
     // --- Detection phase ---
     const eslintVersion = detectEslintVersion()
     const cssPreprocessor = detectCssPreprocessor()
-    const uniApp = isUniAppProject()
+    const projectType = detectProjectType()
 
     // Determine ESLint format
-    const useFlatConfig = eslintVersion === 9
+    const hasLegacyConfigFile =
+        fileExists(".eslintrc.js") ||
+        fileExists(".eslintrc.cjs") ||
+        fileExists(".eslintrc.json") ||
+        fileExists(".eslintrc.yaml") ||
+        fileExists(".eslintrc.yml") ||
+        fileExists(".eslintrc")
+
+    const hasFlatConfigFile =
+        fileExists("eslint.config.mjs") ||
+        fileExists("eslint.config.js") ||
+        fileExists("eslint.config.ts") ||
+        fileExists("eslint.config.cjs")
+
+    if (eslintVersion !== null && eslintVersion < 8) {
+        console.error(`不支持 ESLint ${eslintVersion} 版本；本配置包仅支持 ESLint 8 或 9，未修改任何文件`)
+        process.exitCode = 1
+        return
+    }
+
+    // Do not silently mix an installed major version with an incompatible format.
+    if (
+        (eslintVersion >= 9 && hasLegacyConfigFile && !hasFlatConfigFile) ||
+        (eslintVersion === 8 && hasFlatConfigFile)
+    ) {
+        console.error("ESLint 版本与已有配置格式冲突；请先手动迁移或确认配置格式，未修改任何文件")
+        process.exitCode = 1
+        return
+    }
+    if (!eslintVersion && hasLegacyConfigFile && !hasFlatConfigFile) {
+        console.error(
+            "检测到传统 ESLint 配置但无法确定版本；请先声明 ESLint 版本或迁移到 Flat Config，未修改任何文件",
+        )
+        process.exitCode = 1
+        return
+    }
+    const useFlatConfig = eslintVersion !== 8
     const eslintFormat = useFlatConfig ? "flat" : "eslintrc"
 
-    log(`检测到 ESLint 版本: ${eslintVersion || "未知"} → 使用 ${eslintFormat} 格式`)
-    log(`检测到 CSS 预处理器: ${cssPreprocessor}`)
-    if (uniApp) log(`检测到 uni-app 项目`)
+    log(`检测到 ESLint 版本: ${eslintVersion || "默认最新 (9+)"} → 使用 ${eslintFormat} 格式`)
+    log(
+        `检测到项目类型: ${projectType === "uniapp" ? "uni-app" : projectType === "vue" ? "Vue" : "Node/TS 基础"}`,
+    )
+    log(
+        `检测到 CSS 预处理器: ${cssPreprocessor === "both" ? "SCSS + Less (混合)" : cssPreprocessor}`,
+    )
     console.log("")
 
     // --- Build file list based on detection ---
     const files = []
 
-    if (useFlatConfig) {
+    if (hasFlatConfigFile || hasLegacyConfigFile) {
+        log("保留已有 ESLint 配置，不生成额外入口")
+    } else if (useFlatConfig) {
         files.push({
             path: "eslint.config.mjs",
-            exists: fileExists("eslint.config.mjs") || fileExists("eslint.config.js") || fileExists("eslint.config.ts"),
-            content: eslintFlatConfigContent(uniApp),
+            exists:
+                fileExists("eslint.config.mjs") ||
+                fileExists("eslint.config.js") ||
+                fileExists("eslint.config.ts") ||
+                fileExists("eslint.config.cjs"),
+            content: eslintFlatConfigContent(projectType),
         })
     } else {
         files.push({
             path: ".eslintrc.cjs",
             exists: fileExists(".eslintrc.cjs"),
-            content: eslintrcContent(uniApp),
+            content: eslintrcContent(projectType),
         })
     }
 
@@ -331,9 +555,19 @@ function main() {
         content: commitlintrcContent(),
     })
 
+    const isEsm = isEsmProject()
+    let versionrcPath = ".versionrc.js"
+    if (fileExists(".versionrc.cjs") || isEsm) {
+        versionrcPath = ".versionrc.cjs"
+    }
+
+    if (isEsm && fileExists(".versionrc.js") && !fileExists(".versionrc.cjs")) {
+        warn("检测到 ESM 项目 (type: module) 存在旧的 .versionrc.js，standard-version 需使用 .versionrc.cjs")
+    }
+
     files.push({
-        path: ".versionrc.js",
-        exists: fileExists(".versionrc.js"),
+        path: versionrcPath,
+        exists: fileExists(versionrcPath),
         content: versionrcContent(),
     })
 
@@ -349,6 +583,14 @@ function main() {
         content: gitattributesContent(),
     })
 
+    if (!fileExists(".gitignore")) {
+        files.push({
+            path: ".gitignore",
+            exists: false,
+            content: gitignoreContent(),
+        })
+    }
+
     // Show what will be created/overwritten
     for (const f of files) {
         if (f.exists) {
@@ -385,33 +627,137 @@ function main() {
         return
     }
 
-    // Actually write files
-    for (const f of files) {
-        writeFile(f.path, f.content)
+    // Optional backup of existing files before modifying
+    const backup = args.includes("--backup")
+    if (backup) {
+        const backupDir = path.resolve(PROJECT_ROOT, ".my-code-style-backup")
+        ensureDir(backupDir)
+        for (const item of [...files, ...hooks]) {
+            if (fileExists(item.path)) {
+                const srcPath = path.resolve(PROJECT_ROOT, item.path)
+                const targetPath = path.resolve(backupDir, item.path)
+                ensureDir(path.dirname(targetPath))
+                fs.copyFileSync(srcPath, targetPath)
+                log(`已备份 ${item.path} -> .my-code-style-backup/${item.path}`)
+            }
+        }
     }
 
-    // Husky
-    if (!hasHusky) {
-        ensureDir(huskyDir)
+    // ESLint 8 directory traversal defaults to .js; explicitly include typed
+    // files and the selected component formats so `lint` cannot silently skip them.
+    const legacyExtensions =
+        ".js,.cjs,.mjs,.ts,.mts,.cts,.jsx,.tsx" +
+        (projectType !== "base" ? ",.vue" : "") +
+        (projectType === "uniapp" ? ",.nvue" : "")
+    const lintCommand = useFlatConfig ? "eslint ." : `eslint . --ext ${legacyExtensions}`
+
+    // Take snapshot of files and hooks before making any filesystem modifications
+    const snapshot = new Map()
+    for (const f of files) {
+        const abs = path.resolve(PROJECT_ROOT, f.path)
+        let existed = false
+        let isFile = false
+        let content = null
+        try {
+            if (fs.existsSync(abs)) {
+                existed = true
+                isFile = fs.statSync(abs).isFile()
+                if (isFile) content = fs.readFileSync(abs, "utf8")
+            }
+        } catch {}
+        snapshot.set(f.path, { existed, isFile, content })
     }
     for (const h of hooks) {
-        writeFile(h.path, h.content)
-        fs.chmodSync(path.resolve(PROJECT_ROOT, h.path), 0o755)
-    }
-
-    // package.json scripts + lint-staged
-    modifyPackageJson({
-        scripts: {
-            prepare: "husky",
-            release: "standard-version",
-            cz: "czg",
-        },
-        "lint-staged": getLintStagedConfig(cssPreprocessor),
-    })
-    success("更新 package.json (scripts + lint-staged)")
+        const abs = path.resolve(PROJECT_ROOT, h.path)
+        let existed = false
+        let isFile = false
+        let content = null
+        let mode = undefined
+        try {
+            if (fs.existsSync(abs)) {
+                existed = true
+                const stat = fs.statSync(abs)
+                isFile = stat.isFile()
+                mode = stat.mode
+                if (isFile) content = fs.readFileSync(abs, "utf8")
+            }
+        } catch {}
+        snapshot.set(h.path, { existed, isFile, content, mode })
+    }
+    const pkgPath = path.resolve(PROJECT_ROOT, "package.json")
+    const hadPkg = fs.existsSync(pkgPath)
+    let pkgContent = null
+    try {
+        if (hadPkg && fs.statSync(pkgPath).isFile()) {
+            pkgContent = fs.readFileSync(pkgPath, "utf8")
+        }
+    } catch {}
+    const hadHuskyDir = fs.existsSync(huskyDir)
+
+    try {
+        // Actually write files
+        for (const f of files) {
+            writeFile(f.path, f.content)
+        }
+
+        // Husky
+        if (!hasHusky) {
+            ensureDir(huskyDir)
+        }
+        for (const h of hooks) {
+            writeFile(h.path, h.content)
+            fs.chmodSync(path.resolve(PROJECT_ROOT, h.path), 0o755)
+        }
+
+        // package.json scripts + lint-staged
+        modifyPackageJson({
+            scripts: {
+                lint: lintCommand,
+                "lint:fix": `${lintCommand} --fix`,
+                format: "prettier --write .",
+                prepare: "husky",
+                release: "standard-version",
+                cz: "czg",
+            },
+            "lint-staged": getLintStagedConfig(cssPreprocessor),
+        })
+        success("更新 package.json (scripts + lint-staged)")
+    } catch (err) {
+        console.error(`\n  ✖ 初始化写入失败: ${err.message}；正在回滚...`)
+        for (const [relPath, info] of snapshot.entries()) {
+            const abs = path.resolve(PROJECT_ROOT, relPath)
+            try {
+                if (info.existed && info.isFile) {
+                    fs.writeFileSync(abs, info.content, "utf8")
+                    if (info.mode !== undefined) {
+                        fs.chmodSync(abs, info.mode)
+                    }
+                } else if (!info.existed && fs.existsSync(abs)) {
+                    fs.rmSync(abs, { force: true, recursive: true })
+                }
+            } catch (rollbackErr) {
+                console.error(`  回滚文件失败: ${relPath} (${rollbackErr.message})`)
+            }
+        }
+        if (hadPkg) {
+            fs.writeFileSync(pkgPath, pkgContent, "utf8")
+        } else if (fs.existsSync(pkgPath)) {
+            fs.rmSync(pkgPath, { force: true })
+        }
+        if (!hadHuskyDir && fs.existsSync(huskyDir)) {
+            try {
+                if (fs.readdirSync(huskyDir).length === 0) {
+                    fs.rmdirSync(huskyDir)
+                }
+            } catch {}
+        }
+        console.error("  ✓ 已成功回滚所有更改，工作区已恢复原始状态。\n")
+        process.exitCode = 1
+        return
+    }
 
     // Check for missing peerDependencies
-    checkPeerDeps({ useFlatConfig, cssPreprocessor })
+    checkPeerDeps({ useFlatConfig, cssPreprocessor, projectType })
 
     console.log("")
     success("配置初始化完成！")
@@ -441,25 +787,38 @@ function modifyPackageJson(updates) {
         pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"))
     }
 
-    // Merge scripts
+    // Merge scripts: updates won't overwrite existing scripts with the same key
     if (updates.scripts) {
-        pkg.scripts = { ...pkg.scripts, ...updates.scripts }
+        pkg.scripts = { ...updates.scripts, ...(pkg.scripts || {}) }
     }
 
-    // Merge lint-staged
+    // Set lint-staged (replace existing lint-staged to avoid stale/duplicate patterns)
     if (updates["lint-staged"]) {
-        pkg["lint-staged"] = { ...pkg["lint-staged"], ...updates["lint-staged"] }
+        pkg["lint-staged"] = updates["lint-staged"]
     }
 
     fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 4) + "\n", "utf8")
 }
 
-function checkPeerDeps({ useFlatConfig = false, cssPreprocessor = "scss" } = {}) {
+function checkPeerDeps({
+    useFlatConfig = false,
+    cssPreprocessor = "scss",
+    projectType = "base",
+} = {}) {
+    const pkg = getProjectPkg()
+    if (!pkg) return
+
+    // If running within the package itself, skip external missing deps check
+    if (pkg.name === "my-code-style") {
+        return
+    }
+
     const baseDeps = [
         "eslint",
         "prettier",
-        "eslint-plugin-vue",
+        ...(projectType !== "base" ? ["eslint-plugin-vue"] : []),
         "@commitlint/cli",
+        "@commitlint/config-conventional",
         "husky",
         "lint-staged",
         "czg",
@@ -467,25 +826,73 @@ function checkPeerDeps({ useFlatConfig = false, cssPreprocessor = "scss" } = {})
     ]
 
     const flatDeps = useFlatConfig
-        ? ["typescript-eslint", "vue-eslint-parser", "globals", "eslint-plugin-import-x", "@eslint/js", "eslint-plugin-prettier", "eslint-config-prettier"]
-        : ["@typescript-eslint/parser", "@typescript-eslint/eslint-plugin", "eslint-plugin-prettier", "eslint-config-prettier"]
-
-    const cssDeps = cssPreprocessor === "scss"
-        ? ["stylelint", "postcss-scss", "postcss-html"]
-        : cssPreprocessor === "less"
-            ? ["stylelint", "postcss-less", "postcss-html"]
-            : []
+        ? [
+              "typescript-eslint",
+              "eslint-import-resolver-typescript",
+              ...(projectType !== "base" ? ["vue-eslint-parser"] : []),
+              "globals",
+              "eslint-plugin-import-x",
+              "@eslint/js",
+              "eslint-plugin-prettier",
+              "eslint-config-prettier",
+          ]
+        : [
+              "@typescript-eslint/parser",
+              "@typescript-eslint/eslint-plugin",
+              ...(projectType !== "base" ? ["vue-eslint-parser"] : []),
+              "eslint-plugin-import",
+              "eslint-import-resolver-typescript",
+              "eslint-plugin-prettier",
+              "eslint-config-prettier",
+          ]
+
+    const cssDeps =
+        cssPreprocessor === "both"
+            ? [
+                  "stylelint",
+                  "postcss-scss",
+                  "postcss-less",
+                  "postcss-html",
+                  "stylelint-config-recommended",
+                  "stylelint-config-recommended-scss",
+                  "stylelint-config-recommended-vue",
+                  "stylelint-config-html",
+                  "stylelint-config-recess-order",
+                  "stylelint-prettier",
+              ]
+            : cssPreprocessor === "scss"
+              ? [
+                    "stylelint",
+                    "postcss-scss",
+                    "postcss-html",
+                    "stylelint-config-recommended",
+                    "stylelint-config-recommended-scss",
+                    "stylelint-config-recommended-vue",
+                    "stylelint-config-html",
+                    "stylelint-config-recess-order",
+                    "stylelint-prettier",
+                ]
+              : cssPreprocessor === "less"
+                ? [
+                      "stylelint",
+                      "postcss-less",
+                      "postcss-html",
+                      "stylelint-config-recommended",
+                      "stylelint-config-recommended-vue",
+                      "stylelint-config-html",
+                      "stylelint-config-recess-order",
+                      "stylelint-prettier",
+                  ]
+                : []
 
     const allPeerDeps = [...baseDeps, ...flatDeps, ...cssDeps]
 
     // Read peer dependency versions from my-code-style package.json
-    const packagePkg = JSON.parse(fs.readFileSync(path.resolve(PACKAGE_DIR, "package.json"), "utf8"))
+    const packagePkg = JSON.parse(
+        fs.readFileSync(path.resolve(PACKAGE_DIR, "package.json"), "utf8"),
+    )
     const peerDeps = packagePkg.peerDependencies || {}
 
-    const pkgPath = path.resolve(PROJECT_ROOT, "package.json")
-    if (!fileExists("package.json")) return
-
-    const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"))
     const allDeps = {
         ...(pkg.dependencies || {}),
         ...(pkg.devDependencies || {}),
@@ -499,7 +906,8 @@ function checkPeerDeps({ useFlatConfig = false, cssPreprocessor = "scss" } = {})
         warn("一键安装命令：")
         console.log(`  pnpm add -D my-code-style \\`)
         missing.forEach((dep, i) => {
-            const version = peerDeps[dep] || ""
+            const version =
+                dep === "eslint" ? (useFlatConfig ? "^9.0.0" : "^8.57.0") : peerDeps[dep] || ""
             const depWithVersion = version ? `${dep}@${version}` : dep
             const suffix = i < missing.length - 1 ? " \\" : ""
             console.log(`  ${depWithVersion}${suffix}`)