Skip to content

Commit 135e19b

Browse files
committed
bump resolve.exports
1 parent 7ed7ec9 commit 135e19b

File tree

6 files changed

+14
-26
lines changed

6 files changed

+14
-26
lines changed

e2e/resolve-conditions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"transform": {}
1414
},
1515
"dependencies": {
16-
"resolve.exports": "^1.0.2"
16+
"resolve.exports": "^1.1.0"
1717
}
1818
}

e2e/resolve-conditions/resolver.js

+1-7
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,7 @@ function createPathFilter(conditions) {
2424
const path = relativePath === 'index' ? '.' : relativePath;
2525

2626
return (
27-
resolveExports(pkg, path, {
28-
// `resolve.exports` adds `node` unless `browser` is `true`, so let's add this ugly thing
29-
browser: conditions.includes('browser'),
30-
conditions,
31-
// `resolve.exports` adds `import` unless `require` is `true`, so let's add this ugly thing
32-
require: conditions.includes('require'),
33-
}) || relativePath
27+
resolveExports(pkg, path, {conditions, unsafe: true}) || relativePath
3428
);
3529
};
3630
}

e2e/resolve-conditions/yarn.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ __metadata:
55
version: 4
66
cacheKey: 7
77

8-
"resolve.exports@npm:^1.0.2":
9-
version: 1.0.2
10-
resolution: "resolve.exports@npm:1.0.2"
11-
checksum: 012a46e3ae41c53762abf5b50ea1b4adf2de617bbea1dbc7bf6e609c1ceaedee7782acbc92d443951d5dd0c3a8fb1090ce73285a9ccc24b530e33b5e09ae196f
8+
"resolve.exports@npm:^1.1.0":
9+
version: 1.1.0
10+
resolution: "resolve.exports@npm:1.1.0"
11+
checksum: d04d2ce651fac14fe6ba13b377690f790cbbe91e6211b8fbec97ee08282e278875c74073a9b6243143a64e33d95eefb479e1dd4965664edc73b28b712100b36c
1212
languageName: node
1313
linkType: hard
1414

1515
"root-workspace-0b6124@workspace:.":
1616
version: 0.0.0-use.local
1717
resolution: "root-workspace-0b6124@workspace:."
1818
dependencies:
19-
resolve.exports: ^1.0.2
19+
resolve.exports: ^1.1.0
2020
languageName: unknown
2121
linkType: soft

packages/jest-resolve/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"jest-util": "^27.2.5",
2424
"jest-validate": "^27.2.5",
2525
"resolve": "^1.20.0",
26-
"resolve.exports": "^1.0.2",
26+
"resolve.exports": "^1.1.0",
2727
"slash": "^3.0.0"
2828
},
2929
"devDependencies": {

packages/jest-resolve/src/defaultResolver.ts

+1-7
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,7 @@ function readPackageSync(_: unknown, file: Config.Path): PkgJson {
158158

159159
function createPackageFilter(conditions?: Array<string>) {
160160
const options: ResolveExportsOptions = conditions
161-
? {
162-
// `resolve.exports` adds `node` unless `browser` is `true`, so let's add this ugly thing
163-
browser: conditions.includes('browser'),
164-
conditions,
165-
// `resolve.exports` adds `import` unless `require` is `true`, so let's add this ugly thing
166-
require: conditions.includes('require'),
167-
}
161+
? {conditions, unsafe: true}
168162
: // no conditions were passed - let's assume this is Jest internal and it should be `require`
169163
{browser: false, require: true};
170164

yarn.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -13027,7 +13027,7 @@ fsevents@^1.2.7:
1302713027
jest-util: ^27.2.5
1302813028
jest-validate: ^27.2.5
1302913029
resolve: ^1.20.0
13030-
resolve.exports: ^1.0.2
13030+
resolve.exports: ^1.1.0
1303113031
slash: ^3.0.0
1303213032
languageName: unknown
1303313033
linkType: soft
@@ -18946,10 +18946,10 @@ react-native@0.64.0:
1894618946
languageName: node
1894718947
linkType: hard
1894818948

18949-
"resolve.exports@npm:^1.0.2":
18950-
version: 1.0.2
18951-
resolution: "resolve.exports@npm:1.0.2"
18952-
checksum: 012a46e3ae41c53762abf5b50ea1b4adf2de617bbea1dbc7bf6e609c1ceaedee7782acbc92d443951d5dd0c3a8fb1090ce73285a9ccc24b530e33b5e09ae196f
18949+
"resolve.exports@npm:^1.1.0":
18950+
version: 1.1.0
18951+
resolution: "resolve.exports@npm:1.1.0"
18952+
checksum: d04d2ce651fac14fe6ba13b377690f790cbbe91e6211b8fbec97ee08282e278875c74073a9b6243143a64e33d95eefb479e1dd4965664edc73b28b712100b36c
1895318953
languageName: node
1895418954
linkType: hard
1895518955

0 commit comments

Comments
 (0)