Add tslint-prettier to avoid conflicts

danger · Jun 9, 2017 · d861911 · d861911
1 parent 547faeb
commit d861911
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/package.json b/package.json
@@ -102,6 +102,7 @@
     "ts-jest": "^20.0.0",
     "ts-node": "^3.0.0",
     "tslint": "^5.3.0",
+    "tslint-config-prettier": "^1.0.0",
     "typedoc": "orta/typedoc#0.5.10-no-types",
     "typescript": "2.3.4"
   },

diff --git a/tslint.json b/tslint.json
@@ -63,5 +63,8 @@
   "array-type": [
     true,
     "array-simple"
+  ],
+  "extends": [
+    "tslint-config-prettier"
   ]
 }
diff --git a/yarn.lock b/yarn.lock
@@ -3616,6 +3616,10 @@ tslib@^1.6.0:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"
 
+tslint-config-prettier@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.0.0.tgz#de1cd14fe8805f5f9aa5676a4760056d42e0738d"
+
 tslint@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.3.0.tgz#fb89e4e9c461a2dcb2a80ece8da27f5cd44eff8f"