Skip to content

Commit

Permalink
Merge #1855
Browse files Browse the repository at this point in the history
1855: feat: update Jest to version 27 (v14.x) r=herschel666 a=hops-release-bot[bot]

:warning: **This PR is the successor of #1844 and has been created automatically because the previous PR's commits could not be cherry-picked.** ⚠️

Co-authored-by: Emanuel Kluge <emanuel.kluge@new-work.se>
  • Loading branch information
bors[bot] and Emanuel Kluge committed Jun 8, 2021
2 parents e7062e2 + bbf6e43 commit 1544152
Show file tree
Hide file tree
Showing 9 changed files with 593 additions and 481 deletions.
18 changes: 14 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@
],
"rootManifest": {
"resolutions": {
"graphql-tag": "^2.12"
"graphql-tag": "^2.12",
"babel-jest": "^26.0.0",
"jest": "^26.0.0",
"ts-jest": "^26.0.0"
}
}
},
Expand All @@ -84,7 +87,14 @@
"url": "enc:r6BTklZr+axySHpOBj0JyiGPh/P525a+dfwfWHQq5kkrY1Wruq8QaSL2vCfb0cWp",
"branch": "hops-14.x"
}
]
],
"rootManifest": {
"resolutions": {
"babel-jest": "^26.0.0",
"jest": "^26.0.0",
"ts-jest": "^26.0.0"
}
}
}
]
},
Expand Down Expand Up @@ -227,11 +237,11 @@
"eslint-plugin-prettier": "^3.1.1",
"eslint-plugin-react": "^7.16.0",
"husky": "^4.0.0",
"jest": "^26.0.0",
"jest": "^27.0.0",
"jest-runner-eslint": "0.10.0",
"jest-runner-prettier": "0.3.6",
"jest-watch-select-projects": "2.0.0",
"jest-watch-typeahead": "0.6.2",
"jest-watch-typeahead": "0.6.4",
"lerna": "^4.0.0",
"lint-staged": "^11.0.0",
"prettier": "^2.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-environment/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"url-join": "^4.0.1"
},
"peerDependencies": {
"jest": "^26.0.0"
"jest": "^26.0.0 || ^27.0.0"
},
"homepage": "https://github.com/xing/hops/tree/master/packages/jest-environment#readme"
}
1 change: 1 addition & 0 deletions packages/jest-preset/jest-preset.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ module.exports = {
: {
'ts-jest': {
babelConfig: require('./transforms/babel.js').babelConfig,
useESM: true,
},
},
moduleNameMapper: {
Expand Down
12 changes: 6 additions & 6 deletions packages/jest-preset/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,22 @@
"regenerator-runtime": "^0.13.3"
},
"peerDependencies": {
"babel-jest": "^26.0.0",
"jest": "^26.0.0",
"babel-jest": "^26.0.0 || ^27.0.0",
"jest": "^26.0.0 || ^27.0.0",
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0",
"react-helmet-async": "^1.0.4",
"react-router-dom": "^5.1.0",
"ts-jest": "^26.0.0"
"ts-jest": "^26.0.0 || ^27.0.3"
},
"devDependencies": {
"babel-jest": "^26.0.0",
"jest": "^26.0.0",
"babel-jest": "^27.0.0",
"jest": "^27.0.0",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-helmet-async": "^1.0.4",
"react-router-dom": "^5.1.2",
"ts-jest": "^26.0.0"
"ts-jest": "^27.0.3"
},
"homepage": "https://github.com/xing/hops/tree/master/packages/jest-preset#readme"
}
4 changes: 3 additions & 1 deletion packages/jest-preset/transforms/babel.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
const babelJest = require('babel-jest');
const babelJest = ((mod) => {
return mod.default || mod;
})(require('babel-jest'));

const babelConfig = {
presets: [
Expand Down
2 changes: 1 addition & 1 deletion packages/template-graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"react-router-dom": "^5.1.2"
},
"devDependencies": {
"jest": "^26.0.0",
"jest": "^27.0.0",
"jest-preset-hops": "14.1.0",
"react-test-renderer": "^17.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/template-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"react-router-dom": "^5.1.2"
},
"devDependencies": {
"jest": "^26.0.0",
"jest": "^27.0.0",
"jest-preset-hops": "14.1.0",
"react-test-renderer": "^17.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/template-redux/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"redux-thunk": "^2.3.0"
},
"devDependencies": {
"jest": "^26.0.0",
"jest": "^27.0.0",
"jest-preset-hops": "14.1.0",
"react-test-renderer": "^17.0.1"
},
Expand Down
Loading

0 comments on commit 1544152

Please sign in to comment.