Fix webpack config for angular 2.3.1

Author: hdeshev

tsconfig.aot.json

@@ -16,6 +16,7 @@
       "platforms"
   ],
   "angularCompilerOptions": {
-    "skipMetadataEmit": true
+    "skipMetadataEmit": true,
+    "genDir": "./"
   }
 }

webpack.common.js

@@ -1,12 +1,10 @@
 var webpack = require("webpack");
 var nsWebpack = require("nativescript-dev-webpack");
+var nativescriptTarget = require("nativescript-dev-webpack/nativescript-target");
 var path = require("path");
 var CopyWebpackPlugin = require("copy-webpack-plugin");
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
-var path = require("path");
-var AotPlugin = require('@ngtools/webpack').AotPlugin;
-
-var nativescriptTarget = require('nativescript-dev-webpack/nativescript-target');
+var AotPlugin = require("@ngtools/webpack").AotPlugin;
 
 module.exports = function (platform, destinationApp) {
     if (!destinationApp) {
@@ -21,6 +19,51 @@ module.exports = function (platform, destinationApp) {
     //app.css bundle
     entry["app.css"] = "./app.css";
 
+    var plugins = [
+        new ExtractTextPlugin("app.css"),
+        //Vendor libs go to the vendor.js chunk
+        new webpack.optimize.CommonsChunkPlugin({
+            name: ["vendor"]
+        }),
+        //Define useful constants like TNS_WEBPACK
+        new webpack.DefinePlugin({
+            global: "global",
+            __dirname: "__dirname",
+            "global.TNS_WEBPACK": "true",
+        }),
+        //Copy assets to out dir. Add your own globs as needed.
+        new CopyWebpackPlugin([
+            { from: "app.css" },
+            { from: "css/**" },
+            { from: "fonts/**" },
+            { from: "**/*.jpg" },
+            { from: "**/*.png" },
+            { from: "**/*.xml" },
+        ], { ignore: ["App_Resources/**"] }),
+        //Generate a bundle starter script and activate it in package.json
+        new nsWebpack.GenerateBundleStarterPlugin([
+            "./vendor",
+            "./bundle",
+        ]),
+        //Angular AOT compiler
+        new AotPlugin({
+            tsConfigPath: "tsconfig.aot.json",
+            entryModule: path.resolve(__dirname, "app/app.module#AppModule"),
+            typeChecking: false
+        }),
+    ];
+
+    if (process.env.npm_config_uglify) {
+        //Work around an Android issue by setting compress = false
+        var compress = platform !== "android";
+        plugins.push(new webpack.optimize.UglifyJsPlugin({
+            mangle: {
+                except: nsWebpack.uglifyMangleExcludes,
+            },
+            compress: compress,
+        }));
+    }
+
     return {
         context: path.resolve("./app"),
         target: nativescriptTarget,
@@ -48,11 +91,6 @@ module.exports = function (platform, destinationApp) {
                 "node_modules"
             ]
         },
-        resolveLoader: {
-            alias: {
-                "raw": path.join(__dirname, "node_modules/raw-loader"),
-            }
-        },
         node: {
             //Disable node shims that conflict with NativeScript
             "http": false,
@@ -63,7 +101,7 @@ module.exports = function (platform, destinationApp) {
             loaders: [
                 {
                     test: /\.html$/,
-                    loader: "raw"
+                    loader: "raw-loader"
                 },
                 // Root app.css file gets extracted with bundled dependencies
                 {
@@ -79,59 +117,28 @@ module.exports = function (platform, destinationApp) {
                     test: /\.css$/,
                     exclude: /app\.css$/,
                     loaders: [
-                        "raw",
+                        "raw-loader",
                     ]
                 },
                 // Compile TypeScript files with ahead-of-time compiler.
                 {
                     test: /\.ts$/,
                     loaders: [
-                        '@ngtools/webpack',
-                        'nativescript-dev-webpack/tns-aot-loader'
+                        "nativescript-dev-webpack/tns-aot-loader",
+                        "@ngtools/webpack",
                     ]
                 },
                 // SASS support
                 {
                     test: /\.scss$/,
                     loaders: [
-                        "raw",
+                        "raw-loader",
                         "resolve-url-loader",
                         "sass-loader"
                     ]
                 },
             ]
         },
-        plugins: [
-            new ExtractTextPlugin("app.css"),
-            //Vendor libs go to the vendor.js chunk
-            new webpack.optimize.CommonsChunkPlugin({
-                name: ["vendor"]
-            }),
-            //Define useful constants like TNS_WEBPACK
-            new webpack.DefinePlugin({
-                global: "global",
-                __dirname: "__dirname",
-                "global.TNS_WEBPACK": "true",
-            }),
-            //Copy assets to out dir. Add your own globs as needed.
-            new CopyWebpackPlugin([
-                { from: "app.css" },
-                { from: "css/**" },
-                { from: "**/*.jpg" },
-                { from: "**/*.png" },
-                { from: "**/*.xml" },
-            ], { ignore: ["App_Resources/**"] }),
-            //Generate a bundle starter script and activate it in package.json
-            new nsWebpack.GenerateBundleStarterPlugin([
-                "./vendor",
-                "./bundle",
-            ]),
-            //Angular AOT compiler
-            new AotPlugin({
-                tsConfigPath: 'tsconfig.aot.json',
-                entryModule: 'app/app.module#AppModule',
-                typeChecking: false
-            })
-        ],
+        plugins: plugins,
     };
 };