Skip to content

Commit 054fa33

Browse files
authored
refactor: replace custom isBuiltinModule with node's isBuiltin (#15685)
1 parent edc3272 commit 054fa33

File tree

8 files changed

+9
-48
lines changed

8 files changed

+9
-48
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
### Chore & Maintenance
1212

1313
- `[*]` Remove and deprecate `jest-repl` package ([#15673](https://github.com/jestjs/jest/pull/15673))
14+
- `[jest-resolver]` Replace custom `isBuiltinModule` with node's `isBuiltin` ([#15685](https://github.com/jestjs/jest/pull/15685))
1415

1516
## 30.0.0
1617

e2e/__tests__/__snapshots__/moduleNameMapper.test.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ exports[`moduleNameMapper wrong array configuration 1`] = `
4141
12 | module.exports = () => 'test';
4242
13 |
4343
44-
at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:1142:17)
44+
at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:1117:17)
4545
at Object.require (index.js:10:1)
4646
at Object.require (__tests__/index.js:10:20)"
4747
`;
@@ -71,7 +71,7 @@ exports[`moduleNameMapper wrong configuration 1`] = `
7171
12 | module.exports = () => 'test';
7272
13 |
7373
74-
at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:1142:17)
74+
at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:1117:17)
7575
at Object.require (index.js:10:1)
7676
at Object.require (__tests__/index.js:10:20)"
7777
`;

e2e/__tests__/__snapshots__/requireMissingExt.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ exports[`shows a proper error from deep requires 1`] = `
2626
12 | test('dummy', () => {
2727
13 | expect(1).toBe(1);
2828
29-
at Resolver._throwModNotFoundError (../../packages/jest-resolve/build/index.js:888:11)
29+
at Resolver._throwModNotFoundError (../../packages/jest-resolve/build/index.js:863:11)
3030
at Object.<anonymous> (node_modules/discord.js/src/index.js:21:12)
3131
at Object.require (__tests__/test.js:10:1)"
3232
`;

e2e/__tests__/__snapshots__/resolveNoFileExtensions.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ exports[`show error message with matching files 1`] = `
3737
| ^
3838
9 |
3939
40-
at Resolver._throwModNotFoundError (../../packages/jest-resolve/build/index.js:888:11)
40+
at Resolver._throwModNotFoundError (../../packages/jest-resolve/build/index.js:863:11)
4141
at Object.require (index.js:8:18)
4242
at Object.require (__tests__/test.js:8:11)"
4343
`;

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

Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ describe('isCoreModule', () => {
7575
expect(isCore).toBe(true);
7676
});
7777

78-
it('returns true if using `node:` URLs and `moduleName` is not a core module.', () => {
78+
it('returns false if using `node:` URLs and `moduleName` is not a core module.', () => {
7979
const moduleMap = ModuleMap.create('/');
8080
const resolver = new Resolver(moduleMap, {} as ResolverConfig);
8181
const isCore = resolver.isCoreModule('node:not-a-core-module');
82-
expect(isCore).toBe(true);
82+
expect(isCore).toBe(false);
8383
});
8484
});
8585

packages/jest-resolve/src/isBuiltinModule.ts

Lines changed: 0 additions & 14 deletions
This file was deleted.

packages/jest-resolve/src/resolver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
import {isBuiltin} from 'module';
89
import * as path from 'path';
910
import chalk from 'chalk';
1011
import slash from 'slash';
@@ -18,7 +19,6 @@ import defaultResolver, {
1819
defaultAsyncResolver,
1920
} from './defaultResolver';
2021
import {clearFsCache} from './fileWalkers';
21-
import isBuiltinModule from './isBuiltinModule';
2222
import nodeModulesPaths, {GlobalPaths} from './nodeModulesPaths';
2323
import shouldLoadAsEsm, {clearCachedLookups} from './shouldLoadAsEsm';
2424
import type {ResolverConfig} from './types';
@@ -457,7 +457,7 @@ export default class Resolver {
457457
isCoreModule(moduleName: string): boolean {
458458
return (
459459
this._options.hasCoreModules &&
460-
(isBuiltinModule(moduleName) || moduleName.startsWith('node:')) &&
460+
isBuiltin(moduleName) &&
461461
!this._isAliasModule(moduleName)
462462
);
463463
}

0 commit comments

Comments
 (0)