rollup 0.43.1 → 0.45.2

package/dist/rollup.browser.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.43.1
-	Sun Jul 09 2017 19:16:44 GMT-0400 (EDT) - commit 6f3f349afff179d3ea85764390fe74d38544a88b
+	Rollup.js v0.45.2
+	Wed Jul 12 2017 22:25:07 GMT-0400 (EDT) - commit b7a4edf2b7c26f58c8201a63c820541d9b37186d
 
 
 	https://github.com/rollup/rollup
@@ -5497,13 +5497,26 @@ var builtins = 'Infinity NaN undefined null true false eval uneval isFinite isNa
 var blacklisted = blank();
 reservedWords$1.concat( builtins ).forEach( function (word) { return blacklisted[ word ] = true; } );
 
+var illegalCharacters = /[^$_a-zA-Z0-9]/g;
 
-function makeLegalIdentifier ( str ) {
+var startsWithDigit = function (str) { return /\d/.test( str[0] ); };
+
+function isLegal ( str ) {
+	if ( startsWithDigit(str) || blacklisted[ str ] ) {
+		return false;
+	}
+	if ( illegalCharacters.test(str) ) {
+		return false;
+	}
+	return true;
+}
+
+function makeLegal ( str ) {
 	str = str
 		.replace( /-(\w)/g, function ( _, letter ) { return letter.toUpperCase(); } )
-		.replace( /[^$_a-zA-Z0-9]/g, '_' );
+		.replace( illegalCharacters, '_' );
 
-	if ( /\d/.test( str[0] ) || blacklisted[ str ] ) { str = "_" + str; }
+	if ( startsWithDigit(str) || blacklisted[ str ] ) { str = "_" + str; }
 
 	return str;
 }
@@ -5586,7 +5599,7 @@ Declaration.prototype.addReference = function addReference ( reference ) {
 	reference.declaration = this;
 
 	if ( reference.name !== this.name ) {
-		this.name = makeLegalIdentifier( reference.name ); // TODO handle differences of opinion
+		this.name = makeLegal( reference.name ); // TODO handle differences of opinion
 	}
 
 	if ( reference.isReassignment ) { this.isReassigned = true; }
@@ -6514,6 +6527,25 @@ var CallExpression = (function (Node) {
 	return CallExpression;
 }(Node$1));
 
+var CatchClause = (function (Node) {
+	function CatchClause () {
+		Node.apply(this, arguments);
+	}
+
+	if ( Node ) CatchClause.__proto__ = Node;
+	CatchClause.prototype = Object.create( Node && Node.prototype );
+	CatchClause.prototype.constructor = CatchClause;
+
+	CatchClause.prototype.initialise = function initialise ( scope ) {
+		this.body.createScope( scope );
+		this.scope = this.body.scope;
+
+		this.body.initialise( this.scope );
+	};
+
+	return CatchClause;
+}(Node$1));
+
 // TODO is this basically identical to FunctionDeclaration?
 var ClassDeclaration = (function (Node) {
 	function ClassDeclaration () {
@@ -7959,6 +7991,7 @@ var nodes = {
 	BinaryExpression: BinaryExpression,
 	BlockStatement: BlockStatement,
 	CallExpression: CallExpression,
+	CatchClause: CatchClause,
 	ClassDeclaration: ClassDeclaration,
 	ClassExpression: ClassExpression,
 	ConditionalExpression: ConditionalExpression,
@@ -8165,6 +8198,7 @@ var Module = function Module (ref) {
 	var ast = ref.ast;
 	var sourceMapChain = ref.sourceMapChain;
 	var resolvedIds = ref.resolvedIds;
+	var resolvedExternalIds = ref.resolvedExternalIds;
 	var bundle = ref.bundle;
 
 	this.code = code;
@@ -8197,6 +8231,7 @@ var Module = function Module (ref) {
 	this.sources = [];
 	this.dependencies = [];
 	this.resolvedIds = resolvedIds || blank();
+	this.resolvedExternalIds = resolvedExternalIds || blank();
 
 	// imports and exports, indexed by local name
 	this.imports = blank();
@@ -8391,7 +8426,7 @@ Module.prototype.basename = function basename$1 () {
 	var base = basename( this.id );
 	var ext = extname( this.id );
 
-	return makeLegalIdentifier( ext ? base.slice( 0, -ext.length ) : base );
+	return makeLegal( ext ? base.slice( 0, -ext.length ) : base );
 };
 
 Module.prototype.bindImportSpecifiers = function bindImportSpecifiers () {
@@ -8401,21 +8436,23 @@ Module.prototype.bindImportSpecifiers = function bindImportSpecifiers () {
 		keys( specifiers ).forEach( function (name) {
 			var specifier = specifiers[ name ];
 
-			var id = this$1.resolvedIds[ specifier.source ];
+			var id = this$1.resolvedIds[ specifier.source ] || this$1.resolvedExternalIds[ specifier.source ];
 			specifier.module = this$1.bundle.moduleById.get( id );
 		});
 	});
 
 	this.exportAllModules = this.exportAllSources.map( function (source) {
-		var id = this$1.resolvedIds[ source ];
+		var id = this$1.resolvedIds[ source ] || this$1.resolvedExternalIds[ source ];
 		return this$1.bundle.moduleById.get( id );
 	});
 
 	this.sources.forEach( function (source) {
 		var id = this$1.resolvedIds[ source ];
-		var module = this$1.bundle.moduleById.get( id );
 
-		if ( !module.isExternal ) { this$1.dependencies.push( module ); }
+		if ( id ) {
+			var module = this$1.bundle.moduleById.get( id );
+			this$1.dependencies.push( module );
+		}
 	});
 };
 
@@ -8526,7 +8563,8 @@ Module.prototype.toJSON = function toJSON () {
 		originalSourceMap: this.originalSourceMap,
 		ast: this.astClone,
 		sourceMapChain: this.sourceMapChain,
-		resolvedIds: this.resolvedIds
+		resolvedIds: this.resolvedIds,
+		resolvedExternalIds: this.resolvedExternalIds
 	};
 };
 
@@ -8622,7 +8660,7 @@ var ExternalModule = function ExternalModule ( id, relativePath ) {
 	this.id = id;
 	this.path = relativePath;
 
-	this.name = makeLegalIdentifier( relativePath );
+	this.name = makeLegal( relativePath );
 
 	this.nameSuggestions = blank();
 	this.mostCommonSuggestion = 0;
@@ -8678,7 +8716,7 @@ function getInteropBlock ( bundle, options ) {
 				return ((bundle.varOrConst) + " " + (module.name) + "__default = 'default' in " + (module.name) + " ? " + (module.name) + "['default'] : " + (module.name) + ";");
 			}
 
-			return ((module.name) + " = " + (module.name) + " && 'default' in " + (module.name) + " ? " + (module.name) + "['default'] : " + (module.name) + ";");
+			return ((module.name) + " = " + (module.name) + " && " + (module.name) + ".hasOwnProperty('default') ? " + (module.name) + "['default'] : " + (module.name) + ";");
 		})
 		.filter( Boolean )
 		.join( '\n' );
@@ -9034,8 +9072,17 @@ function iife ( bundle, magicString, ref, options ) {
 
 	var globalNameMaker = getGlobalNameMaker( options.globals || blank(), bundle, 'null' );
 
+	var extend = options.extend;
 	var name = options.moduleName;
-	var isNamespaced = name && ~name.indexOf( '.' );
+	var isNamespaced = name && name.indexOf( '.' ) !== -1;
+	var possibleVariableAssignment = !extend && !isNamespaced;
+
+	if ( name && possibleVariableAssignment && !isLegal(name) ) {
+		error({
+			code: 'ILLEGAL_IDENTIFIER_AS_NAME',
+			message: ("Given moduleName (" + name + ") is not legal JS identifier. If you need this you can try --extend option")
+		});
+	}
 
 	warnOnBuiltins( bundle );
 
@@ -9050,17 +9097,19 @@ function iife ( bundle, magicString, ref, options ) {
 		});
 	}
 
-	if ( exportMode === 'named' ) {
+	if ( extend ) {
 		dependencies.unshift( ("(" + (thisProp(name)) + " = " + (thisProp(name)) + " || {})") );
 		args.unshift( 'exports' );
+	} else if ( exportMode === 'named' ) {
+		dependencies.unshift( '{}' );
+		args.unshift( 'exports' );
 	}
 
 	var useStrict = options.useStrict !== false ? (indentString + "'use strict';\n\n") : "";
 
 	var wrapperIntro = "(function (" + args + ") {\n" + useStrict;
-	var wrapperOutro = "\n\n}(" + dependencies + "));";
 
-	if ( exportMode === 'default' ) {
+	if ( exportMode !== 'none' && !extend) {
 		wrapperIntro = ( isNamespaced ? thisProp(name) : ((bundle.varOrConst) + " " + name) ) + " = " + wrapperIntro;
 	}
 
@@ -9068,6 +9117,12 @@ function iife ( bundle, magicString, ref, options ) {
 		wrapperIntro = setupNamespace( name ) + wrapperIntro;
 	}
 
+	var wrapperOutro = "\n\n}(" + dependencies + "));";
+
+	if (possibleVariableAssignment && exportMode === 'named') {
+		wrapperOutro = "\n\n" + indentString + "return exports;" + wrapperOutro;
+	}
+
 	// var foo__default = 'default' in foo ? foo['default'] : foo;
 	var interopBlock = getInteropBlock( bundle, options );
 	if ( interopBlock ) { magicString.prepend( interopBlock + '\n\n' ); }
@@ -9100,6 +9155,15 @@ function setupNamespace$1 ( name ) {
 		.join( ', ' );
 }
 
+function safeAccess ( name ) {
+	var parts = name.split( '.' );
+
+	var acc = 'global';
+	return parts
+		.map( function (part) { return ( acc += property( part ), acc ); } )
+		.join( " && " );
+}
+
 var wrapperOutro = '\n\n})));';
 
 function umd ( bundle, magicString, ref, options ) {
@@ -9129,7 +9193,7 @@ function umd ( bundle, magicString, ref, options ) {
 	if ( exportMode === 'named' ) {
 		amdDeps.unshift( "'exports'" );
 		cjsDeps.unshift( "exports" );
-		globalDeps.unshift( ("(" + (setupNamespace$1(options.moduleName)) + " = " + (globalProp(options.moduleName)) + " || {})") );
+		globalDeps.unshift( ("(" + (setupNamespace$1(options.moduleName)) + " = " + (options.extend ? ((globalProp(options.moduleName)) + " || ") : '') + "{})") );
 
 		args.unshift( 'exports' );
 	}
@@ -9147,8 +9211,21 @@ function umd ( bundle, magicString, ref, options ) {
 
 	var useStrict = options.useStrict !== false ? " 'use strict';" : "";
 
-	var globalExport = options.noConflict === true ?
-		("(function() {\n\t\t\t\tvar current = " + (globalProp(options.moduleName)) + ";\n\t\t\t\tvar exports = factory(" + globalDeps + ");\n\t\t\t\t" + (globalProp(options.moduleName)) + " = exports;\n\t\t\t\texports.noConflict = function() { " + (globalProp(options.moduleName)) + " = current; return exports; };\n\t\t\t})()") : ("(" + defaultExport + "factory(" + globalDeps + "))");
+	var globalExport;
+
+	if (options.noConflict === true) {
+		var factory;
+
+		if ( exportMode === 'default' ) {
+			factory = "var exports = factory(" + globalDeps + ");";
+		} else if ( exportMode === 'named' ) {
+			var module = globalDeps.shift();
+			factory = "var exports = " + module + ";\n\t\t\t\tfactory(" + (['exports'].concat(globalDeps)) + ");";
+		}
+		globalExport = "(function() {\n\t\t\t\tvar current = " + (safeAccess(options.moduleName)) + ";\n\t\t\t\t" + factory + "\n\t\t\t\t" + (globalProp(options.moduleName)) + " = exports;\n\t\t\t\texports.noConflict = function() { " + (globalProp(options.moduleName)) + " = current; return exports; };\n\t\t\t})()";
+	} else {
+		globalExport = "(" + defaultExport + "factory(" + globalDeps + "))";
+	}
 
 	var wrapperIntro =
 		("(function (global, factory) {\n\t\t\ttypeof exports === 'object' && typeof module !== 'undefined' ? " + cjsExport + "factory(" + (cjsDeps.join( ', ' )) + ") :\n\t\t\ttypeof " + define + " === 'function' && " + define + ".amd ? " + define + "(" + amdParams + "factory) :\n\t\t\t" + globalExport + ";\n\t\t}(this, (function (" + args + ") {" + useStrict + "\n\n\t\t").replace( /^\t\t/gm, '' ).replace( /^\t/gm, indentString || '\t' );
@@ -9403,39 +9480,40 @@ function transform ( bundle, source, id, plugins ) {
 }
 
 function transformBundle ( code, plugins, sourceMapChain, options ) {
-	return plugins.reduce( function ( code, plugin ) {
-		if ( !plugin.transformBundle ) { return code; }
-
-		var result;
-
-		try {
-			result = plugin.transformBundle( code, { format : options.format } );
-		} catch ( err ) {
-			error({
-				code: 'BAD_BUNDLE_TRANSFORMER',
-				message: ("Error transforming bundle" + (plugin.name ? (" with '" + (plugin.name) + "' plugin") : '') + ": " + (err.message)),
-				plugin: plugin.name
-			});
-		}
-
-		if ( result == null ) { return code; }
+	return plugins.reduce( function ( promise, plugin ) {
+		if ( !plugin.transformBundle ) { return promise; }
+
+		return promise.then( function (code) {
+			return Promise.resolve().then( function () {
+				return plugin.transformBundle( code, { format : options.format } );
+			}).then( function (result) {
+				if ( result == null ) { return code; }
+
+				if ( typeof result === 'string' ) {
+					result = {
+						code: result,
+						map: null
+					};
+				}
 
-		if ( typeof result === 'string' ) {
-			result = {
-				code: result,
-				map: null
-			};
-		}
+				var map = typeof result.map === 'string' ? JSON.parse( result.map ) : result.map;
+				if ( map && typeof map.mappings === 'string' ) {
+					map.mappings = decode$$1( map.mappings );
+				}
 
-		var map = typeof result.map === 'string' ? JSON.parse( result.map ) : result.map;
-		if ( map && typeof map.mappings === 'string' ) {
-			map.mappings = decode$$1( map.mappings );
-		}
+				sourceMapChain.push( map );
 
-		sourceMapChain.push( map );
+				return result.code;
+			}).catch( function (err) {
+				error({
+					code: 'BAD_BUNDLE_TRANSFORMER',
+					message: ("Error transforming bundle" + (plugin.name ? (" with '" + (plugin.name) + "' plugin") : '') + ": " + (err.message)),
+					plugin: plugin.name
+				});
+			});
+		});
 
-		return result.code;
-	}, code );
+	}, Promise.resolve( code ) );
 }
 
 var Source = function Source ( filename, content ) {
@@ -10002,7 +10080,7 @@ Bundle.prototype.fetchModule = function fetchModule ( id, importer ) {
 					}
 				});
 				module.exportAllSources.forEach( function (source) {
-					var id = module.resolvedIds[ source ];
+					var id = module.resolvedIds[ source ] || module.resolvedExternalIds[ source ];
 					var exportAllModule = this$1.moduleById.get( id );
 					if ( exportAllModule.isExternal ) { return; }
 
@@ -10052,7 +10130,7 @@ Bundle.prototype.fetchAllDependencies = function fetchAllDependencies ( module )
 				}
 
 				if ( isExternal ) {
-					module.resolvedIds[ source ] = externalId;
+					module.resolvedExternalIds[ source ] = externalId;
 
 					if ( !this$1.moduleById.has( externalId ) ) {
 						var module$1 = new ExternalModule( externalId, this$1.getPath( externalId ) );
@@ -10105,119 +10183,121 @@ Bundle.prototype.render = function render ( options ) {
 		var this$1 = this;
 		if ( options === void 0 ) options = {};
 
-	if ( options.format === 'es6' ) {
-		this.warn({
-			code: 'DEPRECATED_ES6',
-			message: 'The es6 format is deprecated – use `es` instead'
-		});
-
-		options.format = 'es';
-	}
+	return Promise.resolve().then( function () {
+		if ( options.format === 'es6' ) {
+			this$1.warn({
+				code: 'DEPRECATED_ES6',
+				message: 'The es6 format is deprecated – use `es` instead'
+			});
 
-	// Determine export mode - 'default', 'named', 'none'
-	var exportMode = getExportMode( this, options );
+			options.format = 'es';
+		}
 
-	var magicString = new Bundle$2({ separator: '\n\n' });
-	var usedModules = [];
+		// Determine export mode - 'default', 'named', 'none'
+		var exportMode = getExportMode( this$1, options );
 
-	timeStart( 'render modules' );
+		var magicString = new Bundle$2({ separator: '\n\n' });
+		var usedModules = [];
 
-	this.orderedModules.forEach( function (module) {
-		var source = module.render( options.format === 'es', this$1.legacy );
+		timeStart( 'render modules' );
 
-		if ( source.toString().length ) {
-			magicString.addSource( source );
-			usedModules.push( module );
-		}
-	});
+		this$1.orderedModules.forEach( function (module) {
+			var source = module.render( options.format === 'es', this$1.legacy );
 
-	if ( !magicString.toString().trim() && this.entryModule.getExports().length === 0 ) {
-		this.warn({
-			code: 'EMPTY_BUNDLE',
-			message: 'Generated an empty bundle'
+			if ( source.toString().length ) {
+				magicString.addSource( source );
+				usedModules.push( module );
+			}
 		});
-	}
 
-	timeEnd( 'render modules' );
+		if ( !magicString.toString().trim() && this$1.entryModule.getExports().length === 0 ) {
+			this$1.warn({
+				code: 'EMPTY_BUNDLE',
+				message: 'Generated an empty bundle'
+			});
+		}
 
-	var intro = [ options.intro ]
-		.concat(
-			this.plugins.map( function (plugin) { return plugin.intro && plugin.intro(); } )
-		)
-		.filter( Boolean )
-		.join( '\n\n' );
+		timeEnd( 'render modules' );
 
-	if ( intro ) { intro += '\n\n'; }
+		var intro = [ options.intro ]
+			.concat(
+				this$1.plugins.map( function (plugin) { return plugin.intro && plugin.intro(); } )
+			)
+			.filter( Boolean )
+			.join( '\n\n' );
 
-	var outro = [ options.outro ]
-		.concat(
-			this.plugins.map( function (plugin) { return plugin.outro && plugin.outro(); } )
-		)
-		.filter( Boolean )
-		.join( '\n\n' );
+		if ( intro ) { intro += '\n\n'; }
 
-	if ( outro ) { outro = "\n\n" + outro; }
+		var outro = [ options.outro ]
+			.concat(
+				this$1.plugins.map( function (plugin) { return plugin.outro && plugin.outro(); } )
+			)
+			.filter( Boolean )
+			.join( '\n\n' );
 
-	var indentString = getIndentString( magicString, options );
+		if ( outro ) { outro = "\n\n" + outro; }
 
-	var finalise = finalisers[ options.format ];
-	if ( !finalise ) {
-		error({
-			code: 'INVALID_OPTION',
-			message: ("You must specify an output type - valid options are " + (keys( finalisers ).join( ', ' )))
-		});
-	}
+		var indentString = getIndentString( magicString, options );
 
-	timeStart( 'render format' );
+		var finalise = finalisers[ options.format ];
+		if ( !finalise ) {
+			error({
+				code: 'INVALID_OPTION',
+				message: ("You must specify an output type - valid options are " + (keys( finalisers ).join( ', ' )))
+			});
+		}
 
-	magicString = finalise( this, magicString.trim(), { exportMode: exportMode, indentString: indentString, intro: intro, outro: outro }, options );
+		timeStart( 'render format' );
 
-	timeEnd( 'render format' );
+		magicString = finalise( this$1, magicString.trim(), { exportMode: exportMode, indentString: indentString, intro: intro, outro: outro }, options );
 
-	var banner = [ options.banner ]
-		.concat( this.plugins.map( function (plugin) { return plugin.banner; } ) )
-		.map( callIfFunction )
-		.filter( Boolean )
-		.join( '\n' );
+		timeEnd( 'render format' );
 
-	var footer = [ options.footer ]
-		.concat( this.plugins.map( function (plugin) { return plugin.footer; } ) )
-		.map( callIfFunction )
-		.filter( Boolean )
-		.join( '\n' );
+		var banner = [ options.banner ]
+			.concat( this$1.plugins.map( function (plugin) { return plugin.banner; } ) )
+			.map( callIfFunction )
+			.filter( Boolean )
+			.join( '\n' );
 
-	if ( banner ) { magicString.prepend( banner + '\n' ); }
-	if ( footer ) { magicString.append( '\n' + footer ); }
+		var footer = [ options.footer ]
+			.concat( this$1.plugins.map( function (plugin) { return plugin.footer; } ) )
+			.map( callIfFunction )
+			.filter( Boolean )
+			.join( '\n' );
 
-	var code = magicString.toString();
-	var map = null;
-	var bundleSourcemapChain = [];
+		if ( banner ) { magicString.prepend( banner + '\n' ); }
+		if ( footer ) { magicString.append( '\n' + footer ); }
 
-	code = transformBundle( code, this.plugins, bundleSourcemapChain, options );
+		var prevCode = magicString.toString();
+		var map = null;
+		var bundleSourcemapChain = [];
 
-	if ( options.sourceMap ) {
-		timeStart( 'sourceMap' );
+		return transformBundle( prevCode, this$1.plugins, bundleSourcemapChain, options ).then( function (code) {
+			if ( options.sourceMap ) {
+				timeStart( 'sourceMap' );
 
-		var file = options.sourceMapFile || options.dest;
-		if ( file ) { file = resolve( typeof process !== 'undefined' ? process.cwd() : '', file ); }
+				var file = options.sourceMapFile || options.dest;
+				if ( file ) { file = resolve( typeof process !== 'undefined' ? process.cwd() : '', file ); }
 
-		if ( this.hasLoaders || find( this.plugins, function (plugin) { return plugin.transform || plugin.transformBundle; } ) ) {
-			map = magicString.generateMap({});
-			if ( typeof map.mappings === 'string' ) {
-				map.mappings = decode$$1( map.mappings );
-			}
-			map = collapseSourcemaps( this, file, map, usedModules, bundleSourcemapChain );
-		} else {
-			map = magicString.generateMap({ file: file, includeContent: true });
-		}
+				if ( this$1.hasLoaders || find( this$1.plugins, function (plugin) { return plugin.transform || plugin.transformBundle; } ) ) {
+					map = magicString.generateMap({});
+					if ( typeof map.mappings === 'string' ) {
+						map.mappings = decode$$1( map.mappings );
+					}
+					map = collapseSourcemaps( this$1, file, map, usedModules, bundleSourcemapChain );
+				} else {
+					map = magicString.generateMap({ file: file, includeContent: true });
+				}
 
-		map.sources = map.sources.map( normalize );
+				map.sources = map.sources.map( normalize );
 
-		timeEnd( 'sourceMap' );
-	}
+				timeEnd( 'sourceMap' );
+			}
 
-	if ( code[ code.length - 1 ] !== '\n' ) { code += '\n'; }
-	return { code: code, map: map };
+			if ( code[ code.length - 1 ] !== '\n' ) { code += '\n'; }
+			return { code: code, map: map };
+		});
+	});
 };
 
 Bundle.prototype.sort = function sort () {
@@ -10322,7 +10402,7 @@ Bundle.prototype.warn = function warn ( warning ) {
 	this.onwarn( warning );
 };
 
-var VERSION = '0.43.1';
+var VERSION = '0.45.2';
 
 var ALLOWED_KEYS = [
 	'acorn',
@@ -10333,6 +10413,7 @@ var ALLOWED_KEYS = [
 	'dest',
 	'entry',
 	'exports',
+	'extend',
 	'external',
 	'footer',
 	'format',
@@ -10389,6 +10470,12 @@ function checkOptions ( options ) {
 	if ( err ) { throw err; }
 }
 
+var throwAsyncGenerateError = {
+	get: function get () {
+		throw new Error( "bundle.generate(...) now returns a Promise instead of a { code, map } object" );
+	}
+};
+
 function rollup ( options ) {
 	try {
 		checkOptions( options );
@@ -10416,21 +10503,28 @@ function rollup ( options ) {
 
 				timeStart( '--GENERATE--' );
 
-				var rendered = bundle.render( options );
+				var promise = Promise.resolve()
+					.then( function () { return bundle.render( options ); } )
+					.then( function (rendered) {
+						timeEnd( '--GENERATE--' );
 
-				timeEnd( '--GENERATE--' );
+						bundle.plugins.forEach( function (plugin) {
+							if ( plugin.ongenerate ) {
+								plugin.ongenerate( assign({
+									bundle: result
+								}, options ), rendered);
+							}
+						});
 
-				bundle.plugins.forEach( function (plugin) {
-					if ( plugin.ongenerate ) {
-						plugin.ongenerate( assign({
-							bundle: result
-						}, options ), rendered);
-					}
-				});
+						flushTime();
 
-				flushTime();
+						return rendered;
+					});
+
+				Object.defineProperty( promise, 'code', throwAsyncGenerateError );
+				Object.defineProperty( promise, 'map', throwAsyncGenerateError );
 
-				return rendered;
+				return promise;
 			}
 
 			var result = {
@@ -10448,31 +10542,32 @@ function rollup ( options ) {
 					}
 
 					var dest = options.dest;
-					var output = generate( options );
-					var code = output.code;
-					var map = output.map;
+					return generate( options ).then( function (output) {
+						var code = output.code;
+						var map = output.map;
 
-					var promises = [];
+						var promises = [];
 
-					if ( options.sourceMap ) {
-						var url;
+						if ( options.sourceMap ) {
+							var url;
 
-						if ( options.sourceMap === 'inline' ) {
-							url = map.toUrl();
-						} else {
-							url = (basename( dest )) + ".map";
-							promises.push( writeFile( dest + '.map', map.toString() ) );
-						}
+							if ( options.sourceMap === 'inline' ) {
+								url = map.toUrl();
+							} else {
+								url = (basename( dest )) + ".map";
+								promises.push( writeFile( dest + '.map', map.toString() ) );
+							}
 
-						code += "//# " + SOURCEMAPPING_URL + "=" + url + "\n";
-					}
+							code += "//# " + SOURCEMAPPING_URL + "=" + url + "\n";
+						}
 
-					promises.push( writeFile( dest, code ) );
-					return Promise.all( promises ).then( function () {
-						return mapSequence( bundle.plugins.filter( function (plugin) { return plugin.onwrite; } ), function (plugin) {
-							return Promise.resolve( plugin.onwrite( assign({
-								bundle: result
-							}, options ), output));
+						promises.push( writeFile( dest, code ) );
+						return Promise.all( promises ).then( function () {
+							return mapSequence( bundle.plugins.filter( function (plugin) { return plugin.onwrite; } ), function (plugin) {
+								return Promise.resolve( plugin.onwrite( assign({
+									bundle: result
+								}, options ), output));
+							});
 						});
 					});
 				}