client: refactor plugins and bump eslint-config-joenn

wJoenn · Apr 1, 2024 · b09ca33 · b09ca33
1 parent 373095c
commit b09ca33
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 108 deletions.
diff --git a/client/.vue/.eslintrc-auto-import.json b/client/.vue/.eslintrc-auto-import.json
diff --git a/client/.vue/eslint.components.config.js b/client/.vue/eslint.components.config.js
@@ -6,17 +6,17 @@ export default {
   rules: {
     "vue/component-name-in-template-casing": ["error", "PascalCase", {
       globals: [
+        "BaseButton",
+        "BaseContainer",
+        "BaseForm",
         "KeepAlive",
         "RouterLink",
         "RouterView",
         "Suspense",
+        "TaskTable",
         "Teleport",
         "Transition",
-        "TransitionGroup",
-        "BaseButton",
-        "BaseContainer",
-        "BaseForm",
-        "TaskTable"
+        "TransitionGroup"
       ]
     }]
   }

diff --git a/client/eslint.config.js b/client/eslint.config.js
@@ -1,13 +1,9 @@
-import fs from "fs"
 import { vue } from "eslint-config-joenn"
 import componentsConfig from "./.vue/eslint.components.config.js"
 
-const autoImportConfig = JSON.parse(fs.readFileSync("./.vue/.eslintrc-auto-import.json"))
-
 export default [
   ...vue,
   componentsConfig,
-  { languageOptions: autoImportConfig },
   {
     files: ["**/*.ts"],
     ignores: ["src"],

diff --git a/client/package.json b/client/package.json
@@ -24,7 +24,7 @@
     "@vue/eslint-config-typescript": "^12.0.0",
     "autoprefixer": "^10.4.17",
     "eslint": "^8.57.0",
-    "eslint-config-joenn": "^0.2.9",
+    "eslint-config-joenn": "^0.2.10",
     "sass": "^1.71.1",
     "typescript": "^5.3.3",
     "unplugin-auto-import": "^0.17.5",

diff --git a/client/plugins/unplugin/autoImport.ts b/client/plugins/unplugin/autoImport.ts
@@ -7,10 +7,6 @@ import { rootDir } from "."
 const unpluginAutoImport = () => AutoImport({
   dirs: [`${rootDir}/src/stores`, `${rootDir}/src/utils`],
   dts: `${rootDir}/.vue/auto-import.d.ts`,
-  eslintrc: {
-    enabled: true,
-    filepath: `${rootDir}/.vue/.eslintrc-auto-import.json`
-  },
   imports: [
     "pinia",
     "vue",

diff --git a/client/plugins/unplugin/vueComponents.ts b/client/plugins/unplugin/vueComponents.ts
@@ -22,9 +22,10 @@ const getComponents = (componentsDir = `${rootDir}/src/components/`): string[] =
     const stat = fs.statSync(filePath)
     return stat.isDirectory() ? getComponents(`${filePath}/`) : [file.replace(".vue", "")]
   })
-  .sort()
 
 const createEslintComponentsFile = () => {
+  const components = [...VUE_COMPONENTS, ...getComponents()].sort()
+
   const eslintConfig = [
     "/* eslint-disable */",
     'import vue from "eslint-plugin-vue"',
@@ -34,7 +35,7 @@ const createEslintComponentsFile = () => {
     "  rules: {",
     '    "vue/component-name-in-template-casing": ["error", "PascalCase", {',
     "      globals: [",
-    VUE_COMPONENTS.concat(getComponents()).map(component => `        "${component}"`).join(",\n"),
+    components.map(component => `        "${component}"`).join(",\n"),
     "      ]",
     "    }]",
     "  }",

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