refactor: 适应新版prettier配置

Author: HRan2004

.github/workflows/release.yml

@@ -8,7 +8,6 @@ on:
       - 'package.json'
 
 jobs:
-
   Version:
     name: Analysis Version
     runs-on: ubuntu-latest
@@ -26,11 +25,11 @@ jobs:
         run: |
           CURRENT_VERSION=$(jq -r .version package.json)
           echo "Current version: $CURRENT_VERSION"
-          
+
           git checkout HEAD~1 -- package.json 2>/dev/null || true
           PREVIOUS_VERSION=$(jq -r .version package.json 2>/dev/null || echo "0.0.0")
           echo "Previous version: $PREVIOUS_VERSION"
-          
+
           if [[ "$CURRENT_VERSION" != "$PREVIOUS_VERSION" ]]; then
             echo "version_changed=true" >> $GITHUB_OUTPUT
             echo "current_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
@@ -54,7 +53,7 @@ jobs:
         with:
           tag_name: v${{ needs.Version.outputs.current_version }}
           release_name: v${{ needs.Version.outputs.current_version }}
-          body: "Install: https://www.npmjs.com/package/oflow-interface"
+          body: 'Install: https://www.npmjs.com/package/oflow-interface'
           draft: false
           prerelease: false
 
@@ -64,14 +63,13 @@ jobs:
     if: ${{ needs.Version.outputs.version_changed == 'true' }}
     runs-on: ubuntu-latest
     steps:
-
       - name: Checkout Code
         uses: actions/checkout@v4
 
       - name: Setup Bun Environment
         uses: oven-sh/setup-bun@v2
         with:
-          bun-version: "latest"
+          bun-version: 'latest'
 
       - name: Install Dependencies
         run: bun install --frozen-lockfile
@@ -102,14 +100,13 @@ jobs:
       contents: read
       packages: write
     steps:
-
       - name: Checkout Code
         uses: actions/checkout@v4
 
       - name: Setup Bun Environment
         uses: oven-sh/setup-bun@v2
         with:
-          bun-version: "latest"
+          bun-version: 'latest'
 
       - name: Install Dependencies
         run: bun install --frozen-lockfile
@@ -126,7 +123,7 @@ jobs:
           cp package.json package.json.bak
           jq '.name = "@O-FLOW/\(.name)" | .repository.url = "git+https://github.com/O-FLOW/rhine-var.git"' package.json > package.json.tmp
           mv package.json.tmp package.json
-          jq empty package.json   
+          jq empty package.json
 
       - name: Setup NodeJs for NPM
         uses: actions/setup-node@v4
@@ -142,4 +139,3 @@ jobs:
         run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
-

.prettierrc

@@ -0,0 +1,12 @@
+{
+  "semi": false,
+  "singleQuote": true,
+  "jsxSingleQuote": true,
+  "trailingComma": "all",
+  "bracketSpacing": true,
+  "printWidth": 100,
+  "tabWidth": 2,
+  "useTabs": false,
+  "arrowParens": "always",
+  "endOfLine": "lf"
+}

bun.lock

@@ -12,15 +12,13 @@ import { defineConfig } from 'eslint/config'
 import eslintConfigPrettier from 'eslint-config-prettier/flat'
 import { importX } from 'eslint-plugin-import-x'
 import globals from 'globals'
-import tseslint, {ConfigArray} from 'typescript-eslint'
-
+import tseslint, { ConfigArray } from 'typescript-eslint'
 
 // Configuration
-const ENABLE_TYPE_CHECKED = true  // Set to enable project-based type checking
-const ENABLE_FRONTEND = false  // Set to enable Next.js, JSX, React, Hooks, and other frontend features
-const ENABLE_STYLESHEET = true  // Set to enable CSS, SCSS, SASS and other stylesheet features
-const IGNORE_PRETTIER = true  // Set to disable all rules that are unnecessary or might conflict with Prettier
-
+const ENABLE_TYPE_CHECKED = true // Set to enable project-based type checking
+const ENABLE_FRONTEND = false // Set to enable Next.js, JSX, React, Hooks, and other frontend features
+const ENABLE_STYLESHEET = true // Set to enable CSS, SCSS, SASS and other stylesheet features
+const IGNORE_PRETTIER = true // Set to disable all rules that are unnecessary or might conflict with Prettier
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -30,60 +28,58 @@ const compat = new FlatCompat({
   baseDirectory: __dirname,
 })
 
-
-const globalConfig = defineConfig([
-  includeIgnoreFile(gitignorePath),
-  {ignores: []},
-])
+const globalConfig = defineConfig([includeIgnoreFile(gitignorePath), { ignores: [] }])
 
 const scriptFile = '*.{cjs,js,jsx,mjs,mjsx,cts,ts,tsx,mts,mtsx}'
 const jsFile = '*.{cjs,js,jsx,mjs,mjsx}'
 const tsFile = '*.{cts,ts,tsx,mts,mtsx}'
 
-const tsConfig = ENABLE_TYPE_CHECKED ? [
-  {
-    files: [`**/${scriptFile}`],
-    languageOptions: {
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: __dirname,
+const tsConfig = ENABLE_TYPE_CHECKED
+  ? [
+      {
+        files: [`**/${scriptFile}`],
+        languageOptions: {
+          parserOptions: {
+            projectService: true,
+            tsconfigRootDir: __dirname,
+          },
+        },
       },
-    },
-  },
-  {
-    ...tseslint.configs.strictTypeChecked[0],
-    files: [`**/${scriptFile}`],
-  },
-  {
-    ...tseslint.configs.strictTypeChecked[1],
-    files: [`**/${tsFile}`],
-  },
-  {
-    ...tseslint.configs.strictTypeChecked[2],
-    files: [`**/${scriptFile}`],
-  },
-  {
-    ...tseslint.configs.stylisticTypeChecked[2],
-    files: [`**/${scriptFile}`],
-  },
-] : [
-  {
-    ...tseslint.configs.strict[0],
-    files: [`**/${scriptFile}`],
-  },
-  {
-    ...tseslint.configs.strict[1],
-    files: [`**/${tsFile}`],
-  },
-  {
-    ...tseslint.configs.strict[2],
-    files: [`**/${scriptFile}`],
-  },
-  {
-    ...tseslint.configs.stylistic[2],
-    files: [`**/${scriptFile}`],
-  },
-]
+      {
+        ...tseslint.configs.strictTypeChecked[0],
+        files: [`**/${scriptFile}`],
+      },
+      {
+        ...tseslint.configs.strictTypeChecked[1],
+        files: [`**/${tsFile}`],
+      },
+      {
+        ...tseslint.configs.strictTypeChecked[2],
+        files: [`**/${scriptFile}`],
+      },
+      {
+        ...tseslint.configs.stylisticTypeChecked[2],
+        files: [`**/${scriptFile}`],
+      },
+    ]
+  : [
+      {
+        ...tseslint.configs.strict[0],
+        files: [`**/${scriptFile}`],
+      },
+      {
+        ...tseslint.configs.strict[1],
+        files: [`**/${tsFile}`],
+      },
+      {
+        ...tseslint.configs.strict[2],
+        files: [`**/${scriptFile}`],
+      },
+      {
+        ...tseslint.configs.stylistic[2],
+        files: [`**/${scriptFile}`],
+      },
+    ]
 
 const scriptConfig: ConfigArray = tseslint.config([
   {
@@ -96,14 +92,14 @@ const scriptConfig: ConfigArray = tseslint.config([
       `tools/**/${scriptFile}`,
     ],
     languageOptions: {
-      globals: globals.node
-    }
+      globals: globals.node,
+    },
   },
   {
     files: [`src/**/${scriptFile}`],
     languageOptions: {
-      globals: globals.browser
-    }
+      globals: globals.browser,
+    },
   },
   {
     ...js.configs.recommended,
@@ -128,12 +124,13 @@ const scriptConfig: ConfigArray = tseslint.config([
   },
 ])
 
-
 const nextConfig = []
 if (ENABLE_FRONTEND) {
-  nextConfig.push(...compat.config({
-    extends: ['next/core-web-vitals', 'next/typescript'],
-  }))
+  nextConfig.push(
+    ...compat.config({
+      extends: ['next/core-web-vitals', 'next/typescript'],
+    }),
+  )
 
   for (const nextConfigElement of nextConfig) {
     if (!nextConfigElement.files) {
@@ -142,20 +139,20 @@ if (ENABLE_FRONTEND) {
   }
 }
 
-
 const cssConfig = []
 
 if (ENABLE_STYLESHEET) {
-  cssConfig.push(...defineConfig([
-    {
-      ...css.configs.recommended,
-      files: ['**/*.css'],
-      language: 'css/css',
-    }
-  ]))
+  cssConfig.push(
+    ...defineConfig([
+      {
+        ...css.configs.recommended,
+        files: ['**/*.css'],
+        language: 'css/css',
+      },
+    ]),
+  )
 }
 
-
 const markdownConfig = defineConfig([
   {
     ...markdown.configs.recommended[0],
@@ -164,15 +161,11 @@ const markdownConfig = defineConfig([
   },
 ])
 
-
 const jsonConfig = defineConfig([
   {
     ...json.configs.recommended,
     files: ['**/*.json'],
-    ignores: [
-      '**/tsconfig.json',
-      '**/tsconfig.*.json',
-    ],
+    ignores: ['**/tsconfig.json', '**/tsconfig.*.json'],
     language: 'json/json',
   },
   {
@@ -182,14 +175,12 @@ const jsonConfig = defineConfig([
   },
 ])
 
-
 const prettierConfig = []
 
 if (IGNORE_PRETTIER) {
   prettierConfig.push(eslintConfigPrettier)
 }
 
-
 const customConfig = defineConfig([
   {
     files: [`**/${scriptFile}`],
@@ -199,7 +190,7 @@ const customConfig = defineConfig([
       'import-x/order': [
         'error',
         {
-          'groups': [
+          groups: [
             'builtin',
             'external',
             'internal',
@@ -209,29 +200,28 @@ const customConfig = defineConfig([
             'object',
             'type',
           ],
-          'pathGroups': [
+          pathGroups: [
             {
-              'pattern': '@/**',
-              'group': 'internal',
-              'position': 'before',
+              pattern: '@/**',
+              group: 'internal',
+              position: 'before',
             },
           ],
-          'pathGroupsExcludedImportTypes': ['builtin'],
+          pathGroupsExcludedImportTypes: ['builtin'],
           'newlines-between': 'always',
-          'distinctGroup': false,
-          'alphabetize': {
-            'order': 'asc',
-            'caseInsensitive': true
+          distinctGroup: false,
+          alphabetize: {
+            order: 'asc',
+            caseInsensitive: true,
           },
-          'sortTypesGroup': true,
+          sortTypesGroup: true,
           'newlines-between-types': 'always',
         },
       ],
     },
   },
 ])
 
-
 const config = [
   ...globalConfig,
   ...scriptConfig,

eslint.config.ts

@@ -54,6 +54,7 @@
     "file-type": "^20.4.1",
     "globals": "^16.2.0",
     "mime": "^4.0.7",
+    "prettier": "^3.5.3",
     "react": "19.1.0-canary-ff628334-20250205",
     "react-dom": "19.1.0-canary-ff628334-20250205",
     "rhine-var": "0.10.5",
@@ -76,4 +77,4 @@
   "dependencies": {
     "eslint-plugin-unused-imports": "^4.1.4"
   }
-}
+}