fix(): bundle before build, emulate, run and upload

ionic-team · Mar 28, 2016 · c8930b8 · c8930b8
1 parent a4f3f5a
commit c8930b8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
@@ -127,7 +127,10 @@ IonicTask.prototype.run = function(ionic, argv) {
     })
     .then(function(){
       // TODO :(
-      if (argv.v2 && cmdName === 'build'){
+      if (  argv.v2 &&
+            !argv.b && !argv.nobundle &&
+            (cmdName === 'build' || cmdName === 'emulate' || cmdName === 'run' || cmdName === 'upload'))
+      {
         var Build = IonicAppLib.v2.build;
         var buildOptions = {
           appDirectory: process.cwd(),

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
@@ -23,7 +23,11 @@ var cordovaRunEmulateOptions = {
     title: '',
     boolean: true
   },
-  '--device|--emulator|--target=FOO': ''
+  '--device|--emulator|--target=FOO': '',
+  '--nobundle|-b': {
+    title: '(v2 only) don\'t bundle JS/Sass before running.',
+    boolean: true
+  }
 };
 
 var TASKS = [
@@ -170,8 +174,7 @@ var TASKS = [
   {
     title: 'build',
     name: 'build',
-    summary: 'Locally build an Ionic project for a given platform.\n' +
-             '(v2 only) does webpack build before given platform.',
+    summary: 'Build (prepare + compile) an Ionic project for a given platform.\n',
     args: {
       '[options]': '',
       '<PLATFORM>': ''
@@ -180,6 +183,10 @@ var TASKS = [
       '--nohooks|-n': {
         title: 'Do not add default Ionic hooks for Cordova',
         boolean: true
+      },
+      '--nobundle|-b': {
+        title: '(v2 only) don\'t bundle JS/Sass before building.',
+        boolean: true
       }
     },
     module: './ionic/cordova'
@@ -238,7 +245,11 @@ var TASKS = [
       '--email|-e': 'Ionic account email',
       '--password|-p': 'Ionic account password',
       '--note': 'The note to signify the upload',
-      '--deploy <channel_tag>': 'Deploys the upload to the given channel. Defaults to the Dev channel'
+      '--deploy <channel_tag>': 'Deploys the upload to the given channel. Defaults to the Dev channel',
+      '--nobundle|-b': {
+        title: '(v2 only) don\'t bundle JS/Sass before uploading.',
+        boolean: true
+      }
     },
     alt: ['up'],
     module: './ionic/upload'