Disable errors for duplicate emitted file names

And add a test to make sure such emits no longer error spuriously. Issue #3174
rollup · Oct 18, 2019 · 3100b4e · 3100b4e
1 parent d677eb7
commit 3100b4e
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 2 deletions.
diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts
@@ -10,7 +10,6 @@ import {
 	errAssetSourceAlreadySet,
 	errChunkNotGeneratedForFileName,
 	errFailedValidation,
-	errFileNameConflict,
 	errFileReferenceIdNotFoundForFilename,
 	errInvalidRollupPhaseForChunkEmission,
 	errNoAssetSourceSet,
@@ -50,7 +49,8 @@ function generateAssetFileName(
 
 function reserveFileNameInBundle(fileName: string, bundle: OutputBundleWithPlaceholders) {
 	if (fileName in bundle) {
-		return error(errFileNameConflict(fileName));
+		// FIXME this should return error(errFileNameConflict(fileName));
+		// but until #3174 is fixed, this raises spurious errors and is disabled
 	}
 	bundle[fileName] = FILE_PLACEHOLDER;
 }

diff --git a/test/chunking-form/samples/emit-same-file/_config.js b/test/chunking-form/samples/emit-same-file/_config.js
@@ -0,0 +1,12 @@
+module.exports = {
+	options: {
+		input: 'main.js',
+		plugins: [
+			{
+				generateBundle() {
+					this.emitFile({ type: 'asset', fileName: 'myfile', source: 'abc' });
+				}
+			}
+		]
+	}
+};
diff --git a/test/chunking-form/samples/emit-same-file/_expected/amd/main.js b/test/chunking-form/samples/emit-same-file/_expected/amd/main.js
@@ -0,0 +1,9 @@
+define(['exports'], function (exports) { 'use strict';
+
+	function hi() { return 2 }
+
+	exports.hi = hi;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+});
diff --git a/test/chunking-form/samples/emit-same-file/_expected/amd/myfile b/test/chunking-form/samples/emit-same-file/_expected/amd/myfile
@@ -0,0 +1 @@
+abc
diff --git a/test/chunking-form/samples/emit-same-file/_expected/cjs/main.js b/test/chunking-form/samples/emit-same-file/_expected/cjs/main.js
@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+function hi() { return 2 }
+
+exports.hi = hi;
diff --git a/test/chunking-form/samples/emit-same-file/_expected/cjs/myfile b/test/chunking-form/samples/emit-same-file/_expected/cjs/myfile
@@ -0,0 +1 @@
+abc
diff --git a/test/chunking-form/samples/emit-same-file/_expected/es/main.js b/test/chunking-form/samples/emit-same-file/_expected/es/main.js
@@ -0,0 +1,3 @@
+function hi() { return 2 }
+
+export { hi };
diff --git a/test/chunking-form/samples/emit-same-file/_expected/es/myfile b/test/chunking-form/samples/emit-same-file/_expected/es/myfile
@@ -0,0 +1 @@
+abc
diff --git a/test/chunking-form/samples/emit-same-file/_expected/system/main.js b/test/chunking-form/samples/emit-same-file/_expected/system/main.js
@@ -0,0 +1,12 @@
+System.register([], function (exports) {
+	'use strict';
+	return {
+		execute: function () {
+
+			exports('hi', hi);
+
+			function hi() { return 2 }
+
+		}
+	};
+});
diff --git a/test/chunking-form/samples/emit-same-file/_expected/system/myfile b/test/chunking-form/samples/emit-same-file/_expected/system/myfile
@@ -0,0 +1 @@
+abc
diff --git a/test/chunking-form/samples/emit-same-file/main.js b/test/chunking-form/samples/emit-same-file/main.js
@@ -0,0 +1 @@
+export function hi() { return 2 }