Merge pull request #175 from rollup/gh-174

allow require statements to pass through unmolested

README.md

@@ -50,7 +50,13 @@ export default {
 
       // explicitly specify unresolvable named exports
       // (see below for more details)
-      namedExports: { './module.js': ['foo', 'bar' ] }  // Default: undefined
+      namedExports: { './module.js': ['foo', 'bar' ] },  // Default: undefined
+
+      // sometimes you have to leave require statements
+      // unconverted. Pass an array containing the IDs
+      // or a `id => boolean` function. Only use this
+      // option if you know what you're doing!
+      ignore: [ 'conditional-runtime-dependency' ]
     })
   ]
 };

src/index.js

@@ -58,6 +58,13 @@ export default function commonjs ( options = {} ) {
 		});
 	}
 
+	const allowDynamicRequire = !!options.ignore; // TODO maybe this should be configurable?
+
+	const ignoreRequire = typeof options.ignore === 'function' ?
+		options.ignore :
+		Array.isArray( options.ignore ) ? id => ~options.ignore.indexOf( id ) :
+		() => false;
+
 	let entryModuleIdPromise = null;
 	let entryModuleId = null;
 
@@ -150,7 +157,7 @@ export default function commonjs ( options = {} ) {
 			if ( extensions.indexOf( extname( id ) ) === -1 ) return null;
 
 			return entryModuleIdPromise.then( () => {
-				const transformed = transformCommonjs( code, id, id === entryModuleId, ignoreGlobal, customNamedExports[ id ], sourceMap );
+				const transformed = transformCommonjs( code, id, id === entryModuleId, ignoreGlobal, ignoreRequire, customNamedExports[ id ], sourceMap, allowDynamicRequire );
 
 				if ( transformed ) {
 					commonjsModules.set( id, true );

src/transform.js

@@ -38,7 +38,7 @@ function tryParse ( code, id ) {
 	}
 }
 
-export default function transformCommonjs ( code, id, isEntry, ignoreGlobal, customNamedExports, sourceMap ) {
+export default function transformCommonjs ( code, id, isEntry, ignoreGlobal, ignoreRequire, customNamedExports, sourceMap, allowDynamicRequire ) {
 	const firstpass = ignoreGlobal ? firstpassNoGlobal : firstpassGlobal;
 	if ( !firstpass.test( code ) ) return null;
 
@@ -140,15 +140,16 @@ export default function transformCommonjs ( code, id, isEntry, ignoreGlobal, cus
 			if ( node.type === 'Identifier' ) {
 				if ( isReference( node, parent ) && !scope.contains( node.name ) ) {
 					if ( node.name in uses ) {
+						if ( node.name === 'require' ) {
+							if ( allowDynamicRequire ) return;
+							magicString.overwrite( node.start, node.end, `${HELPERS_NAME}.commonjsRequire`, true );
+						}
+
 						uses[ node.name ] = true;
 						if ( node.name === 'global' && !ignoreGlobal ) {
 							magicString.overwrite( node.start, node.end, `${HELPERS_NAME}.commonjsGlobal`, true );
 						}
 
-						if ( node.name === 'require' ) {
-							magicString.overwrite( node.start, node.end, `${HELPERS_NAME}.commonjsRequire`, true );
-						}
-
 						// if module or exports are used outside the context of an assignment
 						// expression, we need to wrap the module
 						if ( node.name === 'module' || node.name === 'exports' ) {
@@ -175,6 +176,7 @@ export default function transformCommonjs ( code, id, isEntry, ignoreGlobal, cus
 			if ( node.type !== 'CallExpression' ) return;
 			if ( node.callee.name !== 'require' || scope.contains( 'require' ) ) return;
 			if ( node.arguments.length !== 1 || node.arguments[0].type !== 'Literal' ) return; // TODO handle these weird cases?
+			if ( ignoreRequire( node.arguments[0].value ) ) return;
 
 			const source = node.arguments[0].value;
 

test/form/ignore-ids-function/_config.js

@@ -0,0 +1,5 @@
+module.exports = {
+	options: {
+		ignore: id => id === 'foo'
+	}
+};

test/form/ignore-ids-function/input.js

@@ -0,0 +1,2 @@
+var foo = require( 'foo' );
+var bar = require( 'bar' );

test/form/ignore-ids-function/output.js

@@ -0,0 +1,12 @@
+import 'bar';
+import require$$0 from 'commonjs-proxy:bar';
+
+var foo = require( 'foo' );
+var bar = require$$0;
+
+var input = {
+
+};
+
+export default input;
+export { input as __moduleExports };

test/form/ignore-ids/_config.js

@@ -0,0 +1,5 @@
+module.exports = {
+	options: {
+		ignore: [ 'foo' ]
+	}
+};

test/form/ignore-ids/input.js

@@ -0,0 +1,2 @@
+var foo = require( 'foo' );
+var bar = require( 'bar' );

test/form/ignore-ids/output.js

@@ -0,0 +1,12 @@
+import 'bar';
+import require$$0 from 'commonjs-proxy:bar';
+
+var foo = require( 'foo' );
+var bar = require$$0;
+
+var input = {
+
+};
+
+export default input;
+export { input as __moduleExports };

test/test.js

@@ -56,9 +56,6 @@ function executeBundle ( bundle, { context, exports } = {} ) {
 
 describe( 'rollup-plugin-commonjs', () => {
 	describe( 'form', () => {
-		const { transform, options } = commonjs();
-		options({ entry: 'main.js' });
-
 		fs.readdirSync( 'form' ).forEach( dir => {
 			let config;
 
@@ -69,6 +66,9 @@ describe( 'rollup-plugin-commonjs', () => {
 			}
 
 			( config.solo ? it.only : it )( dir, () => {
+				const { transform, options } = commonjs( config.options );
+				options({ entry: 'main.js' });
+
 				const input = fs.readFileSync( `form/${dir}/input.js`, 'utf-8' );
 				const expected = fs.readFileSync( `form/${dir}/output.js`, 'utf-8' ).trim();