From a3ac763a689eb3cac1169527fbd7b5100798f77a Mon Sep 17 00:00:00 2001
From: Tom Jenkinson <tom@tjenkinson.me>
Date: Tue, 19 Nov 2019 08:20:26 +0000
Subject: [PATCH 1/6] include chunk in EMPTY_BUNDLE warning message

---
 src/Chunk.ts                                                  | 4 +++-
 src/rollup/types.d.ts                                         | 1 +
 test/function/samples/assign-namespace-to-var/_config.js      | 3 ++-
 test/function/samples/can-import-self-treeshake/_config.js    | 3 ++-
 test/function/samples/module-tree/_config.js                  | 3 ++-
 .../function/samples/vars-with-init-in-dead-branch/_config.js | 3 ++-
 test/function/samples/warn-on-empty-bundle/_config.js         | 3 ++-
 test/function/samples/warnings-to-string/_config.js           | 2 +-
 8 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/Chunk.ts b/src/Chunk.ts
index b6ead70e594..4f59549e28f 100644
--- a/src/Chunk.ts
+++ b/src/Chunk.ts
@@ -620,9 +620,11 @@ export default class Chunk {
 		this.renderedHash = undefined as any;
 
 		if (this.getExportNames().length === 0 && this.getImportIds().length === 0 && this.isEmpty) {
+			const chunkName = this.getChunkName();
 			this.graph.warn({
+				chunkName,
 				code: 'EMPTY_BUNDLE',
-				message: 'Generated an empty bundle'
+				message: `Generated an empty chunk: "${chunkName}"`
 			});
 		}
 
diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts
index 343491308f0..6add08a8fce 100644
--- a/src/rollup/types.d.ts
+++ b/src/rollup/types.d.ts
@@ -10,6 +10,7 @@ export interface RollupError extends RollupLogProps {
 }
 
 export interface RollupWarning extends RollupLogProps {
+	chunkName?: string;
 	exporter?: string;
 	exportName?: string;
 	guess?: string;
diff --git a/test/function/samples/assign-namespace-to-var/_config.js b/test/function/samples/assign-namespace-to-var/_config.js
index 396c49db5c2..4a5e6b0a579 100644
--- a/test/function/samples/assign-namespace-to-var/_config.js
+++ b/test/function/samples/assign-namespace-to-var/_config.js
@@ -2,8 +2,9 @@ module.exports = {
 	description: 'allows a namespace to be assigned to a variable',
 	warnings: [
 		{
+			chunkName: 'main',
 			code: 'EMPTY_BUNDLE',
-			message: 'Generated an empty bundle'
+			message: 'Generated an empty chunk: "main"'
 		}
 	]
 };
diff --git a/test/function/samples/can-import-self-treeshake/_config.js b/test/function/samples/can-import-self-treeshake/_config.js
index a83923383e8..98770762cfd 100644
--- a/test/function/samples/can-import-self-treeshake/_config.js
+++ b/test/function/samples/can-import-self-treeshake/_config.js
@@ -7,8 +7,9 @@ module.exports = {
 			message: 'Circular dependency: lib.js -> lib.js'
 		},
 		{
+			chunkName: 'main',
 			code: 'EMPTY_BUNDLE',
-			message: `Generated an empty bundle`
+			message: `Generated an empty chunk: "main"`
 		}
 	]
 };
diff --git a/test/function/samples/module-tree/_config.js b/test/function/samples/module-tree/_config.js
index add3840062e..ca506e1aae8 100644
--- a/test/function/samples/module-tree/_config.js
+++ b/test/function/samples/module-tree/_config.js
@@ -34,8 +34,9 @@ module.exports = {
 	},
 	warnings: [
 		{
+			chunkName: 'main',
 			code: 'EMPTY_BUNDLE',
-			message: 'Generated an empty bundle'
+			message: 'Generated an empty chunk: "main"'
 		}
 	]
 };
diff --git a/test/function/samples/vars-with-init-in-dead-branch/_config.js b/test/function/samples/vars-with-init-in-dead-branch/_config.js
index c3a1c465ff2..897cf3d7a13 100644
--- a/test/function/samples/vars-with-init-in-dead-branch/_config.js
+++ b/test/function/samples/vars-with-init-in-dead-branch/_config.js
@@ -2,8 +2,9 @@ module.exports = {
 	description: 'handles vars with init in dead branch (#1198)',
 	warnings: [
 		{
+			chunkName: 'main',
 			code: 'EMPTY_BUNDLE',
-			message: 'Generated an empty bundle'
+			message: 'Generated an empty chunk: "main"'
 		}
 	]
 };
diff --git a/test/function/samples/warn-on-empty-bundle/_config.js b/test/function/samples/warn-on-empty-bundle/_config.js
index a6d0a2377ee..2b7303d550f 100644
--- a/test/function/samples/warn-on-empty-bundle/_config.js
+++ b/test/function/samples/warn-on-empty-bundle/_config.js
@@ -2,8 +2,9 @@ module.exports = {
 	description: 'warns if empty bundle is generated  (#444)',
 	warnings: [
 		{
+			chunkName: 'main',
 			code: 'EMPTY_BUNDLE',
-			message: 'Generated an empty bundle'
+			message: 'Generated an empty chunk: "main"'
 		}
 	]
 };
diff --git a/test/function/samples/warnings-to-string/_config.js b/test/function/samples/warnings-to-string/_config.js
index 9b339bb7ff0..fc39492df8b 100644
--- a/test/function/samples/warnings-to-string/_config.js
+++ b/test/function/samples/warnings-to-string/_config.js
@@ -13,7 +13,7 @@ module.exports = {
 	warnings(warnings) {
 		assert.deepStrictEqual(warnings.map(String), [
 			'(test-plugin plugin) main.js (1:6) This might be removed',
-			'Generated an empty bundle'
+			'Generated an empty chunk: "main"'
 		]);
 	}
 };

From d0be854f2c54a780e8984e2f1f9f3b9e5e1e0618 Mon Sep 17 00:00:00 2001
From: Tom Jenkinson <tom@tjenkinson.me>
Date: Tue, 19 Nov 2019 08:20:45 +0000
Subject: [PATCH 2/6] update batchWarnings to group multiple EMPTY_BUNDLE's
 together

---
 cli/run/batchWarnings.ts | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/cli/run/batchWarnings.ts b/cli/run/batchWarnings.ts
index 425c397e69e..25bca2c3cf2 100644
--- a/cli/run/batchWarnings.ts
+++ b/cli/run/batchWarnings.ts
@@ -110,10 +110,6 @@ const immediateHandlers: {
 		stderr(
 			`Consumers of your bundle will have to use bundle['default'] to access the default export, which may not be what you want. Use \`output.exports: 'named'\` to disable this warning`
 		);
-	},
-
-	EMPTY_BUNDLE: () => {
-		title(`Generated an empty bundle`);
 	}
 };
 
@@ -270,6 +266,20 @@ const deferredHandlers: {
 			});
 		},
 		priority: 1
+	},
+
+	EMPTY_BUNDLE: {
+		fn: warnings => {
+			title(
+				`Generated${warnings.length === 1 ? ' an' : ''} empty ${
+					warnings.length > 1 ? 'chunks' : 'chunk'
+				}`
+			);
+			warnings.forEach(warning => {
+				stderr(warning.chunkName as string);
+			});
+		},
+		priority: 1
 	}
 };
 

From ad503ce5adb0ff9e3b2d2749a3d60b8d99a28bcd Mon Sep 17 00:00:00 2001
From: Tom Jenkinson <tom@tjenkinson.me>
Date: Tue, 19 Nov 2019 22:31:44 +0000
Subject: [PATCH 3/6] put chunks on single line

---
 cli/run/batchWarnings.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cli/run/batchWarnings.ts b/cli/run/batchWarnings.ts
index 25bca2c3cf2..223b4131474 100644
--- a/cli/run/batchWarnings.ts
+++ b/cli/run/batchWarnings.ts
@@ -275,9 +275,7 @@ const deferredHandlers: {
 					warnings.length > 1 ? 'chunks' : 'chunk'
 				}`
 			);
-			warnings.forEach(warning => {
-				stderr(warning.chunkName as string);
-			});
+			stderr(warnings.map(warning => warning.chunkName!).join(', '));
 		},
 		priority: 1
 	}

From 8a7733f793dfe2fbd7ca1da5be43200b0e907d0b Mon Sep 17 00:00:00 2001
From: Tom Jenkinson <tom@tjenkinson.me>
Date: Tue, 19 Nov 2019 22:32:18 +0000
Subject: [PATCH 4/6] use non-null assertion operator

---
 cli/run/batchWarnings.ts | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/cli/run/batchWarnings.ts b/cli/run/batchWarnings.ts
index 223b4131474..8261008902e 100644
--- a/cli/run/batchWarnings.ts
+++ b/cli/run/batchWarnings.ts
@@ -23,13 +23,13 @@ export default function batchWarnings() {
 				warning = { code: 'UNKNOWN', message: warning };
 			}
 
-			if ((warning.code as string) in immediateHandlers) {
-				immediateHandlers[warning.code as string](warning);
+			if (warning.code! in immediateHandlers) {
+				immediateHandlers[warning.code!](warning);
 				return;
 			}
 
-			if (!allWarnings.has(warning.code as string)) allWarnings.set(warning.code as string, []);
-			(allWarnings.get(warning.code as string) as RollupWarning[]).push(warning);
+			if (!allWarnings.has(warning.code!)) allWarnings.set(warning.code!, []);
+			(allWarnings.get(warning.code!) as RollupWarning[]).push(warning);
 
 			count += 1;
 		},
@@ -94,12 +94,12 @@ const immediateHandlers: {
 		title(`Missing shims for Node.js built-ins`);
 
 		const detail =
-			(warning.modules as string[]).length === 1
-				? `'${(warning.modules as string[])[0]}'`
-				: `${(warning.modules as string[])
-						.slice(0, -1)
+			warning.modules!.length === 1
+				? `'${warning.modules![0]}'`
+				: `${warning
+						.modules!.slice(0, -1)
 						.map((name: string) => `'${name}'`)
-						.join(', ')} and '${(warning.modules as string[]).slice(-1)}'`;
+						.join(', ')} and '${warning.modules!.slice(-1)}'`;
 		stderr(
 			`Creating a browser bundle that depends on ${detail}. You might need to include https://www.npmjs.com/package/rollup-plugin-node-builtins`
 		);
@@ -155,9 +155,9 @@ const deferredHandlers: {
 			info('https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module');
 
 			warnings.forEach(warning => {
-				stderr(tc.bold(warning.importer as string));
+				stderr(tc.bold(warning.importer!));
 				stderr(`${warning.missing} is not exported by ${warning.exporter}`);
-				stderr(tc.gray(warning.frame as string));
+				stderr(tc.gray(warning.frame!));
 			});
 		},
 		priority: 1
@@ -194,10 +194,10 @@ const deferredHandlers: {
 			title(`Conflicting re-exports`);
 			warnings.forEach(warning => {
 				stderr(
-					`${tc.bold(relativeId(warning.reexporter as string))} re-exports '${
+					`${tc.bold(relativeId(warning.reexporter!))} re-exports '${
 						warning.name
-					}' from both ${relativeId((warning.sources as string[])[0])} and ${relativeId(
-						(warning.sources as string[])[1]
+					}' from both ${relativeId(warning.sources![0])} and ${relativeId(
+						warning.sources![1]
 					)} (will be ignored)`
 				);
 			});
@@ -212,7 +212,7 @@ const deferredHandlers: {
 				`Use output.globals to specify browser global variable names corresponding to external modules`
 			);
 			warnings.forEach(warning => {
-				stderr(`${tc.bold(warning.source as string)} (guessing '${warning.guess}')`);
+				stderr(`${tc.bold(warning.source!)} (guessing '${warning.guess}')`);
 			});
 		},
 		priority: 1
@@ -251,7 +251,7 @@ const deferredHandlers: {
 				nestedByMessage.forEach(({ key: message, items }) => {
 					title(`Plugin ${plugin}: ${message}`);
 					items.forEach(warning => {
-						if (warning.url !== lastUrl) info((lastUrl = warning.url as string));
+						if (warning.url !== lastUrl) info((lastUrl = warning.url!));
 
 						if (warning.id) {
 							let loc = relativeId(warning.id);
@@ -316,7 +316,7 @@ function showTruncatedWarnings(warnings: RollupWarning[]) {
 	const sliced = nestedByModule.length > 5 ? nestedByModule.slice(0, 3) : nestedByModule;
 	sliced.forEach(({ key: id, items }) => {
 		stderr(tc.bold(relativeId(id)));
-		stderr(tc.gray(items[0].frame as string));
+		stderr(tc.gray(items[0].frame!));
 
 		if (items.length > 1) {
 			stderr(`...and ${items.length - 1} other ${items.length > 2 ? 'occurrences' : 'occurrence'}`);

From 25aa6e9c54cb99e1178e465b6c583ae030c58a9c Mon Sep 17 00:00:00 2001
From: Tom Jenkinson <tom@tjenkinson.me>
Date: Tue, 19 Nov 2019 22:33:11 +0000
Subject: [PATCH 5/6] add tests for cli EMPTY_BUNDLE

---
 test/cli/samples/empty-chunk-multiple/_config.js      | 11 +++++++++++
 test/cli/samples/empty-chunk-multiple/a.js            |  0
 test/cli/samples/empty-chunk-multiple/b.js            |  0
 test/cli/samples/empty-chunk-multiple/main.js         |  2 ++
 .../cli/samples/empty-chunk-multiple/rollup.config.js |  6 ++++++
 test/cli/samples/empty-chunk/_config.js               | 10 ++++++++++
 test/cli/samples/empty-chunk/main.js                  |  0
 test/cli/samples/empty-chunk/rollup.config.js         |  6 ++++++
 8 files changed, 35 insertions(+)
 create mode 100644 test/cli/samples/empty-chunk-multiple/_config.js
 create mode 100644 test/cli/samples/empty-chunk-multiple/a.js
 create mode 100644 test/cli/samples/empty-chunk-multiple/b.js
 create mode 100644 test/cli/samples/empty-chunk-multiple/main.js
 create mode 100644 test/cli/samples/empty-chunk-multiple/rollup.config.js
 create mode 100644 test/cli/samples/empty-chunk/_config.js
 create mode 100644 test/cli/samples/empty-chunk/main.js
 create mode 100644 test/cli/samples/empty-chunk/rollup.config.js

diff --git a/test/cli/samples/empty-chunk-multiple/_config.js b/test/cli/samples/empty-chunk-multiple/_config.js
new file mode 100644
index 00000000000..84971bf3b8d
--- /dev/null
+++ b/test/cli/samples/empty-chunk-multiple/_config.js
@@ -0,0 +1,11 @@
+const assert = require('assert');
+
+module.exports = {
+	description: 'shows warning when multiple chunks empty',
+	command: 'rollup -c',
+	error: () => true,
+	stderr: stderr => {
+		console.log(stderr);
+		assert.ok(stderr.includes('(!) Generated empty chunks\na, b'));
+	}
+};
diff --git a/test/cli/samples/empty-chunk-multiple/a.js b/test/cli/samples/empty-chunk-multiple/a.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/cli/samples/empty-chunk-multiple/b.js b/test/cli/samples/empty-chunk-multiple/b.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/cli/samples/empty-chunk-multiple/main.js b/test/cli/samples/empty-chunk-multiple/main.js
new file mode 100644
index 00000000000..f0bdb216130
--- /dev/null
+++ b/test/cli/samples/empty-chunk-multiple/main.js
@@ -0,0 +1,2 @@
+import('./a.js');
+import('./b.js');
diff --git a/test/cli/samples/empty-chunk-multiple/rollup.config.js b/test/cli/samples/empty-chunk-multiple/rollup.config.js
new file mode 100644
index 00000000000..d3fce68c3a7
--- /dev/null
+++ b/test/cli/samples/empty-chunk-multiple/rollup.config.js
@@ -0,0 +1,6 @@
+module.exports = {
+	input: 'main.js',
+	output: {
+		format: 'cjs'
+	}
+};
diff --git a/test/cli/samples/empty-chunk/_config.js b/test/cli/samples/empty-chunk/_config.js
new file mode 100644
index 00000000000..d6799dcc875
--- /dev/null
+++ b/test/cli/samples/empty-chunk/_config.js
@@ -0,0 +1,10 @@
+const assert = require('assert');
+
+module.exports = {
+	description: 'shows warning when chunk empty',
+	command: 'rollup -c',
+	error: () => true,
+	stderr: stderr => {
+		assert.ok(stderr.includes('(!) Generated an empty chunk\nmain'));
+	}
+};
diff --git a/test/cli/samples/empty-chunk/main.js b/test/cli/samples/empty-chunk/main.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/cli/samples/empty-chunk/rollup.config.js b/test/cli/samples/empty-chunk/rollup.config.js
new file mode 100644
index 00000000000..d3fce68c3a7
--- /dev/null
+++ b/test/cli/samples/empty-chunk/rollup.config.js
@@ -0,0 +1,6 @@
+module.exports = {
+	input: 'main.js',
+	output: {
+		format: 'cjs'
+	}
+};

From 87b9cea26102474c16246b8e73438a2ff36509e9 Mon Sep 17 00:00:00 2001
From: Tom Jenkinson <tom@tjenkinson.me>
Date: Tue, 19 Nov 2019 22:35:25 +0000
Subject: [PATCH 6/6] remove console.log

---
 test/cli/samples/empty-chunk-multiple/_config.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/cli/samples/empty-chunk-multiple/_config.js b/test/cli/samples/empty-chunk-multiple/_config.js
index 84971bf3b8d..f2544764593 100644
--- a/test/cli/samples/empty-chunk-multiple/_config.js
+++ b/test/cli/samples/empty-chunk-multiple/_config.js
@@ -5,7 +5,6 @@ module.exports = {
 	command: 'rollup -c',
 	error: () => true,
 	stderr: stderr => {
-		console.log(stderr);
 		assert.ok(stderr.includes('(!) Generated empty chunks\na, b'));
 	}
 };