From be9ed1812a52ad79a9fa3c18153a3ebfefacb4ff Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Thu, 26 Mar 2020 20:42:57 +0800
Subject: [PATCH] feat: support prettier@2 (#361)

---
 .travis.yml                        |  6 ++++++
 package.json                       |  5 ++---
 tests/prettier/default/tslint.json |  2 +-
 tests/prettier/useTabs/tslint.json |  2 +-
 tslint.json                        | 12 ++++++------
 yarn.lock                          | 11 ++++-------
 6 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a3ec1cd..e2eb3805 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,12 @@ node_js:
 - 6
 - stable
 
+before_install:
+- >
+  if [ "$TRAVIS_NODE_VERSION" = "6" ]; then
+    yarn upgrade prettier@1.19.1
+  fi
+
 script:
 - yarn run lint
 - yarn run build
diff --git a/package.json b/package.json
index 820665fa..dcd3a46f 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,7 @@
     "@types/prettier": "1.19.1",
     "codecov": "3.6.5",
     "nyc": "11.9.0",
-    "prettier": "1.19.1",
-    "prettier-config-ikatyang": "1.1.1",
+    "prettier": "2.0.0",
     "standard-version": "4.4.0",
     "tslint": "6.1.0",
     "tslint-config-prettier": "1.18.0",
@@ -46,7 +45,7 @@
     "typescript": "3.8.3"
   },
   "peerDependencies": {
-    "prettier": "^1.9.0",
+    "prettier": "^1.9.0 || ^2.0.0",
     "tslint": "^5.0.0 || ^6.0.0"
   },
   "resolutions": {
diff --git a/tests/prettier/default/tslint.json b/tests/prettier/default/tslint.json
index de88218b..925e35d6 100644
--- a/tests/prettier/default/tslint.json
+++ b/tests/prettier/default/tslint.json
@@ -1,6 +1,6 @@
 {
   "rulesDirectory": ["../../../rules"],
   "rules": {
-    "prettier": [true, {}]
+    "prettier": [true, { "trailingComma": "none" }]
   }
 }
diff --git a/tests/prettier/useTabs/tslint.json b/tests/prettier/useTabs/tslint.json
index 4e5995ff..fdb52cba 100644
--- a/tests/prettier/useTabs/tslint.json
+++ b/tests/prettier/useTabs/tslint.json
@@ -1,6 +1,6 @@
 {
   "rulesDirectory": ["../../../rules"],
   "rules": {
-    "prettier": [true, { "useTabs": true }]
+    "prettier": [true, { "useTabs": true, "trailingComma": "none" }]
   }
 }
diff --git a/tslint.json b/tslint.json
index 02f46f54..75ed6159 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,12 +1,12 @@
 {
   "rulesDirectory": ["tslint-plugin-prettier"],
-  "extends": [
-    "tslint:recommended",
-    "tslint-config-prettier",
-    "prettier-config-ikatyang/tslint"
-  ],
+  "extends": ["tslint:recommended", "tslint-config-prettier"],
   "rules": {
     "max-classes-per-file": false,
-    "no-switch-case-fall-through": true
+    "no-switch-case-fall-through": true,
+    "prettier": [
+      true,
+      { "arrowParens": "avoid", "singleQuote": true, "trailingComma": "all" }
+    ]
   }
 }
diff --git a/yarn.lock b/yarn.lock
index a9a425bc..68ed959a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1914,13 +1914,10 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier-config-ikatyang@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/prettier-config-ikatyang/-/prettier-config-ikatyang-1.1.1.tgz#9ccab4bc2d441e4c68b58dbe8f1a4e18213c3f2d"
-
-prettier@1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+prettier@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.0.tgz#9c8fdba0aeae3faf0d9d9391623ac4f9321a4455"
+  integrity sha512-vI55PC+GFLOVtpwr2di1mYhJF36v+kztJov8sx3AmqbfdA+2Dhozxb+3e1hTgoV9lyhnVJFF3Z8GCVeMBOS1bA==
 
 process-nextick-args@~2.0.0:
   version "2.0.0"