diff --git a/.npmignore b/.npmignore
index 2144451e3e8..67fa1d5ad89 100644
--- a/.npmignore
+++ b/.npmignore
@@ -9,8 +9,8 @@ netci.groovy
 scripts
 src
 tests
-tslint.json
 Jakefile.js
+.eslintrc
 .editorconfig
 .failed-tests
 .git
diff --git a/.travis.yml b/.travis.yml
index 2124f3ada33..cfb265e189e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,6 @@ branches:
 
 install:
   - npm uninstall typescript --no-save
-  - npm uninstall tslint --no-save
   - npm install
 
 cache:
diff --git a/package.json b/package.json
index fae9ffede90..787148cf05d 100644
--- a/package.json
+++ b/package.json
@@ -54,8 +54,8 @@
         "@types/through2": "latest",
         "@types/travis-fold": "latest",
         "@types/xml2js": "^0.4.0",
-        "@typescript-eslint/eslint-plugin": "1.11.0",
-        "@typescript-eslint/parser": "1.11.0",
+        "@typescript-eslint/eslint-plugin": "1.12.0",
+        "@typescript-eslint/parser": "1.12.0",
         "async": "latest",
         "azure-devops-node-api": "^8.0.0",
         "browser-resolve": "^1.11.2",
diff --git a/scripts/processDiagnosticMessages.ts b/scripts/processDiagnosticMessages.ts
index 0c1f6142b35..4bdf3ca0178 100644
--- a/scripts/processDiagnosticMessages.ts
+++ b/scripts/processDiagnosticMessages.ts
@@ -66,7 +66,6 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, inputFil
         "    function diag(code: number, category: DiagnosticCategory, key: string, message: string, reportsUnnecessary?: {}): DiagnosticMessage {\r\n" +
         "        return { code, category, key, message, reportsUnnecessary };\r\n" +
         "    }\r\n" +
-        "    // tslint:disable-next-line variable-name\r\n" +
         "    export const Diagnostics = {\r\n";
     messageTable.forEach(({ code, category, reportsUnnecessary }, name) => {
         const propName = convertPropertyName(name);
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 0971c89ecd5..2e5ee92077d 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -413,7 +413,7 @@ namespace ts {
                 if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === SyntaxKind.SourceFile) {
                     // Improved narrowing in master/3.6 makes this cast unnecessary, triggering a lint rule.
                     // But at the same time, the LKG (3.5) necessitates it because it doesn’t narrow.
-                    // Once the LKG is updated to 3.6, this comment, the cast to `SourceFile`, and the
+                    // Once the LKG is updated to 3.6, this comment, the cast to `SourceFile`
                     const sourceFile = declarationTransform.transformed[0] as SourceFile;
                     exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
                 }