Merge pull request webpack#1283 from KamilSzot/master

sokra · sokra · commit 678843076f9d · 2015-07-23T15:55:23.000+02:00
Adjust to use of interpret module version 0.6
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -56,15 +56,27 @@ module.exports = function(optimist, argv, convertOptions) {
 	}
 
 	if(configPath) {
-		var moduleName = interpret.extensions[ext];
-		if (moduleName) {
-			var compiler = require(moduleName);
-			var register = interpret.register[moduleName];
-			var config = interpret.configurations[moduleName];
-			if (register) {
-				register(compiler, config);
+
+		function registerCompiler(moduleDescriptor) {
+			if (moduleDescriptor) {
+				if(typeof(moduleDescriptor) == "string") {
+					require(moduleDescriptor);
+				} else if(!Array.isArray(moduleDescriptor)) {
+					moduleDescriptor.register(require(moduleDescriptor.module));
+				} else {
+					for(var i = 0; i < moduleDescriptor.length; i++) {
+						try {
+							registerCompiler(moduleDescriptor[i]);
+							break;
+						} catch(e) {
+							// do nothing
+						}
+					}
+				}
 			}
 		}
+
+		registerCompiler(interpret.extensions[ext]);
 		options = require(configPath);
 	}
 
