From 56b7aa390c07a815c7f06b93b3e326239e30151c Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Mon, 13 Sep 2021 09:14:04 +0200 Subject: [PATCH] simplify types a bit --- packages/jest-resolve/src/defaultResolver.ts | 26 ++++---------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/packages/jest-resolve/src/defaultResolver.ts b/packages/jest-resolve/src/defaultResolver.ts index 942b6db0b1cb..79ea2976a848 100644 --- a/packages/jest-resolve/src/defaultResolver.ts +++ b/packages/jest-resolve/src/defaultResolver.ts @@ -7,29 +7,18 @@ import * as fs from 'graceful-fs'; import pnpResolver from 'jest-pnp-resolver'; -import {sync as resolveSync} from 'resolve'; +import {Opts as ResolveOpts, sync as resolveSync} from 'resolve'; import type {Config} from '@jest/types'; import {tryRealpath} from 'jest-util'; -type ResolverOptions = { +interface ResolverOptions extends ResolveOpts { basedir: Config.Path; browser?: boolean; + conditions?: Array; defaultResolver: typeof defaultResolver; extensions?: Array; - moduleDirectory?: Array; - paths?: Array; rootDir?: Config.Path; - packageFilter?: ( - pkg: Record, - pkgfile: string, - ) => Record; - pathFilter?: ( - pkg: Record, - path: string, - relativePath: string, - ) => string; - conditions?: Array; -}; +} // https://github.com/facebook/jest/pull/10617 declare global { @@ -51,14 +40,9 @@ export default function defaultResolver( } const result = resolveSync(path, { - basedir: options.basedir, - extensions: options.extensions, + ...options, isDirectory, isFile, - moduleDirectory: options.moduleDirectory, - packageFilter: options.packageFilter, - pathFilter: options.pathFilter, - paths: options.paths, preserveSymlinks: false, readPackageSync, realpathSync,