handle duplicate default export case (#158)

rollup · Mar 7, 2017 · 5cf3b07 · 5cf3b07
1 parent 81dc501
commit 5cf3b07
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 4 deletions.
diff --git a/src/transform.js b/src/transform.js
@@ -235,7 +235,11 @@ export default function transformCommonjs ( code, id, isEntry, ignoreGlobal, cus
 
 	const moduleName = deconflict( scope, globals, getName( id ) );
 	if ( !isEntry ) {
-		const exportModuleExports = `export { ${moduleName} as __moduleExports };`;
+		const exportModuleExports = {
+			str: `export { ${moduleName} as __moduleExports };`,
+			name: '__moduleExports'
+		};
+
 		namedExportDeclarations.push( exportModuleExports );
 	}
 
@@ -248,7 +252,10 @@ export default function transformCommonjs ( code, id, isEntry, ignoreGlobal, cus
 			`export var ${x} = ${moduleName}.${x};` :
 			`var ${deconflicted} = ${moduleName}.${x};\nexport { ${deconflicted} as ${x} };`;
 
-		namedExportDeclarations.push( declaration );
+		namedExportDeclarations.push({
+			str: declaration,
+			name: x
+		});
 	}
 
 	if ( customNamedExports ) customNamedExports.forEach( addExport );
@@ -293,7 +300,11 @@ export default function transformCommonjs ( code, id, isEntry, ignoreGlobal, cus
 						`export { ${name} };` :
 						`export { ${deconflicted} as ${name} };`;
 
-					namedExportDeclarations.push( declaration );
+					namedExportDeclarations.push({
+						str: declaration,
+						name
+					});
+
 					defaultExportPropertyAssignments.push( `${moduleName}.${name} = ${deconflicted};` );
 				}
 			}
@@ -310,8 +321,12 @@ export default function transformCommonjs ( code, id, isEntry, ignoreGlobal, cus
 		`export default ${HELPERS_NAME}.unwrapExports(${moduleName});` :
 		`export default ${moduleName};`;
 
+	const named = namedExportDeclarations
+		.filter( x => x.name !== 'default' || !hasDefaultExport )
+		.map( x => x.str );
+
 	const exportBlock = '\n\n' + [ defaultExport ]
-		.concat( namedExportDeclarations )
+		.concat( named )
 		.concat( hasDefaultExport ? defaultExportPropertyAssignments : [] )
 		.join( '\n' );
 

diff --git a/test/function/duplicate-default-exports-b/main.js b/test/function/duplicate-default-exports-b/main.js
@@ -0,0 +1,3 @@
+import x from './x';
+
+assert.deepEqual( x, { default: 42 });
diff --git a/test/function/duplicate-default-exports-b/x.js b/test/function/duplicate-default-exports-b/x.js
@@ -0,0 +1,4 @@
+var x = {};
+
+module.exports = x;
+module.exports.default = 42;
diff --git a/test/function/duplicate-default-exports/main.js b/test/function/duplicate-default-exports/main.js
@@ -0,0 +1,3 @@
+import x from './x';
+
+assert.strictEqual( x.default, x );
diff --git a/test/function/duplicate-default-exports/x.js b/test/function/duplicate-default-exports/x.js
@@ -0,0 +1,4 @@
+var x = {};
+
+module.exports = x;
+module.exports.default = x;