From 1b7bb045057f5b36f1211fcfe4da5ead5b42cd4e Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 29 Dec 2016 16:52:03 -0800
Subject: [PATCH] chore(webpack): upgrade webpack to RC 3.

Need to use before-resolve until https://github.com/webpack/webpack/issues/3641 is fixed.
---
 package.json                                  |  2 +-
 packages/@ngtools/webpack/package.json        |  2 +-
 packages/@ngtools/webpack/src/plugin.ts       | 26 ++++++++++---------
 packages/angular-cli/package.json             |  2 +-
 .../webpack/test-app-weird/package.json       |  2 +-
 .../e2e/assets/webpack/test-app/package.json  |  2 +-
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index ff3afddc2e42..e8b30c96f93e 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
     "typescript": "~2.0.3",
     "url-loader": "^0.5.7",
     "walk-sync": "^0.2.6",
-    "webpack": "2.1.0-beta.25",
+    "webpack": "2.2.0-rc.3",
     "webpack-dev-server": "2.1.0-beta.9",
     "webpack-merge": "^0.14.0",
     "webpack-sources": "^0.1.3",
diff --git a/packages/@ngtools/webpack/package.json b/packages/@ngtools/webpack/package.json
index ff47bf556c1f..5de8debadece 100644
--- a/packages/@ngtools/webpack/package.json
+++ b/packages/@ngtools/webpack/package.json
@@ -37,6 +37,6 @@
     "@angular/tsc-wrapped": "^0.5.0",
     "typescript": "^2.0.2",
     "reflect-metadata": "^0.1.8",
-    "webpack": "^2.1.0-beta.25"
+    "webpack": "2.2.0-rc.3"
   }
 }
diff --git a/packages/@ngtools/webpack/src/plugin.ts b/packages/@ngtools/webpack/src/plugin.ts
index b01e8f910163..939efd0e4017 100644
--- a/packages/@ngtools/webpack/src/plugin.ts
+++ b/packages/@ngtools/webpack/src/plugin.ts
@@ -228,19 +228,21 @@ export class AotPlugin implements Tapable {
       cb();
     });
 
-    // Virtual file system.
-    compiler.resolvers.normal.plugin('resolve', (request: any, cb?: (err?: any) => void) => {
-      if (request.request.match(/\.ts$/)) {
-        this.done.then(() => cb(), () => cb());
-      } else {
-        cb();
-      }
+    compiler.plugin('after-resolvers', (compiler: any) => {
+      // Virtual file system.
+      compiler.resolvers.normal.plugin('before-resolve', (request: any, cb: () => void) => {
+        if (request.request.match(/\.ts$/)) {
+          this.done.then(() => cb(), () => cb());
+        } else {
+          cb();
+        }
+      });
+      compiler.resolvers.normal.apply(new PathsPlugin({
+        tsConfigPath: this._tsConfigPath,
+        compilerOptions: this._compilerOptions,
+        compilerHost: this._compilerHost
+      }));
     });
-    compiler.resolvers.normal.apply(new PathsPlugin({
-      tsConfigPath: this._tsConfigPath,
-      compilerOptions: this._compilerOptions,
-      compilerHost: this._compilerHost
-    }));
   }
 
   private _make(compilation: any, cb: (err?: any, request?: any) => void) {
diff --git a/packages/angular-cli/package.json b/packages/angular-cli/package.json
index 7ac4355e9dba..c8a0d31fa6cd 100644
--- a/packages/angular-cli/package.json
+++ b/packages/angular-cli/package.json
@@ -95,7 +95,7 @@
     "typescript": "~2.0.3",
     "url-loader": "^0.5.7",
     "walk-sync": "^0.2.6",
-    "webpack": "2.1.0-beta.25",
+    "webpack": "2.2.0-rc.3",
     "webpack-dev-server": "2.1.0-beta.9",
     "webpack-merge": "^0.14.0",
     "webpack-sources": "^0.1.3",
diff --git a/tests/e2e/assets/webpack/test-app-weird/package.json b/tests/e2e/assets/webpack/test-app-weird/package.json
index 0eb1cb4056f9..ad983eeb45fa 100644
--- a/tests/e2e/assets/webpack/test-app-weird/package.json
+++ b/tests/e2e/assets/webpack/test-app-weird/package.json
@@ -22,6 +22,6 @@
     "raw-loader": "^0.5.1",
     "sass-loader": "^3.2.0",
     "typescript": "~2.0.3",
-    "webpack": "2.1.0-beta.22"
+    "webpack": "2.2.0-rc.3"
   }
 }
diff --git a/tests/e2e/assets/webpack/test-app/package.json b/tests/e2e/assets/webpack/test-app/package.json
index 511a03bdcc2d..ad983eeb45fa 100644
--- a/tests/e2e/assets/webpack/test-app/package.json
+++ b/tests/e2e/assets/webpack/test-app/package.json
@@ -22,6 +22,6 @@
     "raw-loader": "^0.5.1",
     "sass-loader": "^3.2.0",
     "typescript": "~2.0.3",
-    "webpack": "2.1.0-beta.25"
+    "webpack": "2.2.0-rc.3"
   }
 }