fix up successive build handling

rollup · Apr 30, 2018 · c95b06b · c95b06b
1 parent 95b5f70
commit c95b06b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
@@ -114,7 +114,7 @@ export default function commonjs ( options = {} ) {
 	function setIsCjsPromise ( id, promise ) {
 		const isCjsPromise = isCjsPromises[id];
 		if (isCjsPromise) {
-			if (!isCjsPromise.resolve) {
+			if (isCjsPromise.resolve) {
 				isCjsPromise.resolve(promise);
 				isCjsPromise.resolve = undefined;
 			}

diff --git a/test/test.js b/test/test.js
@@ -238,6 +238,32 @@ describe( 'rollup-plugin-commonjs', () => {
 			assert.equal( module.exports, 'foobar', generated.code );
 		});
 
+		it( 'handles successive builds', async () => {
+			const plugin = commonjs()
+			let bundle = await rollup({
+				input: 'samples/corejs/literal-with-default.js',
+				plugins: [ plugin ]
+			});
+			await bundle.generate({
+				format: 'cjs'
+			});
+
+			bundle = await rollup({
+				input: 'samples/corejs/literal-with-default.js',
+				plugins: [ plugin ]
+			});
+			const generated = await bundle.generate({
+				format: 'cjs'
+			});
+
+			const module = { exports: {} };
+
+			const fn = new Function ( 'module', 'exports', generated.code );
+			fn( module, module.exports );
+
+			assert.equal( module.exports, 'foobar', generated.code );
+		});
+
 		it( 'allows named exports to be added explicitly via config', async () => {
 			const bundle = await rollup({
 				input: 'samples/custom-named-exports/main.js',