Merge pull request #395 from rollup/gh-392-redux

reinstate #392 fix

src/finalisers/umd.js

@@ -50,7 +50,7 @@ export default function umd ( bundle, magicString, { exportMode, indentString },
 		`(function (global, factory) {
 			typeof exports === 'object' && typeof module !== 'undefined' ? ${cjsExport}factory(${cjsDeps.join( ', ' )}) :
 			typeof define === 'function' && define.amd ? define(${amdParams}factory) :
-			${defaultExport}factory(${globalDeps});
+			(${defaultExport}factory(${globalDeps}));
 		}(this, function (${args}) {${useStrict}
 
 		`.replace( /^\t\t/gm, '' ).replace( /^\t/gm, magicString.getIndentString() );

test/cli/indent-none/_expected.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 assert.equal( 1 + 1, 2 );

test/cli/module-name/_expected.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.myBundle = factory();
+	(global.myBundle = factory());
 }(this, function () { 'use strict';
 
 	var main = 42;

test/form/banner-and-footer-plugin/_expected/umd.js

@@ -3,11 +3,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	console.log( 1 + 1 );
 
 }));
 /* first footer */
-/* second footer */
+/* second footer */

test/form/banner-and-footer/_expected/umd.js

@@ -2,10 +2,10 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	console.log( 'hello world' );
 
 }));
-/* this is a footer */
+/* this is a footer */

test/form/block-comments/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	function foo () {
@@ -20,4 +20,4 @@
 
 	alert( foo() );
 
-}));
+}));

test/form/dedupes-external-imports/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'external'], factory) :
-	factory((global.myBundle = {}),global.external);
+	(factory((global.myBundle = {}),global.external));
 }(this, function (exports,external) { 'use strict';
 
 	class Foo extends external.Component {
@@ -33,4 +33,4 @@
 	exports.bar = bar;
 	exports.baz = baz;
 
-}));
+}));

test/form/exclude-unnecessary-modifications/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	var foo = {};
@@ -29,4 +29,4 @@
 
 	console.log( foo );
 
-}));
+}));

test/form/export-all-from-internal/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	factory((global.exposedInternals = {}));
+	(factory((global.exposedInternals = {})));
 }(this, function (exports) { 'use strict';
 
 	const a = 1;
@@ -10,4 +10,4 @@
 	exports.a = a;
 	exports.b = b;
 
-}));
+}));

test/form/export-default-2/_expected/umd.js

@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.myBundle = factory();
+	(global.myBundle = factory());
 }(this, function () { 'use strict';
 
 	var bar = 1;
 
 	return bar;
 
-}));
+}));

test/form/export-default-3/_expected/umd.js

@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.myBundle = factory();
+	(global.myBundle = factory());
 }(this, function () { 'use strict';
 
 	var bar = 1;
 
 	return bar;
 
-}));
+}));

test/form/export-default/_expected/umd.js

@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.myBundle = factory();
+	(global.myBundle = factory());
 }(this, function () { 'use strict';
 
 	var main = 42;
 
 	return main;
 
-}));
+}));

test/form/export-multiple-vars/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	var a = 1;
@@ -14,4 +14,4 @@
 	assert.equal( e, 5 );
 	assert.equal( i, 9 );
 
-}));
+}));

test/form/exports-at-end-if-possible/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	factory((global.myBundle = {}));
+	(factory((global.myBundle = {})));
 }(this, function (exports) { 'use strict';
 
 	var FOO = 'foo';
@@ -12,4 +12,4 @@
 
 	exports.FOO = FOO;
 
-}));
+}));

test/form/external-imports-custom-names/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('jquery')) :
 	typeof define === 'function' && define.amd ? define(['jquery'], factory) :
-	factory(global.jQuery);
+	(factory(global.jQuery));
 }(this, function ($) { 'use strict';
 
 	$ = 'default' in $ ? $['default'] : $;
@@ -10,4 +10,4 @@
 		$( 'body' ).html( '<h1>hello world!</h1>' );
 	});
 
-}));
+}));

test/form/external-imports/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('factory'), require('baz'), require('shipping-port'), require('alphabet')) :
 	typeof define === 'function' && define.amd ? define(['factory', 'baz', 'shipping-port', 'alphabet'], factory) :
-	factory(global.factory,global.baz,global.containers,global.alphabet);
+	(factory(global.factory,global.baz,global.containers,global.alphabet));
 }(this, function (factory,baz,containers,alphabet) { 'use strict';
 
 	factory = 'default' in factory ? factory['default'] : factory;
@@ -13,4 +13,4 @@
 	console.log( alphabet.a );
 	console.log( alphabet__default.length );
 
-}));
+}));

test/form/indent-false/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.foo = factory();
+	(global.foo = factory());
 }(this, function () { 'use strict';
 
 function foo () {
@@ -10,4 +10,4 @@ function foo () {
 
 return foo;
 
-}));
+}));

test/form/indent-true-spaces/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
-  global.foo = factory();
+  (global.foo = factory());
 }(this, function () { 'use strict';
 
   function foo () {
@@ -10,4 +10,4 @@
 
   return foo;
 
-}));
+}));

test/form/indent-true/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.foo = factory();
+	(global.foo = factory());
 }(this, function () { 'use strict';
 
 	function foo () {
@@ -10,4 +10,4 @@
 
 	return foo;
 
-}));
+}));

test/form/internal-conflict-resolution/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	var bar$1 = 42;
@@ -16,4 +16,4 @@
 
 	bar();
 
-}));
+}));

test/form/intro-and-outro/_expected/umd.js

@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	/* this is an intro */
 	console.log( 'hello world' );
 	/* this is an outro */
 
-}));
+}));

test/form/multiple-exports/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	factory((global.myBundle = {}));
+	(factory((global.myBundle = {})));
 }(this, function (exports) { 'use strict';
 
 	var foo = 1;
@@ -10,4 +10,4 @@
 	exports.foo = foo;
 	exports.bar = bar;
 
-}));
+}));

test/form/namespace-optimization-b/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	function foo () {

test/form/namespace-optimization/_expected/umd.js

@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	function a () {}
 
 	a();
 
-}));
+}));

test/form/namespaced-default-exports/_expected/umd.js

@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.foo = global.foo || {}, global.foo.bar = global.foo.bar || {}, global.foo.bar.baz = factory();
+	(global.foo = global.foo || {}, global.foo.bar = global.foo.bar || {}, global.foo.bar.baz = factory());
 }(this, function () { 'use strict';
 
 	var main = 42;
 
 	return main;
 
-}));
+}));

test/form/namespaced-named-exports/_expected/umd.js

@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	factory((global.foo = global.foo || {}, global.foo.bar = global.foo.bar || {}, global.foo.bar.baz = {}));
+	(factory((global.foo = global.foo || {}, global.foo.bar = global.foo.bar || {}, global.foo.bar.baz = {})));
 }(this, function (exports) { 'use strict';
 
 	var answer = 42;
 
 	exports.answer = answer;
 
-}));
+}));

test/form/no-imports-or-exports/_expected/umd.js

@@ -1,9 +1,9 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	console.log( 'this is it' );
 
-}));
+}));

test/form/object-destructuring-default-values/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	const a = 1;

test/form/preserves-comments-after-imports/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	factory((global.myBundle = {}));
+	(factory((global.myBundle = {})));
 }(this, function (exports) { 'use strict';
 
 	/** A comment for a number */
@@ -12,4 +12,4 @@
 
 	exports.obj = obj;
 
-}));
+}));

test/form/removes-existing-sourcemap-comments/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	function foo () {
@@ -10,4 +10,4 @@
 
 	console.log( foo() );
 
-}));
+}));

test/form/self-contained-bundle/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	function foo () {
@@ -19,4 +19,4 @@
 	foo();
 	console.log( 3 );
 
-}));
+}));

test/form/shorthand-properties/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	function x () {
@@ -26,4 +26,4 @@
 	assert.equal( bar.x(), 'bar' );
 	assert.equal( baz.x(), 'baz' );
 
-}));
+}));

test/form/side-effect-b/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.myBundle = factory();
+	(global.myBundle = factory());
 }(this, function () { 'use strict';
 
 	var main = 42;

test/form/side-effect-c/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.myBundle = factory();
+	(global.myBundle = factory());
 }(this, function () { 'use strict';
 
 	var main = 42;

test/form/side-effect-d/_expected/umd.js

@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.myBundle = factory();
+	(global.myBundle = factory());
 }(this, function () { 'use strict';
 
 	var main = 42;
 
 	return main;
 
-}));
+}));

test/form/side-effect-e/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.myBundle = factory();
+	(global.myBundle = factory());
 }(this, function () { 'use strict';
 
 	function foo () {
@@ -21,4 +21,4 @@
 
 	return main;
 
-}));
+}));

test/form/side-effect-f/_expected/umd.js

@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.myBundle = factory();
+	(global.myBundle = factory());
 }(this, function () { 'use strict';
 
 	var main = 42;
 
 	return main;
 
-}));
+}));

test/form/side-effect-g/_expected/umd.js

@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.myBundle = factory();
+	(global.myBundle = factory());
 }(this, function () { 'use strict';
 
 	var main = 42;
 
 	return main;
 
-}));
+}));

test/form/side-effect-h/_expected/umd.js

@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.myBundle = factory();
+	(global.myBundle = factory());
 }(this, function () { 'use strict';
 
 	var main = 42;
 
 	return main;
 
-}));
+}));

test/form/side-effect-i/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.myBundle = factory();
+	(global.myBundle = factory());
 }(this, function () { 'use strict';
 
 	if ( !ok ) {
@@ -12,4 +12,4 @@
 
 	return main;
 
-}));
+}));

test/form/side-effect-j/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.myBundle = factory();
+	(global.myBundle = factory());
 }(this, function () { 'use strict';
 
 	var augment;

test/form/side-effect-k/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	global.myBundle = factory();
+	(global.myBundle = factory());
 }(this, function () { 'use strict';
 
 	function augment ( x ) {

test/form/side-effect-l/_expected/umd.js

@@ -1,9 +1,9 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 
 
-}));
+}));

test/form/side-effect/_expected/umd.js

@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	var foo = 42;
 
 	assert.equal( foo, 42 );
 
-}));
+}));

test/form/sourcemaps-inline/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	function foo () {

test/form/sourcemaps/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	function foo () {

test/form/spacing-after-function-with-semicolon/_expected/umd.js

@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	function x () { return 'x' };
 
 	assert.equal( x(), 'x' );
 
-}));
+}));

test/form/string-indentation-b/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
     typeof define === 'function' && define.amd ? define(factory) :
-    factory();
+    (factory());
 }(this, function () { 'use strict';
 
     var a = 'a';

test/form/string-indentation/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	var a = '1\
@@ -21,4 +21,4 @@
 	assert.equal( c, '1\n  2' );
 	assert.equal( d, '1\n\t2' );
 
-}));
+}));

test/form/unmodified-default-exports-function-argument/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	var foo = function () {
@@ -17,4 +17,4 @@
 
 	console.log( answer );
 
-}));
+}));

test/form/unmodified-default-exports/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	var Foo = function () {
@@ -16,4 +16,4 @@
 
 	var foo = new Foo();
 
-}));
+}));

test/form/unused-default-exports/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	factory();
+	(factory());
 }(this, function () { 'use strict';
 
 	var foo = { value: 1 };
@@ -15,4 +15,4 @@
 
 	assert.equal( foo.value, 2 );
 
-}));
+}));