From 52a61cd1ca64c793e470c03acce93b03859d4ef7 Mon Sep 17 00:00:00 2001
From: sis0k0 <stanimira.vlaeva@gmail.com>
Date: Thu, 28 Dec 2017 11:46:53 +0200
Subject: [PATCH 1/2] fix(css): disable minification when using uglify

related to #154, #135
fixes #377
---
 templates/webpack.angular.js    | 19 +++++++++++++++++--
 templates/webpack.javascript.js | 20 ++++++++++++++++++--
 templates/webpack.typescript.js | 20 ++++++++++++++++++--
 3 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/templates/webpack.angular.js b/templates/webpack.angular.js
index a33d7d3a..6f3afae7 100644
--- a/templates/webpack.angular.js
+++ b/templates/webpack.angular.js
@@ -60,8 +60,23 @@ module.exports = env => {
                 { test: /\.html$|\.xml$/, use: "raw-loader" },
 
                 // tns-core-modules reads the app.css and its imports using css-loader
-                { test: /[\/|\\]app\.css$/, use: "css-loader?url=false" },
-                { test: /[\/|\\]app\.scss$/, use: ["css-loader?url=false", "sass-loader"] },
+                {
+                    test: /[\/|\\]app\.css$/,
+                    use: {
+                        loader: "css-loader",
+                        options: { minimize: false, url: false },
+                    }
+                },
+                {
+                    test: /[\/|\\]app\.scss$/,
+                    use: [
+                        {
+                            loader: "css-loader",
+                            options: { minimize: false, url: false },
+                        },
+                        "sass-loader"
+                    ]
+                },
 
                 // Angular components reference css files and their imports using raw-loader
                 { test: /\.css$/, exclude: /[\/|\\]app\.css$/, use: "raw-loader" },
diff --git a/templates/webpack.javascript.js b/templates/webpack.javascript.js
index 551a79a1..94bd750d 100644
--- a/templates/webpack.javascript.js
+++ b/templates/webpack.javascript.js
@@ -57,8 +57,24 @@ module.exports = env => {
             rules: [
                 { test: /\.(html|xml)$/, use: "raw-loader" },
 
-                { test: /\.css$/, use: "css-loader?url=false" },
-                { test: /\.scss$/, use: ["css-loader?url=false", "sass-loader"] },
+                {
+                    test: /\.css$/,
+                    use: {
+                        loader: "css-loader",
+                        options: { minimize: false, url: false },
+                    }
+                },
+
+                {
+                    test: /\.scss$/,
+                    use: [
+                        {
+                            loader: "css-loader",
+                            options: { minimize: false, url: false },
+                        },
+                        "sass-loader"
+                    ]
+                }
             ]
         },
         plugins: [
diff --git a/templates/webpack.typescript.js b/templates/webpack.typescript.js
index e7969858..24359cb9 100644
--- a/templates/webpack.typescript.js
+++ b/templates/webpack.typescript.js
@@ -57,8 +57,24 @@ module.exports = env => {
             rules: [
                 { test: /\.(html|xml)$/, use: "raw-loader" },
 
-                { test: /\.css$/, use: "css-loader?url=false" },
-                { test: /\.scss$/, use: ["css-loader?url=false", "sass-loader"] },
+                {
+                    test: /\.css$/,
+                    use: {
+                        loader: "css-loader",
+                        options: { minimize: false, url: false },
+                    }
+                },
+
+                {
+                    test: /\.scss$/,
+                    use: [
+                        {
+                            loader: "css-loader",
+                            options: { minimize: false, url: false },
+                        },
+                        "sass-loader"
+                    ]
+                },
 
                 { test: /\.ts$/, use: "awesome-typescript-loader" }
             ]

From 0872a50138007f5d50351439a6acd6497b5bb6d8 Mon Sep 17 00:00:00 2001
From: sis0k0 <stanimira.vlaeva@gmail.com>
Date: Fri, 29 Dec 2017 15:51:23 +0200
Subject: [PATCH 2/2] refactor: inline css-loader options

---
 templates/webpack.angular.js    |  5 +----
 templates/webpack.javascript.js | 10 ++--------
 templates/webpack.typescript.js | 10 ++--------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/templates/webpack.angular.js b/templates/webpack.angular.js
index 6f3afae7..d7e86ce6 100644
--- a/templates/webpack.angular.js
+++ b/templates/webpack.angular.js
@@ -70,10 +70,7 @@ module.exports = env => {
                 {
                     test: /[\/|\\]app\.scss$/,
                     use: [
-                        {
-                            loader: "css-loader",
-                            options: { minimize: false, url: false },
-                        },
+                        { loader: "css-loader", options: { minimize: false, url: false } },
                         "sass-loader"
                     ]
                 },
diff --git a/templates/webpack.javascript.js b/templates/webpack.javascript.js
index 94bd750d..d4bb5a42 100644
--- a/templates/webpack.javascript.js
+++ b/templates/webpack.javascript.js
@@ -59,19 +59,13 @@ module.exports = env => {
 
                 {
                     test: /\.css$/,
-                    use: {
-                        loader: "css-loader",
-                        options: { minimize: false, url: false },
-                    }
+                    use: { loader: "css-loader", options: { minimize: false, url: false } }
                 },
 
                 {
                     test: /\.scss$/,
                     use: [
-                        {
-                            loader: "css-loader",
-                            options: { minimize: false, url: false },
-                        },
+                        { loader: "css-loader", options: { minimize: false, url: false } },
                         "sass-loader"
                     ]
                 }
diff --git a/templates/webpack.typescript.js b/templates/webpack.typescript.js
index 24359cb9..f485d56e 100644
--- a/templates/webpack.typescript.js
+++ b/templates/webpack.typescript.js
@@ -59,19 +59,13 @@ module.exports = env => {
 
                 {
                     test: /\.css$/,
-                    use: {
-                        loader: "css-loader",
-                        options: { minimize: false, url: false },
-                    }
+                    use: { loader: "css-loader", options: { minimize: false, url: false } }
                 },
 
                 {
                     test: /\.scss$/,
                     use: [
-                        {
-                            loader: "css-loader",
-                            options: { minimize: false, url: false },
-                        },
+                        { loader: "css-loader", options: { minimize: false, url: false } },
                         "sass-loader"
                     ]
                 },