throw helpful error if code or map are accessed from bundle.generate …

…promise
rollup · Jul 10, 2017 · 328a8fa · 328a8fa
1 parent 1be3478
commit 328a8fa
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 13 deletions.
diff --git a/src/rollup.js b/src/rollup.js
@@ -76,6 +76,12 @@ function checkOptions ( options ) {
 	if ( err ) throw err;
 }
 
+const throwAsyncGenerateError = {
+	get () {
+		throw new Error( `bundle.generate(...) now returns a Promise instead of a { code, map } object` );
+	}
+};
+
 export function rollup ( options ) {
 	try {
 		checkOptions( options );
@@ -101,23 +107,28 @@ export function rollup ( options ) {
 
 				timeStart( '--GENERATE--' );
 
-				return Promise.resolve().then( () => {
-					return bundle.render( options );
-				}).then( rendered => {
-					timeEnd( '--GENERATE--' );
+				const promise = Promise.resolve()
+					.then( () => bundle.render( options ) )
+					.then( rendered => {
+						timeEnd( '--GENERATE--' );
 
-					bundle.plugins.forEach( plugin => {
-						if ( plugin.ongenerate ) {
-							plugin.ongenerate( assign({
-								bundle: result
-							}, options ), rendered);
-						}
+						bundle.plugins.forEach( plugin => {
+							if ( plugin.ongenerate ) {
+								plugin.ongenerate( assign({
+									bundle: result
+								}, options ), rendered);
+							}
+						});
+
+						flushTime();
+
+						return rendered;
 					});
 
-					flushTime();
+				Object.defineProperty( promise, 'code', throwAsyncGenerateError );
+				Object.defineProperty( promise, 'map', throwAsyncGenerateError );
 
-					return rendered;
-				});
+				return promise;
 			}
 
 			const result = {

diff --git a/test/test.js b/test/test.js
@@ -180,6 +180,27 @@ describe( 'rollup', function () {
 		});
 	});
 
+	describe( 'deprecations', () => {
+		it( 'throws a useful error on accessing code/map properties of bundle.generate promise', () => {
+			return rollup.rollup({
+				entry: 'x',
+				plugins: [ loader({ x: `console.log( 42 );` }) ]
+			}).then( bundle => {
+				let errored = false;
+
+				try {
+					const { code, map } = bundle.generate({ format: 'es' });
+					console.log( code, map );
+				} catch ( err ) {
+					assert.equal( err.message, `bundle.generate(...) now returns a Promise instead of a { code, map } object` );
+					errored = true;
+				}
+
+				assert.ok( errored );
+			});
+		});
+	});
+
 	describe( 'bundle.write()', () => {
 		it( 'fails without options or options.dest', () => {
 			return rollup.rollup({