From 6b093b208ab06399b88d76e600a875428410a9b3 Mon Sep 17 00:00:00 2001 From: "dependencies[bot]" Date: Tue, 1 Aug 2017 16:53:23 +0800 Subject: [PATCH] Update tslint-config-ikatyang from 2.0.1 to 2.1.0 (#20) * Update tslint-config-ikatyang from 2.0.1 to 2.1.0 * chore: add prettier configs --- package.json | 6 +++++- tslint.json | 7 ++++++- yarn.lock | 30 +++++++++--------------------- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 071165d..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.0.1", + "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 863b695..0b9804b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -55,12 +55,6 @@ version "8.0.17" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.17.tgz#677bc8c118cfb76013febb62ede1f31d2c7222a1" -"@types/prettier@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.5.0.tgz#35ed47a24bd92bcab439c3670742219499a6b717" - dependencies: - "@types/babel-types" "*" - "@types/request@2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@types/request/-/request-2.0.0.tgz#7d6fd2a1ef48ad07d0e3333471b8267156d707a4" @@ -1952,13 +1946,11 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier-config-ikatyang@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/prettier-config-ikatyang/-/prettier-config-ikatyang-1.0.0.tgz#02f445dd875abc35a5a38c6c7d8d43172781f304" - dependencies: - "@types/prettier" "^1.5.0" +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: +prettier@1.5.3: version "1.5.3" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.5.3.tgz#59dadc683345ec6b88f88b94ed4ae7e1da394bfe" @@ -2363,19 +2355,15 @@ tslib@^1.0.0, tslib@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec" -tslint-config-ikatyang@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/tslint-config-ikatyang/-/tslint-config-ikatyang-2.0.1.tgz#ce7374ca07169daf90ae8ab4b2ec6d67a4d70db3" +tslint-config-ikatyang@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tslint-config-ikatyang/-/tslint-config-ikatyang-2.1.0.tgz#8b3b8f615004bc2f6cd4d7cca151c2ad04570e69" dependencies: - prettier "^1.5.3" - prettier-config-ikatyang "^1.0.0" - tslint-config-prettier-ext "^1.2.0" tslint-consistent-codestyle "~1.6.0" tslint-eslint-rules "~4.1.0" tslint-plugin-ikatyang "~1.0.0" - tslint-plugin-prettier "~1.0.0" -tslint-config-prettier-ext@^1.2.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" @@ -2405,7 +2393,7 @@ tslint-plugin-ikatyang@~1.0.0: tslib "^1.7.1" tsutils "^2.8.0" -tslint-plugin-prettier@~1.0.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: