diff options
| author | Mike Lewis <mlewis@gitlab.com> | 2019-03-07 15:59:00 +0000 |
|---|---|---|
| committer | Mike Lewis <mlewis@gitlab.com> | 2019-03-07 15:59:00 +0000 |
| commit | dbd7309a16bd3abc6c586b6c2df2beb317cfef95 (patch) | |
| tree | 3fdd719c926ac80285f0dc93ef975625657d0fbb /babel.config.js | |
| parent | 7be248334b350091e83d0335bf0c263071c6a67f (diff) | |
| parent | b63efb09a5c864047924cd2d84527b47dd563d5f (diff) | |
| download | gitlab-ce-reply-to-comment-documentation.tar.gz | |
Merge branch 'master' into 'reply-to-comment-documentation'reply-to-comment-documentation
# Conflicts:
# doc/user/discussions/index.md
Diffstat (limited to 'babel.config.js')
| -rw-r--r-- | babel.config.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/babel.config.js b/babel.config.js index e3de8ef2d83..78d14095b0b 100644 --- a/babel.config.js +++ b/babel.config.js @@ -40,8 +40,12 @@ if (BABEL_ENV === 'karma' || BABEL_ENV === 'coverage') { // Jest is running in node environment if (BABEL_ENV === 'jest') { - plugins.push('transform-es2015-modules-commonjs'); - plugins.push('dynamic-import-node'); + 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 }; |