From 135e19ba81bd00fd89de3c3adb856204aba8bffd Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Fri, 15 Oct 2021 08:12:45 +0200
Subject: [PATCH] bump resolve.exports

---
 e2e/resolve-conditions/package.json          |  2 +-
 e2e/resolve-conditions/resolver.js           |  8 +-------
 e2e/resolve-conditions/yarn.lock             | 10 +++++-----
 packages/jest-resolve/package.json           |  2 +-
 packages/jest-resolve/src/defaultResolver.ts |  8 +-------
 yarn.lock                                    | 10 +++++-----
 6 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/e2e/resolve-conditions/package.json b/e2e/resolve-conditions/package.json
index 987f46111b8a..33449adf2da3 100644
--- a/e2e/resolve-conditions/package.json
+++ b/e2e/resolve-conditions/package.json
@@ -13,6 +13,6 @@
     "transform": {}
   },
   "dependencies": {
-    "resolve.exports": "^1.0.2"
+    "resolve.exports": "^1.1.0"
   }
 }
diff --git a/e2e/resolve-conditions/resolver.js b/e2e/resolve-conditions/resolver.js
index fe2665e71798..09cee4fb91a3 100644
--- a/e2e/resolve-conditions/resolver.js
+++ b/e2e/resolve-conditions/resolver.js
@@ -24,13 +24,7 @@ function createPathFilter(conditions) {
     const path = relativePath === 'index' ? '.' : relativePath;
 
     return (
-      resolveExports(pkg, path, {
-        // `resolve.exports` adds `node` unless `browser` is `true`, so let's add this ugly thing
-        browser: conditions.includes('browser'),
-        conditions,
-        // `resolve.exports` adds `import` unless `require` is `true`, so let's add this ugly thing
-        require: conditions.includes('require'),
-      }) || relativePath
+      resolveExports(pkg, path, {conditions, unsafe: true}) || relativePath
     );
   };
 }
diff --git a/e2e/resolve-conditions/yarn.lock b/e2e/resolve-conditions/yarn.lock
index b98bb300b2b9..df2f59b137b1 100644
--- a/e2e/resolve-conditions/yarn.lock
+++ b/e2e/resolve-conditions/yarn.lock
@@ -5,10 +5,10 @@ __metadata:
   version: 4
   cacheKey: 7
 
-"resolve.exports@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "resolve.exports@npm:1.0.2"
-  checksum: 012a46e3ae41c53762abf5b50ea1b4adf2de617bbea1dbc7bf6e609c1ceaedee7782acbc92d443951d5dd0c3a8fb1090ce73285a9ccc24b530e33b5e09ae196f
+"resolve.exports@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "resolve.exports@npm:1.1.0"
+  checksum: d04d2ce651fac14fe6ba13b377690f790cbbe91e6211b8fbec97ee08282e278875c74073a9b6243143a64e33d95eefb479e1dd4965664edc73b28b712100b36c
   languageName: node
   linkType: hard
 
@@ -16,6 +16,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
-    resolve.exports: ^1.0.2
+    resolve.exports: ^1.1.0
   languageName: unknown
   linkType: soft
diff --git a/packages/jest-resolve/package.json b/packages/jest-resolve/package.json
index 04303161d714..4377e7fe2500 100644
--- a/packages/jest-resolve/package.json
+++ b/packages/jest-resolve/package.json
@@ -23,7 +23,7 @@
     "jest-util": "^27.2.5",
     "jest-validate": "^27.2.5",
     "resolve": "^1.20.0",
-    "resolve.exports": "^1.0.2",
+    "resolve.exports": "^1.1.0",
     "slash": "^3.0.0"
   },
   "devDependencies": {
diff --git a/packages/jest-resolve/src/defaultResolver.ts b/packages/jest-resolve/src/defaultResolver.ts
index 0ea77e0a5e3c..db460cfcbe8d 100644
--- a/packages/jest-resolve/src/defaultResolver.ts
+++ b/packages/jest-resolve/src/defaultResolver.ts
@@ -158,13 +158,7 @@ function readPackageSync(_: unknown, file: Config.Path): PkgJson {
 
 function createPackageFilter(conditions?: Array<string>) {
   const options: ResolveExportsOptions = conditions
-    ? {
-        // `resolve.exports` adds `node` unless `browser` is `true`, so let's add this ugly thing
-        browser: conditions.includes('browser'),
-        conditions,
-        // `resolve.exports` adds `import` unless `require` is `true`, so let's add this ugly thing
-        require: conditions.includes('require'),
-      }
+    ? {conditions, unsafe: true}
     : // no conditions were passed - let's assume this is Jest internal and it should be `require`
       {browser: false, require: true};
 
diff --git a/yarn.lock b/yarn.lock
index 4a1369d666a1..1279f5d33173 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13027,7 +13027,7 @@ fsevents@^1.2.7:
     jest-util: ^27.2.5
     jest-validate: ^27.2.5
     resolve: ^1.20.0
-    resolve.exports: ^1.0.2
+    resolve.exports: ^1.1.0
     slash: ^3.0.0
   languageName: unknown
   linkType: soft
@@ -18946,10 +18946,10 @@ react-native@0.64.0:
   languageName: node
   linkType: hard
 
-"resolve.exports@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "resolve.exports@npm:1.0.2"
-  checksum: 012a46e3ae41c53762abf5b50ea1b4adf2de617bbea1dbc7bf6e609c1ceaedee7782acbc92d443951d5dd0c3a8fb1090ce73285a9ccc24b530e33b5e09ae196f
+"resolve.exports@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "resolve.exports@npm:1.1.0"
+  checksum: d04d2ce651fac14fe6ba13b377690f790cbbe91e6211b8fbec97ee08282e278875c74073a9b6243143a64e33d95eefb479e1dd4965664edc73b28b712100b36c
   languageName: node
   linkType: hard