fix(serve): prevent emulate and run livereload from using app-scripts for now.

Author: jthoms1

lib/ionic/emulate.js

@@ -80,39 +80,41 @@ function run(ionic, argv, rawCliArguments) {
     hasBuildCommand = results[2];
     hasServeCommand = results[3];
 
-    if (hasBuildCommand && !(isLiveReload && hasServeCommand)) {
+    if (hasBuildCommand) {
       return npmScripts.runIonicScript('build');
     }
     return Q();
   })
   .then(function() {
 
-    if (isLiveReload && hasServeCommand) {
+    if (isLiveReload && hasServeCommand && false) {
 
       // using app-scripts and livereload is requested
       return ConfigXml.setConfigXml(process.cwd(), {
         devServer: serveUtil.getUrl(address, port)
-      }).then(function() {
-        isLiveReload = false;
-        return npmScripts.runIonicScript('serve', ['-p', port, '--address', address]);
       });
     } else if (isLiveReload) {
 
       // not an app-scripts project but the user wants livereload
       return cordovaUtils.setupLiveReload(argv, appDirectory);
-    } else {
-
-      // ensure the content node was set back to its original
-      return ConfigXml.setConfigXml(appDirectory, {
-        resetContent: true,
-        errorWhenNotFound: false
-      });
     }
+
+    // ensure the content node was set back to its original
+    return ConfigXml.setConfigXml(appDirectory, {
+      resetContent: true,
+      errorWhenNotFound: false
+    });
   })
   .then(function(serveOptions) {
     var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
     return cordovaUtils.execCordovaCommand(optionList, isLiveReload, serveOptions);
   })
+  .then(function() {
+    if (isLiveReload && hasServeCommand && false) {
+      return npmScripts.runIonicScript('serve', ['-p', port, '--address', address]);
+    }
+    return Q();
+  })
   .catch(function(ex) {
     if (ex instanceof Error) {
       log.error(ex);

lib/ionic/run.js

@@ -80,38 +80,41 @@ function run(ionic, argv, rawCliArguments) {
     hasBuildCommand = results[2];
     hasServeCommand = results[3];
 
-    if (hasBuildCommand && !(isLiveReload && hasServeCommand)) {
+    if (hasBuildCommand) {
       return npmScripts.runIonicScript('build');
     }
     return Q();
-  }).then(function() {
+  })
+  .then(function() {
 
-    if (isLiveReload && hasServeCommand) {
+    if (isLiveReload && hasServeCommand && false) {
 
       // using app-scripts and livereload is requested
       return ConfigXml.setConfigXml(process.cwd(), {
         devServer: serveUtil.getUrl(address, port)
-      }).then(function() {
-        isLiveReload = false;
-        return npmScripts.runIonicScript('serve', ['-p', port, '--address', address]);
       });
     } else if (isLiveReload) {
 
       // not an app-scripts project but the user wants livereload
       return cordovaUtils.setupLiveReload(argv, appDirectory);
-    } else {
-
-      // ensure the content node was set back to its original
-      return ConfigXml.setConfigXml(appDirectory, {
-        resetContent: true,
-        errorWhenNotFound: false
-      });
     }
+
+    // ensure the content node was set back to its original
+    return ConfigXml.setConfigXml(appDirectory, {
+      resetContent: true,
+      errorWhenNotFound: false
+    });
   })
   .then(function(serveOptions) {
     var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
     return cordovaUtils.execCordovaCommand(optionList, isLiveReload, serveOptions);
   })
+  .then(function() {
+    if (isLiveReload && hasServeCommand && false) {
+      return npmScripts.runIonicScript('serve', ['-p', port, '--address', address]);
+    }
+    return Q();
+  })
   .catch(function(ex) {
     if (ex instanceof Error) {
       log.error(ex);