1 files changed, 9 insertions, 4 deletions
diff --git a/babel.config.js b/babel.config.js
index e3de8ef2d83..05554e8763e 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -38,10 +38,15 @@ if (BABEL_ENV === 'karma' || BABEL_ENV === 'coverage') {
   plugins.push('babel-plugin-rewire');
 }
 
-// Jest is running in node environment
-if (BABEL_ENV === 'jest') {
-  plugins.push('transform-es2015-modules-commonjs');
-  plugins.push('dynamic-import-node');
+// Jest is running in node environment, so we need additional plugins
+const isJest = Boolean(process.env.JEST_WORKER_ID);
+if (isJest) {
+  plugins.push('@babel/plugin-transform-modules-commonjs');
+  /*
+  without the following, babel-plugin-istanbul throws an error:
+  https://gitlab.com/gitlab-org/gitlab-ce/issues/58390
+  */
+  plugins.push('babel-plugin-dynamic-import-node');
 }
 
 module.exports = { presets, plugins };