From afca168d290d3ffb4b817517a1e04c0f3436eed9 Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Mon, 16 Nov 2020 13:21:33 +0100
Subject: [PATCH] patch fbjs-scripts

---
 package.json               |  3 ++-
 patches/fbjs-scripts.patch | 13 +++++++++++++
 yarn.lock                  | 20 +++++++++++++++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 patches/fbjs-scripts.patch

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..d3da4a8c1950
--- /dev/null
+++ b/patches/fbjs-scripts.patch
@@ -0,0 +1,13 @@
+diff --git a/jest/createCacheKeyFunction.js b/jest/createCacheKeyFunction.js
+index 890918962daebefedee59a48cd02906447f9de5b..2e73413d30a9964891608eb9ec02568b981b5ba0 100644
+--- a/jest/createCacheKeyFunction.js
++++ b/jest/createCacheKeyFunction.js
+@@ -32,6 +32,8 @@ function getGlobalCacheKey(files, values) {
+ 
+ function getCacheKeyFunction(globalCacheKey) {
+   return (src, file, configString, options) => {
++    // Jest 27 passes a single options bag which contains `configString` rather than as a separate argument
++    options = options || configString;
+     const {instrument, config} = options;
+     const rootDir = config && config.rootDir;
+ 
diff --git a/yarn.lock b/yarn.lock
index 2c6bfbee05de..f06703de94a8 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=f23fdb&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: 908b412866a6d1dd625b466153834f2f1e417f903e2c4a110840a14c2d7973e9ae9f03101be947ca01faf99dd198370cc405181a9223066ee803c84e41110190
+  languageName: node
+  linkType: hard
+
 "fbjs@npm:^1.0.0":
   version: 1.0.0
   resolution: "fbjs@npm:1.0.0"