Skip to content

Load modules from node_modules before custom paths #5403

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.

Sign up for GitHub

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

Merged
cpojer merged 4 commits into from
Jan 27, 2018
Merged

Load modules from node_modules before custom paths #5403

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c05c213
Load modules from node_modules before custom paths
Jan 27, 2018
70a3811
Update CHANGELOG
Jan 27, 2018
12339e2
Update CHANGELOG
Jan 27, 2018
3e28cc7
Merge branch 'master' into master
vlasy Jan 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Load modules from node_modules before custom paths
  • Loading branch information
Michal Vlasák committed Jan 27, 2018
commit c05c213e8ce5ee447b123d3fd3337bad2e7cf59e
9 changes: 9 additions & 0 deletions packages/jest-resolve/src/__tests__/resolve.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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');
});
});
2 changes: 1 addition & 1 deletion packages/jest-resolve/src/node_modules_paths.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ export default function nodeModulesPaths(
);
}, []);

return options.paths ? options.paths.concat(dirs) : dirs;
return options.paths ? dirs.concat(options.paths) : dirs;
}