Skip to content

Commit c1c275f

Browse files
chore(tslint): upgrade tslint
1 parent dfa0eae commit c1c275f

File tree

3 files changed

+53
-44
lines changed

3 files changed

+53
-44
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"rxjs": "5.5.6",
8787
"shelljs": "^0.7.0",
8888
"shx": "^0.2.2",
89-
"tslint": "^5.4.3",
89+
"tslint": "5.8.0",
9090
"typedoc": "~0.9.0",
9191
"typedoc-plugin-external-module-name": "^1.0.2",
9292
"typedoc-plugin-internal-external": "^1.0.0",

tslint.json

Lines changed: 27 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,46 @@
11
{
2+
"extends": ["tslint-eslint-rules"],
23
"rules": {
3-
"align": [true, "parameters", "statements"],
4-
"ban": false,
54
"class-name": true,
6-
"comment-format": [false, "check-space", "check-lowercase" ],
5+
"comment-format": [ true, "check-space" ],
76
"curly": false,
8-
"eofline": false,
7+
"eofline": true,
98
"forin": true,
10-
"indent": [true, "spaces"],
11-
"interface-name": false,
12-
"jsdoc-format": true,
9+
"indent": [ true, "spaces" ],
1310
"label-position": true,
14-
"label-undefined": true,
15-
"max-line-length": [true, 180],
11+
"max-line-length": false,
1612
"member-access": false,
17-
"member-ordering": [false, "public-before-private", "static-before-instance", "variables-before-functions" ],
18-
"no-any": false,
13+
"member-ordering": [ true, "static-before-instance", "variables-before-functions" ],
1914
"no-arg": true,
2015
"no-bitwise": true,
21-
"no-conditional-assignment": true,
22-
"no-console": [true, "debug", "info", "time", "timeEnd", "trace" ],
16+
"no-console": [ true, "log", "warn", "debug", "info", "time", "timeEnd", "trace" ],
2317
"no-construct": true,
24-
"no-constructor-vars": false,
2518
"no-debugger": true,
26-
"no-duplicate-key": true,
27-
"no-shadowed-variable": true,
2819
"no-duplicate-variable": true,
2920
"no-empty": false,
3021
"no-eval": true,
31-
"no-internal-module": true,
32-
"no-require-imports": true,
22+
"no-inferrable-types": true,
23+
"no-shadowed-variable": true,
3324
"no-string-literal": false,
3425
"no-switch-case-fall-through": true,
35-
"no-trailing-whitespace": false,
36-
"no-unreachable": true,
37-
"no-unused-expression": [true, "allow-fast-null-checks"],
38-
"no-unused-variable": true,
39-
"no-use-before-declare": true,
26+
"no-trailing-whitespace": true,
27+
"no-unused-expression": [ true, "allow-fast-null-checks" ],
28+
"no-use-before-declare": false,
4029
"no-var-keyword": true,
41-
"no-var-requires": true,
42-
"one-line": [true, "check-open-brace", "check-catch", "check-else", "check-whitespace" ],
43-
"quotemark": [false, "double"],
30+
"object-curly-spacing": "always",
31+
"object-literal-sort-keys": false,
32+
"one-line": [ true, "check-catch", "check-else", "check-open-brace", "check-whitespace" ],
33+
"prefer-const": [ true, { "destructuring": "all" } ],
34+
"quotemark": [ true, "single", "avoid-escape", "jsx-double" ],
4435
"radix": true,
45-
"semicolon": true,
46-
"switch-default": true,
47-
"trailing-comma": [true, {"multiline": "always", "singleline": "never"}],
48-
"triple-equals": [true, "allow-null-check"],
49-
"typedef": [false, "call-signature", "parameter", "property-declaration", "variable-declaration", "member-variable-declaration" ],
50-
"typedef-whitespace": [true, {
51-
"call-signature": "nospace",
52-
"index-signature": "nospace",
53-
"parameter": "nospace",
54-
"variable-declaration": "nospace"
55-
}],
56-
"use-strict": [false, "check-module", "check-function" ],
57-
"variable-name": false,
58-
"whitespace": [true, "check-branch", "check-decl", "check-operator", "check-separator", "check-type" ]
59-
}
36+
"semicolon": [ "always" ],
37+
"triple-equals": [ true, "allow-null-check" ],
38+
"typedef": [ "call-signature", "property-declaration" ],
39+
"typedef-whitespace": [ true, { "call-signature": "nospace", "index-signature": "nospace", "parameter": "nospace", "property-declaration": "nospace", "variable-declaration": "nospace" } ],
40+
"variable-name": [ true, "ban-keywords", "allow-leading-underscore" ],
41+
"whitespace": [ true, "check-branch", "check-decl", "check-operator", "check-separator", "check-type" ],
42+
"jsx-no-multiline-js": false,
43+
"jsx-no-lambda": false
44+
}
6045
}
46+

yarn.lock

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,6 +1404,13 @@ dns-txt@^2.0.2:
14041404
dependencies:
14051405
buffer-indexof "^1.0.0"
14061406

1407+
doctrine@^0.7.2:
1408+
version "0.7.2"
1409+
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523"
1410+
dependencies:
1411+
esutils "^1.1.6"
1412+
isarray "0.0.1"
1413+
14071414
dom-serialize@^2.2.0:
14081415
version "2.2.1"
14091416
resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
@@ -1664,6 +1671,10 @@ estree-walker@^0.5.0:
16641671
version "0.5.1"
16651672
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.1.tgz#64fc375053abc6f57d73e9bd2f004644ad3c5854"
16661673

1674+
esutils@^1.1.6:
1675+
version "1.1.6"
1676+
resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
1677+
16671678
esutils@^2.0.2:
16681679
version "2.0.2"
16691680
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -4988,11 +4999,19 @@ tsickle@^0.21.0:
49884999
source-map "^0.5.6"
49895000
source-map-support "^0.4.2"
49905001

4991-
tslib@^1.7.1:
5002+
tslib@^1.0.0, tslib@^1.7.1:
49925003
version "1.8.1"
49935004
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac"
49945005

4995-
tslint@^5.4.3:
5006+
tslint-eslint-rules@^4.1.1:
5007+
version "4.1.1"
5008+
resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz#7c30e7882f26bc276bff91d2384975c69daf88ba"
5009+
dependencies:
5010+
doctrine "^0.7.2"
5011+
tslib "^1.0.0"
5012+
tsutils "^1.4.0"
5013+
5014+
49965015
version "5.8.0"
49975016
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.8.0.tgz#1f49ad5b2e77c76c3af4ddcae552ae4e3612eb13"
49985017
dependencies:
@@ -5012,6 +5031,10 @@ tsscmp@~1.0.0:
50125031
version "1.0.5"
50135032
resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.5.tgz#7dc4a33af71581ab4337da91d85ca5427ebd9a97"
50145033

5034+
tsutils@^1.4.0:
5035+
version "1.9.1"
5036+
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
5037+
50155038
tsutils@^2.12.1:
50165039
version "2.13.0"
50175040
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.13.0.tgz#0f52b6aabbc4216e72796b66db028c6cf173e144"

0 commit comments

Comments
 (0)