Skip to content

Commit 07c7a20

Browse files
wtgtybhertgeghgtwtgcpojer
authored andcommitted
[jest-resolve] Use is-builtin-module instead of resolve.isCore. (#2997)
* Use `is-builtin-module` instead of `resolve.isCore`. * Fix typo. * Remove `browser: false`.
1 parent f67fc6d commit 07c7a20

File tree

3 files changed

+42
-4
lines changed

3 files changed

+42
-4
lines changed

packages/jest-resolve/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"main": "build/index.js",
1010
"dependencies": {
1111
"browser-resolve": "^1.11.2",
12+
"is-builtin-module": "^1.0.0",
1213
"jest-haste-map": "^19.0.0",
1314
"resolve": "^1.2.0"
1415
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/**
2+
* Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
3+
*
4+
* This source code is licensed under the BSD-style license found in the
5+
* LICENSE file in the root directory of this source tree. An additional grant
6+
* of patent rights can be found in the PATENTS file in the same directory.
7+
*
8+
* @emails oncall+jsinfra
9+
*/
10+
11+
'use strict';
12+
13+
const ModuleMap = require('jest-haste-map').ModuleMap;
14+
const Resolver = require('../');
15+
16+
describe('isCoreModule', () => {
17+
it('returns false if `hasCoreModules` is false.', () => {
18+
const moduleMap = new ModuleMap();
19+
const resolver = new Resolver(moduleMap, {
20+
hasCoreModules: false,
21+
});
22+
const isCore = resolver.isCoreModule('assert');
23+
expect(isCore).toEqual(false);
24+
});
25+
26+
it('returns true if `hasCoreModules` is true and `moduleName` is a core module.', () => {
27+
const moduleMap = new ModuleMap();
28+
const resolver = new Resolver(moduleMap, {});
29+
const isCore = resolver.isCoreModule('assert');
30+
expect(isCore).toEqual(true);
31+
});
32+
33+
it('returns false if `hasCoreModules` is true and `moduleName` is not a core module.', () => {
34+
const moduleMap = new ModuleMap();
35+
const resolver = new Resolver(moduleMap, {});
36+
const isCore = resolver.isCoreModule('not-a-core-module');
37+
expect(isCore).toEqual(false);
38+
});
39+
});

packages/jest-resolve/src/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const nodeModulesPaths = require('resolve/lib/node-modules-paths');
1717
const path = require('path');
1818
const resolve = require('resolve');
1919
const browserResolve = require('browser-resolve');
20+
const isBuiltinModule = require('is-builtin-module');
2021

2122
type ResolverConfig = {|
2223
browser?: boolean,
@@ -177,10 +178,7 @@ class Resolver {
177178
isCoreModule(moduleName: string): boolean {
178179
return (
179180
this._options.hasCoreModules &&
180-
(
181-
resolve.isCore(moduleName) ||
182-
moduleName === 'v8'
183-
)
181+
isBuiltinModule(moduleName)
184182
);
185183
}
186184

0 commit comments

Comments
 (0)