From a340c6a10893c743c993561772088f39ca3364a7 Mon Sep 17 00:00:00 2001
From: Kasra Bigdeli <kasra85@gmail.com>
Date: Sat, 7 Aug 2021 09:33:52 -0700
Subject: [PATCH] Updated vscode.prettier to use the config file

---
 .prettierrc => .prettierrc.json |  0
 package-lock.json               | 23 +++++++++++++++++++++++
 package.json                    |  5 ++++-
 tslint.json                     |  3 ++-
 4 files changed, 29 insertions(+), 2 deletions(-)
 rename .prettierrc => .prettierrc.json (100%)

diff --git a/.prettierrc b/.prettierrc.json
similarity index 100%
rename from .prettierrc
rename to .prettierrc.json
diff --git a/package-lock.json b/package-lock.json
index f7b01a32..231ffaeb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -44,6 +44,9 @@
                 "tslint": "^6.1.3",
                 "typescript": "^4.1.5",
                 "yaml": "^1.10.0"
+            },
+            "devDependencies": {
+                "tslint-config-prettier": "^1.18.0"
             }
         },
         "node_modules/@ant-design/colors": {
@@ -24516,6 +24519,18 @@
                 "node": ">=4.8.0"
             }
         },
+        "node_modules/tslint-config-prettier": {
+            "version": "1.18.0",
+            "resolved": "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz",
+            "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==",
+            "dev": true,
+            "bin": {
+                "tslint-config-prettier-check": "bin/check.js"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
         "node_modules/tslint/node_modules/ansi-styles": {
             "version": "3.2.1",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -25452,6 +25467,7 @@
             "version": "1.2.13",
             "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
             "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+            "hasInstallScript": true,
             "optional": true,
             "os": [
                 "darwin"
@@ -25917,6 +25933,7 @@
             "version": "1.2.13",
             "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
             "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+            "hasInstallScript": true,
             "optional": true,
             "os": [
                 "darwin"
@@ -47261,6 +47278,12 @@
                 }
             }
         },
+        "tslint-config-prettier": {
+            "version": "1.18.0",
+            "resolved": "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz",
+            "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==",
+            "dev": true
+        },
         "tsutils": {
             "version": "3.20.0",
             "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.20.0.tgz",
diff --git a/package.json b/package.json
index cfd72f79..e3014192 100644
--- a/package.json
+++ b/package.json
@@ -58,5 +58,8 @@
         "not dead",
         "not ie <= 11",
         "not op_mini all"
-    ]
+    ],
+    "devDependencies": {
+        "tslint-config-prettier": "^1.18.0"
+    }
 }
diff --git a/tslint.json b/tslint.json
index 7a78f3d5..154aa0ff 100644
--- a/tslint.json
+++ b/tslint.json
@@ -41,5 +41,6 @@
         "no-null-keyword": true,
         //"prefer-const": true,
         "jsdoc-format": true
-    }
+    },
+    "extends": ["tslint-config-prettier"]
 }