diff --git a/package.json b/package.json index 09810e0..2976c02 100644 --- a/package.json +++ b/package.json @@ -22,9 +22,13 @@ "@types/request": "2.0.0", "jest": "20.0.4", "jest-playback": "1.0.0", + "prettier": "1.5.3", + "prettier-config-ikatyang": "1.1.1", "ts-jest": "20.0.7", "tslint": "5.5.0", "tslint-config-ikatyang": "2.1.0", + "tslint-config-prettier-ext": "1.3.0", + "tslint-plugin-prettier": "1.0.0", "typescript": "2.4.2" } } diff --git a/tslint.json b/tslint.json index 8fea16e..a1d4426 100644 --- a/tslint.json +++ b/tslint.json @@ -1,3 +1,8 @@ { - "extends": "tslint-config-ikatyang" + "extends": [ + "tslint-config-ikatyang", + "tslint-config-prettier-ext", + "tslint-plugin-prettier", + "prettier-config-ikatyang/tslint" + ] } diff --git a/yarn.lock b/yarn.lock index 4440dff..0b9804b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -769,6 +769,10 @@ extsprintf@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550" +fast-diff@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.1.tgz#0aea0e4e605b6a2189f0e936d4b7fbaf1b7cfd9b" + fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -1942,6 +1946,14 @@ 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.5.3: + version "1.5.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.5.3.tgz#59dadc683345ec6b88f88b94ed4ae7e1da394bfe" + pretty-format@^20.0.3: version "20.0.3" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-20.0.3.tgz#020e350a560a1fe1a98dc3beb6ccffb386de8b14" @@ -2351,6 +2363,10 @@ tslint-config-ikatyang@2.1.0: tslint-eslint-rules "~4.1.0" tslint-plugin-ikatyang "~1.0.0" +tslint-config-prettier-ext@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/tslint-config-prettier-ext/-/tslint-config-prettier-ext-1.3.0.tgz#501437366b90be5a05478123ac78965e5a38287a" + tslint-consistent-codestyle@~1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/tslint-consistent-codestyle/-/tslint-consistent-codestyle-1.6.0.tgz#e42f5fd1d5bd4ffa697386ec8a41ed2cb6812aaf" @@ -2377,6 +2393,13 @@ tslint-plugin-ikatyang@~1.0.0: tslib "^1.7.1" tsutils "^2.8.0" +tslint-plugin-prettier@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/tslint-plugin-prettier/-/tslint-plugin-prettier-1.0.0.tgz#2138ec2a65de883d19b95247430771cdfcbff8de" + dependencies: + fast-diff "^1.1.1" + tslib "^1.7.1" + tslint@5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.5.0.tgz#10e8dab3e3061fa61e9442e8cee3982acf20a6aa"