From 1f301bac24989710b777237763bf9c221ca5b07d Mon Sep 17 00:00:00 2001
From: Diego Netto <diegormnetto@gmail.com>
Date: Fri, 24 Oct 2014 12:27:18 -0500
Subject: [PATCH] fix(ionic): Run ionic and watch concurrently. Closes #114,
 #116, & #121

---
 templates/common/Gruntfile.js | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/templates/common/Gruntfile.js b/templates/common/Gruntfile.js
index c5f4b39..30fb734 100644
--- a/templates/common/Gruntfile.js
+++ b/templates/common/Gruntfile.js
@@ -303,6 +303,12 @@ module.exports = function (grunt) {
     },
 
     concurrent: {
+      ionic: {
+        tasks: [],
+        options: {
+          logConcurrentOutput: true
+        }
+      },
       server: [<% if (compass) { %>
         'compass:server',<% } %>
         'copy:styles',
@@ -478,21 +484,14 @@ module.exports = function (grunt) {
 
   // Wrap ionic-cli commands
   grunt.registerTask('ionic', function() {
+    var done = this.async();
     var script = path.resolve('./node_modules/ionic/bin/', 'ionic');
     var flags = process.argv.splice(3);
-    var child = spawn(script, this.args.concat(flags));
-    child.stdout.on('data', function (data) {
-      grunt.log.writeln(data);
-    });
-    child.stderr.on('data', function (data) {
-      grunt.log.error(data);
+    var child = spawn(script, this.args.concat(flags), { stdio: 'inherit' });
+    child.on('close', function (code) {
+      code = code ? false : true;
+      done(code);
     });
-    process.on('exit', function (code) {
-      child.kill('SIGINT');
-      process.exit(code);
-    });
-
-    return grunt.task.run(['watch']);
   });
 
   grunt.registerTask('test', [
@@ -502,18 +501,22 @@ module.exports = function (grunt) {
     'karma:unit:start',
     'watch:karma'
   ]);
+
   grunt.registerTask('serve', function (target) {
     if (target === 'compress') {
       return grunt.task.run(['compress', 'ionic:serve']);
     }
 
-    grunt.task.run(['init', 'ionic:serve']);
+    grunt.config('concurrent.ionic.tasks', ['ionic:serve', 'watch']);
+    grunt.task.run(['init', 'concurrent:ionic']);
   });
   grunt.registerTask('emulate', function() {
-    return grunt.task.run(['init', 'ionic:emulate:' + this.args.join()]);
+    grunt.config('concurrent.ionic.tasks', ['ionic:emulate:' + this.args.join(), 'watch']);
+    return grunt.task.run(['init', 'concurrent:ionic']);
   });
   grunt.registerTask('run', function() {
-    return grunt.task.run(['init', 'ionic:run:' + this.args.join()]);
+    grunt.config('concurrent.ionic.tasks', ['ionic:run:' + this.args.join(), 'watch']);
+    return grunt.task.run(['init', 'concurrent:ionic']);
   });
   grunt.registerTask('build', function() {
     return grunt.task.run(['init', 'ionic:build:' + this.args.join()]);