Merge pull request #7 from reedsy/indent

Use TypeScript-safe version of `indent` rule
reedsy · Jan 29, 2020 · 68def1b · 68def1b
2 parents a81e133 + c7cb7f1
commit 68def1b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/eslint.yaml b/eslint.yaml
@@ -16,11 +16,8 @@ rules:
     - code: 120
       ignorePattern: '^import '
       ignoreUrls: true
-  # 2 spaces means nested code doesn't drift too far across the screen
-  indent:
-    - error
-    - 2
-    - SwitchCase: 1
+  # Use the TypesScript-safe version
+  indent: off
   # Google enforces this, but TypeScript is enough documentation for us
   require-jsdoc: off
   valid-jsdoc: off
@@ -73,6 +70,11 @@ rules:
     - always
   '@typescript-eslint/explicit-member-accessibility':
     - error
+    # 2 spaces means nested code doesn't drift too far across the screen
+  '@typescript-eslint/indent':
+    - error
+    - 2
+    - SwitchCase: 1
 overrides:
   - files:
     - '*.spec.ts'

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reedsy/eslint-config-reedsy",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Common eslint config",
   "main": "eslint.yaml",
   "scripts": {