Do not accumulate change listeners in watch mode (#2441)

* Do not accumulate change listeners in watch mode * preserve change listeners (#2443)
rollup · Sep 5, 2018 · 5c86099 · 5c86099
1 parent 0258c70
commit 5c86099
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 6 deletions.
diff --git a/src/Graph.ts b/src/Graph.ts
@@ -137,7 +137,13 @@ export default class Graph {
 
 		this.pluginDriver = createPluginDriver(this, options, this.pluginCache, watcher);
 
-		if (watcher) watcher.on('change', id => this.pluginDriver.hookSeqSync('watchChange', [id]));
+		if (watcher) {
+			const handleChange = (id: string) => this.pluginDriver.hookSeqSync('watchChange', [id]);
+			watcher.on('change', handleChange);
+			watcher.once('restart', () => {
+				watcher.removeListener('change', handleChange);
+			});
+		}
 
 		if (typeof options.external === 'function') {
 			const external = options.external;

diff --git a/src/watch/index.ts b/src/watch/index.ts
@@ -24,6 +24,7 @@ export class Watcher extends EventEmitter {
 	private rerun: boolean = false;
 	private tasks: Task[];
 	private succeeded: boolean = false;
+	private invalidatedIds: Set<string> = new Set();
 
 	constructor(configs: RollupWatchOptions[] = []) {
 		super();
@@ -42,7 +43,10 @@ export class Watcher extends EventEmitter {
 		this.removeAllListeners();
 	}
 
-	invalidate() {
+	invalidate(id?: string) {
+		if (id) {
+			this.invalidatedIds.add(id);
+		}
 		if (this.running) {
 			this.rerun = true;
 			return;
@@ -52,6 +56,9 @@ export class Watcher extends EventEmitter {
 
 		this.buildTimeout = setTimeout(() => {
 			this.buildTimeout = undefined;
+			this.invalidatedIds.forEach(id => this.emit('change', id));
+			this.invalidatedIds.clear();
+			this.emit('restart');
 			this.run();
 		}, DELAY);
 	}
@@ -156,7 +163,6 @@ export class Task {
 	}
 
 	invalidate(id: string, isTransformDependency: boolean) {
-		this.watcher.emit('change', id);
 		this.invalidated = true;
 		if (isTransformDependency) {
 			this.cache.modules.forEach(module => {
@@ -166,7 +172,7 @@ export class Task {
 				module.originalCode = null;
 			});
 		}
-		this.watcher.invalidate();
+		this.watcher.invalidate(id);
 	}
 
 	run() {

diff --git a/test/watch/index.js b/test/watch/index.js
@@ -105,7 +105,7 @@ describe('rollup.watch', () => {
 				});
 		});
 
-		it('passes file events to the watchChange plugin hook', () => {
+		it('passes file events to the watchChange plugin hook once for each change', () => {
 			let watchChangeCnt = 0;
 			return sander
 				.copydir('test/watch/samples/basic')
@@ -144,7 +144,25 @@ describe('rollup.watch', () => {
 						'END',
 						() => {
 							assert.equal(run('../_tmp/output/bundle.js'), 43);
-							assert.ok(watchChangeCnt >= 1);
+							assert.equal(watchChangeCnt, 1);
+							sander.writeFileSync('test/_tmp/input/main.js', 'export default 43;');
+						},
+						'START',
+						'BUNDLE_START',
+						'BUNDLE_END',
+						'END',
+						() => {
+							assert.equal(run('../_tmp/output/bundle.js'), 43);
+							assert.equal(watchChangeCnt, 2);
+							sander.writeFileSync('test/_tmp/input/main.js', 'export default 43;');
+						},
+						'START',
+						'BUNDLE_START',
+						'BUNDLE_END',
+						'END',
+						() => {
+							assert.equal(run('../_tmp/output/bundle.js'), 43);
+							assert.equal(watchChangeCnt, 3);
 						}
 					]);
 				});