Merge branch 'dmitrage-fix-ignore-global'

src/transform.js

@@ -107,14 +107,14 @@ export default function transform ( code, id, isEntry, ignoreGlobal, customNamed
 			if ( node.type === 'Identifier' ) {
 				if ( ( node.name in uses ) && isReference( node, parent ) && !scope.contains( node.name ) ) {
 					uses[ node.name ] = true;
-					if ( node.name === 'global' ) magicString.overwrite( node.start, node.end, `${HELPERS_NAME}.commonjsGlobal` );
+					if ( node.name === 'global' && !ignoreGlobal ) magicString.overwrite( node.start, node.end, `${HELPERS_NAME}.commonjsGlobal` );
 				}
 				return;
 			}
 
 			if ( node.type === 'ThisExpression' && scopeDepth === 0 && !ignoreGlobal ) {
 				uses.global = true;
-				magicString.overwrite( node.start, node.end, `${HELPERS_NAME}.commonjsGlobal`, true );
+				if ( !ignoreGlobal ) magicString.overwrite( node.start, node.end, `${HELPERS_NAME}.commonjsGlobal`, true );
 				return;
 			}
 
@@ -152,7 +152,7 @@ export default function transform ( code, id, isEntry, ignoreGlobal, customNamed
 		}
 	});
 
-	if ( !sources.length && !uses.module && !uses.exports && !uses.global ) {
+	if ( !sources.length && !uses.module && !uses.exports && ( ignoreGlobal || !uses.global ) ) {
 		if ( Object.keys( namedExports ).length ) {
 			throw new Error( `Custom named exports were specified for ${id} but it does not appear to be a CommonJS module` );
 		}

test/samples/ignore-global/firstpass.js

@@ -0,0 +1,2 @@
+export var immediate = typeof global.setImmediate === 'function' ?
+   global.setImmediate : global.setTimeout;

test/samples/ignore-global/identifier.js

@@ -0,0 +1,4 @@
+// require (firstpass)
+
+export var immediate = typeof global.setImmediate === 'function' ?
+   global.setImmediate : global.setTimeout;

test/samples/ignore-global/main.js

@@ -1,2 +1,3 @@
-export var immediate = typeof global.setImmediate === 'function' ?
-   global.setImmediate : global.setTimeout;
+export { immediate as immediate1 } from './firstpass';
+export { immediate as immediate2 } from './identifier';
+export { immediate as immediate3 } from './this';

test/samples/ignore-global/this.js

@@ -0,0 +1,6 @@
+// require (firstpass)
+
+// "this" will be rewritten with "undefined" by rollup
+export var immediate = typeof this === 'undefined' ? 
+   null : typeof this.setImmediate === 'function' ?
+   this.setImmediate : this.setTimeout;

test/test.js

@@ -305,7 +305,11 @@ describe( 'rollup-plugin-commonjs', () => {
 				format: 'cjs'
 			});
 
-			assert.equal( global.setImmediate, executeBundle( bundle ).immediate, generated.code );
+			const bundleExports = executeBundle( bundle );
+
+			assert.equal( bundleExports.immediate1, global.setImmediate, generated.code );
+			assert.equal( bundleExports.immediate2, global.setImmediate, generated.code );
+			assert.equal( bundleExports.immediate3, null, generated.code );
 		});
 	});