zixulu 1.71.1 → 1.71.3

package/dist/index.js

@@ -1421,126 +1421,23 @@ const config = {
     arrowParens: "avoid",
     endOfLine: "lf",
     printWidth: 160,
-    plugins: ["./prettier-plugin-sort-imports.mjs"],
+    plugins: ["@1adybug/prettier"],
     controlStatementBraces: "add",
 }
 
 export default config
 `;
-function getPluginConfig({ isTailwind, isReact }) {
-    const config = `// @ts-check
-
-import { readFileSync } from "fs"
-import { builtinModules } from "module"
-
-import removeBraces from "@1adybug/prettier-plugin-remove-braces"
-import { createPlugin } from "@1adybug/prettier-plugin-sort-imports"
-import JSON5 from "json5"
-import blockPadding from "prettier-plugin-block-padding"${isTailwind ? `
-import * as tailwindcss from "prettier-plugin-tailwindcss"` : ""}
-${isReact ? `
-/**
- * @param {string} path
- */
-function isReact(path) {
-    return /^@?react\\b/.test(path)
-}
-` : ""}
-/**
- * @param {string} path
- */
-function isBuiltin(path) {
-    return path.startsWith("node:") || builtinModules.includes(path)
-}
-
-/** @type {string[]} */
-let pathAlias = []
-
-try {
-    const tsConfig = JSON5.parse(readFileSync("tsconfig.json", "utf-8"))
-    pathAlias = Object.keys(tsConfig.compilerOptions?.paths ?? {})
-        .map(item => item.match(/^(@.*\\/)\\*/))
-        .filter(Boolean)
-        .map(item => /** @type {string} */ (item?.[1]))
-} catch {}
-
-/**
- * @param {string} path
- */
-function isAbsolute(path) {
-    return pathAlias.some(item => path.startsWith(item))
-}
-
-/**
- * @param {string} path
- */
-function isRelative(path) {
-    return path.startsWith("./") || path.startsWith("../")
-}
-
-/**
- * @param {string} a
- * @param {string} b
- */
-function compareGroupName(a, b) {
-    const orders = [${isReact ? '"react", ' : ""}"builtin", "third-party", "absolute", "relative"]
-
-    a = a.replace(/-side-effect$/, "")
-    b = b.replace(/-side-effect$/, "")
-    return orders.indexOf(a) - orders.indexOf(b) || a.localeCompare(b)
-}
-
-export default createPlugin({
-    getGroup({ path, isSideEffect }) {
-        if (isSideEffect) {${isReact ? `
-            if (isReact(path)) return "react-side-effect"` : ""}
-            if (isBuiltin(path)) return "builtin-side-effect"
-            if (isAbsolute(path)) return "absolute-side-effect"
-            if (isRelative(path)) return "relative-side-effect"
-            return "third-party-side-effect"
-        }
-${isReact ? `
-        if (isReact(path)) return "react"` : ""}
-        if (isBuiltin(path)) return "builtin"
-        if (isAbsolute(path)) return "absolute"
-        if (isRelative(path)) return "relative"
-        return "third-party"
-    },
-    sortGroup(a, b) {
-        return (
-            Number(a.isSideEffect) - Number(b.isSideEffect) ||
-            compareGroupName(a.name, b.name)
-        )
-    },
-    separator: "",
-    sortSideEffect: true,
-    removeUnusedImports: true,
-    otherPlugins: [blockPadding${isTailwind ? ", tailwindcss" : ""}, removeBraces],
-})
-`;
-    return config;
-}
 async function addPrettier() {
     consola_0.start("开始添加 prettier 配置");
-    const packageJson = await readPackageJson();
-    const isTailwind = Object.keys(packageJson.dependencies ?? {}).includes("tailwindcss") || Object.keys(packageJson.devDependencies ?? {}).includes("tailwindcss");
-    const isReact = await hasDependency("react");
-    await writeFile("prettier-plugin-sort-imports.mjs", getPluginConfig({
-        isTailwind,
-        isReact
-    }), "utf-8");
     await writeFile("prettier.config.mjs", prettierConfig, "utf-8");
     await writeFile(".prettierignore", ignoreConfig, "utf-8");
     const config2 = {
         package: [
             "prettier",
-            "@1adybug/prettier-plugin-sort-imports",
-            "prettier-plugin-block-padding",
-            "json5"
+            "@1adybug/prettier"
         ],
         type: "devDependencies"
     };
-    if (isTailwind) config2.package.push("prettier-plugin-tailwindcss");
     await addDependency(config2);
     const packageJson2 = await readPackageJson();
     packageJson2.scripts ??= {};
@@ -1579,7 +1476,7 @@ async function addPrettier() {
         }
         try {
             consola_0.start("配置 pre-commit hook");
-            const preCommitHook = "bunx lint-staged";
+            const preCommitHook = "npx lint-staged";
             await writeFile(".husky/pre-commit", preCommitHook, "utf-8");
             consola_0.success("pre-commit hook 配置成功");
         } catch (error) {