From 2203a7f4e924be6912d90512e109ff996d18365b Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Mon, 30 Aug 2021 23:14:48 -0400 Subject: [PATCH] Use named export for sync defaultResolver --- packages/jest-resolve/src/__mocks__/userResolver.d.ts | 2 +- packages/jest-resolve/src/__tests__/resolve.test.ts | 2 +- packages/jest-resolve/src/defaultResolver.ts | 6 +++--- packages/jest-resolve/src/resolver.ts | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/jest-resolve/src/__mocks__/userResolver.d.ts b/packages/jest-resolve/src/__mocks__/userResolver.d.ts index 155346eca132..1e10b90437a3 100644 --- a/packages/jest-resolve/src/__mocks__/userResolver.d.ts +++ b/packages/jest-resolve/src/__mocks__/userResolver.d.ts @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -import defaultResolver from '../defaultResolver'; +import {defaultResolver} from '../defaultResolver'; // todo: can be replaced with jest.MockedFunction declare const userResolver: jest.MockInstance< diff --git a/packages/jest-resolve/src/__tests__/resolve.test.ts b/packages/jest-resolve/src/__tests__/resolve.test.ts index 06be6ae14517..797dc280816f 100644 --- a/packages/jest-resolve/src/__tests__/resolve.test.ts +++ b/packages/jest-resolve/src/__tests__/resolve.test.ts @@ -12,7 +12,7 @@ import resolveAsync = require('resolve'); import {ModuleMap} from 'jest-haste-map'; import userResolver from '../__mocks__/userResolver'; import userResolverAsync from '../__mocks__/userResolverAsync'; -import defaultResolver, {defaultResolverAsync} from '../defaultResolver'; +import {defaultResolver, defaultResolverAsync} from '../defaultResolver'; import nodeModulesPaths from '../nodeModulesPaths'; import Resolver from '../resolver'; import type {ResolverConfig} from '../types'; diff --git a/packages/jest-resolve/src/defaultResolver.ts b/packages/jest-resolve/src/defaultResolver.ts index 34c1ebc4339e..63c8f56aa69a 100644 --- a/packages/jest-resolve/src/defaultResolver.ts +++ b/packages/jest-resolve/src/defaultResolver.ts @@ -13,10 +13,10 @@ import {tryRealpath} from 'jest-util'; // QUESTION: What is a better way to import this? const resolveAsync = require('resolve/lib/async'); -type ResolverOptions = { +export type ResolverOptions = { basedir: Config.Path; browser?: boolean; - defaultResolver: typeof defaultResolverSync; + defaultResolver: typeof defaultResolver; extensions?: Array; moduleDirectory?: Array; paths?: Array; @@ -37,7 +37,7 @@ declare global { } } -export default function defaultResolverSync( +export function defaultResolver( path: Config.Path, options: ResolverOptions, ): Config.Path { diff --git a/packages/jest-resolve/src/resolver.ts b/packages/jest-resolve/src/resolver.ts index c390cccc7844..2ec7a67d3f1f 100644 --- a/packages/jest-resolve/src/resolver.ts +++ b/packages/jest-resolve/src/resolver.ts @@ -14,8 +14,9 @@ import type {Config} from '@jest/types'; import type {IModuleMap} from 'jest-haste-map'; import {tryRealpath} from 'jest-util'; import ModuleNotFoundError from './ModuleNotFoundError'; -import defaultResolver, { +import { clearDefaultResolverCache, + defaultResolver, defaultResolverAsync, } from './defaultResolver'; import isBuiltinModule from './isBuiltinModule';