From acaf1aa5302a295e005155da06a0c31c85b89f81 Mon Sep 17 00:00:00 2001 From: George Kalpakas Date: Wed, 24 Apr 2019 15:27:25 +0300 Subject: [PATCH] build(docs-infra): switch from no-op `no-jasmine-focus` tslint rule to `ban` (#29926) The `no-jasmine-focus` rule has been removed from `vrsource-tslint-rules` [since version 5.8.0][1] (theoretically; practically it remained [until version 5.8.2][2]). This commit removes the non-existent rule (and the obsolete dependency) and uses tslint's `ban` rule instead (as recommended). [1]: https://github.com/vrsource/vrsource-tslint-rules/commit/477f622cb2b6adb66eecce69a122834920cee7a0#diff-04c6e90faac2675aa89e2176d2eec7d8R162 [2]: https://github.com/vrsource/vrsource-tslint-rules/pull/13#issuecomment-442053340 PR Close #29926 --- aio/package.json | 1 - aio/tslint.json | 6 +++++- aio/yarn.lock | 5 ----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/aio/package.json b/aio/package.json index 71afbe0df1..2a309583b3 100644 --- a/aio/package.json +++ b/aio/package.json @@ -163,7 +163,6 @@ "unist-util-source": "^1.0.1", "unist-util-visit": "^1.1.1", "unist-util-visit-parents": "^1.1.1", - "vrsource-tslint-rules": "^5.8.2", "watchr": "^3.0.1", "xregexp": "^4.0.0", "yargs": "^7.0.2" diff --git a/aio/tslint.json b/aio/tslint.json index 8d9c3b52a1..49e9059792 100644 --- a/aio/tslint.json +++ b/aio/tslint.json @@ -6,6 +6,11 @@ "rules": { "array-type": false, "arrow-parens": false, + "ban": [ + true, + {"name": "fdescribe", "message": "Don't keep jasmine focus methods."}, + {"name": "fit", "message": "Don't keep jasmine focus methods."} + ], "component-class-suffix": true, "component-selector": [ true, @@ -64,7 +69,6 @@ ], "no-input-rename": true, "no-inputs-metadata-property": true, - "no-jasmine-focus": true, "no-output-native": true, "no-output-on-prefix": true, "no-output-rename": true, diff --git a/aio/yarn.lock b/aio/yarn.lock index 6b82d9f835..28e01751e1 100644 --- a/aio/yarn.lock +++ b/aio/yarn.lock @@ -10726,11 +10726,6 @@ void-elements@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" -vrsource-tslint-rules@^5.8.2: - version "5.8.3" - resolved "https://registry.yarnpkg.com/vrsource-tslint-rules/-/vrsource-tslint-rules-5.8.3.tgz#b050f25e5967547a3c5e12539b4530d4d3f0d0e0" - integrity sha512-3tYS1zn+d9QtgmQIYmQ9e1i0kipmUjp6cvvYWLC+lZ3z8CQUle7rPKsTFMexOTIVXDpBt9JSJlhDWbwljl3DMQ== - walkdir@^0.0.11: version "0.0.11" resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.0.11.tgz#a16d025eb931bd03b52f308caed0f40fcebe9532"