From 17e6b5eb42cdd160cc845c97d410aee290bc6051 Mon Sep 17 00:00:00 2001
From: Maurizio Vitale <maurizio.vitale@alfresco.com>
Date: Tue, 22 Aug 2017 14:23:46 +0100
Subject: [PATCH] ADF Theme Dev/Prod mode (#2236)

* Add undescore

* Move the scss logic from webpack common to dev/prod
Rollback the change about the color.scss name
---
 demo-shell-ng2/config/webpack.common.js | 13 -------------
 demo-shell-ng2/config/webpack.dev.js    | 15 ++++++++++++++-
 demo-shell-ng2/config/webpack.prod.js   | 24 ++++++++++++++++++++++--
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/demo-shell-ng2/config/webpack.common.js b/demo-shell-ng2/config/webpack.common.js
index a16ca8ba34..9436c1774d 100644
--- a/demo-shell-ng2/config/webpack.common.js
+++ b/demo-shell-ng2/config/webpack.common.js
@@ -63,19 +63,6 @@ module.exports = {
                 include: [helpers.root('app'), helpers.root('../ng2-components')],
                 loader: 'raw-loader'
             },
-            {
-                test: /\.scss$/,
-                use: [{
-                    loader: "to-string-loader"
-                }, {
-                    loader: "raw-loader"
-                }, {
-                    loader: "sass-loader",
-                    options: {
-                        includePaths: [path.resolve(__dirname, '../../ng2-components/ng2-alfresco-core/styles')]
-                    }
-                }]
-            },
             {
                 test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
                 loader: 'file-loader?name=assets/[name].[hash].[ext]'
diff --git a/demo-shell-ng2/config/webpack.dev.js b/demo-shell-ng2/config/webpack.dev.js
index 29ff7add58..de14b8ad67 100644
--- a/demo-shell-ng2/config/webpack.dev.js
+++ b/demo-shell-ng2/config/webpack.dev.js
@@ -45,7 +45,20 @@ module.exports = webpackMerge(commonConfig, {
                     'happypack/loader?id=ts','angular2-template-loader'
                 ],
                 exclude: [/node_modules/, /public/, /resources/, /dist/]
-            }
+            },
+            {
+                test: /\.scss$/,
+                use: [{
+                    loader: "to-string-loader"
+                }, {
+                    loader: "raw-loader"
+                }, {
+                    loader: "sass-loader",
+                    options: {
+                        includePaths: [path.resolve(__dirname, '../../ng2-components/ng2-alfresco-core/styles')]
+                    }
+                }]
+            },
         ]
     },
 
diff --git a/demo-shell-ng2/config/webpack.prod.js b/demo-shell-ng2/config/webpack.prod.js
index 996e9ed846..6c632c5484 100644
--- a/demo-shell-ng2/config/webpack.prod.js
+++ b/demo-shell-ng2/config/webpack.prod.js
@@ -6,7 +6,7 @@ const helpers = require('./helpers');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 var HappyPack = require('happypack');
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
-
+const path = require('path');
 const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
 
 const alfrescoLibs = [
@@ -50,7 +50,20 @@ module.exports = webpackMerge(commonConfig, {
                 include: [helpers.root('app'), helpers.root('../ng2-components')],
                 use: ['happypack/loader?id=ts', 'angular2-template-loader'],
                 exclude: [/node_modules/, /public/, /resources/, /dist/]
-            }
+            },
+            {
+                test: /\.scss$/,
+                use: [{
+                    loader: "to-string-loader"
+                }, {
+                    loader: "raw-loader"
+                }, {
+                    loader: "sass-loader",
+                    options: {
+                        includePaths: [path.resolve(__dirname, helpers.root('node_modules') + '/ng2-alfresco-core/styles')]
+                    }
+                }]
+            },
         ]
     },
 
@@ -82,6 +95,13 @@ module.exports = webpackMerge(commonConfig, {
                 }
             })
         ]),
+        new CopyWebpackPlugin([
+            {
+                context: `node_modules/ng2-alfresco-core/prebuilt-themes/`,
+                from: '**/*.css',
+                to: 'prebuilt-themes'
+            }
+        ]),
         new webpack.NoEmitOnErrorsPlugin(),
         new webpack.optimize.UglifyJsPlugin({ // https://github.com/angular/angular/issues/10618
             mangle: {