Various fixed

emilwidlund · Aug 24, 2023 · cb6cee0 · cb6cee0
1 parent ace65d1
commit cb6cee0
Show file tree

Hide file tree

Showing 68 changed files with 1,593 additions and 956 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,12 +4,12 @@ module.exports = {
     extends: [
         'eslint:recommended',
         'plugin:@typescript-eslint/recommended',
+        'plugin:prettier/recommended',
         'plugin:import/recommended',
-        'plugin:import/typescript',
-        'prettier'
+        'plugin:import/typescript'
     ],
     parser: '@typescript-eslint/parser',
-    plugins: ['@typescript-eslint', 'unused-imports'],
+    plugins: ['@typescript-eslint', 'unused-imports', 'prettier'],
     root: true,
     settings: {
         'import/resolver': {
@@ -44,6 +44,7 @@ module.exports = {
                 args: 'after-used',
                 argsIgnorePattern: '^_'
             }
-        ]
+        ],
+        'prettier/prettier': 'error'
     }
 };
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,10 +3,16 @@
         "source.fixAll.eslint": true
     },
     "eslint.validate": ["javascript"],
-    "editor.formatOnSave": true,
     "eslint.format.enable": true,
-    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
     "[javascript]": {
         "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
-    }
+    },
+    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
+    "editor.formatOnPaste": false, // required 
+    "editor.formatOnType": false, // required
+    "editor.formatOnSave": true, // optional 
+    "editor.formatOnSaveMode": "file", // required to format on save
+    "files.autoSave": "onFocusChange", // optional but recommended
+    "vs-code-prettier-eslint.prettierLast": false // set as "true" to run 'prettier' last not first
+
 }