more progress

prettier · Jul 28, 2023 · 2a66102 · 2a66102
1 parent 4e645b4
commit 2a66102
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.eslintrc.base.js b/.eslintrc.base.js
@@ -76,7 +76,7 @@ module.exports = {
   },
   overrides: [
     {
-      files: ["*.ts", "*.tsx"],
+      files: ["**/*.{ts,tsx}"],
       parserOptions: { parser: "@typescript-eslint/parser" },
       rules: {
         // Force a conflict with Prettier in test-lint/typescript.js.

diff --git a/eslint.base.config.js b/eslint.base.config.js
@@ -30,7 +30,7 @@ module.exports = [
   },
   {
     // TODO
-    ignores: ["test-lint/flowtype.js"],
+    // ignores: ["test-lint/flowtype.js"],
   },
   google,
   {
@@ -62,14 +62,16 @@ module.exports = [
     rules: unicorn.configs.recommended.rules,
   },
   {
+    files: ["**/*.vue"],
+    processor: vue.processors[".vue"],
     plugins: {
       vue,
     },
     rules: {
       ...vue.configs.base.rules,
-      ...vue.configs.base.essential,
-      ...vue.configs.base["strongly-recommended"],
-      ...vue.configs.base.recommended,
+      ...vue.configs.essential.rules,
+      ...vue.configs["strongly-recommended"].rules,
+      ...vue.configs.recommended.rules,
     },
   },
   {
@@ -95,5 +97,8 @@ module.exports = [
     rules: eslintrcBase.rules,
     settings: eslintrcBase.settings,
   },
-  ...eslintrcBase.overrides,
+  ...eslintrcBase.overrides.map(({ parserOptions, ...override }) => ({
+    ...override,
+    languageOptions: { parser: require(parserOptions.parser) },
+  })),
 ];