Merge branch 'master' of https://github.com/rollup/rollup

bin/runRollup.js

@@ -143,6 +143,16 @@ function bundle ( options ) {
 			return bundle.write( options );
 		}
 
+		if ( options.targets ) {
+			var result = null;
+
+			options.targets.forEach( function ( target ) {
+				result = bundle.write(target);
+			});
+
+			return result;
+		}
+
 		if ( options.sourceMap && options.sourceMap !== 'inline' ) {
 			handleError({ code: 'MISSING_OUTPUT_OPTION' });
 		}

package.json

@@ -45,7 +45,6 @@
     "buble": "^0.6.4",
     "codecov.io": "^0.1.6",
     "console-group": "^0.2.0",
-    "es6-promise": "^3.0.2",
     "eslint": "^2.9.0",
     "estree-walker": "^0.2.0",
     "istanbul": "^0.4.0",

src/rollup.js

@@ -1,4 +1,3 @@
-import Promise from 'es6-promise/lib/es6-promise/promise.js';
 import { basename } from './utils/path.js';
 import { writeFile } from './utils/fs.js';
 import { keys } from './utils/object.js';
@@ -27,6 +26,7 @@ const ALLOWED_KEYS = [
 	'plugins',
 	'preferConst',
 	'sourceMap',
+	'targets',
 	'treeshake',
 	'useStrict'
 ];

src/utils/first.js

@@ -1,5 +1,3 @@
-import Promise from 'es6-promise/lib/es6-promise/promise.js';
-
 // Return the first non-falsy result from an array of
 // maybe-sync, maybe-promise-returning functions
 export default function first ( candidates ) {

src/utils/fs.js

@@ -1,4 +1,3 @@
-import Promise from 'es6-promise/lib/es6-promise/promise.js';
 import * as fs from 'fs';
 import { dirname } from './path.js';
 

src/utils/promise.js

@@ -1,5 +1,3 @@
-import Promise from 'es6-promise/lib/es6-promise/promise.js';
-
 export function mapSequence ( array, fn ) {
 	let results = [];
 	let promise = Promise.resolve();

src/utils/transform.js

@@ -1,5 +1,3 @@
-import Promise from 'es6-promise/lib/es6-promise/promise.js';
-
 export default function transform ( source, id, transformers ) {
 	let sourceMapChain = [];
 

test/cli/multiple-targets/_config.js

@@ -0,0 +1,4 @@
+module.exports = {
+	description: 'generates multiple output files when multiple targets are specified',
+	command: 'rollup -c'
+};

test/cli/multiple-targets/_expected/cjs.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var main = 0;
+
+module.exports = main;

test/cli/multiple-targets/_expected/es6.js

@@ -0,0 +1,3 @@
+var main = 0;
+
+export default main;

test/cli/multiple-targets/main.js

@@ -0,0 +1 @@
+export default 0;

test/cli/multiple-targets/rollup.config.js

@@ -0,0 +1,13 @@
+export default {
+	entry: 'main.js',
+	targets: [
+		{
+			format: 'cjs',
+			dest: '_actual/cjs.js'
+		},
+		{
+			format: 'es6',
+			dest: '_actual/es6.js'
+		}
+	]
+};

test/function/transformer-async/_config.js

@@ -1,5 +1,3 @@
-var Promise = require( 'es6-promise' ).Promise;
-
 module.exports = {
 	description: 'transformers can be asynchronous',
 	options: {

test/test.js

@@ -76,7 +76,7 @@ describe( 'rollup', function () {
 			return rollup.rollup({ entry: 'x', plUgins: [] }).then( function () {
 				throw new Error( 'Missing expected error' );
 			}, function ( err ) {
-				assert.equal( err.message, 'Unexpected key \'plUgins\' found, expected one of: banner, dest, entry, exports, external, footer, format, globals, indent, intro, moduleId, moduleName, noConflict, onwarn, outro, plugins, preferConst, sourceMap, treeshake, useStrict' );
+				assert.equal( err.message, 'Unexpected key \'plUgins\' found, expected one of: banner, dest, entry, exports, external, footer, format, globals, indent, intro, moduleId, moduleName, noConflict, onwarn, outro, plugins, preferConst, sourceMap, targets, treeshake, useStrict' );
 			});
 		});
 	});
@@ -357,9 +357,13 @@ describe( 'rollup', function () {
 							PATH: path.resolve( __dirname, '../bin' ) + path.delimiter + process.env.PATH
 						}
 					}, function ( err, code, stderr ) {
-						if ( err || config.error ) {
+						if ( err ) {
-							config.error( err );
+							if ( config.error ) {
-							return done();
+								config.error( err );
+								return done();
+							} else {
+								throw err;
+							}
 						}
 
 						if ( stderr ) console.error( stderr );
@@ -413,6 +417,20 @@ describe( 'rollup', function () {
 							}
 						}
 
+						else if ( sander.existsSync( '_expected' ) && sander.statSync( '_expected' ).isDirectory() ) {
+							var error = null;
+							sander.readdirSync( '_expected' ).forEach( child => {
+								var expected = sander.readFileSync( path.join( '_expected', child ) ).toString();
+								var actual = sander.readFileSync( path.join( '_actual', child ) ).toString();
+								try {
+									assert.equal( normaliseOutput( actual ), normaliseOutput( expected ) );
+								} catch ( err ) {
+									error = err;
+								}
+							});
+							done( error );
+						}
+						
 						else {
 							var expected = sander.readFileSync( '_expected.js' ).toString();
 							try {