From f26d14eef1c1c1fb2d10a9bad505e3b14bb9acf5 Mon Sep 17 00:00:00 2001
From: Marcus Andersson <marcus.andersson@grafana.com>
Date: Wed, 11 Mar 2020 11:26:52 +0100
Subject: [PATCH] reverting the changes that failed the e2e tests. (#22714)

---
 .../cypress/plugins/typescriptPreprocessor.js          | 10 ----------
 packages/grafana-e2e/cypress/tsconfig.json             |  3 +--
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/packages/grafana-e2e/cypress/plugins/typescriptPreprocessor.js b/packages/grafana-e2e/cypress/plugins/typescriptPreprocessor.js
index da12a823396..352b660a1a0 100644
--- a/packages/grafana-e2e/cypress/plugins/typescriptPreprocessor.js
+++ b/packages/grafana-e2e/cypress/plugins/typescriptPreprocessor.js
@@ -1,23 +1,13 @@
-const { resolve } = require('path');
 const wp = require('@cypress/webpack-preprocessor');
 
-const packageRoot = resolve(`${__dirname}/../../`);
-const packageModules = `${packageRoot}/node_modules`;
-
 const webpackOptions = {
   module: {
     rules: [
       {
-        include: modulePath => {
-          return modulePath.startsWith(packageRoot) && !modulePath.startsWith(packageModules);
-        },
         test: /\.ts$/,
         use: [
           {
             loader: 'ts-loader',
-            options: {
-              configFile: `${__dirname}/../tsconfig.json`,
-            },
           },
         ],
       },
diff --git a/packages/grafana-e2e/cypress/tsconfig.json b/packages/grafana-e2e/cypress/tsconfig.json
index 41a42f4f422..c5d0b72aed0 100644
--- a/packages/grafana-e2e/cypress/tsconfig.json
+++ b/packages/grafana-e2e/cypress/tsconfig.json
@@ -1,8 +1,7 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
     "types": ["cypress"]
   },
-  "extends": "@grafana/tsconfig",
+  "extends": "../tsconfig.json",
   "include": ["**/*.ts"]
 }