From 0110101bef06f490abf007eaf034a0b9bf9e1cc8 Mon Sep 17 00:00:00 2001 From: vlasy Date: Sat, 27 Jan 2018 19:49:22 +0100 Subject: [PATCH] Load modules from node_modules before custom paths (#5403) * Load modules from node_modules before custom paths * Update CHANGELOG * Update CHANGELOG --- CHANGELOG.md | 5 ++++- packages/jest-resolve/src/__tests__/resolve.test.js | 9 +++++++++ packages/jest-resolve/src/node_modules_paths.js | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2822ebb21d9d..ed454b4f67d7 100644 --- a/CHANGELOG.md +++ b/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. \ No newline at end of file diff --git a/packages/jest-resolve/src/__tests__/resolve.test.js b/packages/jest-resolve/src/__tests__/resolve.test.js index 4be45b3f61c8..892f2387463a 100644 --- a/packages/jest-resolve/src/__tests__/resolve.test.js +++ b/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'); + }); +}); diff --git a/packages/jest-resolve/src/node_modules_paths.js b/packages/jest-resolve/src/node_modules_paths.js index 51600755396d..e925b629246a 100644 --- a/packages/jest-resolve/src/node_modules_paths.js +++ b/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; }