Merge pull request #484 from jellyfin/nvv-prettier-via-eslint

jellyfin · Oct 7, 2023 · 00c17ea · 00c17ea
2 parents 83fa27d + 80c8c43
commit 00c17ea
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 16 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -9,7 +9,6 @@ module.exports = {
         'plugin:jsdoc/recommended',
         'plugin:json/recommended',
         'plugin:@typescript-eslint/recommended',
-        'prettier',
         'plugin:prettier/recommended',
         'plugin:promise/recommended',
         'plugin:import/errors',
@@ -30,7 +29,7 @@ module.exports = {
             }
         }
     ],
-    plugins: ['prettier', 'promise', 'import', 'jsdoc'],
+    plugins: ['promise', 'import', 'jsdoc'],
     root: true,
     rules: {
         '@typescript-eslint/explicit-function-return-type': 'error',

diff --git a/.prettierignore b/.prettierignore
diff --git a/.prettierrc b/.prettierrc
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
@@ -0,0 +1,4 @@
+semi: true
+singleQuote: true
+tabWidth: 4
+trailingComma: none
diff --git a/package.json b/package.json
@@ -38,9 +38,8 @@
         "start": "vite",
         "build": "vite build",
         "test": "vitest",
-        "lint": "npm run lint:code && npm run lint:css && npm run prettier",
+        "lint": "npm run lint:code && npm run lint:css",
         "lint:code": "eslint --ext .ts,.js,.json .",
-        "lint:css": "stylelint src/**/*.css",
-        "prettier": "prettier --check ."
+        "lint:css": "stylelint src/**/*.css"
     }
 }