Merge branch 'master' of https://github.com/sunnylost/rollup into sun…

…nylost-master
rollup · Sep 8, 2017 · 604fdda · 604fdda
2 parents cef0db2 + 0ffac58
commit 604fdda
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/bin/src/run/mergeOptions.js b/bin/src/run/mergeOptions.js
@@ -73,14 +73,21 @@ export default function mergeOptions ( config, command ) {
 		paths: getOption('paths')
 	};
 
-	const outputOptions = (
-		(command.output || config.output) ?
+	let mergedOutputOptions;
+	if (Array.isArray(config.output)) {
+		mergedOutputOptions = config.output.map((output) => Object.assign({}, output, command.output));
+	} else if (config.output && command.output) {
+		mergedOutputOptions = [Object.assign({}, config.output, command.output)];
+	} else {
+		mergedOutputOptions = (command.output || config.output) ?
 			ensureArray(command.output || config.output) :
 			[{
 				file: command.output ? command.output.file : null,
 				format: command.output ? command.output.format : null
-			}]
-	).map(output => {
+			}];
+	}
+
+	const outputOptions = mergedOutputOptions.map(output => {
 		return Object.assign({}, baseOutputOptions, output);
 	});