commit 00d82eed23ffc1aa2c75b4085cbeab3db8001e04
author Matteo Scandolo <teo@opennetworking.org> Thu Nov 16 10:27:44 2017 -0800
committer Matteo Scandolo <teo@opennetworking.org> Fri Nov 17 21:14:29 2017 +0000
tree fdc5ed6c596688ac081ef95aca5b43c3d7b99ba4
parent 4f6067c0fdcb30c831bc89d5561b5dd762138e9d

[CORD-2188] Updated build to accomodate multi-stage build

Change-Id: Iff6b926acd125b6a960d6c6b5996cbe4c55e3f90
(cherry picked from commit 469cea459d09441441846626217282d09f154cb9)

conf/gulp.conf.js

diff --git a/conf/gulp.conf.js b/conf/gulp.conf.js
index 1721c87..ee29c80 100755
--- a/conf/gulp.conf.js
+++ b/conf/gulp.conf.js
@@ -36,7 +36,7 @@
  */
 exports.paths = {
   src: 'src',
-  dist: 'dist/extensions/sample', // NOTE that 'sample' have to match the extension name provided in platform install
+  dist: 'dist',
   appConfig: 'conf/app',
   tmp: '.tmp',
   e2e: 'e2e',

conf/webpack-dist.conf.js

diff --git a/conf/webpack-dist.conf.js b/conf/webpack-dist.conf.js
index c870043..5f924fb 100755
--- a/conf/webpack-dist.conf.js
+++ b/conf/webpack-dist.conf.js
@@ -105,7 +105,10 @@
       '.web.js',
       '.js',
       '.ts'
-    ]
+    ],
+    alias: {
+      "ngprogress": path.resolve(__dirname, '../node_modules/ngprogress/build/ngProgress.js')
+    }
   },
   entry: {
     app: `./${conf.path.src('index')}`,

conf/webpack.conf.js

diff --git a/conf/webpack.conf.js b/conf/webpack.conf.js
index d70e771..f0dbc51 100755
--- a/conf/webpack.conf.js
+++ b/conf/webpack.conf.js
@@ -99,7 +99,10 @@
       '.web.js',
       '.js',
       '.ts'
-    ]
+    ],
+    alias: {
+      "ngprogress": path.resolve(__dirname, '../node_modules/ngprogress/build/ngProgress.js')
+    }
   },
   entry: `./${conf.path.src('index')}`,
   ts: {