rollup 0.37.1 → 0.37.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # rollup changelog
 
+## 0.37.2
+
+* Remove unused `new` expressions without side-effects ([#179](https://github.com/rollup/rollup/issues/179))
+* Only remove valid sourceMappingURL comments ([#1132](https://github.com/rollup/rollup/issues/1132))
+* Ensure blocks containing activated `var` declarations are included in output ([#1113](https://github.com/rollup/rollup/issues/1113))
+* Support plugin outros ([#1116](https://github.com/rollup/rollup/issues/1116))
+
 ## 0.37.1
 
 * Follow symlinks ([#447](https://github.com/rollup/rollup/issues/447))

package/bin/rollup

@@ -257,7 +257,7 @@ var minimist = interopDefault(index);
 
 var help = "rollup version __VERSION__\n=====================================\n\nUsage: rollup [options] <entry file>\n\nBasic options:\n\n-v, --version            Show version number\n-h, --help               Show this help message\n-c, --config             Use this config file (if argument is used but value\n                           is unspecified, defaults to rollup.config.js)\n-w, --watch              Watch files in bundle and rebuild on changes\n-i, --input              Input (alternative to <entry file>)\n-o, --output <output>    Output (if absent, prints to stdout)\n-f, --format [es]       Type of output (amd, cjs, es, iife, umd)\n-e, --external           Comma-separate list of module IDs to exclude\n-g, --globals            Comma-separate list of `module ID:Global` pairs\n                            Any module IDs defined here are added to external\n-n, --name               Name for UMD export\n-u, --id                 ID for AMD module (default is anonymous)\n-m, --sourcemap          Generate sourcemap (`-m inline` for inline map)\n--no-strict              Don't emit a `\"use strict\";` in the generated modules.\n--no-indent              Don't indent result\n--environment <values>   Settings passed to config file (see example)\n--no-conflict            Generate a noConflict method for UMD globals\n--intro                  Content to insert at top of bundle (inside wrapper)\n--outro                  Content to insert at end of bundle (inside wrapper)\n--banner                 Content to insert at top of bundle (outside wrapper)\n--footer                 Content to insert at end of bundle (outside wrapper)\n\nExamples:\n\n# use settings in config file\nrollup -c\n\n# in config file, process.env.INCLUDE_DEPS === 'true'\n# and process.env.BUILD === 'production'\nrollup -c --environment INCLUDE_DEPS,BUILD:production\n\n# create CommonJS bundle.js from src/main.js\nrollup --format=cjs --output=bundle.js -- src/main.js\n\n# create self-executing IIFE using `window.jQuery`\n# and `window._` as external globals\nrollup -f iife --globals jquery:jQuery,lodash:_ \\\n  -i src/app.js -o build/app.js -m build/app.js.map\n\nNotes:\n\n* When piping to stdout, only inline sourcemaps are permitted\n\nFor more information visit https://github.com/rollup/rollup/wiki\n";
 
-var version = "0.37.1";
+var version = "0.37.2";
 
 var index$1 = createCommonjsModule(function (module) {
 /*

package/dist/rollup.browser.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.37.1
-	Tue Dec 20 2016 20:09:03 GMT-0500 (EST) - commit b3b10986cc181511d681a80c3535bfd644b986f9
+	Rollup.js v0.37.2
+	Tue Dec 20 2016 23:13:18 GMT-0500 (EST) - commit 37a6869ef967e0bed8fd20dfc70f86dfdb993804
 
 
 	https://github.com/rollup/rollup
@@ -5827,7 +5827,43 @@ simdTypes.forEach( function (t) {
 
 var currentlyCalling = new Set();
 
-function fnHasEffects ( fn ) {
+function isES5Function ( node ) {
+	return node.type === 'FunctionExpression' || node.type === 'FunctionDeclaration';
+}
+
+function hasEffectsNew ( node, scope ) {
+	var inner = node;
+
+	if ( inner.type === 'ExpressionStatement' ) {
+		inner = inner.expression;
+
+		if ( inner.type === 'AssignmentExpression' ) {
+			if ( inner.right.hasEffects( scope ) ) {
+				return true;
+
+			} else {
+				inner = inner.left;
+
+				if ( inner.type === 'MemberExpression' ) {
+					if ( inner.computed && inner.property.hasEffects( scope ) ) {
+						return true;
+
+					} else {
+						inner = inner.object;
+
+						if ( inner.type === 'ThisExpression' ) {
+							return false;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return node.hasEffects( scope );
+}
+
+function fnHasEffects ( fn, isNew ) {
 	if ( currentlyCalling.has( fn ) ) return false; // prevent infinite loops... TODO there must be a better way
 	currentlyCalling.add( fn );
 
@@ -5836,7 +5872,7 @@ function fnHasEffects ( fn ) {
 	var body = fn.body.type === 'BlockStatement' ? fn.body.body : [ fn.body ];
 
 	for ( var node of body ) {
-		if ( node.hasEffects( scope ) ) {
+		if ( isNew ? hasEffectsNew( node, scope ) : node.hasEffects( scope ) ) {
 			currentlyCalling.delete( fn );
 			return true;
 		}
@@ -5846,14 +5882,14 @@ function fnHasEffects ( fn ) {
 	return false;
 }
 
-function callHasEffects ( scope, callee ) {
+function callHasEffects ( scope, callee, isNew ) {
 	var values = new Set([ callee ]);
 
 	for ( var node of values ) {
 		if ( node === UNKNOWN ) return true; // err on side of caution
 
 		if ( /Function/.test( node.type ) ) {
-			if ( fnHasEffects( node ) ) return true;
+			if ( fnHasEffects( node, isNew && isES5Function( node ) ) ) return true;
 		}
 
 		else if ( isReference( node ) ) {
@@ -5919,7 +5955,7 @@ var CallExpression = (function (Node) {
 	};
 
 	CallExpression.prototype.hasEffects = function hasEffects ( scope ) {
-		return callHasEffects( scope, this.callee );
+		return callHasEffects( scope, this.callee, false );
 	};
 
 	CallExpression.prototype.initialise = function initialise ( scope ) {
@@ -6846,7 +6882,7 @@ var NewExpression = (function (Node) {
 	NewExpression.prototype.constructor = NewExpression;
 
 	NewExpression.prototype.hasEffects = function hasEffects ( scope ) {
-		return callHasEffects( scope, this.callee );
+		return callHasEffects( scope, this.callee, true );
 	};
 
 	return NewExpression;
@@ -7087,6 +7123,16 @@ var VariableDeclarator = (function (Node) {
 		this.activated = true;
 
 		this.run( this.findScope() );
+
+		// if declaration is inside a block, ensure that the block
+		// is marked for inclusion
+		if ( this.parent.kind === 'var' ) {
+			var node = this.parent.parent;
+			while ( /Statement/.test( node.type ) ) {
+				node.shouldInclude = true;
+				node = node.parent;
+			}
+		}
 	};
 
 	VariableDeclarator.prototype.hasEffects = function hasEffects ( scope ) {
@@ -7487,7 +7533,7 @@ var Module = function Module (ref) {
 	});
 
 	// remove existing sourceMappingURL comments
-	var pattern = new RegExp( ("\\/\\/#\\s+" + SOURCEMAPPING_URL$1 + "=.+\\n?"), 'g' );
+	var pattern = new RegExp( ("^\\/\\/#\\s+" + SOURCEMAPPING_URL$1 + "=.+\\n?"), 'gm' );
 	var match;
 	while ( match = pattern.exec( code ) ) {
 		this$1.magicString.remove( match.index, match.index + match[0].length );
@@ -7522,7 +7568,7 @@ Module.prototype.addExport = function addExport ( node ) {
 		}
 
 		else {
-				node.specifiers.forEach( function (specifier) {
+			node.specifiers.forEach( function (specifier) {
 				var name = specifier.exported.name;
 
 				if ( this$1.exports[ name ] || this$1.reexports[ name ] ) {
@@ -7935,6 +7981,7 @@ function amd ( bundle, magicString, ref, options ) {
 	var exportMode = ref.exportMode;
 	var indentString = ref.indentString;
 	var intro = ref.intro;
+	var outro = ref.outro;
 
 	var deps = bundle.externalModules.map( quotePath );
 	var args = bundle.externalModules.map( getName );
@@ -7960,7 +8007,7 @@ function amd ( bundle, magicString, ref, options ) {
 	var exportBlock = getExportBlock( bundle.entryModule, exportMode );
 	if ( exportBlock ) magicString.append( '\n\n' + exportBlock );
 	if ( exportMode === 'named' && options.legacy !== true ) magicString.append( ("\n\n" + esModuleExport) );
-	if ( options.outro ) magicString.append( ("\n" + (options.outro)) );
+	if ( outro ) magicString.append( outro );
 
 	return magicString
 		.indent( indentString )
@@ -7971,6 +8018,7 @@ function amd ( bundle, magicString, ref, options ) {
 function cjs ( bundle, magicString, ref, options ) {
 	var exportMode = ref.exportMode;
 	var intro = ref.intro;
+	var outro = ref.outro;
 
 	intro = ( options.useStrict === false ? intro : ("'use strict';\n\n" + intro) ) +
 	        ( exportMode === 'named' && options.legacy !== true ? (esModuleExport + "\n\n") : '' );
@@ -8015,7 +8063,7 @@ function cjs ( bundle, magicString, ref, options ) {
 
 	var exportBlock = getExportBlock( bundle.entryModule, exportMode, 'module.exports =' );
 	if ( exportBlock ) magicString.append( '\n\n' + exportBlock );
-	if ( options.outro ) magicString.append( ("\n" + (options.outro)) );
+	if ( outro ) magicString.append( outro );
 
 	return magicString;
 }
@@ -8024,8 +8072,9 @@ function notDefault ( name ) {
 	return name !== 'default';
 }
 
-function es ( bundle, magicString, ref, options ) {
+function es ( bundle, magicString, ref ) {
 	var intro = ref.intro;
+	var outro = ref.outro;
 
 	var importBlock = bundle.externalModules
 		.map( function (module) {
@@ -8092,7 +8141,7 @@ function es ( bundle, magicString, ref, options ) {
 	}
 
 	if ( exportBlock ) magicString.append( '\n\n' + exportBlock.trim() );
-	if ( options.outro ) magicString.append( ("\n" + (options.outro)) );
+	if ( outro ) magicString.append( outro );
 
 	return magicString.trim();
 }
@@ -8145,6 +8194,7 @@ function iife ( bundle, magicString, ref, options ) {
 	var exportMode = ref.exportMode;
 	var indentString = ref.indentString;
 	var intro = ref.intro;
+	var outro = ref.outro;
 
 	var globalNameMaker = getGlobalNameMaker( options.globals || blank(), bundle.onwarn );
 
@@ -8185,7 +8235,7 @@ function iife ( bundle, magicString, ref, options ) {
 
 	var exportBlock = getExportBlock( bundle.entryModule, exportMode );
 	if ( exportBlock ) magicString.append( '\n\n' + exportBlock );
-	if ( options.outro ) magicString.append( ("\n" + (options.outro)) );
+	if ( outro ) magicString.append( outro );
 
 	return magicString
 		.indent( indentString )
@@ -8216,6 +8266,7 @@ function umd ( bundle, magicString, ref, options ) {
 	var exportMode = ref.exportMode;
 	var indentString = ref.indentString;
 	var intro = ref.intro;
+	var outro = ref.outro;
 
 	if ( exportMode !== 'none' && !options.moduleName ) {
 		throw new Error( 'You must supply options.moduleName for UMD bundles' );
@@ -8261,7 +8312,7 @@ function umd ( bundle, magicString, ref, options ) {
 	var exportBlock = getExportBlock( bundle.entryModule, exportMode );
 	if ( exportBlock ) magicString.append( '\n\n' + exportBlock );
 	if ( exportMode === 'named' && options.legacy !== true ) magicString.append( ("\n\n" + esModuleExport) );
-	if ( options.outro ) magicString.append( ("\n" + (options.outro)) );
+	if ( outro ) magicString.append( outro );
 
 	return magicString
 		.trim()
@@ -9064,7 +9115,16 @@ Bundle.prototype.render = function render ( options ) {
 		.filter( Boolean )
 		.join( '\n\n' );
 
-	if ( intro ) intro += '\n';
+	if ( intro ) intro += '\n\n';
+
+	var outro = [ options.outro ]
+		.concat(
+			this.plugins.map( function (plugin) { return plugin.outro && plugin.outro(); } )
+		)
+		.filter( Boolean )
+		.join( '\n\n' );
+
+	if ( outro ) outro = "\n\n" + outro;
 
 	var indentString = getIndentString( magicString, options );
 
@@ -9073,7 +9133,7 @@ Bundle.prototype.render = function render ( options ) {
 
 	timeStart( 'render format' );
 
-	magicString = finalise( this, magicString.trim(), { exportMode: exportMode, indentString: indentString, intro: intro }, options );
+	magicString = finalise( this, magicString.trim(), { exportMode: exportMode, indentString: indentString, intro: intro, outro: outro }, options );
 
 	timeEnd( 'render format' );
 
@@ -9097,7 +9157,7 @@ Bundle.prototype.render = function render ( options ) {
 	var bundleSourcemapChain = [];
 
 	code = transformBundle( code, this.plugins, bundleSourcemapChain, options )
-		.replace( new RegExp( ("\\/\\/#\\s+" + SOURCEMAPPING_URL$1 + "=.+\\n?"), 'g' ), '' );
+		.replace( new RegExp( ("^\\/\\/#\\s+" + SOURCEMAPPING_URL$1 + "=.+\\n?"), 'gm' ), '' );
 
 	if ( options.sourceMap ) {
 		timeStart( 'sourceMap' );
@@ -9124,7 +9184,7 @@ Bundle.prototype.render = function render ( options ) {
 	return { code: code, map: map };
 };
 
-	Bundle.prototype.sort = function sort () {
+Bundle.prototype.sort = function sort () {
 		var this$1 = this;
 
 	var hasCycles;
@@ -9200,7 +9260,7 @@ Bundle.prototype.render = function render ( options ) {
 
 					this$1.onwarn(
 						("Module " + (a.id) + " may be unable to evaluate without " + (b.id) + ", but is included first due to a cyclical dependency. Consider swapping the import statements in " + parent + " to ensure correct ordering")
-					);
+						);
 				}
 			};
 
@@ -9211,7 +9271,7 @@ Bundle.prototype.render = function render ( options ) {
 	return ordered;
 };
 
-var VERSION = '0.37.1';
+var VERSION = '0.37.2';
 
 var ALLOWED_KEYS = [
 	'acorn',