Add support for experimentalCodeSplitting from Rollup 0.55.0

package.json

@@ -32,7 +32,7 @@
     "locate-character": "^2.0.1",
     "mocha": "^4.0.1",
     "require-relative": "^0.8.7",
-    "rollup": "^0.50.0",
+    "rollup": "^0.55.0",
     "rollup-plugin-buble": "^0.16.0",
     "rollup-plugin-node-resolve": "^3.0.0",
     "shx": "^0.2.2",

src/index.js

@@ -67,8 +67,8 @@ export default function commonjs ( options = {} ) {
 		Array.isArray( options.ignore ) ? id => ~options.ignore.indexOf( id ) :
 			() => false;
 
-	let entryModuleIdPromise = null;
-	let entryModuleId = null;
+	let entryModuleIdsPromise = null;
+	const entryModuleIds = [];
 
 	function resolveId ( importee, importer ) {
 		if ( importee === HELPERS_ID ) return importee;
@@ -133,9 +133,14 @@ export default function commonjs ( options = {} ) {
 
 			resolveUsingOtherResolvers = first( resolvers );
 
-			entryModuleIdPromise = resolveId( options.input || options.entry ).then( resolved => {
-				entryModuleId = resolved;
-			});
+			const entryModules = [].concat( options.input || options.entry );
+			entryModuleIdsPromise = Promise.all(
+				entryModules.map( entry =>
+					resolveId( entry ).then( resolved => {
+						entryModuleIds.push( resolved );
+					})
+				)
+			);
 		},
 
 		resolveId,
@@ -168,7 +173,7 @@ export default function commonjs ( options = {} ) {
 			if ( !filter( id ) ) return null;
 			if ( extensions.indexOf( extname( id ) ) === -1 ) return null;
 
-			return entryModuleIdPromise.then( () => {
+			return entryModuleIdsPromise.then( () => {
 				const {isEsModule, hasDefaultExport, ast} = checkEsModule( code, id );
 				if ( isEsModule ) {
 					if ( !hasDefaultExport )
@@ -182,7 +187,7 @@ export default function commonjs ( options = {} ) {
 					return;
 				}
 
-				const transformed = transformCommonjs( code, id, id === entryModuleId, ignoreGlobal, ignoreRequire, customNamedExports[ id ], sourceMap, allowDynamicRequire, ast );
+				const transformed = transformCommonjs( code, id, entryModuleIds.indexOf(id) !== -1, ignoreGlobal, ignoreRequire, customNamedExports[ id ], sourceMap, allowDynamicRequire, ast );
 				if ( !transformed ) return;
 
 				commonjsModules.set( id, true );

test/samples/multiple-entry-points/2.js

@@ -0,0 +1,4 @@
+function second () {
+	console.log('second');
+}
+exports.second = second;

test/samples/multiple-entry-points/3.js

@@ -0,0 +1,5 @@
+function third () {
+	console.log('third');
+}
+
+exports.third = third;

test/samples/multiple-entry-points/4.js

@@ -0,0 +1,3 @@
+export function fourth () {
+	console.log('fourth');
+}

test/samples/multiple-entry-points/b.js

@@ -0,0 +1,5 @@
+import { second } from './2';
+import { third } from './3';
+
+second();
+third();

test/samples/multiple-entry-points/c.js

@@ -0,0 +1,7 @@
+import { second } from './2';
+import { third } from './3';
+import { fourth } from './4';
+
+second();
+third();
+fourth();

test/test.js

@@ -130,17 +130,36 @@ describe( 'rollup-plugin-commonjs', () => {
 
 			let generatedLoc = locator( '42' );
 			let loc = smc.originalPositionFor( generatedLoc ); // 42
-			assert.equal( loc.source, 'samples/sourcemap/foo.js' );
+			assert.equal( loc.source, 'foo.js' );
 			assert.equal( loc.line, 1 );
 			assert.equal( loc.column, 15 );
 
 			generatedLoc = locator( 'log' );
 			loc = smc.originalPositionFor( generatedLoc ); // log
-			assert.equal( loc.source, 'samples/sourcemap/main.js' );
+			assert.equal( loc.source, 'main.js' );
 			assert.equal( loc.line, 2 );
 			assert.equal( loc.column, 8 );
 		});
 
+		it( 'supports multiple entry points for experimentalCodeSplitting', async () => {
+			const bundle = await rollup({
+				input: [
+					'samples/multiple-entry-points/b.js',
+					'samples/multiple-entry-points/c.js'
+				],
+				experimentalCodeSplitting: true,
+				plugins: [ commonjs() ]
+			});
+
+			const generated = await bundle.generate({
+				format: 'cjs',
+			});
+
+			assert.equal(Object.keys(generated).length, 3);
+			assert.equal(generated.hasOwnProperty('./b.js'), true);
+			assert.equal(generated.hasOwnProperty('./c.js'), true);
+		});
+
 		it( 'handles references to `global`', async () => {
 			const bundle = await rollup({
 				input: 'samples/global/main.js',