Load modules from node_modules before custom paths (#5403)

* Load modules from node_modules before custom paths

* Update CHANGELOG

* Update CHANGELOG

CHANGELOG.md

@@ -17,6 +17,9 @@
   ([#5364](https://github.com/facebook/jest/pull/5364))
 * `[docs]` Add tutorial page for ES6 class mocks.
   ([#5383]https://github.com/facebook/jest/pull/5383))
+* `[jest-resolve]` Search required modules in node_modules and then in custom
+  paths.
+  ([#5403](https://github.com/facebook/jest/pull/5403))
 
 ## jest 22.1.4
 
@@ -1490,4 +1493,4 @@ See https://facebook.github.io/jest/blog/2016/12/15/2016-in-jest.html
 
 ## <=0.4.0
 
-* See commit history for changes in previous versions of jest.
+* See commit history for changes in previous versions of jest.

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

@@ -15,6 +15,7 @@ const path = require('path');
 const ModuleMap = require('jest-haste-map').ModuleMap;
 const Resolver = require('../');
 const userResolver = require('../__mocks__/userResolver');
+const nodeModulesPaths = require('../node_modules_paths').default;
 
 beforeEach(() => {
   userResolver.mockClear();
@@ -181,3 +182,11 @@ describe('getMockModule', () => {
     );
   });
 });
+
+describe('nodeModulesPaths', () => {
+  it('provides custom module paths after node_modules', () => {
+    const src = require.resolve('../');
+    const result = nodeModulesPaths(src, {paths: ['./customFolder']});
+    expect(result[result.length - 1]).toBe('./customFolder');
+  });
+});

packages/jest-resolve/src/node_modules_paths.js

@@ -52,5 +52,5 @@ export default function nodeModulesPaths(
     );
   }, []);
 
-  return options.paths ? options.paths.concat(dirs) : dirs;
+  return options.paths ? dirs.concat(options.paths) : dirs;
 }