Merge branch 'master' into 5211-tests-arent-using-source-maps-master

simplify config
2022-07-28 11:19:28 -07:00 · 2022-07-28 08:13:17 -07:00 · 2022-07-27 07:09:29 +02:00 · 2022-07-27 07:09:23 +02:00 · 2022-07-27 07:08:33 +02:00
2 changed files with 4 additions and 11 deletions
--- a/babel.coverage.js
+++ b/babel.coverage.js
@@ -1,9 +0,0 @@
-// This is a Babel config that webpack.coverage.js uses in order to instrument
-// code with coverage instrumentation.
-const babelConfig = {
-    plugins: [['babel-plugin-istanbul', {
-        extension: ['.js', '.vue']
-    }]]
-};
-
-module.exports = babelConfig;
--- a/webpack.coverage.js
+++ b/webpack.coverage.js
@@ -2,7 +2,6 @@
 // instrumentation using babel-plugin-istanbul (see babel.coverage.js)

 const config = require('./webpack.dev');
-const path = require('path');
 const vueLoaderRule = config.module.rules.find(r => r.use === 'vue-loader');
 // eslint-disable-next-line no-undef
 const CI = process.env.CI === 'true';
@@ -34,8 +33,11 @@ config.module.rules.push({
    use: {
        loader: 'babel-loader',
        options: {
+            retainLines: true,
            // eslint-disable-next-line no-undef
-            configFile: path.resolve(process.cwd(), 'babel.coverage.js')
+            plugins: [['babel-plugin-istanbul', {
+                extension: ['.js', '.vue']
+            }]]
        }
    }
 });
Author	SHA1	Message	Date
Andrew Henry	7b88655373	Merge branch 'master' into 5211-tests-arent-using-source-maps-master	2022-07-28 11:19:28 -07:00
Scott Bell	9c54a9f862	Merge branch 'master' into 5211-tests-arent-using-source-maps-master	2022-07-28 08:13:17 -07:00
Scott Bell	029605ebdc	simplify config	2022-07-27 07:09:29 +02:00
Scott Bell	60b59d6bd7	closer to what we want	2022-07-27 07:09:23 +02:00
Scott Bell	9de84df6a9	removed unused require	2022-07-27 07:08:33 +02:00