sobotsofware
diff --git a/‎templates/Angular2Spa/package.json‎
Lines changed: 0 additions & 1 deletion b/‎templates/Angular2Spa/package.json‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎templates/Angular2Spa/webpack.config.dev.js‎
Lines changed: 0 additions & 3 deletions b/‎templates/Angular2Spa/webpack.config.dev.js‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎templates/Angular2Spa/webpack.config.js‎
Lines changed: 12 additions & 13 deletions b/‎templates/Angular2Spa/webpack.config.js‎
Lines changed: 12 additions & 13 deletions
diff --git a/‎templates/Angular2Spa/webpack.config.prod.js‎
Lines changed: 0 additions & 12 deletions b/‎templates/Angular2Spa/webpack.config.prod.js‎
Lines changed: 0 additions & 12 deletions
diff --git a/‎templates/Angular2Spa/webpack.config.vendor.js‎
Lines changed: 1 addition & 5 deletions b/‎templates/Angular2Spa/webpack.config.vendor.js‎
Lines changed: 1 addition & 5 deletions
@@ -34,7 +34,6 @@
     "css-loader": "^0.25.0",
     "es6-shim": "^0.35.1",
     "expose-loader": "^0.7.1",
-    "extendify": "^1.0.0",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.9.0",
     "isomorphic-fetch": "^2.2.1",
 
@@ -1,26 +1,21 @@
 var path = require('path');
 var webpack = require('webpack');
-var merge = require('extendify')({ isDeep: true, arrays: 'concat' });
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
+
+var isDevBuild = process.env.ASPNETCORE_ENVIRONMENT === 'Development';
 var extractCSS = new ExtractTextPlugin('styles.css');
-var devConfig = require('./webpack.config.dev');
-var prodConfig = require('./webpack.config.prod');
-var isDevelopment = process.env.ASPNETCORE_ENVIRONMENT === 'Development';
 
-module.exports = merge({
-    resolve: {
-        extensions: [ '', '.js', '.ts' ]
-    },
+module.exports = {
+    devtool: isDevBuild ? 'inline-source-map' : null,
+    resolve: { extensions: [ '', '.js', '.ts' ] },
+    entry: { main: ['./ClientApp/boot-client.ts'] },
     module: {
         loaders: [
             { test: /\.ts$/, include: /ClientApp/, loader: 'ts-loader?silent=true' },
             { test: /\.html$/, loader: 'raw-loader' },
             { test: /\.css/, loader: extractCSS.extract(['css']) }
         ]
     },
-    entry: {
-        main: ['./ClientApp/boot-client.ts']
-    },
     output: {
         path: path.join(__dirname, 'wwwroot', 'dist'),
         filename: '[name].js',
@@ -32,5 +27,9 @@ module.exports = merge({
             context: __dirname,
             manifest: require('./wwwroot/dist/vendor-manifest.json')
         })
-    ]
-}, isDevelopment ? devConfig : prodConfig);
+    ].concat(isDevBuild ? [] : [
+        // Plugins that apply in production builds only
+        new webpack.optimize.OccurenceOrderPlugin(),
+        new webpack.optimize.UglifyJsPlugin()
+    ])
+};
@@ -49,10 +49,6 @@ module.exports = {
             name: '[name]_[hash]'
         })
     ].concat(isDevelopment ? [] : [
-        new webpack.optimize.UglifyJsPlugin({
-            compress: { warnings: false },
-            minimize: true,
-            mangle: false // Due to https://github.com/angular/angular/issues/6678
-        })
+        new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } })
     ])
 };