root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1158 from miniEggRoll/master 

fix config extension interpretation for .babel.js
This commit is contained in:
Tobias Koppers 2015-06-15 09:35:22 +02:00
parent 6bc6fcd75a d4d012e6bc
commit b2f2643437
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/convert-argv.js
View File

@ -28,11 +28,23 @@ module.exports = function(optimist, argv, convertOptions) {
} }
var configPath, ext; var configPath, ext;
var extensions = Object.keys(interpret.extensions).sort(function(a, b){
return a.length - b.length;
});
if (argv.config) { if (argv.config) {
configPath = path.resolve(argv.config); configPath = path.resolve(argv.config);
ext = path.extname(configPath); for (var i = extensions.length - 1; i >= 0; i--) {
var tmpExt = extensions[i];
if (configPath.indexOf(tmpExt, configPath.length - tmpExt.length) > -1){
ext = tmpExt;
break;
}
};
if (!ext) {
ext = path.extname(configPath);
}
} else { } else {
var extensions = Object.keys(interpret.extensions);
for(var i = 0; i < extensions.length; i++) { for(var i = 0; i < extensions.length; i++) {
var webpackConfig = path.resolve('webpack.config' + extensions[i]); var webpackConfig = path.resolve('webpack.config' + extensions[i]);
if(fs.existsSync(webpackConfig)) { if(fs.existsSync(webpackConfig)) {