Fix an issue where the same hash was generated when different variabl…

…es (#2741)

where exported under the same name

src/Chunk.ts

@@ -30,6 +30,7 @@ import { sortByExecutionOrder } from './utils/executionOrder';
 import getIndentString from './utils/getIndentString';
 import { makeLegal } from './utils/identifierHelpers';
 import { basename, dirname, isAbsolute, normalize, relative, resolve } from './utils/path';
+import relativeId from './utils/relativeId';
 import renderChunk from './utils/renderChunk';
 import { RenderOptions } from './utils/renderHelpers';
 import { makeUnique, renderNamePattern } from './utils/renderNamePattern';
@@ -286,7 +287,16 @@ export default class Chunk {
 		if (!this.renderedSource) return '';
 		const hash = sha256();
 		hash.update(this.renderedSource.toString());
-		hash.update(Object.keys(this.exportNames).join(','));
+		hash.update(
+			Object.keys(this.exportNames)
+				.map(exportName => {
+					const variable = this.exportNames[exportName];
+					return `${relativeId(variable.module.id).replace(/\\/g, '/')}:${
+						variable.name
+					}:${exportName}`;
+				})
+				.join(',')
+		);
 		return (this.renderedHash = hash.digest('hex'));
 	}
 

test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-174b752b-amd.js

@@ -0,0 +1,5 @@
+define(['./chunk-main2-ed4460c9-amd.js'], function (main2) { 'use strict';
+
+	main2.log(main2.dep);
+
+});

test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-a8c16f0a-amd.js

@@ -0,0 +1,7 @@
+define(['./chunk-main2-ed4460c9-amd.js'], function (main2) { 'use strict';
+
+
+
+	return main2.log;
+
+});

test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-544352cb-cjs.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var main2 = require('./chunk-main2-690ec2d2-cjs.js');
+
+main2.log(main2.dep);

test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-a45eef7f-cjs.js

@@ -0,0 +1,7 @@
+'use strict';
+
+var main2 = require('./chunk-main2-690ec2d2-cjs.js');
+
+
+
+module.exports = main2.log;

test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-0152a638-esm.js

@@ -0,0 +1,3 @@
+import { a as log, b as dep } from './chunk-main2-88db1d1d-esm.js';
+
+log(dep);

test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-5a78ab60-esm.js

@@ -0,0 +1 @@
+export { a as default } from './chunk-main2-88db1d1d-esm.js';

test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-4e36d280-system.js → test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-2c874064-system.js

@@ -1,4 +1,4 @@
-System.register(['./chunk-main2-d134c6d9-system.js'], function (exports, module) {
+System.register(['./chunk-main2-26e1391e-system.js'], function (exports, module) {
 	'use strict';
 	var log, dep;
 	return {

test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-ebb140d8-system.js → test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-dd802b9d-system.js

@@ -1,4 +1,4 @@
-System.register(['./chunk-main2-d134c6d9-system.js'], function (exports, module) {
+System.register(['./chunk-main2-26e1391e-system.js'], function (exports, module) {
 	'use strict';
 	return {
 		setters: [function (module) {

test/file-hashes/samples/export-order-2/_config.js

@@ -0,0 +1,9 @@
+module.exports = {
+	description: 'creates different hashes if different variables are exported under the same name',
+	options1: {
+		input: ['main1', 'dep']
+	},
+	options2: {
+		input: ['main2', 'dep']
+	}
+};

test/file-hashes/samples/export-order-2/dep.js

@@ -0,0 +1 @@
+export const a = 3;

test/file-hashes/samples/export-order-2/main1.js

@@ -0,0 +1,7 @@
+import { a as b } from './dep.js';
+
+const a = 1;
+
+console.log(a, b);
+
+export { a };

test/file-hashes/samples/export-order-2/main2.js

@@ -0,0 +1,7 @@
+import { a as b } from './dep.js';
+
+const a = 1;
+
+console.log(a, b);
+
+export { b as a };

test/file-hashes/samples/export-order/_config.js

@@ -0,0 +1,9 @@
+module.exports = {
+	description: 'creates different hashes if different variables are exported under the same name',
+	options1: {
+		input: ['main1']
+	},
+	options2: {
+		input: ['main2']
+	}
+};

test/file-hashes/samples/export-order/main1.js

@@ -0,0 +1,6 @@
+const a = 1;
+const b = 2;
+
+console.log(a, b);
+
+export { a };

test/file-hashes/samples/export-order/main2.js

@@ -0,0 +1,6 @@
+const a = 1;
+const b = 2;
+
+console.log(a, b);
+
+export { b as a };

test/file-hashes/samples/internal-exports/_config.js

@@ -0,0 +1,9 @@
+module.exports = {
+	description: 'creates different hashes if generated internal exports differ',
+	options1: {
+		input: ['main1', 'other']
+	},
+	options2: {
+		input: ['main2', 'other']
+	}
+};

test/file-hashes/samples/internal-exports/dep.js

@@ -0,0 +1,2 @@
+export const a = 1;
+export const b = 2;

test/file-hashes/samples/internal-exports/main1.js

@@ -0,0 +1,3 @@
+import { b } from './dep.js';
+
+console.log(b);

test/file-hashes/samples/internal-exports/main2.js

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

test/file-hashes/samples/internal-exports/other.js

@@ -0,0 +1,3 @@
+import { a, b } from './dep.js';
+
+console.log(a, b);

test/misc/bundle-information.js

@@ -26,7 +26,7 @@ describe('The bundle object', () => {
 			.then(({ output }) => {
 				assert.deepEqual(
 					output.map(chunk => chunk.fileName),
-					['input1-eebe7cfb.js', 'input2-370063a6.js', 'generated-chunk-e9283962.js'],
+					['input1-91cf8b5e.js', 'input2-28e1210a.js', 'generated-chunk-e9283962.js'],
 					'fileName'
 				);
 				assert.deepEqual(