Merge conflict detection into export resolution

rollup · Jan 24, 2022 · 41086b3 · 41086b3
1 parent dd7b7de
commit 41086b3
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 140 deletions.
diff --git a/src/ExternalModule.ts b/src/ExternalModule.ts
@@ -64,13 +64,13 @@ export default class ExternalModule {
 		};
 	}
 
-	getVariableForExportName(name: string): ExternalVariable {
+	getVariableForExportName(name: string): [variable: ExternalVariable] {
 		let declaration = this.declarations[name];
-		if (declaration) return declaration;
+		if (declaration) return [declaration];
 
 		this.declarations[name] = declaration = new ExternalVariable(this, name);
 		this.exportedVariables.set(declaration, name);
-		return declaration;
+		return [declaration];
 	}
 
 	setRenderPath(options: NormalizedOutputOptions, inputBase: string): string {

diff --git a/src/Graph.ts b/src/Graph.ts
@@ -243,7 +243,7 @@ export default class Graph {
 			for (const importDescription of Object.values(module.importDescriptions)) {
 				if (
 					importDescription.name !== '*' &&
-					!importDescription.module.getVariableForExportName(importDescription.name)
+					!importDescription.module.getVariableForExportName(importDescription.name)[0]
 				) {
 					module.warn(
 						{