Merge branch 'cjs-transform-ordering-fix'

CHANGELOG.md

@@ -1,5 +1,9 @@
 # rollup-plugin-commonjs changelog
 
+## 9.1.1
+*2018-04-30*
+* Fix ordering of modules when using rollup 0.58 ([#302](https://github.com/rollup/rollup-plugin-commonjs/issues/302))
+
 ## 9.1.0
 
 * Do not automatically wrap modules with return statements in top level arrow functions ([#302](https://github.com/rollup/rollup-plugin-commonjs/issues/302))

package.json

@@ -35,7 +35,7 @@
     "locate-character": "^2.0.5",
     "mocha": "^5.0.1",
     "require-relative": "^0.8.7",
-    "rollup": "^0.56.4",
+    "rollup": "^0.57.0",
     "rollup-plugin-buble": "^0.19.2",
     "rollup-plugin-node-resolve": "^3.0.3",
     "shx": "^0.2.2",

src/index.js

@@ -93,9 +93,32 @@ export default function commonjs ( options = {} ) {
 
 	const sourceMap = options.sourceMap !== false;
 
-	const commonjsModules = new Map();
 	let resolveUsingOtherResolvers;
 
+	const isCjsPromises = Object.create(null);
+	function getIsCjsPromise ( id ) {
+		let isCjsPromise = isCjsPromises[id];
+		if (isCjsPromise)
+			return isCjsPromise.promise;
+
+		let promise = new Promise( resolve => {
+			isCjsPromises[id] = isCjsPromise = {
+				resolve: resolve,
+				promise: undefined
+			};
+		});
+		isCjsPromise.promise = promise;
+
+		return promise;
+	}
+	function setIsCjsPromise ( id, promise ) {
+		let isCjsPromise = isCjsPromises[id];
+		if (isCjsPromise)
+			isCjsPromise.resolve(promise);
+		else
+			isCjsPromises[id] = { promise: promise, resolve: undefined };
+	}
+
 	return {
 		name: 'commonjs',
 
@@ -155,20 +178,23 @@ export default function commonjs ( options = {} ) {
 				const actualId = id.slice( PREFIX.length );
 				const name = getName( actualId );
 
-				if (commonjsModules.has( actualId ))
-					return `import { __moduleExports } from ${JSON.stringify( actualId )}; export default __moduleExports;`;
-				else if (esModulesWithoutDefaultExport.indexOf(actualId) !== -1)
-					return `import * as ${name} from ${JSON.stringify( actualId )}; export default ${name};`;
-				else
-					return `import * as ${name} from ${JSON.stringify( actualId )}; export default ( ${name} && ${name}['default'] ) || ${name};`;
+				return getIsCjsPromise( actualId )
+				.then( isCjs => {
+					if ( isCjs )
+						return `import { __moduleExports } from ${JSON.stringify( actualId )}; export default __moduleExports;`;
+					else if (esModulesWithoutDefaultExport.indexOf(actualId) !== -1)
+						return `import * as ${name} from ${JSON.stringify( actualId )}; export default ${name};`;
+					else
+						return `import * as ${name} from ${JSON.stringify( actualId )}; export default ( ${name} && ${name}['default'] ) || ${name};`;
+				});
 			}
 		},
 
 		transform ( code, id ) {
 			if ( !filter( id ) ) return null;
 			if ( extensions.indexOf( extname( id ) ) === -1 ) return null;
 
-			return entryModuleIdsPromise.then( (entryModuleIds) => {
+			const transformPromise = entryModuleIdsPromise.then( (entryModuleIds) => {
 				const {isEsModule, hasDefaultExport, ast} = checkEsModule( this.parse, code, id );
 				if ( isEsModule ) {
 					if ( !hasDefaultExport )
@@ -188,11 +214,14 @@ export default function commonjs ( options = {} ) {
 					return;
 				}
 
-				commonjsModules.set( id, true );
 				return transformed;
 			}).catch(err => {
 				this.error(err, err.loc);
 			});
+
+			setIsCjsPromise(id, transformPromise.then( transformed => transformed ? true : false, err => true ));
+
+			return transformPromise;
 		}
 	};
 }