From cc4fec10312bc6951da6925c2f482341bc87fa45 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 8 Feb 2017 14:39:18 -0800
Subject: [PATCH] fix(@ngtools/webpack): invalidate all the files changed

Webpack only passes the first file that was changed. If there are multiple,
we need to validate all of them. For that we result to listening to Watchpack
directly.
---
 packages/@ngtools/webpack/src/plugin.ts |  6 +++--
 tests/e2e/tests/build/rebuild.ts        | 30 ++++++++++++++++++++++++-
 tests/e2e/utils/fs.ts                   |  7 ++----
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/packages/@ngtools/webpack/src/plugin.ts b/packages/@ngtools/webpack/src/plugin.ts
index 1b2543fc4fa5..249f61326376 100644
--- a/packages/@ngtools/webpack/src/plugin.ts
+++ b/packages/@ngtools/webpack/src/plugin.ts
@@ -237,12 +237,14 @@ export class AotPlugin implements Tapable {
   apply(compiler: any) {
     this._compiler = compiler;
 
-    compiler.plugin('invalid', (fileName: string) => {
+    compiler.plugin('invalid', () => {
       // Turn this off as soon as a file becomes invalid and we're about to start a rebuild.
       this._firstRun = false;
       this._diagnoseFiles = {};
 
-      this._compilerHost.invalidate(fileName);
+      compiler.watchFileSystem.watcher.once('aggregated', (changes: string[]) => {
+        changes.forEach((fileName: string) => this._compilerHost.invalidate(fileName));
+      });
     });
 
     // Add lazy modules to the context module for @angular/core/src/linker
diff --git a/tests/e2e/tests/build/rebuild.ts b/tests/e2e/tests/build/rebuild.ts
index 2dfb24bf6c43..686e673940c5 100644
--- a/tests/e2e/tests/build/rebuild.ts
+++ b/tests/e2e/tests/build/rebuild.ts
@@ -5,8 +5,9 @@ import {
   silentExecAndWaitForOutputToMatch,
   ng,
 } from '../../utils/process';
-import {writeFile} from '../../utils/fs';
+import {writeFile, writeMultipleFiles, appendToFile, expectFileToMatch} from '../../utils/fs';
 import {wait} from '../../utils/utils';
+import {request} from '../../utils/http';
 
 
 export default function() {
@@ -69,6 +70,33 @@ export default function() {
         throw new Error('Expected webpack to create a new chunk, but did not.');
       }
     })
+    .then(() => wait(1000))
+    // Change multiple files and check that all of them are invalidated and recompiled.
+    .then(() => writeMultipleFiles({
+      'src/app/app.module.ts': `
+        console.log('$$_E2E_GOLDEN_VALUE_1');
+        export let X = '$$_E2E_GOLDEN_VALUE_2';
+      `,
+      'src/main.ts': `
+        import * as m from './app/app.module';
+        console.log(m.X);
+        console.log('$$_E2E_GOLDEN_VALUE_3');
+      `
+    }))
+    .then(() => waitForAnyProcessOutputToMatch(
+      /webpack: bundle is now VALID|webpack: Compiled successfully./, 10000))
+    .then(() => request('http://localhost:4200/main.bundle.js'))
+    .then((body) => {
+      if (!body.match(/\$\$_E2E_GOLDEN_VALUE_1/)) {
+        throw new Error('Expected golden value 1.');
+      }
+      if (!body.match(/\$\$_E2E_GOLDEN_VALUE_2/)) {
+        throw new Error('Expected golden value 2.');
+      }
+      if (!body.match(/\$\$_E2E_GOLDEN_VALUE_3/)) {
+        throw new Error('Expected golden value 3.');
+      }
+    })
     .then(() => killAllProcesses(), (err: any) => {
       killAllProcesses();
       throw err;
diff --git a/tests/e2e/utils/fs.ts b/tests/e2e/utils/fs.ts
index fa53ad0725a7..5740c3d28202 100644
--- a/tests/e2e/utils/fs.ts
+++ b/tests/e2e/utils/fs.ts
@@ -82,11 +82,8 @@ export function copyFile(from: string, to: string) {
 }
 
 
-export function writeMultipleFiles(fs: any) {
-  return Object.keys(fs)
-    .reduce((previous, curr) => {
-      return previous.then(() => writeFile(curr, fs[curr]));
-    }, Promise.resolve());
+export function writeMultipleFiles(fs: { [path: string]: string }) {
+  return Promise.all(Object.keys(fs).map(fileName => writeFile(fileName, fs[fileName])));
 }