style: sorts out the line ending issues from prettier and eslint

trichards57 · Oct 28, 2020 · b1f0fa1 · b1f0fa1
1 parent c101d94
commit b1f0fa1
Show file tree

Hide file tree

Showing 4 changed files with 559 additions and 52 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -2,19 +2,15 @@ env:
   browser: true
   es2021: true
 extends:
-  - 'eslint:recommended'
-  - 'plugin:@typescript-eslint/recommended'
-parser: '@typescript-eslint/parser'
+  - "eslint:recommended"
+  - "plugin:@typescript-eslint/recommended"
+  - "prettier"
+  - "plugin:import/typescript"
+parser: "@typescript-eslint/parser"
 parserOptions:
   ecmaVersion: 12
   sourceType: module
 plugins:
-  - '@typescript-eslint'
-rules:
-  linebreak-style:
-    - error
-    - windows
-  semi:
-    - error
-    - always
-root: true
+  - "@typescript-eslint"
+  - "prettier"
+rules: { "prettier/prettier": ["error", "endOfLine": "auto"] }
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -5,5 +5,5 @@ module.export = {
   printWidth: 80,
   tabWidth: 2,
   quoteProps: "consistent",
-  endOfLine: "crlf",
+  endOfLine: "auto",
 };