🚀 better config

Author: MarkShawn2020

assets/branding/totem-gen/totem-gen.logo.svg

@@ -1,6 +1,6 @@
 {
   "name": "@cs-magic/eslint-config",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Shared ESLint configurations for CS Magic projects",
   "exports": {
     ".": "./src/base.js",
@@ -22,15 +22,15 @@
     "eslint": ">=8.0.0",
     "typescript": ">=4.0.0"
   },
-  "devDependencies": {
+  "dependencies": {
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.0",
     "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-jsx-a11y": "^6.8.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.33.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "prettier-plugin-organize-imports": "^4.1.0"

packages/tools/eslint-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cs-magic/prettier-config",
-  "version": "0.2.0",
+  "version": "0.5.0",
   "description": "Shared Prettier configurations for CS Magic projects",
   "main": "src/index.js",
   "publishConfig": {
@@ -12,10 +12,6 @@
   "peerDependencies": {
     "prettier": ">=3.0.0"
   },
-  "dependencies": {
-    "prettier-plugin-organize-imports": "^3.0.0",
-    "prettier-plugin-tailwindcss": "^0.5.0"
-  },
   "keywords": [
     "prettier",
     "prettierconfig",
@@ -25,8 +21,13 @@
   ],
   "author": "CS Magic",
   "license": "MIT",
+  "dependencies": {
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "prettier-plugin-organize-imports": "^3.0.0",
+    "prettier-plugin-tailwindcss": "^0.5.0"
+  },
   "devDependencies": {
-    "@cs-magic/ts-config": "workspace:^",
+    "@cs-magic/ts-config": "*",
     "@types/copyfiles": "^2",
     "@types/jest": "^29.5.14",
     "copyfiles": "^2.4.1",

packages/tools/prettier-config/package.json

@@ -33,31 +33,21 @@ module.exports = {
   // importOrderParserPlugins: ['typescript', 'jsx', 'decorators-legacy'],
   // importOrderTypeScriptVersion: '5.0.0',
   importOrder: [
-    // 普通第三方依赖，不是 @cs-magic 不是 @/ 不是 ./ 不是 ../ 开头
-    // "^(?!@cs-magic|@/|\\./|\\.\\./).*",
+    // 第三方依赖
+    "^[^@\\.]",
 
-    "^@cs-magic/.*?$", // @cs-magic 开头
+    // 内部包
+    "^@cs-magic/",
+    "^@/",
 
-    // todo: why this not work
-    "^.prisma/.*?$",
+    // 相对路径
+    "^\\.\\./*",
+    "^\\./*",
 
-    "^contentlayer/.*?$",
-
-    "^@assets/(.*)$",
-
-    "^@/(.*)$",
-
-    // 父级组件
-    "^../.*?$",
-
-    // 同级组件
-    "^./.*?$",
+    // 样式文件
+    "^.*\\.(css|scss|sass|less|styl)$",
   ],
   importOrderSeparation: true,
   importOrderSortSpecifiers: true,
-  plugins: [
-    "@trivago/prettier-plugin-sort-imports",
-    // 让 Prettier 遵循 ESLint 的排序规则
-    "prettier-plugin-organize-imports",
-  ],
+  plugins: ["@trivago/prettier-plugin-sort-imports", "prettier-plugin-organize-imports"],
 }

packages/tools/prettier-config/src/index.js

@@ -1,11 +1,11 @@
 // tailwind.js - Tailwind CSS 专用配置
 module.exports = {
-    ...require('./index'),
+  ...require("./index"),
 
-    // 使用 Tailwind CSS 插件
-    plugins: ['prettier-plugin-tailwindcss'],
+  // 使用 Tailwind CSS 插件
+  plugins: ["prettier-plugin-tailwindcss"],
 
-    // Tailwind 特定配置
-    tailwindAttributes: ['className', 'tw', 'clsx'],
-    tailwindFunctions: ['cx', 'clsx', 'cva', 'tw'],
+  // Tailwind 特定配置
+  tailwindAttributes: ["className", "tw", "clsx"],
+  tailwindFunctions: ["cx", "clsx", "cva", "tw"],
 }

packages/tools/prettier-config/src/tailwind.js

@@ -2903,7 +2903,7 @@ __metadata:
     eslint-import-resolver-typescript: "npm:^3.6.0"
     eslint-plugin-import: "npm:^2.29.0"
     eslint-plugin-jsx-a11y: "npm:^6.8.0"
-    eslint-plugin-prettier: "npm:^5.0.0"
+    eslint-plugin-prettier: "npm:^5.2.1"
     eslint-plugin-react: "npm:^7.33.0"
     eslint-plugin-react-hooks: "npm:^4.6.0"
     prettier-plugin-organize-imports: "npm:^4.1.0"
@@ -3500,7 +3500,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@cs-magic/prettier-config@workspace:packages/tools/prettier-config"
   dependencies:
-    "@cs-magic/ts-config": "workspace:^"
+    "@cs-magic/ts-config": "npm:*"
+    "@trivago/prettier-plugin-sort-imports": "npm:^4.3.0"
     "@types/copyfiles": "npm:^2"
     "@types/jest": "npm:^29.5.14"
     copyfiles: "npm:^2.4.1"
@@ -3763,7 +3764,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@cs-magic/ts-config@workspace:^, @cs-magic/ts-config@workspace:packages/tools/ts-config":
+"@cs-magic/ts-config@npm:*, @cs-magic/ts-config@workspace:^, @cs-magic/ts-config@workspace:packages/tools/ts-config":
   version: 0.0.0-use.local
   resolution: "@cs-magic/ts-config@workspace:packages/tools/ts-config"
   dependencies:
@@ -17679,7 +17680,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-prettier@npm:^5.0.0":
+"eslint-plugin-prettier@npm:^5.2.1":
   version: 5.2.1
   resolution: "eslint-plugin-prettier@npm:5.2.1"
   dependencies: