STCLI-231: Adjust finding in webpack config in order to fix coverage (#…

…326) * STCLI-231: Adjust finding in webpack config in order to fix coverage * Move set * Cleanup
folio-org · May 25, 2023 · 470fbd4 · 470fbd4
1 parent 5e08fe1
commit 470fbd4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/lib/test/webpack-config.js b/lib/test/webpack-config.js
@@ -1,5 +1,6 @@
 const path = require('path');
-const { set } = require('lodash');
+
+const { enableCoverage } = require('../webpack-common');
 
 // TODO: Move this to stripes-core and expose as part of the Stripes Node API
 // Generates a webpack config for Stripes independent of build or serve
@@ -31,17 +32,7 @@ module.exports = function getStripesWebpackConfig(stripeCore, stripesConfig, opt
 
   // Inject babel-plugin-istanbul when coverage is enabled
   if (options.coverage) {
-    const babelLoaderConfigIndex = config.module.rules.findIndex((rule) => {
-      return rule?.oneOf?.[1]?.use?.[0].loader === 'babel-loader';
-    });
-
-    if (!config.module.rules[babelLoaderConfigIndex]?.oneOf?.[1].use[0].options?.plugins) {
-      set(config.module.rules[babelLoaderConfigIndex], 'oneOf[1].use[0].options.plugins', []);
-    }
-
-    config.module.rules[babelLoaderConfigIndex].oneOf[1].use[0].options.plugins.push(
-      require.resolve('babel-plugin-istanbul')
-    );
+    enableCoverage(config);
   }
 
   // Remove HMR plugin during testing

diff --git a/lib/webpack-common.js b/lib/webpack-common.js
@@ -1,5 +1,6 @@
 const fs = require('fs');
 const path = require('path');
+const { set } = require('lodash');
 const webpack = require('webpack');
 const logger = require('./cli/logger')('webpack');
 
@@ -83,14 +84,17 @@ function limitChunks(maxChunks) {
 
 function enableCoverage(config) {
   const babelLoaderConfigIndex = config.module.rules.findIndex((rule) => {
-    return rule.loader === 'babel-loader';
+    return rule?.oneOf?.[1]?.use?.[0].loader === 'babel-loader';
   });
-  if (!config.module.rules[babelLoaderConfigIndex].options.plugins) {
-    config.module.rules[babelLoaderConfigIndex].options.plugins = [];
+
+  if (!config.module.rules[babelLoaderConfigIndex]?.oneOf?.[1].use[0].options?.plugins) {
+    set(config.module.rules[babelLoaderConfigIndex], 'oneOf[1].use[0].options.plugins', []);
   }
-  config.module.rules[babelLoaderConfigIndex].options.plugins.push(
+
+  config.module.rules[babelLoaderConfigIndex].oneOf[1].use[0].options.plugins.push(
     require.resolve('babel-plugin-istanbul')
   );
+
   return config;
 }