Add tests for other hashing situations and fix addon hashing

src/Chunk.ts

@@ -705,7 +705,9 @@ export default class Chunk {
 	private computeContentHashWithDependencies(addons: Addons, options: OutputOptions): string {
 		const hash = sha256();
 
-		hash.update(addons.hash);
+		hash.update(
+			[addons.intro, addons.outro, addons.banner, addons.footer].map(addon => addon || '').join(':')
+		);
 		hash.update(options.format);
 		hash.update(Object.keys(this.exportNames).join(','));
 		this.visitDependencies(dep => {

src/utils/addons.ts

@@ -7,7 +7,6 @@ export interface Addons {
 	outro?: string;
 	banner?: string;
 	footer?: string;
-	hash: Uint8Array;
 }
 
 function evalIfFn(strOrFn: string | (() => string | Promise<string>)): string | Promise<string> {
@@ -38,9 +37,7 @@ export function createAddons(graph: Graph, options: OutputOptions): Promise<Addo
 			if (banner.length) banner += '\n';
 			if (footer.length) footer = '\n' + footer;
 
-			const hash = new Uint8Array(4);
-
-			return { intro, outro, banner, footer, hash };
+			return { intro, outro, banner, footer };
 		})
 		.catch(
 			(err): any => {

test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-843c034d-amd.js

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

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

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

test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-8470b59b-cjs.js

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

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

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

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

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

test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-2206abfa-esm.js

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

test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-2422e801-system.js → test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-ea6917a8-system.js

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

test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-2ad41703-system.js → test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-f2a7f0d8-system.js

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

test/cli/samples/code-splitting-named-default-inputs/_config.js

@@ -17,13 +17,13 @@ module.exports = {
 		assert.equal(
 			code,
 			'\n' +
-				`${color}//→ entry1-a47394dc.js:${standard}\n` +
+				`${color}//→ entry1-d8c4343d.js:${standard}\n` +
 				"console.log('main1');\n" +
 				'\n' +
-				`${color}//→ Entry 2-d6c85f3f.js:${standard}\n` +
+				`${color}//→ Entry 2-99f48ca0.js:${standard}\n` +
 				"console.log('main2');\n" +
 				'\n' +
-				`${color}//→ main3-22d8845f.js:${standard}\n` +
+				`${color}//→ main3-a6240449.js:${standard}\n` +
 				"console.log('main3');\n"
 		);
 	}

test/cli/samples/code-splitting-named-inputs/_config.js

@@ -17,13 +17,13 @@ module.exports = {
 		assert.equal(
 			code,
 			'\n' +
-				`${color}//→ entry1-a47394dc.js:${standard}\n` +
+				`${color}//→ entry1-d8c4343d.js:${standard}\n` +
 				"console.log('main1');\n" +
 				'\n' +
-				`${color}//→ Entry 2-d6c85f3f.js:${standard}\n` +
+				`${color}//→ Entry 2-99f48ca0.js:${standard}\n` +
 				"console.log('main2');\n" +
 				'\n' +
-				`${color}//→ main3-22d8845f.js:${standard}\n` +
+				`${color}//→ main3-a6240449.js:${standard}\n` +
 				"console.log('main3');\n"
 		);
 	}

test/file-hashes/index.js

@@ -29,15 +29,15 @@ runTestSuiteWithSamples('file hashes', path.resolve(__dirname, 'samples'), (dir,
 						assert.equal(
 							hashMap1[name],
 							hashMap2[name],
-							`Expected hashes for chunk containing "${name}" to be equal but they were different.`
+							`Expected hashes for chunk "${name}" to be equal but they were different.`
 						);
 					}
 					for (const name of config.expectedDifferentHashes || []) {
 						checkChunkExists(hashMap1, hashMap2, name);
 						assert.notEqual(
 							hashMap1[name],
 							hashMap2[name],
-							`Expected hashes for chunk containing "${name}" to be different but they were equal.`
+							`Expected hashes for chunk "${name}" to be different but they were equal.`
 						);
 					}
 				});
@@ -48,11 +48,13 @@ runTestSuiteWithSamples('file hashes', path.resolve(__dirname, 'samples'), (dir,
 
 function mapGeneratedToHashMap(generated) {
 	const hashMap = {};
-	const dirLength = process.cwd().length + 1;
 	for (const chunk of generated.output) {
-		for (const moduleName of Object.keys(chunk.modules)) {
-			hashMap[moduleName.slice(dirLength)] = chunk.fileName;
+		let name = chunk.name;
+		let index = 1;
+		while (hashMap[name]) {
+			name = `${chunk.name}${index++}`;
 		}
+		hashMap[name] = chunk.fileName;
 	}
 	return hashMap;
 }
@@ -61,9 +63,9 @@ function checkChunkExists(hashMap1, hashMap2, name) {
 	[hashMap1, hashMap2].forEach((hashMap, index) =>
 		assert.ok(
 			hashMap[name],
-			`Bundle ${index} did not contain a chunk containing module "${name}", found chunks for modules: ${Object.keys(
-				hashMap
-			).join(', ')}`
+			`Bundle ${index + 1} did not contain chunk "${name}", found chunks: ${Object.keys(hashMap)
+				.map(key => `"${key}"`)
+				.join(', ')}`
 		)
 	);
 }

test/file-hashes/samples/banner/_config.js

@@ -0,0 +1,16 @@
+module.exports = {
+	description: 'creates different hashes if the banner differs',
+	options1: {
+		input: 'main',
+		output: {
+			banner: 'console.log(1);'
+		}
+	},
+	options2: {
+		input: 'main',
+		output: {
+			banner: 'console.log(2);'
+		}
+	},
+	expectedDifferentHashes: ['main']
+};

test/file-hashes/samples/banner/main.js

@@ -0,0 +1 @@
+console.log('main');

test/file-hashes/samples/content/_config.js

@@ -0,0 +1,11 @@
+module.exports = {
+	description: 'creates different hashes if the content differs',
+	options1: {
+		input: { main: 'main1', dep: 'dep1' }
+	},
+	options2: {
+		input: { main: 'main2', dep: 'dep2' }
+	},
+	expectedDifferentHashes: ['main'],
+	expectedEqualHashes: ['dep']
+};

test/file-hashes/samples/content/_expected/amd/generated-chunk.js

@@ -0,0 +1,5 @@
+define(function () { 'use strict';
+
+	console.log('main4');
+
+});

test/file-hashes/samples/content/_expected/amd/generated-chunk2.js

@@ -0,0 +1,5 @@
+define(function () { 'use strict';
+
+	console.log('main5');
+
+});

test/file-hashes/samples/content/_expected/amd/main1.js

@@ -0,0 +1,7 @@
+define(['require'], function (require) { 'use strict';
+
+	console.log('main1');
+	new Promise(function (resolve, reject) { require(['./generated-chunk.js'], resolve, reject) });
+	new Promise(function (resolve, reject) { require(['./generated-chunk2.js'], resolve, reject) });
+
+});

test/file-hashes/samples/content/_expected/amd/main2.js

@@ -0,0 +1,5 @@
+define(function () { 'use strict';
+
+	console.log('main2');
+
+});

test/file-hashes/samples/content/_expected/amd/main3.js

@@ -0,0 +1,5 @@
+define(function () { 'use strict';
+
+	console.log('main3');
+
+});

test/file-hashes/samples/content/_expected/cjs/generated-chunk.js

@@ -0,0 +1,3 @@
+'use strict';
+
+console.log('main4');

test/file-hashes/samples/content/_expected/cjs/generated-chunk2.js

@@ -0,0 +1,3 @@
+'use strict';
+
+console.log('main5');

test/file-hashes/samples/content/_expected/cjs/main1.js

@@ -0,0 +1,5 @@
+'use strict';
+
+console.log('main1');
+Promise.resolve(require('./generated-chunk.js'));
+Promise.resolve(require('./generated-chunk2.js'));

test/file-hashes/samples/content/_expected/cjs/main2.js

@@ -0,0 +1,3 @@
+'use strict';
+
+console.log('main2');

test/file-hashes/samples/content/_expected/cjs/main3.js

@@ -0,0 +1,3 @@
+'use strict';
+
+console.log('main3');

test/file-hashes/samples/content/_expected/es/generated-chunk.js

@@ -0,0 +1 @@
+console.log('main4');

test/file-hashes/samples/content/_expected/es/generated-chunk2.js

@@ -0,0 +1 @@
+console.log('main5');

test/file-hashes/samples/content/_expected/es/main1.js

@@ -0,0 +1,3 @@
+console.log('main1');
+import('./generated-chunk.js');
+import('./generated-chunk2.js');

test/file-hashes/samples/content/_expected/es/main2.js

@@ -0,0 +1 @@
+console.log('main2');

test/file-hashes/samples/content/_expected/es/main3.js

@@ -0,0 +1 @@
+console.log('main3');

test/file-hashes/samples/content/_expected/system/generated-chunk.js

@@ -0,0 +1,10 @@
+System.register([], function (exports, module) {
+	'use strict';
+	return {
+		execute: function () {
+
+			console.log('main4');
+
+		}
+	};
+});

test/file-hashes/samples/content/_expected/system/generated-chunk2.js

@@ -0,0 +1,10 @@
+System.register([], function (exports, module) {
+	'use strict';
+	return {
+		execute: function () {
+
+			console.log('main5');
+
+		}
+	};
+});

test/file-hashes/samples/content/_expected/system/main1.js

@@ -0,0 +1,12 @@
+System.register([], function (exports, module) {
+	'use strict';
+	return {
+		execute: function () {
+
+			console.log('main1');
+			module.import('./generated-chunk.js');
+			module.import('./generated-chunk2.js');
+
+		}
+	};
+});

test/file-hashes/samples/content/_expected/system/main2.js

@@ -0,0 +1,10 @@
+System.register([], function (exports, module) {
+	'use strict';
+	return {
+		execute: function () {
+
+			console.log('main2');
+
+		}
+	};
+});

test/file-hashes/samples/content/_expected/system/main3.js

@@ -0,0 +1,10 @@
+System.register([], function (exports, module) {
+	'use strict';
+	return {
+		execute: function () {
+
+			console.log('main3');
+
+		}
+	};
+});

test/file-hashes/samples/content/dep1.js

@@ -0,0 +1 @@
+console.log('dep');

test/file-hashes/samples/content/dep2.js

@@ -0,0 +1 @@
+console.log('dep');

test/file-hashes/samples/content/main1.js

@@ -0,0 +1,3 @@
+import './dep1';
+
+console.log('main1');

test/file-hashes/samples/content/main2.js

@@ -0,0 +1,3 @@
+import './dep2';
+
+console.log('main2');

test/file-hashes/samples/dependency-content/_config.js

@@ -0,0 +1,10 @@
+module.exports = {
+	description: 'creates different hashes if the content of dependencies differs',
+	options1: {
+		input: { main: 'main1', dep: 'dep1' }
+	},
+	options2: {
+		input: { main: 'main2', dep: 'dep2' }
+	},
+	expectedDifferentHashes: ['main', 'dep']
+};

test/file-hashes/samples/dependency-content/_expected/amd/generated-chunk.js

@@ -0,0 +1,5 @@
+define(function () { 'use strict';
+
+	console.log('main4');
+
+});

test/file-hashes/samples/dependency-content/_expected/amd/generated-chunk2.js

@@ -0,0 +1,5 @@
+define(function () { 'use strict';
+
+	console.log('main5');
+
+});

test/file-hashes/samples/dependency-content/_expected/amd/main1.js

@@ -0,0 +1,7 @@
+define(['require'], function (require) { 'use strict';
+
+	console.log('main1');
+	new Promise(function (resolve, reject) { require(['./generated-chunk.js'], resolve, reject) });
+	new Promise(function (resolve, reject) { require(['./generated-chunk2.js'], resolve, reject) });
+
+});

test/file-hashes/samples/dependency-content/_expected/amd/main2.js

@@ -0,0 +1,5 @@
+define(function () { 'use strict';
+
+	console.log('main2');
+
+});