Skip to content

Commit

Permalink
Merge pull request #621 from dhis2/fix/revert-jest-27
Browse files Browse the repository at this point in the history
revert: "feat: bump jest to v27 (#616)"
  • Loading branch information
varl authored Aug 25, 2021
2 parents c1a96b3 + 7733d14 commit 19bee10
Show file tree
Hide file tree
Showing 4 changed files with 3,002 additions and 1,056 deletions.
2 changes: 1 addition & 1 deletion cli/config/jest.transform.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const makeBabelConfig = require('./makeBabelConfig.js')
module.exports = require('babel-jest').default.createTransformer(
module.exports = require('babel-jest').createTransformer(
makeBabelConfig({ mode: 'test' })
)
4 changes: 2 additions & 2 deletions cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@dhis2/cli-helpers-engine": "^3.0.0",
"archiver": "^3.1.1",
"axios": "^0.20.0",
"babel-jest": "^27.0.6",
"babel-jest": "^24.9.0",
"babel-plugin-react-require": "^3.1.3",
"chokidar": "^3.3.0",
"detect-port": "^1.3.0",
Expand All @@ -45,7 +45,7 @@
"i18next-conv": "^9",
"i18next-scanner": "^2.10.3",
"inquirer": "^7.3.3",
"@jest/core": "^27.0.6",
"jest-cli": "^24.9.0",
"lodash": "^4.17.11",
"parse-author": "^2.0.0",
"parse-gitignore": "^1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion cli/src/commands/test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const path = require('path')
const { reporter } = require('@dhis2/cli-helpers-engine')
const { runCLI } = require('@jest/core')
const fs = require('fs-extra')
const { runCLI } = require('jest-cli')
const exitOnCatch = require('../lib/exitOnCatch')
const loadEnvFiles = require('../lib/loadEnvFiles')
const makePaths = require('../lib/paths')
Expand Down
Loading

0 comments on commit 19bee10

Please sign in to comment.