From 6c3c90e8620eb1d47ea6dded09b21874be9cd82f Mon Sep 17 00:00:00 2001
From: Klaus Meinhardt <klaus.meinhardt1@gmail.com>
Date: Mon, 27 Nov 2017 19:46:25 +0100
Subject: [PATCH] Update tslint devDependency (#3437)

and try to get rid of some disable comments
---
 package.json                              |  2 +-
 src/rules/noInvalidTemplateStringsRule.ts |  3 +--
 src/rules/noUnusedVariableRule.ts         |  2 +-
 yarn.lock                                 | 21 ++++++---------------
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index f536af9916f..feb2539b366 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "nyc": "^10.2.0",
     "rimraf": "^2.5.4",
     "ts-node": "^3.3.0",
-    "tslint": "^5.7.0",
+    "tslint": "^5.8.0",
     "tslint-test-config-non-relative": "file:test/external/tslint-test-config-non-relative",
     "typescript": "~2.6.1"
   },
diff --git a/src/rules/noInvalidTemplateStringsRule.ts b/src/rules/noInvalidTemplateStringsRule.ts
index 1cdf040f1ae..1d063786ece 100644
--- a/src/rules/noInvalidTemplateStringsRule.ts
+++ b/src/rules/noInvalidTemplateStringsRule.ts
@@ -24,8 +24,7 @@ export class Rule extends Lint.Rules.AbstractRule {
     /* tslint:disable:object-literal-sort-keys */
     public static metadata: Lint.IRuleMetadata = {
         ruleName: "no-invalid-template-strings",
-        // tslint:disable-next-line no-invalid-template-strings
-        description: "Warns on use of `${` in non-template strings.",
+        description: "Warns on use of `\${` in non-template strings.",
         optionsDescription: "Not configurable.",
         options: null,
         optionExamples: [true],
diff --git a/src/rules/noUnusedVariableRule.ts b/src/rules/noUnusedVariableRule.ts
index 21112457147..45f1b8558cc 100644
--- a/src/rules/noUnusedVariableRule.ts
+++ b/src/rules/noUnusedVariableRule.ts
@@ -413,7 +413,7 @@ function makeUnusedCheckedProgram(program: ts.Program, checkParameters: boolean)
         readFile: (f) => sourceFilesByName.get(getCanonicalFileName(f))!.text,
         getSourceFile: (f) => sourceFilesByName.get(getCanonicalFileName(f))!,
         getDefaultLibFileName: () => ts.getDefaultLibFileName(options),
-        writeFile: () => {}, // tslint:disable-line no-empty
+        writeFile: () => undefined,
         getCurrentDirectory: () => "",
         getDirectories: () => [],
         getCanonicalFileName,
diff --git a/yarn.lock b/yarn.lock
index 2849b87b067..6e5b097315f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -339,10 +339,6 @@ color-name@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
-colors@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-
 commander@2.9.0, commander@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
@@ -1577,12 +1573,13 @@ tslib@^1.8.0:
 "tslint-test-config-non-relative@file:test/external/tslint-test-config-non-relative":
   version "0.0.1"
 
-tslint@^5.7.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.7.0.tgz#c25e0d0c92fa1201c2bc30e844e08e682b4f3552"
+tslint@^5.8.0:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.8.0.tgz#1f49ad5b2e77c76c3af4ddcae552ae4e3612eb13"
   dependencies:
     babel-code-frame "^6.22.0"
-    colors "^1.1.2"
+    builtin-modules "^1.1.1"
+    chalk "^2.1.0"
     commander "^2.9.0"
     diff "^3.2.0"
     glob "^7.1.1"
@@ -1590,7 +1587,7 @@ tslint@^5.7.0:
     resolve "^1.3.2"
     semver "^5.3.0"
     tslib "^1.7.1"
-    tsutils "^2.8.1"
+    tsutils "^2.12.1"
 
 tsutils@^2.12.1:
   version "2.12.1"
@@ -1598,12 +1595,6 @@ tsutils@^2.12.1:
   dependencies:
     tslib "^1.7.1"
 
-tsutils@^2.8.1:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.10.0.tgz#ae94511df2656eb06e4424056fba5c388887040c"
-  dependencies:
-    tslib "^1.7.1"
-
 type-detect@0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"