refactor(@angular/cli): use EnvironmentPlugin instead of DefinePlugin

Author: ishitatsuyuki

package.json

@@ -125,7 +125,7 @@
     "@types/rimraf": "0.0.28",
     "@types/semver": "^5.3.30",
     "@types/source-map": "^0.5.0",
-    "@types/webpack": "^2.2.4",
+    "@types/webpack": "^2.2.15",
     "chai": "^3.5.0",
     "conventional-changelog": "^1.1.0",
     "dtsgenerator": "^0.9.1",

packages/@angular/cli/models/webpack-configs/production.ts

@@ -82,8 +82,8 @@ export const getProdConfig = function (wco: WebpackConfigOptions) {
   return {
     entry: entryPoints,
     plugins: [
-      new webpack.DefinePlugin({
-        'process.env.NODE_ENV': JSON.stringify('production')
+      new webpack.EnvironmentPlugin({
+        'NODE_ENV': 'production'
       }),
       new (<any>webpack).HashedModuleIdsPlugin(),
       new webpack.optimize.UglifyJsPlugin(<any>{

packages/@angular/cli/tasks/eject.ts

@@ -126,8 +126,8 @@ class JsonWebpackSerializer {
     });
   }
 
-  _definePlugin(plugin: any) {
-    return plugin.definitions;
+  _environmentPlugin(plugin: any) {
+    return plugin.defaultValues;
   }
 
   private _pluginsReplacer(plugins: any[]) {
@@ -172,9 +172,9 @@ class JsonWebpackSerializer {
           args = this._htmlWebpackPlugin(plugin);
           this.variableImports['html-webpack-plugin'] = 'HtmlWebpackPlugin';
           break;
-        case webpack.DefinePlugin:
-          args = this._definePlugin(plugin);
-          this._addImport('webpack', 'DefinePlugin');
+        case webpack.EnvironmentPlugin:
+          args = this._environmentPlugin(plugin);
+          this._addImport('webpack', 'EnvironmentPlugin');
           break;
 
         default:

yarn.lock

@@ -138,9 +138,9 @@
   dependencies:
     "@types/source-map" "*"
 
-"@types/webpack@^2.2.4":
-  version "2.2.12"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-2.2.12.tgz#5e2ab82b5b43cfadcb308d3210c082cf67fd9893"
+"@types/webpack@^2.2.15":
+  version "2.2.15"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-2.2.15.tgz#4ad7e9b7a51cae736a1dc783f203610c884789ff"
   dependencies:
     "@types/node" "*"
     "@types/tapable" "*"