fix mock

# Conflicts:
#	packages/jest-resolve/src/defaultResolver.ts

Author: SimenB

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

@@ -24,10 +24,12 @@ jest.mock('../__mocks__/userResolverAsync');
 // in very strange ways. Instead just spy on it and its `sync` method.
 jest.mock('resolve', () => {
   const originalModule = jest.requireActual('resolve');
-  return {
-    ...originalModule,
-    sync: jest.spyOn(originalModule, 'sync'),
-  };
+
+  const m = jest.fn((...args) => originalModule(...args));
+  Object.assign(m, originalModule);
+  m.sync = jest.spyOn(originalModule, 'sync');
+
+  return m;
 });
 
 const mockResolveSync = <

packages/jest-resolve/src/defaultResolver.ts

@@ -8,12 +8,12 @@
 import * as fs from 'graceful-fs';
 import pnpResolver from 'jest-pnp-resolver';
 import resolveAsync = require('resolve');
-import type {AsyncOpts, Opts as ResolveOpts, SyncOpts} from 'resolve';
 import type {Config} from '@jest/types';
 import {tryRealpath} from 'jest-util';
+
 const resolveSync = resolveAsync.sync;
 
-export interface ResolverOptions extends ResolveOpts {
+export interface ResolverOptions extends resolveAsync.Opts {
   basedir: Config.Path;
   browser?: boolean;
   conditions?: Array<string>;
@@ -80,7 +80,9 @@ export async function defaultResolverAsync(
 /**
  * getSyncResolveOptions returns resolution options that are used synchronously.
  */
-function getSyncResolveOptions(options: ResolverOptions): SyncOpts {
+function getSyncResolveOptions(
+  options: ResolverOptions,
+): resolveAsync.SyncOpts {
   return {
     ...options,
     isDirectory: isDirectorySync,
@@ -94,7 +96,9 @@ function getSyncResolveOptions(options: ResolverOptions): SyncOpts {
 /**
  * getAsyncResolveOptions returns resolution options that are used asynchronously.
  */
-function getAsyncResolveOptions(options: ResolverOptionsAsync): AsyncOpts {
+function getAsyncResolveOptions(
+  options: ResolverOptionsAsync,
+): resolveAsync.AsyncOpts {
   return {
     ...options,
     isDirectory: isDirectoryAsync,