feat(): allow emulate and run to use serve for livereload. (#1614)

Author: jthoms1

lib/cli.js

@@ -42,6 +42,21 @@ log.level = 'info';
  * @return {Promise}
  */
 Cli.run=functionrun(processArgv){
+
+/*
+ * Before taking any more steps, lets check their
+ * environment and display any upgrade warnings
+ */
+returnQ.all([
+Cli.doRuntimeCheck(),
+Cli.checkLatestVersion()
+]).then(function(){
+Cli.runr(processArgv);
+}).catch(function(ex){
+returnappLibUtils.fail(ex);
+});
+};
+Cli.runr=functionrunr(processArgv){
 try{
 
 /*
@@ -54,18 +69,11 @@ Cli.run = function run(processArgv) {
 vartaskList;
 
 Cli.attachErrorHandling();
-Cli.latestVersion=Cli.checkLatestVersion();
 
 process.on('exit',function(){
 Cli.printVersionWarning(settings.version,Cli.npmVersion);
 });
 
-/*
- * Before taking any more steps, lets check their
- * environment and display any upgrade warnings
- */
-Cli.doRuntimeCheck(settings.version);
-
 /*
  * Print version if '--version' or '--v' is an option
  * TODO: version should probably also be a command
@@ -180,7 +188,7 @@ Cli.run = function run(processArgv) {
 log.debug('\nNpm scripts:',npmScripts);
 log.debug('Gulpfile found:',gulpLoaded,'\n');
 
-if(npmScripts){
+if(npmScripts.hasOwnProperty(taskName+':before')||npmScripts.hasOwnProperty(taskName+':after')){
 returnCli.runWithNpmScripts(argv,task,rawCliArguments);
 }elseif(gulpLoaded){
 returnCli.runWithGulp(argv,task,rawCliArguments);
@@ -621,13 +629,6 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
 returnq.promise;
 };
 
-Cli.gatherInfo=functiongatherInfo(){
-varinfo=Info.gatherInfo();
-Info.getIonicVersion(info,process.cwd());
-Info.getIonicCliVersion(info,path.join(__dirname,'../'));
-returninfo;
-};
-
 Cli.handleUncaughtExceptions=functionhandleUncaughtExceptions(err){
 log.error(chalk.red.bold('An uncaught exception occurred and has been reported to Ionic'));
 varerrorMessage=typeoferr==='string' ? err : err.message;
@@ -637,12 +638,12 @@ Cli.handleUncaughtExceptions = function handleUncaughtExceptions(err) {
 
 Cli.attachErrorHandling=functionattachErrorHandling(){
 appLibUtils.errorHandler=functionerrorHandler(msg){
-try{
-log.debug('Cli.appLibUtils.errorHandler msg',msg,typeofmsg);
-varstack=typeofmsg=='string' ? '' : msg.stack;
-varerrorMessage=typeofmsg=='string' ? msg : msg.message;
-if(msg){
-varinfo=Cli.gatherInfo();
+log.debug('Cli.appLibUtils.errorHandler msg',msg,typeofmsg);
+varstack=typeofmsg=='string' ? '' : msg.stack;
+varerrorMessage=typeofmsg=='string' ? msg : msg.message;
+varpromise=Q();
+if(msg){
+promise=Info.gatherInfo().then(function(info){
 varionicCliVersion=info.ionic_cli;
 if(stack&&stack.length>0){
 process.stderr.write('\n'+chalk.bold(stack)+'\n\n');
@@ -651,14 +652,16 @@ Cli.attachErrorHandling = function attachErrorHandling() {
 process.stderr.write(chalk.bold(' (CLI v'+ionicCliVersion+')')+'\n');
 
 Info.printInfo(info);
-}
+});
+}
+promise.then(function(){
 process.stderr.write('\n');
 process.exit(1);
 return'';
-}catch(ex){
+}).catch(function(ex){
 console.log('errorHandler had an error',ex);
 console.log(ex.stack);
-}
+});
 };
 
 // TODO Attach error reporter here
@@ -686,10 +689,14 @@ Cli.doRuntimeCheck = function doRuntimeCheck(version) {
 }
 
 if(!lastVersionChecked||!versionHasBeenChecked){
-Info.checkRuntime();
-IonicConfig.set('lastVersionChecked',version);
-IonicConfig.save();
+returnInfo.gatherInfo().then(function(info){
+Info.checkRuntime(info);
+IonicConfig.set('lastVersionChecked',version);
+IonicConfig.save();
+});
 }
+
+returnQ();
 };
 
 module.exports=Cli;

lib/ionic/emulate.js

@@ -1,6 +1,7 @@
 'use strict';
 
 varchalk=require('chalk');
+varserveUtil=require('../utils/serve');
 varextend=require('../utils/extend');
 varnpmScripts=require('../utils/npmScripts');
 varos=require('os');
@@ -46,6 +47,10 @@ function run(ionic, argv, rawCliArguments) {
 varappDirectory=process.cwd();
 varrawArgs=rawCliArguments.slice(0);
 varcmdName=argv._[0].toLowerCase();
+varhasBuildCommand=false;
+varhasServeCommand=false;
+varaddress=argv.address||serveUtil.DEFAULT_ADDRESS;
+varport=argv.port||serveUtil.DEFAULT_HTTP_PORT;
 
 varisLiveReload=argv.livereload||argv['live-reload']||argv.l||false;
 
@@ -64,30 +69,45 @@ function run(ionic, argv, rawCliArguments) {
 varpromiseList=[]
 .concat(!cordovaUtils.isPlatformInstalled(runPlatform,appDirectory) ?
 cordovaUtils.installPlatform(runPlatform) :
-[])
+Q())
 .concat(!cordovaUtils.arePluginsInstalled(appDirectory) ?
 cordovaUtils.installPlugins() :
-[]);
+Q())
+.concat(npmScripts.hasIonicScript('build'))
+.concat(npmScripts.hasIonicScript('serve'));
 
-returnQ.all(promiseList).then(function(){
-returnnpmScripts.hasIonicScript('build');
-})
-.then(function(hasBuildCommand){
-if(hasBuildCommand){
+returnQ.all(promiseList).then(function(results){
+hasBuildCommand=results[2];
+hasServeCommand=results[3];
+
+if(hasBuildCommand&&!(isLiveReload&&hasServeCommand)){
 returnnpmScripts.runIonicScript('build');
 }
-returnQ.resolve();
+returnQ();
 })
 .then(function(){
-if(isLiveReload){
+
+if(isLiveReload&&hasServeCommand){
+
+// using app-scripts and livereload is requested
+returnConfigXml.setConfigXml(process.cwd(),{
+devServer: serveUtil.getUrl(address,port)
+}).then(function(){
+isLiveReload=false;
+returnnpmScripts.runIonicScript('serve',['-p',port,'--address',address]);
+});
+}elseif(isLiveReload){
+
+// not an app-scripts project but the user wants livereload
 returncordovaUtils.setupLiveReload(argv,appDirectory);
-}
+}else{
 
-// ensure the content node was set back to its original
-returnConfigXml.setConfigXml(appDirectory,{
-resetContent: true,
-errorWhenNotFound: false
-});
+// ensure the content node was set back to its original
+returnConfigXml.setConfigXml(appDirectory,{
+resetContent: true,
+errorWhenNotFound: false
+});
+}
 })
 .then(function(serveOptions){
 varoptionList=cordovaUtils.filterArgumentsForCordova(cmdName,argv,rawArgs);

lib/ionic/info.js

@@ -1,7 +1,6 @@
 'use strict';
 
 varextend=require('../utils/extend');
-varpath=require('path');
 varIonicAppLib=require('ionic-app-lib');
 varInfo=IonicAppLib.info;
 varappLibUtils=IonicAppLib.utils;
@@ -14,20 +13,13 @@ var settings = {
 };
 
 functionrun(){
-try{
-
-varinfo=Info.gatherInfo();
-
-Info.getIonicVersion(info,process.cwd());
-Info.getIonicCliVersion(info,path.join(__dirname,'../../'));
-Info.getIonicAppScriptsVersion(info,process.cwd());
-
+returnInfo.gatherInfo().then(function(info){
 Info.printInfo(info);
 
-Info.checkRuntime();
-}catch(ex){
+Info.checkRuntime(info);
+}).catch(function(ex){
 appLibUtils.fail('There was an error retrieving your environment information:',ex);
-}
+});
 }
 
 module.exports=extend(settings,{

lib/ionic/run.js

@@ -1,6 +1,7 @@
 'use strict';
 
 varchalk=require('chalk');
+varserveUtil=require('../utils/serve');
 varextend=require('../utils/extend');
 varnpmScripts=require('../utils/npmScripts');
 varos=require('os');
@@ -46,6 +47,10 @@ function run(ionic, argv, rawCliArguments) {
 varappDirectory=process.cwd();
 varrawArgs=rawCliArguments.slice(0);
 varcmdName=argv._[0].toLowerCase();
+varhasBuildCommand=false;
+varhasServeCommand=false;
+varaddress=argv.address||serveUtil.DEFAULT_ADDRESS;
+varport=argv.port||serveUtil.DEFAULT_HTTP_PORT;
 
 varisLiveReload=argv.livereload||argv['live-reload']||argv.l||false;
 
@@ -64,30 +69,44 @@ function run(ionic, argv, rawCliArguments) {
 varpromiseList=[]
 .concat(!cordovaUtils.isPlatformInstalled(runPlatform,appDirectory) ?
 cordovaUtils.installPlatform(runPlatform) :
-[])
+Q())
 .concat(!cordovaUtils.arePluginsInstalled(appDirectory) ?
 cordovaUtils.installPlugins() :
-[]);
+Q())
+.concat(npmScripts.hasIonicScript('build'))
+.concat(npmScripts.hasIonicScript('serve'));
 
-returnQ.all(promiseList).then(function(){
-returnnpmScripts.hasIonicScript('build');
-})
-.then(function(hasBuildCommand){
-if(hasBuildCommand){
+returnQ.all(promiseList).then(function(results){
+hasBuildCommand=results[2];
+hasServeCommand=results[3];
+
+if(hasBuildCommand&&!(isLiveReload&&hasServeCommand)){
 returnnpmScripts.runIonicScript('build');
 }
-returnQ.resolve();
-})
-.then(function(){
-if(isLiveReload){
+returnQ();
+}).then(function(){
+
+if(isLiveReload&&hasServeCommand){
+
+// using app-scripts and livereload is requested
+returnConfigXml.setConfigXml(process.cwd(),{
+devServer: serveUtil.getUrl(address,port)
+}).then(function(){
+isLiveReload=false;
+returnnpmScripts.runIonicScript('serve',['-p',port,'--address',address]);
+});
+}elseif(isLiveReload){
+
+// not an app-scripts project but the user wants livereload
 returncordovaUtils.setupLiveReload(argv,appDirectory);
-}
+}else{
 
-// ensure the content node was set back to its original
-returnConfigXml.setConfigXml(appDirectory,{
-resetContent: true,
-errorWhenNotFound: false
-});
+// ensure the content node was set back to its original
+returnConfigXml.setConfigXml(appDirectory,{
+resetContent: true,
+errorWhenNotFound: false
+});
+}
 })
 .then(function(serveOptions){
 varoptionList=cordovaUtils.filterArgumentsForCordova(cmdName,argv,rawArgs);