refactor: use singleton resolver instance (#15666)

Author: JounQin

e2e/__tests__/__snapshots__/moduleNameMapper.test.ts.snap

@@ -41,7 +41,7 @@ exports[`moduleNameMapper wrong array configuration 1`] = `
       12 | module.exports = () => 'test';
       13 |
 
-      at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:1105:17)
+      at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:1122:17)
       at Object.require (index.js:10:1)
       at Object.require (__tests__/index.js:10:20)"
 `;
@@ -71,7 +71,7 @@ exports[`moduleNameMapper wrong configuration 1`] = `
       12 | module.exports = () => 'test';
       13 |
 
-      at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:1105:17)
+      at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:1122:17)
       at Object.require (index.js:10:1)
       at Object.require (__tests__/index.js:10:20)"
 `;

e2e/__tests__/__snapshots__/requireMissingExt.test.ts.snap

@@ -26,7 +26,7 @@ exports[`shows a proper error from deep requires 1`] = `
       12 | test('dummy', () => {
       13 |   expect(1).toBe(1);
 
-      at Resolver._throwModNotFoundError (../../packages/jest-resolve/build/index.js:851:11)
+      at Resolver._throwModNotFoundError (../../packages/jest-resolve/build/index.js:868:11)
       at Object.<anonymous> (node_modules/discord.js/src/index.js:21:12)
       at Object.require (__tests__/test.js:10:1)"
 `;

e2e/__tests__/__snapshots__/resolveNoFileExtensions.test.ts.snap

@@ -37,7 +37,7 @@ exports[`show error message with matching files 1`] = `
         |                  ^
       9 |
 
-      at Resolver._throwModNotFoundError (../../packages/jest-resolve/build/index.js:851:11)
+      at Resolver._throwModNotFoundError (../../packages/jest-resolve/build/index.js:868:11)
       at Object.require (index.js:8:18)
       at Object.require (__tests__/test.js:8:11)"
 `;

packages/jest-resolve/package.json

@@ -26,7 +26,7 @@
     "jest-util": "workspace:*",
     "jest-validate": "workspace:*",
     "slash": "^3.0.0",
-    "unrs-resolver": "^1.7.10"
+    "unrs-resolver": "^1.7.11"
   },
   "devDependencies": {
     "@types/graceful-fs": "^4.1.9"

packages/jest-resolve/src/defaultResolver.ts

@@ -12,6 +12,7 @@ import {
   ResolverFactory,
   type NapiResolveOptions as UpstreamResolveOptions,
 } from 'unrs-resolver';
+import {getResolver, setResolver} from './fileWalkers';
 
 export interface ResolverOptions extends UpstreamResolveOptions {
   /** Directory to begin resolving from. */
@@ -88,7 +89,15 @@ const defaultResolver: SyncResolver = (path, options) => {
     ...rest,
   };
 
-  let unrsResolver = new ResolverFactory(resolveOptions);
+  let unrsResolver = getResolver();
+
+  if (unrsResolver) {
+    unrsResolver = unrsResolver.cloneWithOptions(resolveOptions);
+  } else {
+    unrsResolver = new ResolverFactory(resolveOptions);
+  }
+
+  setResolver(unrsResolver);
 
   let result = unrsResolver.sync(basedir, path);
 

packages/jest-resolve/src/fileWalkers.ts

@@ -7,10 +7,22 @@
 
 import {dirname, resolve} from 'path';
 import * as fs from 'graceful-fs';
+import type {ResolverFactory} from 'unrs-resolver';
 import {tryRealpath} from 'jest-util';
 import type {PackageJSON} from './types';
 
+let unrsResolver: ResolverFactory | undefined;
+
+export function getResolver(): ResolverFactory | undefined {
+  return unrsResolver;
+}
+
+export function setResolver(nextResolver: ResolverFactory): void {
+  unrsResolver = nextResolver;
+}
+
 export function clearFsCache(): void {
+  unrsResolver?.clearCache();
   checkedPaths.clear();
   checkedRealpathPaths.clear();
   packageContents.clear();

yarn.lock

@@ -6776,123 +6776,123 @@ __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"
+"@unrs/resolver-binding-darwin-arm64@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-darwin-arm64@npm:1.7.11"
   conditions: os=darwin & cpu=arm64
   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"
+"@unrs/resolver-binding-darwin-x64@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-darwin-x64@npm:1.7.11"
   conditions: os=darwin & cpu=x64
   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"
+"@unrs/resolver-binding-freebsd-x64@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-freebsd-x64@npm:1.7.11"
   conditions: os=freebsd & cpu=x64
   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"
+"@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.11"
   conditions: os=linux & cpu=arm
   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"
+"@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.11"
   conditions: os=linux & cpu=arm
   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"
+"@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.11"
   conditions: os=linux & cpu=arm64 & libc=glibc
   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"
+"@unrs/resolver-binding-linux-arm64-musl@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-linux-arm64-musl@npm:1.7.11"
   conditions: os=linux & cpu=arm64 & libc=musl
   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"
+"@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.11"
   conditions: os=linux & cpu=ppc64 & libc=glibc
   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"
+"@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.11"
   conditions: os=linux & cpu=riscv64 & libc=glibc
   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"
+"@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.11"
   conditions: os=linux & cpu=riscv64 & libc=musl
   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"
+"@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.11"
   conditions: os=linux & cpu=s390x & libc=glibc
   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"
+"@unrs/resolver-binding-linux-x64-gnu@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-linux-x64-gnu@npm:1.7.11"
   conditions: os=linux & cpu=x64 & libc=glibc
   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"
+"@unrs/resolver-binding-linux-x64-musl@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-linux-x64-musl@npm:1.7.11"
   conditions: os=linux & cpu=x64 & libc=musl
   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"
+"@unrs/resolver-binding-wasm32-wasi@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-wasm32-wasi@npm:1.7.11"
   dependencies:
     "@napi-rs/wasm-runtime": ^0.2.10
   conditions: cpu=wasm32
   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"
+"@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.11"
   conditions: os=win32 & cpu=arm64
   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"
+"@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.11"
   conditions: os=win32 & cpu=ia32
   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"
+"@unrs/resolver-binding-win32-x64-msvc@npm:1.7.11":
+  version: 1.7.11
+  resolution: "@unrs/resolver-binding-win32-x64-msvc@npm:1.7.11"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -13809,7 +13809,7 @@ __metadata:
     jest-util: "workspace:*"
     jest-validate: "workspace:*"
     slash: ^3.0.0
-    unrs-resolver: ^1.7.10
+    unrs-resolver: ^1.7.11
   languageName: unknown
   linkType: soft
 
@@ -21450,27 +21450,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unrs-resolver@npm:^1.7.10, unrs-resolver@npm:^1.7.2, unrs-resolver@npm:^1.7.8":
-  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
+"unrs-resolver@npm:^1.7.11, unrs-resolver@npm:^1.7.2, unrs-resolver@npm:^1.7.8":
+  version: 1.7.11
+  resolution: "unrs-resolver@npm:1.7.11"
+  dependencies:
+    "@unrs/resolver-binding-darwin-arm64": 1.7.11
+    "@unrs/resolver-binding-darwin-x64": 1.7.11
+    "@unrs/resolver-binding-freebsd-x64": 1.7.11
+    "@unrs/resolver-binding-linux-arm-gnueabihf": 1.7.11
+    "@unrs/resolver-binding-linux-arm-musleabihf": 1.7.11
+    "@unrs/resolver-binding-linux-arm64-gnu": 1.7.11
+    "@unrs/resolver-binding-linux-arm64-musl": 1.7.11
+    "@unrs/resolver-binding-linux-ppc64-gnu": 1.7.11
+    "@unrs/resolver-binding-linux-riscv64-gnu": 1.7.11
+    "@unrs/resolver-binding-linux-riscv64-musl": 1.7.11
+    "@unrs/resolver-binding-linux-s390x-gnu": 1.7.11
+    "@unrs/resolver-binding-linux-x64-gnu": 1.7.11
+    "@unrs/resolver-binding-linux-x64-musl": 1.7.11
+    "@unrs/resolver-binding-wasm32-wasi": 1.7.11
+    "@unrs/resolver-binding-win32-arm64-msvc": 1.7.11
+    "@unrs/resolver-binding-win32-ia32-msvc": 1.7.11
+    "@unrs/resolver-binding-win32-x64-msvc": 1.7.11
     napi-postinstall: ^0.2.2
   dependenciesMeta:
     "@unrs/resolver-binding-darwin-arm64":
@@ -21507,7 +21507,7 @@ __metadata:
       optional: true
     "@unrs/resolver-binding-win32-x64-msvc":
       optional: true
-  checksum: 9f3734db018add7ce00fd6c677ede79dffe14027647b2c953abf83b378dc3985d53d89399a0306aa0ab4d0bca717d64ccbc3412cdefb67a033c16da01bcba3f9
+  checksum: e9097c7ea77a079a3605de087f364f4f6b4bcf0552ac52f0af021ce90826c476c6b7ca91979930f485ee375708913fcbf4c9cac883dc14f8182ef8e399a147cb
   languageName: node
   linkType: hard