fix: update galaxy config

CyanSalt · May 17, 2024 · 8d3e596 · 8d3e596
1 parent d7f59a8
commit 8d3e596
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/configs/galaxy.js b/configs/galaxy.js
@@ -3,12 +3,9 @@ import { defineConfig } from '../config.js'
 
 export default defineConfig(options => {
   return [
+    galaxyPlugin.configs.recommended,
     {
-      plugins: {
-        galaxy: galaxyPlugin,
-      },
       rules: {
-        ...galaxyPlugin.configs.recommended.rules,
         // 自动移除 .ts 文件的导入后缀
         'galaxy/import-extensions': ['warn', {
           '.cts': 'never',
@@ -37,9 +34,9 @@ export default defineConfig(options => {
       },
     ] : []),
     ...(options.vue ? [
+      galaxyPlugin.configs['recommended-vue'],
       {
         rules: {
-          ...galaxyPlugin.configs['recommended-vue'].rules,
           // 自动调整组件选项内的属性顺序
           'galaxy/conventional-vue-keys-order': ['warn', {
             rules: [

diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "eslint-flat-config-utils": "^0.2.4",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-galaxy": "^1.33.0",
+    "eslint-plugin-galaxy": "^1.34.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.2",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml