Merge pull request #1337 from krisselden/fix-cache-loader-sourcemaps

Fix cache losing originalSourceMap for loaders with sourcemaps
rollup · Mar 16, 2017 · 7c8c6ba · 7c8c6ba
2 parents ae9eb5c + d94d8c2
commit 7c8c6ba
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Module.js b/src/Module.js
@@ -373,6 +373,7 @@ export default class Module {
 			dependencies: this.dependencies.map( module => module.id ),
 			code: this.code,
 			originalCode: this.originalCode,
+			originalSourceMap: this.originalSourceMap,
 			ast: this.astClone,
 			sourceMapChain: this.sourceMapChain,
 			resolvedIds: this.resolvedIds

diff --git a/test/test.js b/test/test.js
@@ -454,7 +454,7 @@ describe( 'rollup', function () {
 						process.chdir( SOURCEMAPS + '/' + dir );
 						warnings = [];
 
-						return rollup.rollup( options ).then( bundle => {
+						const testBundle = (bundle) => {
 							const options = extend( {}, {
 								format: profile.format,
 								sourceMap: true,
@@ -473,6 +473,18 @@ describe( 'rollup', function () {
 							} else if ( warnings.length ) {
 								throw new Error( `Unexpected warnings` );
 							}
+						};
+
+						return rollup.rollup( options ).then(bundle => {
+							testBundle(bundle);
+							// cache rebuild does not reemit warnings.
+							if ( config.warnings ) {
+								return;
+							}
+							// test cache noop rebuild
+							return rollup.rollup( extend({ cache: bundle }, options) ).then(bundle => {
+								testBundle(bundle);
+							});
 						});
 					});
 				});