Merge branch 'master' of github.com:babel/babel

This commit is contained in:
Sebastian McKenzie 2015-06-15 15:18:35 +01:00
commit 939c00d33c

View File

@ -125,7 +125,7 @@ var normalLoader = function (m, filename) {
};
var registerExtension = function (ext) {
var old = oldHandlers[ext] || oldHandlers[".js"];
var old = oldHandlers[ext] || oldHandlers[".js"] || require.extensions[".js"];
var loader = normalLoader;
if (process.env.running_under_istanbul) loader = istanbulLoader;