reverting the changes that failed the e2e tests. (#22714)

pull/22716/head
Marcus Andersson 5 years ago committed by GitHub
parent 49418f1a63
commit f26d14eef1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      packages/grafana-e2e/cypress/plugins/typescriptPreprocessor.js
  2. 3
      packages/grafana-e2e/cypress/tsconfig.json

@ -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`,
},
},
],
},

@ -1,8 +1,7 @@
{
"compilerOptions": {
"module": "commonjs",
"types": ["cypress"]
},
"extends": "@grafana/tsconfig",
"extends": "../tsconfig.json",
"include": ["**/*.ts"]
}

Loading…
Cancel
Save