diff --git a/packages/jest-resolve/package.json b/packages/jest-resolve/package.json index 17bff3225e1d..f6fc16f250a9 100644 --- a/packages/jest-resolve/package.json +++ b/packages/jest-resolve/package.json @@ -26,7 +26,7 @@ "jest-util": "workspace:*", "jest-validate": "workspace:*", "slash": "^3.0.0", - "unrs-resolver": "^1.7.9" + "unrs-resolver": "^1.7.10" }, "devDependencies": { "@types/graceful-fs": "^4.1.9" diff --git a/packages/jest-resolve/src/__tests__/resolve.test.ts b/packages/jest-resolve/src/__tests__/resolve.test.ts index 70de6a603f43..81433f2c22d5 100644 --- a/packages/jest-resolve/src/__tests__/resolve.test.ts +++ b/packages/jest-resolve/src/__tests__/resolve.test.ts @@ -173,7 +173,7 @@ describe('findNodeModule', () => { ); }); - test('respects order in conditions over package.json', () => { + test('respects order in package.json, not conditions', () => { const resultImport = Resolver.findNodeModule('exports', { basedir: conditionsRoot, conditions: ['import', 'require'], @@ -183,7 +183,7 @@ describe('findNodeModule', () => { conditions: ['require', 'import'], }); - expect(resultImport).not.toEqual(resultRequire); + expect(resultImport).toEqual(resultRequire); }); test('supports nested paths', () => { diff --git a/yarn.lock b/yarn.lock index a67d04b143dc..731aacd8bdfe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6776,6 +6776,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-darwin-arm64@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-darwin-arm64@npm:1.7.10" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@unrs/resolver-binding-darwin-arm64@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-darwin-arm64@npm:1.7.9" @@ -6783,6 +6790,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-darwin-x64@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-darwin-x64@npm:1.7.10" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@unrs/resolver-binding-darwin-x64@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-darwin-x64@npm:1.7.9" @@ -6790,6 +6804,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-freebsd-x64@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-freebsd-x64@npm:1.7.10" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + "@unrs/resolver-binding-freebsd-x64@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-freebsd-x64@npm:1.7.9" @@ -6797,6 +6818,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.10" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.9" @@ -6804,6 +6832,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.10" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.9" @@ -6811,6 +6846,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.10" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + "@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.9" @@ -6818,6 +6860,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-linux-arm64-musl@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-linux-arm64-musl@npm:1.7.10" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + "@unrs/resolver-binding-linux-arm64-musl@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-linux-arm64-musl@npm:1.7.9" @@ -6825,6 +6874,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.10" + conditions: os=linux & cpu=ppc64 & libc=glibc + languageName: node + linkType: hard + "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.9" @@ -6832,6 +6888,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.10" + conditions: os=linux & cpu=riscv64 & libc=glibc + languageName: node + linkType: hard + "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.9" @@ -6839,6 +6902,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.10" + conditions: os=linux & cpu=riscv64 & libc=musl + languageName: node + linkType: hard + "@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.9" @@ -6846,6 +6916,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.10" + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + "@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.9" @@ -6853,6 +6930,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-linux-x64-gnu@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-linux-x64-gnu@npm:1.7.10" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + "@unrs/resolver-binding-linux-x64-gnu@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-linux-x64-gnu@npm:1.7.9" @@ -6860,6 +6944,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-linux-x64-musl@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-linux-x64-musl@npm:1.7.10" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + "@unrs/resolver-binding-linux-x64-musl@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-linux-x64-musl@npm:1.7.9" @@ -6867,6 +6958,15 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-wasm32-wasi@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-wasm32-wasi@npm:1.7.10" + dependencies: + "@napi-rs/wasm-runtime": ^0.2.10 + conditions: cpu=wasm32 + languageName: node + linkType: hard + "@unrs/resolver-binding-wasm32-wasi@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-wasm32-wasi@npm:1.7.9" @@ -6876,6 +6976,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.10" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.9" @@ -6883,6 +6990,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.10" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + "@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.9" @@ -6890,6 +7004,13 @@ __metadata: languageName: node linkType: hard +"@unrs/resolver-binding-win32-x64-msvc@npm:1.7.10": + version: 1.7.10 + resolution: "@unrs/resolver-binding-win32-x64-msvc@npm:1.7.10" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@unrs/resolver-binding-win32-x64-msvc@npm:1.7.9": version: 1.7.9 resolution: "@unrs/resolver-binding-win32-x64-msvc@npm:1.7.9" @@ -13809,7 +13930,7 @@ __metadata: jest-util: "workspace:*" jest-validate: "workspace:*" slash: ^3.0.0 - unrs-resolver: ^1.7.9 + unrs-resolver: ^1.7.10 languageName: unknown linkType: soft @@ -21449,7 +21570,68 @@ __metadata: languageName: node linkType: hard -"unrs-resolver@npm:^1.7.2, unrs-resolver@npm:^1.7.8, unrs-resolver@npm:^1.7.9": +"unrs-resolver@npm:^1.7.10": + version: 1.7.10 + resolution: "unrs-resolver@npm:1.7.10" + dependencies: + "@unrs/resolver-binding-darwin-arm64": 1.7.10 + "@unrs/resolver-binding-darwin-x64": 1.7.10 + "@unrs/resolver-binding-freebsd-x64": 1.7.10 + "@unrs/resolver-binding-linux-arm-gnueabihf": 1.7.10 + "@unrs/resolver-binding-linux-arm-musleabihf": 1.7.10 + "@unrs/resolver-binding-linux-arm64-gnu": 1.7.10 + "@unrs/resolver-binding-linux-arm64-musl": 1.7.10 + "@unrs/resolver-binding-linux-ppc64-gnu": 1.7.10 + "@unrs/resolver-binding-linux-riscv64-gnu": 1.7.10 + "@unrs/resolver-binding-linux-riscv64-musl": 1.7.10 + "@unrs/resolver-binding-linux-s390x-gnu": 1.7.10 + "@unrs/resolver-binding-linux-x64-gnu": 1.7.10 + "@unrs/resolver-binding-linux-x64-musl": 1.7.10 + "@unrs/resolver-binding-wasm32-wasi": 1.7.10 + "@unrs/resolver-binding-win32-arm64-msvc": 1.7.10 + "@unrs/resolver-binding-win32-ia32-msvc": 1.7.10 + "@unrs/resolver-binding-win32-x64-msvc": 1.7.10 + napi-postinstall: ^0.2.2 + dependenciesMeta: + "@unrs/resolver-binding-darwin-arm64": + optional: true + "@unrs/resolver-binding-darwin-x64": + optional: true + "@unrs/resolver-binding-freebsd-x64": + optional: true + "@unrs/resolver-binding-linux-arm-gnueabihf": + optional: true + "@unrs/resolver-binding-linux-arm-musleabihf": + optional: true + "@unrs/resolver-binding-linux-arm64-gnu": + optional: true + "@unrs/resolver-binding-linux-arm64-musl": + optional: true + "@unrs/resolver-binding-linux-ppc64-gnu": + optional: true + "@unrs/resolver-binding-linux-riscv64-gnu": + optional: true + "@unrs/resolver-binding-linux-riscv64-musl": + optional: true + "@unrs/resolver-binding-linux-s390x-gnu": + optional: true + "@unrs/resolver-binding-linux-x64-gnu": + optional: true + "@unrs/resolver-binding-linux-x64-musl": + optional: true + "@unrs/resolver-binding-wasm32-wasi": + optional: true + "@unrs/resolver-binding-win32-arm64-msvc": + optional: true + "@unrs/resolver-binding-win32-ia32-msvc": + optional: true + "@unrs/resolver-binding-win32-x64-msvc": + optional: true + checksum: 9f3734db018add7ce00fd6c677ede79dffe14027647b2c953abf83b378dc3985d53d89399a0306aa0ab4d0bca717d64ccbc3412cdefb67a033c16da01bcba3f9 + languageName: node + linkType: hard + +"unrs-resolver@npm:^1.7.2, unrs-resolver@npm:^1.7.8": version: 1.7.9 resolution: "unrs-resolver@npm:1.7.9" dependencies: