Handle side-effects next to side-effect-free default exports in case …

…the default export is reexported (#3602)
rollup · May 28, 2020 · 41778fe · 41778fe
1 parent ca0854e
commit 41778fe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/Module.ts b/src/Module.ts
@@ -330,7 +330,8 @@ export default class Module {
 	getDependenciesToBeIncluded(): Set<Module | ExternalModule> {
 		if (this.relevantDependencies) return this.relevantDependencies;
 		const relevantDependencies = new Set<Module | ExternalModule>();
-		const additionalSideEffectModules = new Set();
+		const additionalSideEffectModules = new Set<Module>();
+		const possibleDependencies = new Set(this.dependencies);
 		let dependencyVariables = this.imports;
 		if (
 			this.isEntryPoint ||
@@ -350,15 +351,17 @@ export default class Module {
 				variable = original;
 				for (const module of modules) {
 					additionalSideEffectModules.add(module);
+					possibleDependencies.add(module);
 				}
 			}
 			relevantDependencies.add(variable.module!);
 		}
 		if (this.options.treeshake) {
-			const possibleDependencies = new Set(this.dependencies);
 			for (const dependency of possibleDependencies) {
 				if (
-					!(dependency.moduleSideEffects || additionalSideEffectModules.has(dependency)) ||
+					!(
+						dependency.moduleSideEffects || additionalSideEffectModules.has(dependency as Module)
+					) ||
 					relevantDependencies.has(dependency)
 				) {
 					continue;

diff --git a/test/form/samples/side-effect-default-reexport/default-export/reexport.js b/test/form/samples/side-effect-default-reexport/default-export/reexport.js
@@ -0,0 +1 @@
+export { default as Menu } from './index';
diff --git a/test/form/samples/side-effect-default-reexport/main.js b/test/form/samples/side-effect-default-reexport/main.js
@@ -1,8 +1,7 @@
-import DefaultExport from './default-export/index.js';
+import { Menu as DefaultExport } from './default-export/reexport.js';
 console.log('test-package-default-export', DefaultExport.Item);
 
 import { Menu as NamedExport } from './named-export/index.js';
 console.log('test-package-named-export', NamedExport.Item);
 
 export { default } from './default-export2/index.js';
-