rollup 0.49.2 → 0.49.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # rollup changelog
 
+## 0.49.3
+
+* Respect `watch` options ([#1596](https://github.com/rollup/rollup/issues/1596))
+* Fix treeshaking regressions ([#1604](https://github.com/rollup/rollup/pull/1604))
+* Allow `-o` to work with `output.format` ([#1606](https://github.com/rollup/rollup/pull/1606))
+
 ## 0.49.2
 
 * Fix treeshaking regressions ([#1591](https://github.com/rollup/rollup/pull/1591))
@@ -59,7 +65,7 @@
 ## 0.46.3
 
 * init for/for-of loop section head with correct scopes ([#1538](https://github.com/rollup/rollup/issues/1538), [#1539](https://github.com/rollup/rollup/issues/1539))
-* Fix namespace imports and re-exports in `es` outpot ([#1511](https://github.com/rollup/rollup/issues/1511))
+* Fix namespace imports and re-exports in `es` output ([#1511](https://github.com/rollup/rollup/issues/1511))
 * Deshadow indirectly imported namespaces ([#1488](https://github.com/rollup/rollup/issues/1488), [#1505](https://github.com/rollup/rollup/issues/1505))
 
 ## 0.46.2

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.49.2";
+var version = "0.49.3";
 
 var modules = {};
 
@@ -2244,7 +2244,8 @@ function mergeOptions ( config, command ) {
 		context: config.context,
 		moduleContext: config.moduleContext,
 		plugins: config.plugins,
-		onwarn: config.onwarn
+		onwarn: config.onwarn,
+		watch: config.watch
 	};
 
 	// legacy, to ensure e.g. commonjs plugin still works
@@ -2300,14 +2301,21 @@ 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);
 	});
 

package/dist/rollup.browser.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.49.2
-	Tue Aug 29 2017 08:11:12 GMT-0400 (EDT) - commit 0c85e2c31fc8787550e9482a0746d626379a068d
+	Rollup.js v0.49.3
+	Thu Sep 07 2017 21:02:36 GMT-0400 (EDT) - commit 0d20ed12e069b4fc445faecf221ffe5b40fbf90a
 
 
 	https://github.com/rollup/rollup
@@ -5745,11 +5745,11 @@ class Node$1 {
 	}
 
 	hasEffectsWhenAssigned () {
-		return false;
+		return true;
 	}
 
 	hasEffectsWhenMutated () {
-		return false;
+		return true;
 	}
 
 	includeDeclaration () {
@@ -6027,9 +6027,11 @@ class AssignmentExpression extends Node$1 {
 	hasEffectsAsExpressionStatement ( options ) {
 		return this.hasEffects( options );
 	}
+}
 
-	hasEffectsWhenMutated () {
-		return true;
+class AssignmentPattern extends Node$1 {
+	hasEffectsWhenAssigned ( options ) {
+		return this.left.hasEffectsWhenAssigned( options );
 	}
 }
 
@@ -6081,10 +6083,6 @@ class BinaryExpression extends Node$1 {
 
 		return operators[ this.operator ]( leftValue, rightValue );
 	}
-
-	hasEffectsWhenMutated () {
-		return true;
-	}
 }
 
 class Statement extends Node$1 {
@@ -6241,7 +6239,7 @@ simdTypes.forEach( t => {
 	'ArrayBuffer', 'ArrayBuffer.isView',
 	'DataView',
 	'JSON.parse', 'JSON.stringify',
-	'Promise', 'Promise.all', 'Promise.race', 'Promise.reject', 'Promise.resolve',
+	'Promise.all', 'Promise.race', 'Promise.resolve',
 	'Intl.Collator', 'Intl.Collator.supportedLocalesOf', 'Intl.DateTimeFormat', 'Intl.DateTimeFormat.supportedLocalesOf', 'Intl.NumberFormat', 'Intl.NumberFormat.supportedLocalesOf'
 
 	// TODO properties of e.g. window...
@@ -6391,10 +6389,6 @@ class CallExpression extends Node$1 {
 	hasEffectsAsExpressionStatement ( options ) {
 		return this.hasEffects( options );
 	}
-
-	hasEffectsWhenMutated () {
-		return true;
-	}
 }
 
 class CatchClause extends Node$1 {
@@ -6511,10 +6505,6 @@ class ConditionalExpression extends Node$1 {
 		return testValue ? this.consequent.getValue() : this.alternate.getValue();
 	}
 
-	hasEffectsWhenMutated () {
-		return true;
-	}
-
 	render ( code, es ) {
 		if ( !this.module.bundle.treeshake ) {
 			super.render( code, es );
@@ -6932,6 +6922,10 @@ class Identifier extends Node$1 {
 		}
 	}
 
+	hasEffectsAsExpressionStatement ( options ) {
+		return this.hasEffects( options ) || this.declaration.isGlobal;
+	}
+
 	hasEffectsWhenAssigned () {
 		return this.declaration && this.declaration.included;
 	}
@@ -7105,6 +7099,10 @@ class Literal extends Node$1 {
 		values.add( this );
 	}
 
+	hasEffectsWhenMutated () {
+		return false;
+	}
+
 	render ( code ) {
 		if ( typeof this.value === 'string' ) {
 			code.indentExclusionRanges.push( [ this.start + 1, this.end - 1 ] );
@@ -7127,6 +7125,17 @@ class LogicalExpression extends Node$1 {
 
 		return operators$1[ this.operator ]( leftValue, rightValue );
 	}
+
+	hasEffectsWhenMutated ( options ) {
+		const leftValue = this.left.getValue();
+		if ( leftValue === UNKNOWN_VALUE ) {
+			return this.left.hasEffectsWhenMutated( options ) || this.right.hasEffectsWhenMutated( options );
+		}
+		if ((leftValue && this.operator === '||') || (!leftValue && this.operator === '&&')) {
+			return this.left.hasEffectsWhenMutated( options );
+		}
+		return this.right.hasEffectsWhenMutated( options );
+	}
 }
 
 const validProp = /^[a-zA-Z_$][a-zA-Z_$0-9]*$/;
@@ -7210,10 +7219,6 @@ class MemberExpression extends Node$1 {
 		return this.object.hasEffectsWhenMutated( options );
 	}
 
-	hasEffectsWhenMutated () {
-		return true;
-	}
-
 	includeInBundle () {
 		let addedNewNodes = super.includeInBundle();
 		if ( this.declaration && !this.declaration.included ) {
@@ -7243,6 +7248,12 @@ class NewExpression extends Node$1 {
 	}
 }
 
+class ObjectExpression extends Node$1 {
+	hasEffectsWhenMutated () {
+		return false;
+	}
+}
+
 class ObjectPattern extends Node$1 {
 	assignExpression () {
 		this.eachChild( child => child.assignExpression( UNKNOWN_ASSIGNMENT ) );
@@ -7370,10 +7381,6 @@ class TemplateLiteral extends Node$1 {
 }
 
 class ThisExpression extends Node$1 {
-	hasEffectsWhenMutated () {
-		return true;
-	}
-
 	initialiseNode () {
 		const lexicalBoundary = this.scope.findLexicalBoundary();
 
@@ -7702,7 +7709,7 @@ var nodes = {
 	ArrayPattern,
 	ArrowFunctionExpression,
 	AssignmentExpression,
-	AssignmentPattern: Node$1,
+	AssignmentPattern,
 	AwaitExpression,
 	BinaryExpression,
 	BlockStatement,
@@ -7730,7 +7737,7 @@ var nodes = {
 	LogicalExpression,
 	MemberExpression,
 	NewExpression,
-	ObjectExpression: Node$1,
+	ObjectExpression,
 	ObjectPattern,
 	Property,
 	RestElement,
@@ -7754,14 +7761,6 @@ class UnknownNode extends Node$1 {
 	hasEffects () {
 		return true;
 	}
-
-	hasEffectsWhenAssigned () {
-		return true;
-	}
-
-	hasEffectsWhenMutated () {
-		return true;
-	}
 }
 
 var keys$1 = {
@@ -10358,7 +10357,7 @@ function rollup ( options ) {
 	}
 }
 
-var version$1 = "0.49.2";
+var version$1 = "0.49.3";
 
 exports.rollup = rollup;
 exports.VERSION = version$1;

package/dist/rollup.es.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.49.2
-	Tue Aug 29 2017 08:11:12 GMT-0400 (EDT) - commit 0c85e2c31fc8787550e9482a0746d626379a068d
+	Rollup.js v0.49.3
+	Thu Sep 07 2017 21:02:36 GMT-0400 (EDT) - commit 0d20ed12e069b4fc445faecf221ffe5b40fbf90a
 
 
 	https://github.com/rollup/rollup
@@ -5697,11 +5697,11 @@ class Node$1 {
 	}
 
 	hasEffectsWhenAssigned () {
-		return false;
+		return true;
 	}
 
 	hasEffectsWhenMutated () {
-		return false;
+		return true;
 	}
 
 	includeDeclaration () {
@@ -5979,9 +5979,11 @@ class AssignmentExpression extends Node$1 {
 	hasEffectsAsExpressionStatement ( options ) {
 		return this.hasEffects( options );
 	}
+}
 
-	hasEffectsWhenMutated () {
-		return true;
+class AssignmentPattern extends Node$1 {
+	hasEffectsWhenAssigned ( options ) {
+		return this.left.hasEffectsWhenAssigned( options );
 	}
 }
 
@@ -6033,10 +6035,6 @@ class BinaryExpression extends Node$1 {
 
 		return operators[ this.operator ]( leftValue, rightValue );
 	}
-
-	hasEffectsWhenMutated () {
-		return true;
-	}
 }
 
 class Statement extends Node$1 {
@@ -6193,7 +6191,7 @@ simdTypes.forEach( t => {
 	'ArrayBuffer', 'ArrayBuffer.isView',
 	'DataView',
 	'JSON.parse', 'JSON.stringify',
-	'Promise', 'Promise.all', 'Promise.race', 'Promise.reject', 'Promise.resolve',
+	'Promise.all', 'Promise.race', 'Promise.resolve',
 	'Intl.Collator', 'Intl.Collator.supportedLocalesOf', 'Intl.DateTimeFormat', 'Intl.DateTimeFormat.supportedLocalesOf', 'Intl.NumberFormat', 'Intl.NumberFormat.supportedLocalesOf'
 
 	// TODO properties of e.g. window...
@@ -6343,10 +6341,6 @@ class CallExpression extends Node$1 {
 	hasEffectsAsExpressionStatement ( options ) {
 		return this.hasEffects( options );
 	}
-
-	hasEffectsWhenMutated () {
-		return true;
-	}
 }
 
 class CatchClause extends Node$1 {
@@ -6463,10 +6457,6 @@ class ConditionalExpression extends Node$1 {
 		return testValue ? this.consequent.getValue() : this.alternate.getValue();
 	}
 
-	hasEffectsWhenMutated () {
-		return true;
-	}
-
 	render ( code, es ) {
 		if ( !this.module.bundle.treeshake ) {
 			super.render( code, es );
@@ -6884,6 +6874,10 @@ class Identifier extends Node$1 {
 		}
 	}
 
+	hasEffectsAsExpressionStatement ( options ) {
+		return this.hasEffects( options ) || this.declaration.isGlobal;
+	}
+
 	hasEffectsWhenAssigned () {
 		return this.declaration && this.declaration.included;
 	}
@@ -7057,6 +7051,10 @@ class Literal extends Node$1 {
 		values.add( this );
 	}
 
+	hasEffectsWhenMutated () {
+		return false;
+	}
+
 	render ( code ) {
 		if ( typeof this.value === 'string' ) {
 			code.indentExclusionRanges.push( [ this.start + 1, this.end - 1 ] );
@@ -7079,6 +7077,17 @@ class LogicalExpression extends Node$1 {
 
 		return operators$1[ this.operator ]( leftValue, rightValue );
 	}
+
+	hasEffectsWhenMutated ( options ) {
+		const leftValue = this.left.getValue();
+		if ( leftValue === UNKNOWN_VALUE ) {
+			return this.left.hasEffectsWhenMutated( options ) || this.right.hasEffectsWhenMutated( options );
+		}
+		if ((leftValue && this.operator === '||') || (!leftValue && this.operator === '&&')) {
+			return this.left.hasEffectsWhenMutated( options );
+		}
+		return this.right.hasEffectsWhenMutated( options );
+	}
 }
 
 const validProp = /^[a-zA-Z_$][a-zA-Z_$0-9]*$/;
@@ -7162,10 +7171,6 @@ class MemberExpression extends Node$1 {
 		return this.object.hasEffectsWhenMutated( options );
 	}
 
-	hasEffectsWhenMutated () {
-		return true;
-	}
-
 	includeInBundle () {
 		let addedNewNodes = super.includeInBundle();
 		if ( this.declaration && !this.declaration.included ) {
@@ -7195,6 +7200,12 @@ class NewExpression extends Node$1 {
 	}
 }
 
+class ObjectExpression extends Node$1 {
+	hasEffectsWhenMutated () {
+		return false;
+	}
+}
+
 class ObjectPattern extends Node$1 {
 	assignExpression () {
 		this.eachChild( child => child.assignExpression( UNKNOWN_ASSIGNMENT ) );
@@ -7322,10 +7333,6 @@ class TemplateLiteral extends Node$1 {
 }
 
 class ThisExpression extends Node$1 {
-	hasEffectsWhenMutated () {
-		return true;
-	}
-
 	initialiseNode () {
 		const lexicalBoundary = this.scope.findLexicalBoundary();
 
@@ -7654,7 +7661,7 @@ var nodes = {
 	ArrayPattern,
 	ArrowFunctionExpression,
 	AssignmentExpression,
-	AssignmentPattern: Node$1,
+	AssignmentPattern,
 	AwaitExpression,
 	BinaryExpression,
 	BlockStatement,
@@ -7682,7 +7689,7 @@ var nodes = {
 	LogicalExpression,
 	MemberExpression,
 	NewExpression,
-	ObjectExpression: Node$1,
+	ObjectExpression,
 	ObjectPattern,
 	Property,
 	RestElement,
@@ -7706,14 +7713,6 @@ class UnknownNode extends Node$1 {
 	hasEffects () {
 		return true;
 	}
-
-	hasEffectsWhenAssigned () {
-		return true;
-	}
-
-	hasEffectsWhenMutated () {
-		return true;
-	}
 }
 
 var keys$1 = {
@@ -14166,7 +14165,7 @@ function watch$1(configs) {
 	return new Watcher(configs);
 }
 
-var version$1 = "0.49.2";
+var version$1 = "0.49.3";
 
 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.49.2
-	Tue Aug 29 2017 08:11:12 GMT-0400 (EDT) - commit 0c85e2c31fc8787550e9482a0746d626379a068d
+	Rollup.js v0.49.3
+	Thu Sep 07 2017 21:02:36 GMT-0400 (EDT) - commit 0d20ed12e069b4fc445faecf221ffe5b40fbf90a
 
 
 	https://github.com/rollup/rollup
@@ -5704,11 +5704,11 @@ class Node$1 {
 	}
 
 	hasEffectsWhenAssigned () {
-		return false;
+		return true;
 	}
 
 	hasEffectsWhenMutated () {
-		return false;
+		return true;
 	}
 
 	includeDeclaration () {
@@ -5986,9 +5986,11 @@ class AssignmentExpression extends Node$1 {
 	hasEffectsAsExpressionStatement ( options ) {
 		return this.hasEffects( options );
 	}
+}
 
-	hasEffectsWhenMutated () {
-		return true;
+class AssignmentPattern extends Node$1 {
+	hasEffectsWhenAssigned ( options ) {
+		return this.left.hasEffectsWhenAssigned( options );
 	}
 }
 
@@ -6040,10 +6042,6 @@ class BinaryExpression extends Node$1 {
 
 		return operators[ this.operator ]( leftValue, rightValue );
 	}
-
-	hasEffectsWhenMutated () {
-		return true;
-	}
 }
 
 class Statement extends Node$1 {
@@ -6200,7 +6198,7 @@ simdTypes.forEach( t => {
 	'ArrayBuffer', 'ArrayBuffer.isView',
 	'DataView',
 	'JSON.parse', 'JSON.stringify',
-	'Promise', 'Promise.all', 'Promise.race', 'Promise.reject', 'Promise.resolve',
+	'Promise.all', 'Promise.race', 'Promise.resolve',
 	'Intl.Collator', 'Intl.Collator.supportedLocalesOf', 'Intl.DateTimeFormat', 'Intl.DateTimeFormat.supportedLocalesOf', 'Intl.NumberFormat', 'Intl.NumberFormat.supportedLocalesOf'
 
 	// TODO properties of e.g. window...
@@ -6350,10 +6348,6 @@ class CallExpression extends Node$1 {
 	hasEffectsAsExpressionStatement ( options ) {
 		return this.hasEffects( options );
 	}
-
-	hasEffectsWhenMutated () {
-		return true;
-	}
 }
 
 class CatchClause extends Node$1 {
@@ -6470,10 +6464,6 @@ class ConditionalExpression extends Node$1 {
 		return testValue ? this.consequent.getValue() : this.alternate.getValue();
 	}
 
-	hasEffectsWhenMutated () {
-		return true;
-	}
-
 	render ( code, es ) {
 		if ( !this.module.bundle.treeshake ) {
 			super.render( code, es );
@@ -6891,6 +6881,10 @@ class Identifier extends Node$1 {
 		}
 	}
 
+	hasEffectsAsExpressionStatement ( options ) {
+		return this.hasEffects( options ) || this.declaration.isGlobal;
+	}
+
 	hasEffectsWhenAssigned () {
 		return this.declaration && this.declaration.included;
 	}
@@ -7064,6 +7058,10 @@ class Literal extends Node$1 {
 		values.add( this );
 	}
 
+	hasEffectsWhenMutated () {
+		return false;
+	}
+
 	render ( code ) {
 		if ( typeof this.value === 'string' ) {
 			code.indentExclusionRanges.push( [ this.start + 1, this.end - 1 ] );
@@ -7086,6 +7084,17 @@ class LogicalExpression extends Node$1 {
 
 		return operators$1[ this.operator ]( leftValue, rightValue );
 	}
+
+	hasEffectsWhenMutated ( options ) {
+		const leftValue = this.left.getValue();
+		if ( leftValue === UNKNOWN_VALUE ) {
+			return this.left.hasEffectsWhenMutated( options ) || this.right.hasEffectsWhenMutated( options );
+		}
+		if ((leftValue && this.operator === '||') || (!leftValue && this.operator === '&&')) {
+			return this.left.hasEffectsWhenMutated( options );
+		}
+		return this.right.hasEffectsWhenMutated( options );
+	}
 }
 
 const validProp = /^[a-zA-Z_$][a-zA-Z_$0-9]*$/;
@@ -7169,10 +7178,6 @@ class MemberExpression extends Node$1 {
 		return this.object.hasEffectsWhenMutated( options );
 	}
 
-	hasEffectsWhenMutated () {
-		return true;
-	}
-
 	includeInBundle () {
 		let addedNewNodes = super.includeInBundle();
 		if ( this.declaration && !this.declaration.included ) {
@@ -7202,6 +7207,12 @@ class NewExpression extends Node$1 {
 	}
 }
 
+class ObjectExpression extends Node$1 {
+	hasEffectsWhenMutated () {
+		return false;
+	}
+}
+
 class ObjectPattern extends Node$1 {
 	assignExpression () {
 		this.eachChild( child => child.assignExpression( UNKNOWN_ASSIGNMENT ) );
@@ -7329,10 +7340,6 @@ class TemplateLiteral extends Node$1 {
 }
 
 class ThisExpression extends Node$1 {
-	hasEffectsWhenMutated () {
-		return true;
-	}
-
 	initialiseNode () {
 		const lexicalBoundary = this.scope.findLexicalBoundary();
 
@@ -7661,7 +7668,7 @@ var nodes = {
 	ArrayPattern,
 	ArrowFunctionExpression,
 	AssignmentExpression,
-	AssignmentPattern: Node$1,
+	AssignmentPattern,
 	AwaitExpression,
 	BinaryExpression,
 	BlockStatement,
@@ -7689,7 +7696,7 @@ var nodes = {
 	LogicalExpression,
 	MemberExpression,
 	NewExpression,
-	ObjectExpression: Node$1,
+	ObjectExpression,
 	ObjectPattern,
 	Property,
 	RestElement,
@@ -7713,14 +7720,6 @@ class UnknownNode extends Node$1 {
 	hasEffects () {
 		return true;
 	}
-
-	hasEffectsWhenAssigned () {
-		return true;
-	}
-
-	hasEffectsWhenMutated () {
-		return true;
-	}
 }
 
 var keys$1 = {
@@ -14173,7 +14172,7 @@ function watch$1(configs) {
 	return new Watcher(configs);
 }
 
-var version$1 = "0.49.2";
+var version$1 = "0.49.3";
 
 exports.rollup = rollup;
 exports.watch = watch$1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "0.49.2",
+  "version": "0.49.3",
   "description": "Next-generation ES6 module bundler",
   "main": "dist/rollup.js",
   "module": "dist/rollup.es.js",