Update to latest Grunt tasks

Author: Pavel Strashkin

Gruntfile.js

@@ -3,22 +3,6 @@
 module.exports = function (grunt) {
   require('load-grunt-tasks')(grunt);
 
-  grunt.registerTask('default', ['build', 'connect:livereload', 'open:server', 'watch']);
-  grunt.registerTask('regression', ['build', 'protractor:local']);
-  grunt.registerTask('build', [
-    'jshint',
-    'clean',
-    'ngtemplates',
-    'concat:app',
-    'concat:vendor',
-    'concat:index',
-    'copy:assets',
-    'sass:build',
-    'css_prefix:prefix',
-    'concat:darkTheme',
-    'concat:lightTheme'
-  ]);
-
   grunt.initConfig({
     tempdir: '.tmp',
     distdir: 'dist',
@@ -61,22 +45,17 @@ module.exports = function (grunt) {
 
       livereload: {
         options: {
+        livereload:   true,
+        open:         true,
           middleware: function (connect) {
             return [
-              require('connect-livereload')(),
               connect.static('dist')
             ];
           }
         }
       }
     },
 
-    open: {
-      server: {
-        url: 'http://localhost:<%= connect.options.port %>'
-      }
-    },
-
     clean: {
       build: [
         '<%= tempdir %>',
@@ -129,6 +108,12 @@ module.exports = function (grunt) {
       },
 
       darkTheme: {
+        options: {
+          process: function process(value) {
+            return value.replace(/\.raml-console-CodeMirror/g, '.CodeMirror');
+          }
+        },
+
         dest: '<%= distdir %>/styles/<%= pkg.name %>-dark-theme.css',
         src:  [
           'src/assets/styles/vendor/codemirror.css',
@@ -140,6 +125,12 @@ module.exports = function (grunt) {
       },
 
       lightTheme: {
+        options: {
+          process: function process(value) {
+            return value.replace(/\.raml-console-CodeMirror/g, '.CodeMirror');
+          }
+        },
+
         dest: '<%= distdir %>/styles/<%= pkg.name %>-light-theme.css',
         src:  [
           'src/assets/styles/vendor/codemirror.css',
@@ -156,6 +147,21 @@ module.exports = function (grunt) {
       }
     },
 
+    concurrent: {
+      build: [
+        'build:scripts',
+        'concat:vendor',
+        'concat:index',
+        'copy:assets',
+        'build:styles'
+      ],
+
+      themes: [
+        'concat:darkTheme',
+        'concat:lightTheme'
+      ]
+    },
+
     sass: {
       build: {
         options: {
@@ -168,6 +174,7 @@ module.exports = function (grunt) {
           '<%= distdir %>/styles/<%= pkg.name %>-dark-theme.css':  'src/scss/dark-theme.scss'
         }
       },
+
       min: {
         options: {
           sourcemap: 'none',
@@ -182,16 +189,43 @@ module.exports = function (grunt) {
     },
 
     watch: {
-      build: {
+      dist: {
         options: {
           livereload: true
         },
-        tasks: ['build'],
+
+        tasks: [],
         files: [
-          '<%= src.js %>',
-          '<%= src.scssWatch %>',
-          'src/app/**/*.tpl.html',
-          '<%= src.html %>'
+          '<%= distdir %>/**/*'
+        ]
+      },
+
+      scripts: {
+        tasks: ['build:scripts'],
+        files: [
+          '<%= ngtemplates.ramlConsole.src %>',
+          '<%= src.js %>'
+        ]
+      },
+
+      vendor: {
+        tasks: ['concat:scripts'],
+        files: [
+          '<%= concat.vendor.src %>'
+        ]
+      },
+
+      index: {
+        tasks: ['concat:index'],
+        files: [
+          '<%= concat.index.src %>'
+        ]
+      },
+
+      styles: {
+        tasks: ['build:styles'],
+        files: [
+          'src/scss/**/*.scss'
         ]
       }
     },
@@ -200,7 +234,8 @@ module.exports = function (grunt) {
     css_prefix: {
       prefix: {
         options: {
-          prefix: 'raml-console-'
+          prefix:      'raml-console-',
+          processName: 'trim'
         },
 
         files: {
@@ -213,7 +248,7 @@ module.exports = function (grunt) {
 
     jshint: {
       options: {
-        jshintrc: '.jshintrc'
+        jshintrc: true
       },
 
       files: [
@@ -243,4 +278,32 @@ module.exports = function (grunt) {
       }
     }
   });
+
+  grunt.registerTask('default', [
+    'build',
+    'connect:livereload',
+    'watch'
+  ]);
+
+  grunt.registerTask('build', [
+    'jshint',
+    'clean',
+    'concurrent:build'
+  ]);
+
+  grunt.registerTask('build:scripts', [
+    'ngtemplates',
+    'concat:app'
+  ]);
+
+  grunt.registerTask('build:styles', [
+    'sass:build',
+    'css_prefix:prefix',
+    'concurrent:themes'
+  ]);
+
+  grunt.registerTask('regression', [
+    'build',
+    'protractor:local'
+  ]);
 };

dist/scripts/api-console.js

@@ -1114,7 +1114,6 @@
                 return;
               }
 
-              /* jshint es5: true */
               authStrategy = RAML.Client.AuthStrategies.for(scheme, $scope.credentials);
               authStrategy.authenticate().then(function(token) {
                 token.sign(request);
@@ -1126,7 +1125,6 @@
               });
 
               $scope.requestOptions = request.toOptions();
-              /* jshint es5: false */
             } catch (e) {
               // custom strategies aren't supported yet.
             }
@@ -1722,7 +1720,6 @@
 (function() {
   'use strict';
 
-  /* jshint es5: true */
   RAML.Client.AuthStrategies = {
     for: function(scheme, credentials) {
       if (!scheme) {
@@ -1741,7 +1738,6 @@
       }
     }
   };
-  /* jshint es5: false */
 })();
 
 'use strict';

package.json

@@ -23,23 +23,21 @@
   "homepage": "https://github.com/mulesoft/api-console",
   "dependencies": {},
   "devDependencies": {
-    "connect": "~3.3.2",
-    "connect-livereload": "~0.4.0",
     "grunt": "~0.4.0",
     "grunt-angular-templates": "~0.5.7",
-    "grunt-contrib-clean": "~0.4.0",
-    "grunt-contrib-concat": "~0.1.3",
-    "grunt-contrib-connect": "~0.8.0",
-    "grunt-contrib-copy": "~0.4.0",
-    "grunt-contrib-jshint": "~0.2.0",
+    "grunt-concurrent": "~1.0.0",
+    "grunt-contrib-clean": "~0.6.0",
+    "grunt-contrib-concat": "~0.5.0",
+    "grunt-contrib-connect": "~0.9.0",
+    "grunt-contrib-copy": "~0.7.0",
+    "grunt-contrib-jshint": "~0.10.0",
     "grunt-contrib-sass": "~0.8.1",
-    "grunt-contrib-watch": "~0.3.1",
+    "grunt-contrib-watch": "~0.6.1",
     "grunt-css-prefix": "~0.2.3",
-    "grunt-karma": "~0.4.4",
-    "grunt-open": "~0.2.3",
+    "grunt-karma": "~0.10.1",
     "grunt-protractor-runner": "~1.1.4",
     "jasmine-spec-reporter": "~1.1.0",
-    "load-grunt-tasks": "~0.6.0",
-    "serve-static": "~1.7.1"
+    "load-grunt-tasks": "~2.0.0",
+    "serve-static": "~1.8.0"
   }
 }

src/app/directives/sidebar.js

@@ -323,7 +323,6 @@
                 return;
               }
 
-              /* jshint es5: true */
               authStrategy = RAML.Client.AuthStrategies.for(scheme, $scope.credentials);
               authStrategy.authenticate().then(function(token) {
                 token.sign(request);
@@ -335,7 +334,6 @@
               });
 
               $scope.requestOptions = request.toOptions();
-              /* jshint es5: false */
             } catch (e) {
               // custom strategies aren't supported yet.
             }

src/common/client/auth_strategies.js

@@ -1,7 +1,6 @@
 (function() {
   'use strict';
 
-  /* jshint es5: true */
   RAML.Client.AuthStrategies = {
     for: function(scheme, credentials) {
       if (!scheme) {
@@ -20,5 +19,4 @@
       }
     }
   };
-  /* jshint es5: false */
 })();