Merge pull request webpack#2118 from johanneslumpe/patch-1

sokra · sokra · commit b0fffd50d35d · 2016-03-11T23:24:11.000+01:00
Added support for using an ES6 default exported function for configuration
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -94,14 +94,19 @@ module.exports = function(optimist, argv, convertOptions) {
 		configFileLoaded = true;
 	}
 
-	if(typeof options === "function") {
+	var isES6DefaultExportedFunc = (
+		typeof options === "object" && options !== null && typeof options.default === "function"
+	);
+
+	if(typeof options === "function" || isES6DefaultExportedFunc) {
+		options = isES6DefaultExportedFunc ? options.default : options;
 		options = options(argv.env, argv);
 	}
 
 	return processConfiguredOptions(options);
 
 	function processConfiguredOptions(options) {
-		if(typeof options !== "object" || options === null) {
+		if(options === null || typeof options !== "object") {
 			console.error("Config did not export an object or a function returning an object.");
 			process.exit(-1); // eslint-disable-line
 		}
@@ -112,8 +117,8 @@ module.exports = function(optimist, argv, convertOptions) {
 		}
 
 		// process ES6 default
-		if(typeof options === "object" && typeof options["default"] === "object") {
-			return processConfiguredOptions(options["default"]);
+		if(typeof options === "object" && typeof options.default === "object") {
+			return processConfiguredOptions(options.default);
 		}
 
 		if(Array.isArray(options)) {

Original file line number	Diff line number	Diff line change
`@@ -94,14 +94,19 @@ module.exports = function(optimist, argv, convertOptions) {`
`94`	`94`	`configFileLoaded = true;`
`95`	`95`	`}`
`96`	`96`
`97`		`- if(typeof options === "function") {`
	`97`	`+ var isES6DefaultExportedFunc = (`
	`98`	`+ typeof options === "object" && options !== null && typeof options.default === "function"`
	`99`	`+ );`
	`100`	`+`
	`101`	`+ if(typeof options === "function" \|\| isES6DefaultExportedFunc) {`
	`102`	`+ options = isES6DefaultExportedFunc ? options.default : options;`
`98`	`103`	`options = options(argv.env, argv);`
`99`	`104`	`}`
`100`	`105`
`101`	`106`	`return processConfiguredOptions(options);`
`102`	`107`
`103`	`108`	`function processConfiguredOptions(options) {`
`104`		`- if(typeof options !== "object" \|\| options === null) {`
	`109`	`+ if(options === null \|\| typeof options !== "object") {`
`105`	`110`	`console.error("Config did not export an object or a function returning an object.");`
`106`	`111`	`process.exit(-1); // eslint-disable-line`
`107`	`112`	`}`
`@@ -112,8 +117,8 @@ module.exports = function(optimist, argv, convertOptions) {`
`112`	`117`	`}`
`113`	`118`
`114`	`119`	`// process ES6 default`
`115`		`- if(typeof options === "object" && typeof options["default"] === "object") {`
`116`		`- return processConfiguredOptions(options["default"]);`
	`120`	`+ if(typeof options === "object" && typeof options.default === "object") {`
	`121`	`+ return processConfiguredOptions(options.default);`
`117`	`122`	`}`
`118`	`123`
`119`	`124`	`if(Array.isArray(options)) {`