Remove the need to provide an output name for IIFE bundles (#3181)

* Remove the need to provide an output name for IIFE bundles * Add test for IIFE warning Also migrate UMD test and remove some unused folders
rollup · Oct 27, 2019 · 2f7e064 · 2f7e064
1 parent b4c8b43
commit 2f7e064
Show file tree

Hide file tree

Showing 26 changed files with 24 additions and 179 deletions.
diff --git a/src/finalisers/iife.ts b/src/finalisers/iife.ts
@@ -48,9 +48,8 @@ export default function iife(
 	const args = external.map(m => m.name);
 
 	if (hasExports && !name) {
-		error({
-			code: 'INVALID_OPTION',
-			message: `You must supply "output.name" for IIFE bundles.`
+		warn({
+			message: `If you do not supply "output.name", you may not be able to access the exports of an IIFE bundle.`
 		});
 	}
 
@@ -68,9 +67,9 @@ export default function iife(
 
 	let wrapperIntro = `(function${_}(${args.join(`,${_}`)})${_}{${n}${useStrict}`;
 
-	if (hasExports && (!extend || !namedExportsMode)) {
+	if (hasExports && (!extend || !namedExportsMode) && name) {
 		wrapperIntro =
-			(useVariableAssignment ? `${varOrConst} ${name}` : thisProp(name as string)) +
+			(useVariableAssignment ? `${varOrConst} ${name}` : thisProp(name)) +
 			`${_}=${_}${wrapperIntro}`;
 	}
 

diff --git a/test/function/samples/compact-multiple-imports/_expected/amd.js b/test/function/samples/compact-multiple-imports/_expected/amd.js
diff --git a/test/function/samples/compact-multiple-imports/_expected/cjs.js b/test/function/samples/compact-multiple-imports/_expected/cjs.js
diff --git a/test/function/samples/compact-multiple-imports/_expected/es.js b/test/function/samples/compact-multiple-imports/_expected/es.js
diff --git a/test/function/samples/compact-multiple-imports/_expected/iife.js b/test/function/samples/compact-multiple-imports/_expected/iife.js
diff --git a/test/function/samples/compact-multiple-imports/_expected/system.js b/test/function/samples/compact-multiple-imports/_expected/system.js
diff --git a/test/function/samples/compact-multiple-imports/_expected/umd.js b/test/function/samples/compact-multiple-imports/_expected/umd.js
diff --git a/test/function/samples/dynamic-import-name-warn/_expected/amd/main.js b/test/function/samples/dynamic-import-name-warn/_expected/amd/main.js
diff --git a/test/function/samples/dynamic-import-name-warn/_expected/cjs/main.js b/test/function/samples/dynamic-import-name-warn/_expected/cjs/main.js
diff --git a/test/function/samples/dynamic-import-name-warn/_expected/es/main.js b/test/function/samples/dynamic-import-name-warn/_expected/es/main.js
diff --git a/test/function/samples/dynamic-import-name-warn/_expected/system/main.js b/test/function/samples/dynamic-import-name-warn/_expected/system/main.js
diff --git a/test/function/samples/dynamic-import-name/_expected/amd/main.js b/test/function/samples/dynamic-import-name/_expected/amd/main.js
diff --git a/test/function/samples/dynamic-import-name/_expected/cjs/main.js b/test/function/samples/dynamic-import-name/_expected/cjs/main.js
diff --git a/test/function/samples/dynamic-import-name/_expected/es/main.js b/test/function/samples/dynamic-import-name/_expected/es/main.js
diff --git a/test/function/samples/dynamic-import-name/_expected/system/main.js b/test/function/samples/dynamic-import-name/_expected/system/main.js
diff --git a/test/function/samples/error-missing-umd-name/_config.js b/test/function/samples/error-missing-umd-name/_config.js
@@ -0,0 +1,8 @@
+module.exports = {
+	description: 'throws an error if no name is provided for a UMD bundle',
+	options: { output: { format: 'umd' } },
+	generateError: {
+		code: 'INVALID_OPTION',
+		message: 'You must supply "output.name" for UMD bundles.'
+	}
+};
diff --git a/test/function/samples/error-missing-umd-name/main.js b/test/function/samples/error-missing-umd-name/main.js
@@ -0,0 +1 @@
+export const x = 42;
diff --git a/test/function/samples/side-effects-only-default-exports/_expected/amd.js b/test/function/samples/side-effects-only-default-exports/_expected/amd.js
diff --git a/test/function/samples/side-effects-only-default-exports/_expected/cjs.js b/test/function/samples/side-effects-only-default-exports/_expected/cjs.js
diff --git a/test/function/samples/side-effects-only-default-exports/_expected/es.js b/test/function/samples/side-effects-only-default-exports/_expected/es.js
diff --git a/test/function/samples/side-effects-only-default-exports/_expected/iife.js b/test/function/samples/side-effects-only-default-exports/_expected/iife.js
diff --git a/test/function/samples/side-effects-only-default-exports/_expected/system.js b/test/function/samples/side-effects-only-default-exports/_expected/system.js
diff --git a/test/function/samples/side-effects-only-default-exports/_expected/umd.js b/test/function/samples/side-effects-only-default-exports/_expected/umd.js
diff --git a/test/function/samples/warn-missing-iife-name/_config.js b/test/function/samples/warn-missing-iife-name/_config.js
@@ -0,0 +1,10 @@
+module.exports = {
+	description: 'warns if no name is provided for an IIFE bundle',
+	options: { output: { format: 'iife' } },
+	warnings: [
+		{
+			message:
+				'If you do not supply "output.name", you may not be able to access the exports of an IIFE bundle.'
+		}
+	]
+};
diff --git a/test/function/samples/warn-missing-iife-name/main.js b/test/function/samples/warn-missing-iife-name/main.js
@@ -0,0 +1 @@
+export const x = 42;
diff --git a/test/misc/write-bundle.js b/test/misc/write-bundle.js
@@ -25,42 +25,6 @@ describe('bundle.write()', () => {
 			});
 	});
 
-	it('expects output.name for IIFE and UMD bundles', () => {
-		let bundle;
-
-		return rollup
-			.rollup({
-				input: 'x',
-				plugins: [
-					{
-						resolveId: () => 'test',
-						load: () => 'export var foo = 42;'
-					}
-				]
-			})
-			.then(rollupInstance => {
-				bundle = rollupInstance;
-				return bundle.generate({
-					format: 'umd'
-				});
-			})
-			.catch(err => {
-				assert.throws(() => {
-					throw err;
-				}, /You must supply "output\.name" for UMD bundles/);
-			})
-			.then(() => {
-				return bundle.generate({
-					format: 'iife'
-				});
-			})
-			.catch(err => {
-				assert.throws(() => {
-					throw err;
-				}, /You must supply "output\.name" for IIFE bundles/);
-			});
-	});
-
 	it('throws on es6 format', () => {
 		return rollup
 			.rollup({