chore(webpack): upgrade webpack to RC 3. (angular#3786)

hansl · web-flow · commit defc26935cad · 2016-12-29T21:12:38.000-08:00
Need to use before-resolve until webpack/webpack#3641 is fixed. Fixes angular#3581 Fixes angular#3660
diff --git a/package.json b/package.json
@@ -115,7 +115,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@`
`37`	`37`	`"@angular/tsc-wrapped": "^0.5.0",`
`38`	`38`	`"typescript": "^2.0.2",`
`39`	`39`	`"reflect-metadata": "^0.1.8",`
`40`		`- "webpack": "^2.1.0-beta.25"`
	`40`	`+ "webpack": "2.2.0-rc.3"`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@`
`22`	`22`	`"raw-loader": "^0.5.1",`
`23`	`23`	`"sass-loader": "^3.2.0",`
`24`	`24`	`"typescript": "~2.0.3",`
`25`		`- "webpack": "2.1.0-beta.22"`
	`25`	`+ "webpack": "2.2.0-rc.3"`
`26`	`26`	`}`
`27`	`27`	`}`