From 9fe6f4b06cde1a2d305c40634c31b8c861b5452f Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eugenio.romano@alfresco.com>
Date: Fri, 26 May 2017 15:11:35 +0100
Subject: [PATCH] split the module runner ts-loader between dev and production
 in the way that the production runner will override the path during the build
 (#1907)

---
 demo-shell-ng2/config/webpack.common.js |  9 ---------
 demo-shell-ng2/config/webpack.dev.js    | 14 ++++++++++++++
 demo-shell-ng2/config/webpack.prod.js   | 15 +++++++++++++++
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/demo-shell-ng2/config/webpack.common.js b/demo-shell-ng2/config/webpack.common.js
index ee7a199828..5ec4c525c5 100644
--- a/demo-shell-ng2/config/webpack.common.js
+++ b/demo-shell-ng2/config/webpack.common.js
@@ -61,15 +61,6 @@ module.exports = {
                 use: 'source-map-loader',
                 exclude: [ /public/, /resources/, /dist/]
             },
-            {
-                test: /\.ts$/,
-                include: [helpers.root('app'), helpers.root('../ng2-components')],
-                loader: [
-                    'ts-loader',
-                    'angular2-template-loader'
-                ],
-                exclude: [ /node_modules/, /public/, /resources/, /dist/]
-            },
             {
                 test: /\.html$/,
                 loader: 'html-loader',
diff --git a/demo-shell-ng2/config/webpack.dev.js b/demo-shell-ng2/config/webpack.dev.js
index 9b3824a5af..1f12afd235 100644
--- a/demo-shell-ng2/config/webpack.dev.js
+++ b/demo-shell-ng2/config/webpack.dev.js
@@ -15,6 +15,20 @@ module.exports = webpackMerge(commonConfig, {
         chunkFilename: '[id].chunk.js'
     },
 
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                include: [helpers.root('app'), helpers.root('../ng2-components')],
+                loader: [
+                    'ts-loader',
+                    'angular2-template-loader'
+                ],
+                exclude: [ /node_modules/, /public/, /resources/, /dist/]
+            }
+        ]
+    },
+
     resolve: {
         alias: {
             "ng2-alfresco-core$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-core/index.ts'),
diff --git a/demo-shell-ng2/config/webpack.prod.js b/demo-shell-ng2/config/webpack.prod.js
index 8ed049c3cb..68926bf13a 100644
--- a/demo-shell-ng2/config/webpack.prod.js
+++ b/demo-shell-ng2/config/webpack.prod.js
@@ -41,6 +41,21 @@ module.exports = webpackMerge(commonConfig, {
         modules: [helpers.root('node_modules')]
     },
 
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                include: [helpers.root('app'), helpers.root('../ng2-components')],
+                use: ['ts-loader?' + JSON.stringify({
+                    "compilerOptions": {
+                        "paths": {}
+                    }
+                }), 'angular2-template-loader'],
+                exclude: [ /node_modules/, /public/, /resources/, /dist/]
+            }
+        ]
+    },
+
     plugins: [
         new CopyWebpackPlugin([
             ... alfrescoLibs.map(lib => {