Fixed issue with exports not being returned for the named mode (in II…

…FE format)
rollup · Jul 3, 2017 · b0f366e · b0f366e
1 parent 97baa41
commit b0f366e
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 1 deletion.
diff --git a/src/finalisers/iife.js b/src/finalisers/iife.js
@@ -61,7 +61,6 @@ export default function iife ( bundle, magicString, { exportMode, indentString,
 	const useStrict = options.useStrict !== false ? `${indentString}'use strict';\n\n` : ``;
 
 	let wrapperIntro = `(function (${args}) {\n${useStrict}`;
-	const wrapperOutro = `\n\n}(${dependencies}));`;
 
 	if ( exportMode !== 'none' && !extend) {
 		wrapperIntro = ( isNamespaced ? thisProp(name) : `${bundle.varOrConst} ${name}` ) + ` = ${wrapperIntro}`;
@@ -71,6 +70,12 @@ export default function iife ( bundle, magicString, { exportMode, indentString,
 		wrapperIntro = setupNamespace( name ) + wrapperIntro;
 	}
 
+	let wrapperOutro = `\n\n}(${dependencies}));`;
+
+	if (justVariable && exportMode === 'named') {
+		wrapperOutro = `\n\n${indentString}return exports;${wrapperOutro}`;
+	}
+
 	// var foo__default = 'default' in foo ? foo['default'] : foo;
 	const interopBlock = getInteropBlock( bundle, options );
 	if ( interopBlock ) magicString.prepend( interopBlock + '\n\n' );

diff --git a/test/form/assignment-to-exports-class-declaration/_expected/iife.js b/test/form/assignment-to-exports-class-declaration/_expected/iife.js
@@ -4,4 +4,6 @@ var myModule = (function (exports) {
 	exports.Foo = class Foo {};
 	exports.Foo = lol( exports.Foo );
 
+	return exports;
+
 }({}));
diff --git a/test/form/assignment-to-exports/_expected/iife.js b/test/form/assignment-to-exports/_expected/iife.js
@@ -3,4 +3,6 @@ var bundle = (function (exports) {
 
 	exports.foo = 1;
 
+	return exports;
+
 }({}));
diff --git a/test/form/computed-properties/_expected/iife.js b/test/form/computed-properties/_expected/iife.js
@@ -17,4 +17,6 @@ var computedProperties = (function (exports) {
 	exports.x = x;
 	exports.X = X;
 
+	return exports;
+
 }({}));
diff --git a/test/form/dedupes-external-imports/_expected/iife.js b/test/form/dedupes-external-imports/_expected/iife.js
@@ -30,4 +30,6 @@ var myBundle = (function (exports,external) {
 	exports.bar = bar;
 	exports.baz = baz;
 
+	return exports;
+
 }({},external));
diff --git a/test/form/export-all-from-internal/_expected/iife.js b/test/form/export-all-from-internal/_expected/iife.js
@@ -7,4 +7,6 @@ var exposedInternals = (function (exports) {
 	exports.a = a;
 	exports.b = b;
 
+	return exports;
+
 }({}));
diff --git a/test/form/export-all-multiple/_expected/iife.js b/test/form/export-all-multiple/_expected/iife.js
@@ -7,4 +7,6 @@ var myBundle = (function (exports,foo,bar,baz) {
 	Object.keys(bar).forEach(function (key) { exports[key] = bar[key]; });
 	Object.keys(baz).forEach(function (key) { exports[key] = baz[key]; });
 
+	return exports;
+
 }({},foo,bar,baz));
diff --git a/test/form/export-default-import/_expected/iife.js b/test/form/export-default-import/_expected/iife.js
@@ -7,4 +7,6 @@ var myBundle = (function (exports,x) {
 
 	exports.x = x;
 
+	return exports;
+
 }({},x));
diff --git a/test/form/exports-at-end-if-possible/_expected/iife.js b/test/form/exports-at-end-if-possible/_expected/iife.js
@@ -9,4 +9,6 @@ var myBundle = (function (exports) {
 
 	exports.FOO = FOO;
 
+	return exports;
+
 }({}));
diff --git a/test/form/legacy-getter/_expected/iife.js b/test/form/legacy-getter/_expected/iife.js
@@ -21,4 +21,6 @@ var foo = (function (exports) {
 
 	exports.B = browserStuff;
 
+	return exports;
+
 }({}));
diff --git a/test/form/legacy/_expected/iife.js b/test/form/legacy/_expected/iife.js
@@ -18,4 +18,6 @@ var myBundle = (function (exports) {
 	exports.a = a;
 	exports.b = b;
 
+	return exports;
+
 }({}));
diff --git a/test/form/multiple-exports/_expected/iife.js b/test/form/multiple-exports/_expected/iife.js
@@ -7,4 +7,6 @@ var myBundle = (function (exports) {
 	exports.foo = foo;
 	exports.bar = bar;
 
+	return exports;
+
 }({}));
diff --git a/test/form/no-treeshake/_expected/iife.js b/test/form/no-treeshake/_expected/iife.js
@@ -23,4 +23,6 @@ var stirred = (function (exports,external) {
 	exports.getPrototypeOf = getPrototypeOf;
 	exports.strange = quux;
 
+	return exports;
+
 }({},external));
diff --git a/test/form/preserves-comments-after-imports/_expected/iife.js b/test/form/preserves-comments-after-imports/_expected/iife.js
@@ -9,4 +9,6 @@ var myBundle = (function (exports) {
 
 	exports.obj = obj;
 
+	return exports;
+
 }({}));
diff --git a/test/form/reexports-from-external/_expected/iife.js b/test/form/reexports-from-external/_expected/iife.js
@@ -5,4 +5,6 @@ var myBundle = (function (exports,external) {
 
 	Object.keys(external).forEach(function (key) { exports[key] = external[key]; });
 
+	return exports;
+
 }({},external));
diff --git a/test/form/umd-noconflict/_expected/iife.js b/test/form/umd-noconflict/_expected/iife.js
@@ -13,4 +13,6 @@ var FooBar = (function (exports) {
 	exports.number = number;
 	exports.setting = setting;
 
+	return exports;
+
 }({}));