Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: call custom resolver with node.js modules #12654

Merged
merged 4 commits into from Apr 9, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions packages/jest-resolve/src/__tests__/resolve.test.ts
Expand Up @@ -399,6 +399,21 @@ describe('resolveModule', () => {
expect(resolvedWithSlash).toBe(fooSlashIndex);
expect(resolvedWithSlash).toBe(resolvedWithDot);
});

it('custom resolver can resolve node modules', () => {
userResolver.mockImplementation(() => 'module');

const moduleMap = ModuleMap.create('/');
const resolver = new Resolver(moduleMap, {
extensions: ['.js'],
resolver: require.resolve('../__mocks__/userResolver'),
} as ResolverConfig);
const src = require.resolve('../');
resolver.resolveModule(src, 'fs');

expect(userResolver).toHaveBeenCalled();
expect(userResolver.mock.calls[0][0]).toBe('fs');
});
});

describe('resolveModuleAsync', () => {
Expand Down
6 changes: 3 additions & 3 deletions packages/jest-resolve/src/resolver.ts
Expand Up @@ -216,9 +216,9 @@ export default class Resolver {
// ignore all modules that look like node modules (ie. are not relative
// requires). This enables us to speed up resolution when we build a
// dependency graph because we don't have to look at modules that may not
// exist and aren't mocked.
// exist and aren't mocked.waq
SimenB marked this conversation as resolved.
Show resolved Hide resolved
const resolveNodeModule = (name: string, throwIfNotFound = false) => {
if (this.isCoreModule(name)) {
if (this.isCoreModule(name) && !this._options.resolver) {
SimenB marked this conversation as resolved.
Show resolved Hide resolved
return name;
}

Expand Down Expand Up @@ -292,7 +292,7 @@ export default class Resolver {
// dependency graph because we don't have to look at modules that may not
// exist and aren't mocked.
const resolveNodeModule = async (name: string, throwIfNotFound = false) => {
if (this.isCoreModule(name)) {
if (this.isCoreModule(name) && !this._options.resolver) {
SimenB marked this conversation as resolved.
Show resolved Hide resolved
return name;
}

Expand Down