Merge pull request #113 from rollup/gh-112

Add named exports to default, in optimised modules

src/transform.js

@@ -240,6 +240,9 @@ export default function transform ( code, id, isEntry, ignoreGlobal, customNamed
 
 	if ( customNamedExports ) customNamedExports.forEach( addExport );
 
+	const defaultExportPropertyAssignments = [];
+	let hasDefaultExport = false;
+
 	if ( shouldWrap ) {
 		const args = `module${uses.exports ? ', exports' : ''}`;
 
@@ -250,7 +253,6 @@ export default function transform ( code, id, isEntry, ignoreGlobal, customNamed
 			.filter( key => !blacklistedExports[ key ] )
 			.forEach( addExport );
 	} else {
-		let hasDefaultExport = false;
 		const names = [];
 
 		ast.body.forEach( node => {
@@ -279,6 +281,7 @@ export default function transform ( code, id, isEntry, ignoreGlobal, customNamed
 						`export { ${deconflicted} as ${name} };`;
 
 					namedExportDeclarations.push( declaration );
+					defaultExportPropertyAssignments.push( `${moduleName}.${name} = ${deconflicted};` );
 				}
 			}
 		});
@@ -294,7 +297,10 @@ export default function transform ( code, id, isEntry, ignoreGlobal, customNamed
 		`export default ${HELPERS_NAME}.unwrapExports(${moduleName});` :
 		`export default ${moduleName};`;
 
-	const exportBlock = '\n\n' + [ defaultExport ].concat( namedExportDeclarations ).join( '\n' );
+	const exportBlock = '\n\n' + [ defaultExport ]
+		.concat( namedExportDeclarations )
+		.concat( hasDefaultExport ? defaultExportPropertyAssignments : [] )
+		.join( '\n' );
 
 	magicString.trim()
 		.prepend( importBlock + wrapperStart )

test/function/assign-properties-to-default-export/foo.js

@@ -0,0 +1,5 @@
+var foo = {};
+
+module.exports = foo;
+module.exports.bar = 1;
+exports.baz = 2;

test/function/assign-properties-to-default-export/main.js

@@ -0,0 +1,4 @@
+import foo from './foo.js';
+
+assert.equal( foo.bar, 1 );
+assert.equal( foo.baz, 2 );