diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-01 10:41:28 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-01 10:41:28 +0300 |
| commit | e7c4ca86d971cd99786cf695f631e9b60c098d87 (patch) | |
| tree | 024c79eb62917a2eda1f2f58959e5c4e1a88eba6 | |
| parent | 7216d460e474fb3ba530a8ce84eca1c18aded8b0 (diff) | |
| parent | 9062b9a5d5e564917decbe3c0691e1f1de430a29 (diff) | |
Merge branch 'winh-jest-ide' into 'master'
Remove babel environment for Jest
Closes #59164
See merge request gitlab-org/gitlab-ce!27676
| -rw-r--r-- | babel.config.js | 5 | ||||
| -rw-r--r-- | package.json | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/babel.config.js b/babel.config.js index 78d14095b0b..df30892731d 100644 --- a/babel.config.js +++ b/babel.config.js @@ -38,8 +38,9 @@ if (BABEL_ENV === 'karma' || BABEL_ENV === 'coverage') { plugins.push('babel-plugin-rewire'); } -// Jest is running in node environment -if (BABEL_ENV === 'jest') { +// Jest is running in node environment, so we need additional plugins +const isJest = !!process.env.JEST_WORKER_ID; +if (isJest) { plugins.push('@babel/plugin-transform-modules-commonjs'); /* without the following, babel-plugin-istanbul throws an error: diff --git a/package.json b/package.json index 6fd364251e8..3410bcaa9f5 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,7 @@ "eslint": "eslint --max-warnings 0 --report-unused-disable-directives --ext .js,.vue .", "eslint-fix": "eslint --max-warnings 0 --report-unused-disable-directives --ext .js,.vue --fix .", "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html --no-inline-config .", - "jest": "BABEL_ENV=jest jest", - "jest-debug": "BABEL_ENV=jest node --inspect-brk node_modules/.bin/jest --runInBand", + "jest-debug": "node --inspect-brk node_modules/.bin/jest --runInBand", "jsdoc": "jsdoc -c config/jsdocs.config.js", "karma": "BABEL_ENV=${BABEL_ENV:=karma} karma start --single-run true config/karma.config.js", "karma-coverage": "BABEL_ENV=coverage karma start --single-run true config/karma.config.js", |