rollup 0.50.0 → 0.50.1

package/README.md

@@ -32,7 +32,7 @@ Rollup is a module bundler for JavaScript which compiles small pieces of code in
 
 ## Quick Start Guide
 
-Install with `npm install --global rollup`. Rollup can be used either through a [command line interface](https://rollupjs.org/#command-line-reference) with an optional configuration file, or else through its [JavaScript API](https://rollupjs.org/#javascript-api). Run `rollup --help` to see the available options and parameters. The [starter project template](https://github.com/rollup/rollup-starter-project) demonstrates common configuration options, and more detailed instructions are available throughout the [user guide](http://rollupjs.org/).
+Install with `npm install --global rollup`. Rollup can be used either through a [command line interface](https://rollupjs.org/#command-line-reference) with an optional configuration file, or else through its [JavaScript API](https://rollupjs.org/#javascript-api). Run `rollup --help` to see the available options and parameters. The starter project templates, [rollup-starter-lib](https://github.com/rollup/rollup-starter-lib) and [rollup-starter-app](https://github.com/rollup/rollup-starter-app), demonstrate common configuration options, and more detailed instructions are available throughout the [user guide](http://rollupjs.org/).
 
 ### Commands
 

package/bin/rollup

@@ -250,7 +250,7 @@ function isNumber (x) {
 
 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.file <output>  Output (if absent, prints to stdout)\n-f, --output.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-m, --sourcemap             Generate sourcemap (`-m inline` for inline map)\n--amd.id                    ID for AMD module (default is anonymous)\n--amd.define                Function to use in place of `define`\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--silent                    Don't print warnings\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--interop                   Include interop block (true by default)\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.50.0";
+var version = "0.50.1";
 
 var modules = {};
 

package/dist/rollup.browser.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.50.0
-	Sat Sep 16 2017 09:48:09 GMT-0400 (EDT) - commit b949eb08169115ff66648838cbc4833379bf9440
+	Rollup.js v0.50.1
+	Wed Nov 08 2017 06:27:53 GMT+0100 (CET) - commit e773b589d9a05ba3d51ad44d3016ee6dfa2d2fd5
 
 
 	https://github.com/rollup/rollup
@@ -6595,6 +6595,15 @@ class ConditionalExpression extends Node$1 {
 		return testValue ? this.consequent.getValue() : this.alternate.getValue();
 	}
 
+	hasEffects ( options ) {
+		return (
+			this.included
+			|| this.test.hasEffects( options )
+			|| (this.testValue === UNKNOWN_VALUE && (this.consequent.hasEffects( options ) || this.alternate.hasEffects( options )))
+			|| (this.testValue ? this.consequent.hasEffects( options ) : this.alternate.hasEffects( options ))
+		);
+	}
+
 	render ( code, es ) {
 		if ( !this.module.bundle.treeshake ) {
 			super.render( code, es );
@@ -6605,22 +6614,16 @@ class ConditionalExpression extends Node$1 {
 				super.render( code, es );
 			}
 
-			else if ( this.testValue ) {
-				code.remove( this.start, this.consequent.start );
-				code.remove( this.consequent.end, this.end );
-				if ( this.consequent.type === 'SequenceExpression' ) {
-					code.prependRight( this.consequent.start, '(' );
-					code.appendLeft( this.consequent.end, ')' );
-				}
-				this.consequent.render( code, es );
-			} else {
-				code.remove( this.start, this.alternate.start );
-				code.remove( this.alternate.end, this.end );
-				if ( this.alternate.type === 'SequenceExpression' ) {
-					code.prependRight( this.alternate.start, '(' );
-					code.appendLeft( this.alternate.end, ')' );
+			else {
+				const branchToRetain = this.testValue ? this.consequent : this.alternate;
+
+				code.remove( this.start, branchToRetain.start );
+				code.remove( branchToRetain.end, this.end );
+				if ( branchToRetain.type === 'SequenceExpression' ) {
+					code.prependLeft( branchToRetain.start, '(' );
+					code.appendRight( branchToRetain.end, ')' );
 				}
-				this.alternate.render( code, es );
+				branchToRetain.render( code, es );
 			}
 		}
 	}
@@ -7555,6 +7558,64 @@ class ReturnStatement extends Statement {
 	}
 }
 
+class SequenceExpression extends Node$1 {
+	getValue () {
+		return this.expressions[ this.expressions.length - 1 ].getValue();
+	}
+
+	hasEffects ( options ) {
+		return this.expressions.some( expression => expression.hasEffects( options ) );
+	}
+
+	includeInBundle () {
+		if ( this.isFullyIncluded() ) { return false; }
+		let addedNewNodes = false;
+		if ( this.expressions[ this.expressions.length - 1 ].includeInBundle() ) {
+			addedNewNodes = true;
+		}
+		this.expressions.forEach( node => {
+			if ( node.shouldBeIncluded() ) {
+				if ( node.includeInBundle() ) {
+					addedNewNodes = true;
+				}
+			}
+		} );
+		if ( !this.included || addedNewNodes ) {
+			this.included = true;
+			return true;
+		}
+		return false;
+	}
+
+	render ( code, es ) {
+		if ( !this.module.bundle.treeshake ) {
+			super.render( code, es );
+		}
+
+		else {
+			const last = this.expressions[ this.expressions.length - 1 ];
+			const included = this.expressions.slice( 0, this.expressions.length - 1 ).filter( expression => expression.included );
+
+			if ( included.length === 0 ) {
+				code.remove( this.start, last.start );
+				code.remove( last.end, this.end );
+			}
+
+			else {
+				let previousEnd = this.start;
+				for ( const expression of included ) {
+					code.remove( previousEnd, expression.start );
+					code.appendLeft( expression.end, ', ' );
+					previousEnd = expression.end;
+				}
+
+				code.remove( previousEnd, last.start );
+				code.remove( last.end, this.end );
+			}
+		}
+	}
+}
+
 class SwitchCase extends Node$1 {
 	includeInBundle () {
 		if ( this.isFullyIncluded() ) { return false; }
@@ -7960,6 +8021,7 @@ var nodes = {
 	Property,
 	RestElement,
 	ReturnStatement,
+	SequenceExpression,
 	SwitchCase,
 	SwitchStatement,
 	TaggedTemplateExpression,
@@ -8625,7 +8687,7 @@ class ExternalVariable extends Variable {
 		return es ? this.safeName : `${this.module.name}.${this.name}`;
 	}
 
-	includeDeclaration () {
+	includeVariable () {
 		if ( this.included ) {
 			return false;
 		}
@@ -10615,7 +10677,7 @@ function rollup ( options ) {
 	}
 }
 
-var version$1 = "0.50.0";
+var version$1 = "0.50.1";
 
 exports.rollup = rollup;
 exports.VERSION = version$1;

package/dist/rollup.es.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.50.0
-	Sat Sep 16 2017 09:48:09 GMT-0400 (EDT) - commit b949eb08169115ff66648838cbc4833379bf9440
+	Rollup.js v0.50.1
+	Wed Nov 08 2017 06:27:53 GMT+0100 (CET) - commit e773b589d9a05ba3d51ad44d3016ee6dfa2d2fd5
 
 
 	https://github.com/rollup/rollup
@@ -6547,6 +6547,15 @@ class ConditionalExpression extends Node$1 {
 		return testValue ? this.consequent.getValue() : this.alternate.getValue();
 	}
 
+	hasEffects ( options ) {
+		return (
+			this.included
+			|| this.test.hasEffects( options )
+			|| (this.testValue === UNKNOWN_VALUE && (this.consequent.hasEffects( options ) || this.alternate.hasEffects( options )))
+			|| (this.testValue ? this.consequent.hasEffects( options ) : this.alternate.hasEffects( options ))
+		);
+	}
+
 	render ( code, es ) {
 		if ( !this.module.bundle.treeshake ) {
 			super.render( code, es );
@@ -6557,22 +6566,16 @@ class ConditionalExpression extends Node$1 {
 				super.render( code, es );
 			}
 
-			else if ( this.testValue ) {
-				code.remove( this.start, this.consequent.start );
-				code.remove( this.consequent.end, this.end );
-				if ( this.consequent.type === 'SequenceExpression' ) {
-					code.prependRight( this.consequent.start, '(' );
-					code.appendLeft( this.consequent.end, ')' );
-				}
-				this.consequent.render( code, es );
-			} else {
-				code.remove( this.start, this.alternate.start );
-				code.remove( this.alternate.end, this.end );
-				if ( this.alternate.type === 'SequenceExpression' ) {
-					code.prependRight( this.alternate.start, '(' );
-					code.appendLeft( this.alternate.end, ')' );
+			else {
+				const branchToRetain = this.testValue ? this.consequent : this.alternate;
+
+				code.remove( this.start, branchToRetain.start );
+				code.remove( branchToRetain.end, this.end );
+				if ( branchToRetain.type === 'SequenceExpression' ) {
+					code.prependLeft( branchToRetain.start, '(' );
+					code.appendRight( branchToRetain.end, ')' );
 				}
-				this.alternate.render( code, es );
+				branchToRetain.render( code, es );
 			}
 		}
 	}
@@ -7507,6 +7510,64 @@ class ReturnStatement extends Statement {
 	}
 }
 
+class SequenceExpression extends Node$1 {
+	getValue () {
+		return this.expressions[ this.expressions.length - 1 ].getValue();
+	}
+
+	hasEffects ( options ) {
+		return this.expressions.some( expression => expression.hasEffects( options ) );
+	}
+
+	includeInBundle () {
+		if ( this.isFullyIncluded() ) { return false; }
+		let addedNewNodes = false;
+		if ( this.expressions[ this.expressions.length - 1 ].includeInBundle() ) {
+			addedNewNodes = true;
+		}
+		this.expressions.forEach( node => {
+			if ( node.shouldBeIncluded() ) {
+				if ( node.includeInBundle() ) {
+					addedNewNodes = true;
+				}
+			}
+		} );
+		if ( !this.included || addedNewNodes ) {
+			this.included = true;
+			return true;
+		}
+		return false;
+	}
+
+	render ( code, es ) {
+		if ( !this.module.bundle.treeshake ) {
+			super.render( code, es );
+		}
+
+		else {
+			const last = this.expressions[ this.expressions.length - 1 ];
+			const included = this.expressions.slice( 0, this.expressions.length - 1 ).filter( expression => expression.included );
+
+			if ( included.length === 0 ) {
+				code.remove( this.start, last.start );
+				code.remove( last.end, this.end );
+			}
+
+			else {
+				let previousEnd = this.start;
+				for ( const expression of included ) {
+					code.remove( previousEnd, expression.start );
+					code.appendLeft( expression.end, ', ' );
+					previousEnd = expression.end;
+				}
+
+				code.remove( previousEnd, last.start );
+				code.remove( last.end, this.end );
+			}
+		}
+	}
+}
+
 class SwitchCase extends Node$1 {
 	includeInBundle () {
 		if ( this.isFullyIncluded() ) { return false; }
@@ -7912,6 +7973,7 @@ var nodes = {
 	Property,
 	RestElement,
 	ReturnStatement,
+	SequenceExpression,
 	SwitchCase,
 	SwitchStatement,
 	TaggedTemplateExpression,
@@ -8577,7 +8639,7 @@ class ExternalVariable extends Variable {
 		return es ? this.safeName : `${this.module.name}.${this.name}`;
 	}
 
-	includeDeclaration () {
+	includeVariable () {
 		if ( this.included ) {
 			return false;
 		}
@@ -14423,7 +14485,7 @@ function watch$1(configs) {
 	return new Watcher(configs);
 }
 
-var version$1 = "0.50.0";
+var version$1 = "0.50.1";
 
 export { rollup, watch$1 as watch, version$1 as VERSION };
 //# sourceMappingURL=rollup.es.js.map

package/dist/rollup.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.50.0
-	Sat Sep 16 2017 09:48:09 GMT-0400 (EDT) - commit b949eb08169115ff66648838cbc4833379bf9440
+	Rollup.js v0.50.1
+	Wed Nov 08 2017 06:27:53 GMT+0100 (CET) - commit e773b589d9a05ba3d51ad44d3016ee6dfa2d2fd5
 
 
 	https://github.com/rollup/rollup
@@ -6554,6 +6554,15 @@ class ConditionalExpression extends Node$1 {
 		return testValue ? this.consequent.getValue() : this.alternate.getValue();
 	}
 
+	hasEffects ( options ) {
+		return (
+			this.included
+			|| this.test.hasEffects( options )
+			|| (this.testValue === UNKNOWN_VALUE && (this.consequent.hasEffects( options ) || this.alternate.hasEffects( options )))
+			|| (this.testValue ? this.consequent.hasEffects( options ) : this.alternate.hasEffects( options ))
+		);
+	}
+
 	render ( code, es ) {
 		if ( !this.module.bundle.treeshake ) {
 			super.render( code, es );
@@ -6564,22 +6573,16 @@ class ConditionalExpression extends Node$1 {
 				super.render( code, es );
 			}
 
-			else if ( this.testValue ) {
-				code.remove( this.start, this.consequent.start );
-				code.remove( this.consequent.end, this.end );
-				if ( this.consequent.type === 'SequenceExpression' ) {
-					code.prependRight( this.consequent.start, '(' );
-					code.appendLeft( this.consequent.end, ')' );
-				}
-				this.consequent.render( code, es );
-			} else {
-				code.remove( this.start, this.alternate.start );
-				code.remove( this.alternate.end, this.end );
-				if ( this.alternate.type === 'SequenceExpression' ) {
-					code.prependRight( this.alternate.start, '(' );
-					code.appendLeft( this.alternate.end, ')' );
+			else {
+				const branchToRetain = this.testValue ? this.consequent : this.alternate;
+
+				code.remove( this.start, branchToRetain.start );
+				code.remove( branchToRetain.end, this.end );
+				if ( branchToRetain.type === 'SequenceExpression' ) {
+					code.prependLeft( branchToRetain.start, '(' );
+					code.appendRight( branchToRetain.end, ')' );
 				}
-				this.alternate.render( code, es );
+				branchToRetain.render( code, es );
 			}
 		}
 	}
@@ -7514,6 +7517,64 @@ class ReturnStatement extends Statement {
 	}
 }
 
+class SequenceExpression extends Node$1 {
+	getValue () {
+		return this.expressions[ this.expressions.length - 1 ].getValue();
+	}
+
+	hasEffects ( options ) {
+		return this.expressions.some( expression => expression.hasEffects( options ) );
+	}
+
+	includeInBundle () {
+		if ( this.isFullyIncluded() ) { return false; }
+		let addedNewNodes = false;
+		if ( this.expressions[ this.expressions.length - 1 ].includeInBundle() ) {
+			addedNewNodes = true;
+		}
+		this.expressions.forEach( node => {
+			if ( node.shouldBeIncluded() ) {
+				if ( node.includeInBundle() ) {
+					addedNewNodes = true;
+				}
+			}
+		} );
+		if ( !this.included || addedNewNodes ) {
+			this.included = true;
+			return true;
+		}
+		return false;
+	}
+
+	render ( code, es ) {
+		if ( !this.module.bundle.treeshake ) {
+			super.render( code, es );
+		}
+
+		else {
+			const last = this.expressions[ this.expressions.length - 1 ];
+			const included = this.expressions.slice( 0, this.expressions.length - 1 ).filter( expression => expression.included );
+
+			if ( included.length === 0 ) {
+				code.remove( this.start, last.start );
+				code.remove( last.end, this.end );
+			}
+
+			else {
+				let previousEnd = this.start;
+				for ( const expression of included ) {
+					code.remove( previousEnd, expression.start );
+					code.appendLeft( expression.end, ', ' );
+					previousEnd = expression.end;
+				}
+
+				code.remove( previousEnd, last.start );
+				code.remove( last.end, this.end );
+			}
+		}
+	}
+}
+
 class SwitchCase extends Node$1 {
 	includeInBundle () {
 		if ( this.isFullyIncluded() ) { return false; }
@@ -7919,6 +7980,7 @@ var nodes = {
 	Property,
 	RestElement,
 	ReturnStatement,
+	SequenceExpression,
 	SwitchCase,
 	SwitchStatement,
 	TaggedTemplateExpression,
@@ -8584,7 +8646,7 @@ class ExternalVariable extends Variable {
 		return es ? this.safeName : `${this.module.name}.${this.name}`;
 	}
 
-	includeDeclaration () {
+	includeVariable () {
 		if ( this.included ) {
 			return false;
 		}
@@ -14430,7 +14492,7 @@ function watch$1(configs) {
 	return new Watcher(configs);
 }
 
-var version$1 = "0.50.0";
+var version$1 = "0.50.1";
 
 exports.rollup = rollup;
 exports.watch = watch$1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "0.50.0",
+  "version": "0.50.1",
   "description": "Next-generation ES6 module bundler",
   "main": "dist/rollup.js",
   "module": "dist/rollup.es.js",
@@ -10,7 +10,8 @@
   },
   "scripts": {
     "pretest": "npm run build",
-    "test": "mocha",
+    "test": "npm run test:only",
+    "test:only": "mocha",
     "test:leak": "node --expose-gc test/leak/index.js",
     "test:quick": "rollup -c && mocha",
     "pretest-coverage": "npm run build",
@@ -19,7 +20,8 @@
     "ci": "npm run test-coverage && codecov < coverage/coverage-remapped.lcov",
     "build": "git rev-parse HEAD > .commithash && rollup -c && chmod a+x bin/rollup",
     "watch": "rollup -cw",
-    "prepublish": "npm run lint && npm test && npm run test:leak",
+    "prepublishOnly": "npm run lint && npm run test:only && npm run test:leak",
+    "prepare": "npm run build",
     "lint": "eslint src browser test/test.js test/*/index.js test/utils test/**/_config.js"
   },
   "repository": "rollup/rollup",