diff --git a/package.json b/package.json index f0f6218ea3ab..3bea730d2ab7 100644 --- a/package.json +++ b/package.json @@ -144,6 +144,7 @@ }, "resolutions": { "@types/jest/jest-diff": "^25.1.0", - "@types/jest/pretty-format": "^25.1.0" + "@types/jest/pretty-format": "^25.1.0", + "fbjs-scripts": "patch:fbjs-scripts@^1.1.0#./patches/fbjs-scripts.patch" } } diff --git a/patches/fbjs-scripts.patch b/patches/fbjs-scripts.patch new file mode 100644 index 000000000000..100440557af9 --- /dev/null +++ b/patches/fbjs-scripts.patch @@ -0,0 +1,13 @@ +diff --git a/jest/createCacheKeyFunction.js b/jest/createCacheKeyFunction.js +index 890918962daebefedee59a48cd02906447f9de5b..3955d97208c753c1208342d045adbce5b569eb57 100644 +--- a/jest/createCacheKeyFunction.js ++++ b/jest/createCacheKeyFunction.js +@@ -31,7 +31,7 @@ function getGlobalCacheKey(files, values) { + } + + function getCacheKeyFunction(globalCacheKey) { +- return (src, file, configString, options) => { ++ return (src, file, options) => { + const {instrument, config} = options; + const rootDir = config && config.rootDir; + diff --git a/yarn.lock b/yarn.lock index 2c6bfbee05de..50d9831af5a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8998,7 +8998,7 @@ __metadata: languageName: node linkType: hard -"fbjs-scripts@npm:^1.1.0": +fbjs-scripts@^1.1.0: version: 1.2.0 resolution: "fbjs-scripts@npm:1.2.0" dependencies: @@ -9016,6 +9016,24 @@ __metadata: languageName: node linkType: hard +"fbjs-scripts@patch:fbjs-scripts@^1.1.0#./patches/fbjs-scripts.patch::locator=%40jest%2Fmonorepo%40workspace%3A.": + version: 1.2.0 + resolution: "fbjs-scripts@patch:fbjs-scripts@npm%3A1.2.0#./patches/fbjs-scripts.patch::version=1.2.0&hash=48439e&locator=%40jest%2Fmonorepo%40workspace%3A." + dependencies: + "@babel/core": ^7.0.0 + ansi-colors: ^1.0.1 + babel-preset-fbjs: ^3.2.0 + core-js: ^2.4.1 + cross-spawn: ^5.1.0 + fancy-log: ^1.3.2 + object-assign: ^4.0.1 + plugin-error: ^0.1.2 + semver: ^5.1.0 + through2: ^2.0.0 + checksum: 80f8e19c09cf8fe91a4afafb11632b9dc165a70ad1391f2d8ca78f884d4d5807a90e40835f7ca70fe061ffdf50b6f885e404cfab0074da0278921807d3c39e9f + languageName: node + linkType: hard + "fbjs@npm:^1.0.0": version: 1.0.0 resolution: "fbjs@npm:1.0.0"