From 8e18bebdd582884c886a92db58f38d75907ee5cc Mon Sep 17 00:00:00 2001
From: Alexander <alexander.tarasyuk@outlook.com>
Date: Fri, 5 Jul 2019 21:12:54 +0300
Subject: [PATCH 1/2] fix eslint errors after merge

---
 src/compiler/checker.ts                  | 2 +-
 src/testRunner/parallel/host.ts          | 4 ++--
 src/testRunner/unittests/jsDocParsing.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 03ae2412519..bade1197018 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15066,7 +15066,7 @@ namespace ts {
                     }
                     diagnostic = !noImplicitAny ? Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage :
                         wideningKind === WideningKind.GeneratorYield ? Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type :
-                            Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type;
+                        Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type;
                     break;
                 case SyntaxKind.MappedType:
                     if (noImplicitAny) {
diff --git a/src/testRunner/parallel/host.ts b/src/testRunner/parallel/host.ts
index 9f602213a30..33d5461cbab 100644
--- a/src/testRunner/parallel/host.ts
+++ b/src/testRunner/parallel/host.ts
@@ -291,8 +291,8 @@ namespace Harness.Parallel.Host {
                     worker.accumulatedOutput += d.toString();
                     console.log(`[Worker ${i}]`, d.toString());
                 };
-                worker.process.stderr!.on("data", appendOutput);
-                worker.process.stdout!.on("data", appendOutput);
+                worker.process.stderr.on("data", appendOutput);
+                worker.process.stdout.on("data", appendOutput);
                 const killChild = (timeout: TaskTimeout) => {
                     worker.process.kill();
                     console.error(`Worker exceeded ${timeout.duration}ms timeout ${worker.currentTasks && worker.currentTasks.length ? `while running test '${worker.currentTasks[0].file}'.` : `during test setup.`}`);
diff --git a/src/testRunner/unittests/jsDocParsing.ts b/src/testRunner/unittests/jsDocParsing.ts
index 5cfb842b164..117e8b51a66 100644
--- a/src/testRunner/unittests/jsDocParsing.ts
+++ b/src/testRunner/unittests/jsDocParsing.ts
@@ -317,7 +317,7 @@ namespace ts {
  * @see {@link second link text} and {@link Foo|a foo} as well.
  */`);
                 parsesCorrectly("authorTag",
-`/**
+                    `/**
  * @author John Doe <john.doe@example.com>
  * @author John Doe <john.doe@example.com> unexpected comment
  */`);

From c5453c8b35f05b2053b4d3fb02429a054af325f9 Mon Sep 17 00:00:00 2001
From: Alexander <alexander.tarasyuk@outlook.com>
Date: Fri, 5 Jul 2019 21:55:05 +0300
Subject: [PATCH 2/2] import/no-extraneous-dependencies

---
 .eslintrc    | 6 +++++-
 package.json | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc
index 064dc326864..0040f1175b8 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -12,7 +12,7 @@
         "es6": true
     },
     "plugins": [
-        "@typescript-eslint", "microsoft-typescript"
+        "@typescript-eslint", "microsoft-typescript", "import"
     ],
     "rules": {
         "@typescript-eslint/adjacent-overload-signatures": "error",
@@ -69,6 +69,10 @@
         "microsoft-typescript/debug-assert": "error",
         "microsoft-typescript/no-keywords": "error",
 
+        "import/no-extraneous-dependencies": ["error", {
+            "optionalDependencies": false
+        }],
+
         "arrow-body-style": "off",
         "arrow-parens": "off",
         "brace-style": ["error", "stroustrup", { "allowSingleLine": true }],
diff --git a/package.json b/package.json
index b27094ebd0b..d969619dd1b 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
         "@types/xml2js": "^0.4.0",
         "@typescript-eslint/eslint-plugin": "1.11.0",
         "@typescript-eslint/parser": "1.11.0",
+        "async": "latest",
         "azure-devops-node-api": "^8.0.0",
         "browser-resolve": "^1.11.2",
         "browserify": "latest",
@@ -65,9 +66,11 @@
         "del": "latest",
         "eslint": "6.0.1",
         "eslint-formatter-autolinkable-stylish": "latest",
+        "eslint-plugin-import": "2.18.0",
         "eslint-plugin-microsoft-typescript": "0.1.11",
         "fancy-log": "latest",
         "fs-extra": "^6.0.1",
+        "glob": "latest",
         "gulp": "^4.0.0",
         "gulp-concat": "latest",
         "gulp-insert": "latest",