Skip to content

Commit c32915f

Browse files
JounQinJounQin
authored
fix: conditions order regression (#15654)
1 parent ac334c0 commit c32915f

File tree

3 files changed

+187
-5
lines changed

3 files changed

+187
-5
lines changed

‎packages/jest-resolve/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"jest-util": "workspace:*",
2727
"jest-validate": "workspace:*",
2828
"slash": "^3.0.0",
29-
"unrs-resolver": "^1.7.9"
29+
"unrs-resolver": "^1.7.10"
3030
},
3131
"devDependencies": {
3232
"@types/graceful-fs": "^4.1.9"

‎packages/jest-resolve/src/__tests__/resolve.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ describe('findNodeModule', () => {
173173
);
174174
});
175175

176-
test('respects order in conditions over package.json', () => {
176+
test('respects order in package.json, not conditions', () => {
177177
const resultImport = Resolver.findNodeModule('exports', {
178178
basedir: conditionsRoot,
179179
conditions: ['import', 'require'],
@@ -183,7 +183,7 @@ describe('findNodeModule', () => {
183183
conditions: ['require', 'import'],
184184
});
185185

186-
expect(resultImport).not.toEqual(resultRequire);
186+
expect(resultImport).toEqual(resultRequire);
187187
});
188188

189189
test('supports nested paths', () => {

‎yarn.lock

Lines changed: 184 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6776,97 +6776,197 @@ __metadata:
67766776
languageName: node
67776777
linkType: hard
67786778

6779+
"@unrs/resolver-binding-darwin-arm64@npm:1.7.10":
6780+
version: 1.7.10
6781+
resolution: "@unrs/resolver-binding-darwin-arm64@npm:1.7.10"
6782+
conditions: os=darwin & cpu=arm64
6783+
languageName: node
6784+
linkType: hard
6785+
67796786
"@unrs/resolver-binding-darwin-arm64@npm:1.7.9":
67806787
version: 1.7.9
67816788
resolution: "@unrs/resolver-binding-darwin-arm64@npm:1.7.9"
67826789
conditions: os=darwin & cpu=arm64
67836790
languageName: node
67846791
linkType: hard
67856792

6793+
"@unrs/resolver-binding-darwin-x64@npm:1.7.10":
6794+
version: 1.7.10
6795+
resolution: "@unrs/resolver-binding-darwin-x64@npm:1.7.10"
6796+
conditions: os=darwin & cpu=x64
6797+
languageName: node
6798+
linkType: hard
6799+
67866800
"@unrs/resolver-binding-darwin-x64@npm:1.7.9":
67876801
version: 1.7.9
67886802
resolution: "@unrs/resolver-binding-darwin-x64@npm:1.7.9"
67896803
conditions: os=darwin & cpu=x64
67906804
languageName: node
67916805
linkType: hard
67926806

6807+
"@unrs/resolver-binding-freebsd-x64@npm:1.7.10":
6808+
version: 1.7.10
6809+
resolution: "@unrs/resolver-binding-freebsd-x64@npm:1.7.10"
6810+
conditions: os=freebsd & cpu=x64
6811+
languageName: node
6812+
linkType: hard
6813+
67936814
"@unrs/resolver-binding-freebsd-x64@npm:1.7.9":
67946815
version: 1.7.9
67956816
resolution: "@unrs/resolver-binding-freebsd-x64@npm:1.7.9"
67966817
conditions: os=freebsd & cpu=x64
67976818
languageName: node
67986819
linkType: hard
67996820

6821+
"@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.10":
6822+
version: 1.7.10
6823+
resolution: "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.10"
6824+
conditions: os=linux & cpu=arm
6825+
languageName: node
6826+
linkType: hard
6827+
68006828
"@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.9":
68016829
version: 1.7.9
68026830
resolution: "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.9"
68036831
conditions: os=linux & cpu=arm
68046832
languageName: node
68056833
linkType: hard
68066834

6835+
"@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.10":
6836+
version: 1.7.10
6837+
resolution: "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.10"
6838+
conditions: os=linux & cpu=arm
6839+
languageName: node
6840+
linkType: hard
6841+
68076842
"@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.9":
68086843
version: 1.7.9
68096844
resolution: "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.9"
68106845
conditions: os=linux & cpu=arm
68116846
languageName: node
68126847
linkType: hard
68136848

6849+
"@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.10":
6850+
version: 1.7.10
6851+
resolution: "@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.10"
6852+
conditions: os=linux & cpu=arm64 & libc=glibc
6853+
languageName: node
6854+
linkType: hard
6855+
68146856
"@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.9":
68156857
version: 1.7.9
68166858
resolution: "@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.9"
68176859
conditions: os=linux & cpu=arm64 & libc=glibc
68186860
languageName: node
68196861
linkType: hard
68206862

6863+
"@unrs/resolver-binding-linux-arm64-musl@npm:1.7.10":
6864+
version: 1.7.10
6865+
resolution: "@unrs/resolver-binding-linux-arm64-musl@npm:1.7.10"
6866+
conditions: os=linux & cpu=arm64 & libc=musl
6867+
languageName: node
6868+
linkType: hard
6869+
68216870
"@unrs/resolver-binding-linux-arm64-musl@npm:1.7.9":
68226871
version: 1.7.9
68236872
resolution: "@unrs/resolver-binding-linux-arm64-musl@npm:1.7.9"
68246873
conditions: os=linux & cpu=arm64 & libc=musl
68256874
languageName: node
68266875
linkType: hard
68276876

6877+
"@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.10":
6878+
version: 1.7.10
6879+
resolution: "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.10"
6880+
conditions: os=linux & cpu=ppc64 & libc=glibc
6881+
languageName: node
6882+
linkType: hard
6883+
68286884
"@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.9":
68296885
version: 1.7.9
68306886
resolution: "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.9"
68316887
conditions: os=linux & cpu=ppc64 & libc=glibc
68326888
languageName: node
68336889
linkType: hard
68346890

6891+
"@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.10":
6892+
version: 1.7.10
6893+
resolution: "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.10"
6894+
conditions: os=linux & cpu=riscv64 & libc=glibc
6895+
languageName: node
6896+
linkType: hard
6897+
68356898
"@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.9":
68366899
version: 1.7.9
68376900
resolution: "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.9"
68386901
conditions: os=linux & cpu=riscv64 & libc=glibc
68396902
languageName: node
68406903
linkType: hard
68416904

6905+
"@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.10":
6906+
version: 1.7.10
6907+
resolution: "@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.10"
6908+
conditions: os=linux & cpu=riscv64 & libc=musl
6909+
languageName: node
6910+
linkType: hard
6911+
68426912
"@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.9":
68436913
version: 1.7.9
68446914
resolution: "@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.9"
68456915
conditions: os=linux & cpu=riscv64 & libc=musl
68466916
languageName: node
68476917
linkType: hard
68486918

6919+
"@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.10":
6920+
version: 1.7.10
6921+
resolution: "@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.10"
6922+
conditions: os=linux & cpu=s390x & libc=glibc
6923+
languageName: node
6924+
linkType: hard
6925+
68496926
"@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.9":
68506927
version: 1.7.9
68516928
resolution: "@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.9"
68526929
conditions: os=linux & cpu=s390x & libc=glibc
68536930
languageName: node
68546931
linkType: hard
68556932

6933+
"@unrs/resolver-binding-linux-x64-gnu@npm:1.7.10":
6934+
version: 1.7.10
6935+
resolution: "@unrs/resolver-binding-linux-x64-gnu@npm:1.7.10"
6936+
conditions: os=linux & cpu=x64 & libc=glibc
6937+
languageName: node
6938+
linkType: hard
6939+
68566940
"@unrs/resolver-binding-linux-x64-gnu@npm:1.7.9":
68576941
version: 1.7.9
68586942
resolution: "@unrs/resolver-binding-linux-x64-gnu@npm:1.7.9"
68596943
conditions: os=linux & cpu=x64 & libc=glibc
68606944
languageName: node
68616945
linkType: hard
68626946

6947+
"@unrs/resolver-binding-linux-x64-musl@npm:1.7.10":
6948+
version: 1.7.10
6949+
resolution: "@unrs/resolver-binding-linux-x64-musl@npm:1.7.10"
6950+
conditions: os=linux & cpu=x64 & libc=musl
6951+
languageName: node
6952+
linkType: hard
6953+
68636954
"@unrs/resolver-binding-linux-x64-musl@npm:1.7.9":
68646955
version: 1.7.9
68656956
resolution: "@unrs/resolver-binding-linux-x64-musl@npm:1.7.9"
68666957
conditions: os=linux & cpu=x64 & libc=musl
68676958
languageName: node
68686959
linkType: hard
68696960

6961+
"@unrs/resolver-binding-wasm32-wasi@npm:1.7.10":
6962+
version: 1.7.10
6963+
resolution: "@unrs/resolver-binding-wasm32-wasi@npm:1.7.10"
6964+
dependencies:
6965+
"@napi-rs/wasm-runtime": ^0.2.10
6966+
conditions: cpu=wasm32
6967+
languageName: node
6968+
linkType: hard
6969+
68706970
"@unrs/resolver-binding-wasm32-wasi@npm:1.7.9":
68716971
version: 1.7.9
68726972
resolution: "@unrs/resolver-binding-wasm32-wasi@npm:1.7.9"
@@ -6876,20 +6976,41 @@ __metadata:
68766976
languageName: node
68776977
linkType: hard
68786978

6979+
"@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.10":
6980+
version: 1.7.10
6981+
resolution: "@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.10"
6982+
conditions: os=win32 & cpu=arm64
6983+
languageName: node
6984+
linkType: hard
6985+
68796986
"@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.9":
68806987
version: 1.7.9
68816988
resolution: "@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.9"
68826989
conditions: os=win32 & cpu=arm64
68836990
languageName: node
68846991
linkType: hard
68856992

6993+
"@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.10":
6994+
version: 1.7.10
6995+
resolution: "@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.10"
6996+
conditions: os=win32 & cpu=ia32
6997+
languageName: node
6998+
linkType: hard
6999+
68867000
"@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.9":
68877001
version: 1.7.9
68887002
resolution: "@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.9"
68897003
conditions: os=win32 & cpu=ia32
68907004
languageName: node
68917005
linkType: hard
68927006

7007+
"@unrs/resolver-binding-win32-x64-msvc@npm:1.7.10":
7008+
version: 1.7.10
7009+
resolution: "@unrs/resolver-binding-win32-x64-msvc@npm:1.7.10"
7010+
conditions: os=win32 & cpu=x64
7011+
languageName: node
7012+
linkType: hard
7013+
68937014
"@unrs/resolver-binding-win32-x64-msvc@npm:1.7.9":
68947015
version: 1.7.9
68957016
resolution: "@unrs/resolver-binding-win32-x64-msvc@npm:1.7.9"
@@ -13809,7 +13930,7 @@ __metadata:
1380913930
jest-util: "workspace:*"
1381013931
jest-validate: "workspace:*"
1381113932
slash: ^3.0.0
13812-
unrs-resolver: ^1.7.9
13933+
unrs-resolver: ^1.7.10
1381313934
languageName: unknown
1381413935
linkType: soft
1381513936

@@ -21449,7 +21570,68 @@ __metadata:
2144921570
languageName: node
2145021571
linkType: hard
2145121572

21452-
"unrs-resolver@npm:^1.7.2, unrs-resolver@npm:^1.7.8, unrs-resolver@npm:^1.7.9":
21573+
"unrs-resolver@npm:^1.7.10":
21574+
version: 1.7.10
21575+
resolution: "unrs-resolver@npm:1.7.10"
21576+
dependencies:
21577+
"@unrs/resolver-binding-darwin-arm64": 1.7.10
21578+
"@unrs/resolver-binding-darwin-x64": 1.7.10
21579+
"@unrs/resolver-binding-freebsd-x64": 1.7.10
21580+
"@unrs/resolver-binding-linux-arm-gnueabihf": 1.7.10
21581+
"@unrs/resolver-binding-linux-arm-musleabihf": 1.7.10
21582+
"@unrs/resolver-binding-linux-arm64-gnu": 1.7.10
21583+
"@unrs/resolver-binding-linux-arm64-musl": 1.7.10
21584+
"@unrs/resolver-binding-linux-ppc64-gnu": 1.7.10
21585+
"@unrs/resolver-binding-linux-riscv64-gnu": 1.7.10
21586+
"@unrs/resolver-binding-linux-riscv64-musl": 1.7.10
21587+
"@unrs/resolver-binding-linux-s390x-gnu": 1.7.10
21588+
"@unrs/resolver-binding-linux-x64-gnu": 1.7.10
21589+
"@unrs/resolver-binding-linux-x64-musl": 1.7.10
21590+
"@unrs/resolver-binding-wasm32-wasi": 1.7.10
21591+
"@unrs/resolver-binding-win32-arm64-msvc": 1.7.10
21592+
"@unrs/resolver-binding-win32-ia32-msvc": 1.7.10
21593+
"@unrs/resolver-binding-win32-x64-msvc": 1.7.10
21594+
napi-postinstall: ^0.2.2
21595+
dependenciesMeta:
21596+
"@unrs/resolver-binding-darwin-arm64":
21597+
optional: true
21598+
"@unrs/resolver-binding-darwin-x64":
21599+
optional: true
21600+
"@unrs/resolver-binding-freebsd-x64":
21601+
optional: true
21602+
"@unrs/resolver-binding-linux-arm-gnueabihf":
21603+
optional: true
21604+
"@unrs/resolver-binding-linux-arm-musleabihf":
21605+
optional: true
21606+
"@unrs/resolver-binding-linux-arm64-gnu":
21607+
optional: true
21608+
"@unrs/resolver-binding-linux-arm64-musl":
21609+
optional: true
21610+
"@unrs/resolver-binding-linux-ppc64-gnu":
21611+
optional: true
21612+
"@unrs/resolver-binding-linux-riscv64-gnu":
21613+
optional: true
21614+
"@unrs/resolver-binding-linux-riscv64-musl":
21615+
optional: true
21616+
"@unrs/resolver-binding-linux-s390x-gnu":
21617+
optional: true
21618+
"@unrs/resolver-binding-linux-x64-gnu":
21619+
optional: true
21620+
"@unrs/resolver-binding-linux-x64-musl":
21621+
optional: true
21622+
"@unrs/resolver-binding-wasm32-wasi":
21623+
optional: true
21624+
"@unrs/resolver-binding-win32-arm64-msvc":
21625+
optional: true
21626+
"@unrs/resolver-binding-win32-ia32-msvc":
21627+
optional: true
21628+
"@unrs/resolver-binding-win32-x64-msvc":
21629+
optional: true
21630+
checksum: 9f3734db018add7ce00fd6c677ede79dffe14027647b2c953abf83b378dc3985d53d89399a0306aa0ab4d0bca717d64ccbc3412cdefb67a033c16da01bcba3f9
21631+
languageName: node
21632+
linkType: hard
21633+
21634+
"unrs-resolver@npm:^1.7.2, unrs-resolver@npm:^1.7.8":
2145321635
version: 1.7.9
2145421636
resolution: "unrs-resolver@npm:1.7.9"
2145521637
dependencies:

0 commit comments

Comments
 (0)