IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marcus Andersson 2020-03-11 11:26:52 +01:00 committed by GitHub
parent 49418f1a63
commit f26d14eef1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/grafana-e2e/cypress/plugins/typescriptPreprocessor.js
View File

@ -1,23 +1,13 @@
const { resolve } = require('path');
const wp = require('@cypress/webpack-preprocessor'); const wp = require('@cypress/webpack-preprocessor');
const packageRoot = resolve(`${__dirname}/../../`);
const packageModules = `${packageRoot}/node_modules`;
const webpackOptions = { const webpackOptions = {
module: { module: {
rules: [ rules: [
{ {
include: modulePath => {
return modulePath.startsWith(packageRoot) && !modulePath.startsWith(packageModules);
},
test: /\.ts$/, test: /\.ts$/,
use: [ use: [
{ {
loader: 'ts-loader', loader: 'ts-loader',
options: {
configFile: `${__dirname}/../tsconfig.json`,
},
}, },
], ],
}, },

3
packages/grafana-e2e/cypress/tsconfig.json
View File

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