Merge pull request #80 from rollup/deep-cjs

Deconflict export and local module

src/index.js

@@ -256,7 +256,13 @@ export default function commonjs ( options = {} ) {
 
 			outro += Object.keys( namedExports )
 				.filter( key => !blacklistedExports[ key ] )
-				.map( x => `export var ${x} = ${name}.${x};` )
+				.map( x => {
+					if (x === name) {
+						return `var ${x}$$1 = ${name}.${x};\nexport { ${x}$$1 as ${x} };`;
+					} else {
+						return `export var ${x} = ${name}.${x};`;
+					}
+				})
 				.join( '\n' );
 
 			magicString.trim()

test/samples/deconflict-export-and-local/index.js

@@ -0,0 +1,14 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.someValue = undefined;
+
+var _someValue2 = require('./someValue');
+
+var _someValue3 = _interopRequireDefault(_someValue2);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+exports.someValue = _someValue3.default;

test/samples/deconflict-export-and-local/main.js

@@ -0,0 +1,3 @@
+import { someValue } from './index.js';
+
+assert.equal(someValue, 10);

test/samples/deconflict-export-and-local/someValue.js

@@ -0,0 +1,10 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.someValue = undefined;
+
+var someValue = exports.someValue = 10;
+
+exports.default = someValue;

test/test.js

@@ -363,4 +363,11 @@ describe( 'rollup-plugin-commonjs', () => {
 		.then( executeBundle)
 		.catch(error => assert.ok(/reexport\.js does not export named/.test(error.message)));
 	});
+
+	it( 'deconflict export name and local variable', () => {
+		return rollup({
+			entry: 'samples/deconflict-export-and-local/main.js',
+			plugins: [ commonjs() ]
+		}).then( executeBundle );
+	});
 });