From 01a70be2117bf89e812ea59bd2e652b0e975cfce Mon Sep 17 00:00:00 2001
From: Dmitriy Kovalenko <dmtr.kovalenko@outlook.com>
Date: Thu, 1 Oct 2020 18:40:43 +0300
Subject: [PATCH] Fix dependency resolution

---
 npm/webpack-preprocessor/tsconfig.json                        | 4 ++--
 packages/desktop-gui/package.json                             | 1 +
 packages/desktop-gui/src/main.scss                            | 2 +-
 packages/reporter/src/main-runner.scss                        | 2 +-
 packages/runner/package.json                                  | 1 +
 packages/runner/src/main.scss                                 | 2 +-
 packages/ui-components/package.json                           | 1 +
 .../ui-components/src/file-opener/editor-picker-modal.tsx     | 1 -
 8 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/npm/webpack-preprocessor/tsconfig.json b/npm/webpack-preprocessor/tsconfig.json
index 5f12ba1f84..19cd3a47ab 100644
--- a/npm/webpack-preprocessor/tsconfig.json
+++ b/npm/webpack-preprocessor/tsconfig.json
@@ -21,7 +21,7 @@
     // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
     // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-
+    "skipLibCheck": true,
     /* Strict Type-Checking Options */
     "strict": true,                           /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
@@ -63,5 +63,5 @@
     /* Advanced Options */
     "forceConsistentCasingInFileNames": true  /* Disallow inconsistently-cased references to the same file. */
   },
-  "include": ["*.ts"]
+  "include": ["./*.ts"]
 }
diff --git a/packages/desktop-gui/package.json b/packages/desktop-gui/package.json
index 47d08f950e..d125b9f432 100644
--- a/packages/desktop-gui/package.json
+++ b/packages/desktop-gui/package.json
@@ -22,6 +22,7 @@
     "@cypress/webpack-preprocessor": "*",
     "@fortawesome/fontawesome-free": "5.11.2",
     "@packages/web-config": "*",
+    "@reach/dialog": "0.10.5",
     "bluebird": "3.5.3",
     "bootstrap-sass": "3.4.1",
     "classnames": "2.2.6",
diff --git a/packages/desktop-gui/src/main.scss b/packages/desktop-gui/src/main.scss
index 056c7da148..2afe2549b5 100644
--- a/packages/desktop-gui/src/main.scss
+++ b/packages/desktop-gui/src/main.scss
@@ -4,5 +4,5 @@
 @import 'styles/components/*';
 @import '../../ui-components/src/file-opener/file-opener';
 @import '!(styles)*/**/*';
-@import '../../../node_modules/@reach/dialog/styles.css';
+@import '../node_modules/@reach/dialog/styles.css';
 @import '../../ui-components/src/dropdown';
diff --git a/packages/reporter/src/main-runner.scss b/packages/reporter/src/main-runner.scss
index aa522c4c63..7fe35e95ee 100644
--- a/packages/reporter/src/main-runner.scss
+++ b/packages/reporter/src/main-runner.scss
@@ -4,6 +4,6 @@
 @import 'lib/mixins';
 @import 'lib/base';
 @import 'lib/tooltip';
-@import '../../../node_modules/@reach/dialog/styles.css';
+@import '../node_modules/@reach/dialog/styles.css';
 @import '../../ui-components/src/file-opener/file-opener';
 @import './!(lib)*/**/*';
diff --git a/packages/runner/package.json b/packages/runner/package.json
index 3151ee0252..e460542afe 100644
--- a/packages/runner/package.json
+++ b/packages/runner/package.json
@@ -24,6 +24,7 @@
     "@packages/reporter": "*",
     "@packages/socket": "*",
     "@packages/web-config": "*",
+    "@reach/dialog": "0.10.5",
     "ansi-to-html": "0.6.14",
     "babel-plugin-prismjs": "1.0.2",
     "bluebird": "3.5.3",
diff --git a/packages/runner/src/main.scss b/packages/runner/src/main.scss
index ad2aeb2525..a4b40b878b 100644
--- a/packages/runner/src/main.scss
+++ b/packages/runner/src/main.scss
@@ -2,7 +2,7 @@
 @import 'lib/mixins';
 @import 'lib/fonts';
 $cy-tooltip-class: 'cy-tooltip';
-@import '../../node_modules/@cypress/react-tooltip/dist/tooltip.scss';
+@import '../node_modules/@cypress/react-tooltip/dist/tooltip.scss';
 @import 'lib/base';
 @import 'lib/shared';
 @import '!(lib)*/**/!(selector-playground.scss)';
diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json
index ef1cdfacfd..c83e1e14e2 100644
--- a/packages/ui-components/package.json
+++ b/packages/ui-components/package.json
@@ -19,6 +19,7 @@
     "@babel/plugin-proposal-decorators": "7.8.3",
     "@babel/preset-env": "7.9.0",
     "@babel/preset-react": "7.9.4",
+    "@cypress/react-tooltip": "0.5.3",
     "@cypress/webpack-preprocessor": "*",
     "@fortawesome/fontawesome-free": "5.12.1",
     "@reach/dialog": "0.10.5",
diff --git a/packages/ui-components/src/file-opener/editor-picker-modal.tsx b/packages/ui-components/src/file-opener/editor-picker-modal.tsx
index 7707519c95..3621ba9acd 100644
--- a/packages/ui-components/src/file-opener/editor-picker-modal.tsx
+++ b/packages/ui-components/src/file-opener/editor-picker-modal.tsx
@@ -2,7 +2,6 @@ import _ from 'lodash'
 import { Dialog } from '@reach/dialog'
 import { action } from 'mobx'
 import { observer, useLocalStore } from 'mobx-react'
-// @ts-ignore
 import Tooltip from '@cypress/react-tooltip'
 
 import cs from 'classnames'