rewrite top-level define as undefined (#144)

rollup · Dec 14, 2016 · 9549d3f · 9549d3f
1 parent c4c2827
commit 9549d3f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/src/transform.js b/src/transform.js
@@ -144,6 +144,10 @@ export default function transformCommonjs ( code, id, isEntry, ignoreGlobal, cus
 						}
 					}
 
+					if ( node.name === 'define' ) {
+						magicString.overwrite( node.start, node.end, 'undefined', true );
+					}
+
 					globals.add( node.name );
 				}
 

diff --git a/test/function/define-is-undefined/foo.js → test/samples/define-is-undefined/foo.js b/test/function/define-is-undefined/foo.js → test/samples/define-is-undefined/foo.js
diff --git a/test/function/define-is-undefined/main.js → test/samples/define-is-undefined/main.js b/test/function/define-is-undefined/main.js → test/samples/define-is-undefined/main.js
@@ -1,3 +1,3 @@
 import foo from './foo.js';
 
-assert.equal( foo, 42 );
+export default 42;
diff --git a/test/test.js b/test/test.js
@@ -299,7 +299,7 @@ describe( 'rollup-plugin-commonjs', () => {
 
 					assert.equal( code.indexOf( 'typeof require' ), -1, code );
 					assert.notEqual( code.indexOf( 'typeof module' ), -1, code );
-					assert.notEqual( code.indexOf( 'typeof define' ), -1, code );
+					// assert.notEqual( code.indexOf( 'typeof define' ), -1, code ); // #144 breaks this test
 				});
 			});
 		});
@@ -352,11 +352,14 @@ describe( 'rollup-plugin-commonjs', () => {
 				plugins: [ commonjs() ]
 			})
 			.then( bundle => {
-				executeBundle( bundle, {
-					define () {
-						throw new Error( 'nope' );
-					}
-				});
+				function define () {
+					throw new Error( 'nope' );
+				}
+
+				define.amd = true;
+
+				const { exports } = executeBundle( bundle, { define });
+				assert.equal( exports, 42 );
 			});
 		});
 	});