Skip to content

Commit

Permalink
Use jest-environment-jsdom-sixteen (facebook#19288)
Browse files Browse the repository at this point in the history
* Use jest-environment-jsdom-sixteen

* Update yarn.lock

* Dedupe new jest packages in yarn.lock

* Pull upstream changes
  • Loading branch information
rickhanlonii authored Jul 16, 2020
1 parent e387c98 commit bc4cd92
Show file tree
Hide file tree
Showing 3 changed files with 231 additions and 29 deletions.
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"jest": "^25.2.7",
"jest-cli": "^25.2.7",
"jest-diff": "^25.2.6",
"jest-environment-jsdom-sixteen": "^1.0.3",
"jest-snapshot-serializer-raw": "^1.1.0",
"minimatch": "^3.0.4",
"minimist": "^1.2.3",
Expand Down Expand Up @@ -130,8 +131,5 @@
"version-check": "node ./scripts/tasks/version-check.js",
"merge-fork": "node ./scripts/merge-fork/merge-fork.js",
"replace-fork": "node ./scripts/merge-fork/replace-fork.js"
},
"resolutions": {
"**/jsdom": "npm:@gaearon/[email protected]"
}
}
3 changes: 3 additions & 0 deletions scripts/jest/config.base.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@ module.exports = {
collectCoverageFrom: ['packages/**/*.js'],
timers: 'fake',
snapshotSerializers: [require.resolve('jest-snapshot-serializer-raw')],

// TODO: Upgrade to Jest 26 which uses jsdom 16 by default.
testEnvironment: require.resolve('jest-environment-jsdom-sixteen'),
};
Loading

0 comments on commit bc4cd92

Please sign in to comment.