Fix a situation where two different imports with the same name are rendered

src/Chunk.ts

@@ -830,21 +830,23 @@ export default class Chunk {
 		}
 
 		const importsAsArray = Array.from(this.imports);
+		const renderedImports = new Set<Variable>();
 		const dependencies: ChunkDependencies = [];
 
 		for (const dep of this.dependencies) {
 			const imports: ImportSpecifier[] = [];
 			for (const variable of importsAsArray) {
+				const renderedVariable =
+					variable instanceof ExportDefaultVariable && variable.referencesOriginal()
+						? variable.getOriginalVariable()
+						: variable;
 				if (
 					(variable.module instanceof Module
 						? variable.module.chunk === dep
 						: variable.module === dep) &&
-					!(
-						variable instanceof ExportDefaultVariable &&
-						variable.referencesOriginal() &&
-						this.imports.has(variable.getOriginalVariable())
-					)
+					!renderedImports.has(renderedVariable)
 				) {
+					renderedImports.add(renderedVariable);
 					const local = variable.getName();
 					const imported =
 						variable.module instanceof ExternalModule

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_config.js

@@ -0,0 +1,7 @@
+module.exports = {
+	description:
+		'do not import variables that reference an original if another variable referencing it is already imported',
+	options: {
+		input: ['main1', 'main2']
+	}
+};

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/generated-chunk.js

@@ -0,0 +1,8 @@
+define(['exports'], function (exports) { 'use strict';
+
+	const foo = {};
+
+	exports.foo = foo;
+	exports.bar = foo;
+
+});

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main1.js

@@ -0,0 +1,5 @@
+define(['./generated-chunk.js'], function (__chunk_1) { 'use strict';
+
+	console.log(__chunk_1.bar, __chunk_1.bar);
+
+});

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main2.js

@@ -0,0 +1,5 @@
+define(['./generated-chunk.js'], function (__chunk_1) { 'use strict';
+
+	console.log(__chunk_1.bar, __chunk_1.bar);
+
+});

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/generated-chunk.js

@@ -0,0 +1,6 @@
+'use strict';
+
+const foo = {};
+
+exports.foo = foo;
+exports.bar = foo;

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main1.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var __chunk_1 = require('./generated-chunk.js');
+
+console.log(__chunk_1.bar, __chunk_1.bar);

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main2.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var __chunk_1 = require('./generated-chunk.js');
+
+console.log(__chunk_1.bar, __chunk_1.bar);

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/generated-chunk.js

@@ -0,0 +1,3 @@
+const foo = {};
+
+export { foo as a, foo as b };

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main1.js

@@ -0,0 +1,3 @@
+import { a as bar } from './generated-chunk.js';
+
+console.log(bar, bar);

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main2.js

@@ -0,0 +1,3 @@
+import { a as bar } from './generated-chunk.js';
+
+console.log(bar, bar);

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/generated-chunk.js

@@ -0,0 +1,14 @@
+System.register([], function (exports, module) {
+	'use strict';
+	return {
+		execute: function () {
+
+			const foo = {};
+
+			exports('a', foo);
+
+			exports('b', foo);
+
+		}
+	};
+});

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main1.js

@@ -0,0 +1,14 @@
+System.register(['./generated-chunk.js'], function (exports, module) {
+	'use strict';
+	var bar;
+	return {
+		setters: [function (module) {
+			bar = module.a;
+		}],
+		execute: function () {
+
+			console.log(bar, bar);
+
+		}
+	};
+});

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main2.js

@@ -0,0 +1,14 @@
+System.register(['./generated-chunk.js'], function (exports, module) {
+	'use strict';
+	var bar;
+	return {
+		setters: [function (module) {
+			bar = module.a;
+		}],
+		execute: function () {
+
+			console.log(bar, bar);
+
+		}
+	};
+});

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/foo.js

@@ -0,0 +1 @@
+export const foo = {};

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/main1.js

@@ -0,0 +1,4 @@
+import foo from './proxy1';
+import bar from './proxy2';
+
+console.log(foo, bar);

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/main2.js

@@ -0,0 +1,4 @@
+import foo from './proxy1';
+import bar from './proxy2';
+
+console.log(foo, bar);

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/proxy1.js

@@ -0,0 +1,3 @@
+import { foo } from './foo';
+
+export default foo;

test/chunking-form/samples/deduplicate-imports-referencing-originals-2/proxy2.js

@@ -0,0 +1,3 @@
+import { foo } from './foo';
+
+export default foo;