make sure to still call user-provided packageFilter

Author: SimenB

packages/jest-resolve/src/__mocks__/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "__mocks__",
+  "version": "1.0.0",
+  "dependencies": {
+  }
+}

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

@@ -126,24 +126,22 @@ describe('findNodeModule', () => {
     });
   });
 
-  it('passes packageFilter to the resolve module when using the default resolver', () => {
+  it('wraps passed packageFilter to the resolve module when using the default resolver', () => {
     const packageFilter = jest.fn();
 
     // A resolver that delegates to defaultResolver with a packageFilter implementation
     userResolver.mockImplementation((request, opts) =>
       opts.defaultResolver(request, {...opts, packageFilter}),
     );
 
-    Resolver.findNodeModule('test', {
-      basedir: '/',
+    Resolver.findNodeModule('./test', {
+      basedir: path.resolve(__dirname, '../__mocks__/'),
       resolver: require.resolve('../__mocks__/userResolver'),
     });
 
-    expect(mockResolveSync).toHaveBeenCalledWith(
-      'test',
-      expect.objectContaining({
-        packageFilter,
-      }),
+    expect(packageFilter).toHaveBeenCalledWith(
+      expect.objectContaining({name: '__mocks__'}),
+      expect.any(String),
     );
   });
 

packages/jest-resolve/src/defaultResolver.ts

@@ -47,8 +47,10 @@ export default function defaultResolver(
     ...options,
     isDirectory,
     isFile,
-    packageFilter:
-      options.packageFilter ?? createPackageFilter(options.conditions),
+    packageFilter: createPackageFilter(
+      options.conditions,
+      options.packageFilter,
+    ),
     preserveSymlinks: false,
     readPackageSync,
     realpathSync,
@@ -156,7 +158,10 @@ function readPackageSync(_: unknown, file: Config.Path): PkgJson {
   return readPackageCached(file);
 }
 
-function createPackageFilter(conditions?: Array<string>) {
+function createPackageFilter(
+  conditions?: Array<string>,
+  userFilter?: ResolverOptions['packageFilter'],
+): ResolverOptions['packageFilter'] {
   function attemptExportsFallback(pkg: PkgJson) {
     const options: ResolveExportsOptions = conditions
       ? {conditions, unsafe: true}
@@ -170,10 +175,16 @@ function createPackageFilter(conditions?: Array<string>) {
     }
   }
 
-  return function packageFilter(pkg: PkgJson) {
+  return function packageFilter(pkg: PkgJson, ...rest) {
+    let filteredPkg = pkg;
+
+    if (userFilter) {
+      filteredPkg = userFilter(filteredPkg, ...rest);
+    }
+
     return {
-      ...pkg,
-      main: pkg.main ?? attemptExportsFallback(pkg),
+      ...filteredPkg,
+      main: filteredPkg.main ?? attemptExportsFallback(filteredPkg),
     };
   };
 }