chore(grunt): fix issue #153 (grunt server build time)

rackerlabs · Apr 17, 2014 · 94397e9 · 94397e9
1 parent fa3a808
commit 94397e9
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 29 deletions.
diff --git a/grunt-tasks/after-test.js b/grunt-tasks/after-test.js
diff --git a/grunt-tasks/before-test.js b/grunt-tasks/before-test.js
diff --git a/grunt-tasks/build.js b/grunt-tasks/build.js
@@ -132,15 +132,16 @@ module.exports = function (grunt) {
         var srcFiles = _.pluck(modules, 'srcFiles');
         var tplJsFiles = _.pluck(modules, 'tplJsFiles');
 
-        //Set the concat task to concatenate the given src modules
+        // Set the concat task to concatenate the given src modules
         grunt.config('concat.dist.src', grunt.config('concat.dist.src').concat(srcFiles));
 
-        //Set the concat-with-templates task to concat the given src & tpl modules
+        // Set the concat-with-templates task to concat the given src & tpl modules
         grunt.config('concat.distTpls.src', grunt.config('concat.distTpls.src').concat(srcFiles).concat(tplJsFiles));
 
-        //Set the copy task to process via grunt template
+        // Set the copy task to process via grunt template
         grunt.config('copy.demohtml.options.process', grunt.template.process);
 
-        grunt.task.run(['clean:build', 'less:encore', 'concat']);
+        grunt.task.run(['clean:build', 'concat:dist', 'concat:distTpls', 'less',
+            'copy:demohtml', 'copy:demoassets', 'copy:componentImages']);
     });
 };
diff --git a/grunt-tasks/default.js b/grunt-tasks/default.js
@@ -1,3 +1,4 @@
 module.exports = function(grunt) {
-    grunt.registerTask('default', ['before-test', 'test', 'after-test']);
+    grunt.registerTask('default', ['clean', 'syntax-check', 'html2js',
+        'build', 'test', 'minify', 'copy', 'rxPageObjects', 'ngdocs']);
 };
diff --git a/grunt-tasks/minify.js b/grunt-tasks/minify.js
@@ -0,0 +1,3 @@
+module.exports = function (grunt) {
+    grunt.registerTask('minify', ['cssmin', 'ngmin', 'uglify']);
+};
diff --git a/grunt-tasks/options/connect.js b/grunt-tasks/options/connect.js
@@ -29,7 +29,7 @@ module.exports = {
                     config.mountFolder(cnct, config.docs)
                 ];
             },
-            livereload:1337
+            livereload: 1337
         }
     },
     keepalive: {

diff --git a/grunt-tasks/options/watch.js b/grunt-tasks/options/watch.js
@@ -4,25 +4,25 @@ module.exports = {
     },
     scripts: {
         files: ['src/**/*.js', '!src/*/*.spec.js'],
-        tasks: ['jshint:scripts', 'jscs', 'karma:watch:run', 'after-test']
+        tasks: ['build', 'karma:watch:run']
     },
     specs: {
         files: ['src/**/*.spec.js'],
-        tasks: ['jshint:specs', 'karma:watch:run', 'copy:coverage'],
+        tasks: ['karma:watch:run', 'copy:coverage'],
         options: {
             livereload: false
         }
     },
     componentHtml: {
         files: ['src/**/templates/*.html'],
-        tasks: ['after-test', 'karma:watch:run']
+        tasks: ['html2js', 'build', 'karma:watch:run']
     },
-    css: {
+    componentLess: {
         files: ['src/**/*.less'],
         tasks: ['less']
     },
-    html: {
-        files: ['demo/*', 'src/**/docs/*.html', 'src/**/*.md'],
-        tasks: ['html2js', 'build', 'copy']
+    demoSite: {
+        files: ['src/**/docs/*.html', 'src/**/*.md', 'demo/*'],
+        tasks: ['build']
     }
 };
diff --git a/grunt-tasks/server.js b/grunt-tasks/server.js
@@ -3,12 +3,14 @@ module.exports = function (grunt) {
         'Runs app in development mode.',
         function () {
             var commonTasks = [
-                'before-test',
-                'after-test',
+                'clean',
+                'html2js',
+                'build',
+                'less',
+                'copy',
                 'configureProxies',
                 'connect:dist',
-                'karma:watch',
-                'karma:watch:run',
+                'karma:watch:start',
                 'watch'
             ];
 

diff --git a/grunt-tasks/shipit.js b/grunt-tasks/shipit.js
@@ -18,8 +18,7 @@ module.exports = function (grunt) {
             tasks.push('bump-commit');
 
             // build the code
-            tasks.push('before-test');
-            tasks.push('after-test');
+            tasks.push('default');
 
             // push files to prod
             tasks.push('cloudfiles:production');

diff --git a/grunt-tasks/syntax-check.js b/grunt-tasks/syntax-check.js
@@ -0,0 +1,4 @@
+module.exports = function (grunt) {
+    // might want to add 'complexity' in the future when it's more standardized
+    grunt.registerTask('syntax-check', ['jshint', 'jscs']);
+};
diff --git a/src/rxApp/docs/rxApp.html b/src/rxApp/docs/rxApp.html
@@ -26,9 +26,9 @@ <h3>Collapsible rxApp</h3>
 
 <!--
 You'll likely want to implement your HTML in your index.html file as:
-<body ng-app="sampleApp">
+<div ng-app="sampleApp">
     <rx-app ng-view></rx-app>
-</body>
+</div>
 
 And the template for each view/page will be something like:
 <rx-page title="'Example Page'">

diff --git a/src/rxApp/templates/rxApp.html b/src/rxApp/templates/rxApp.html
@@ -1,4 +1,4 @@
-<div class="rx-app" ng-class="{collapsible: collapsibleNav === 'true', collapsed: collapsedNav}">
+<div class="rx-app" ng-class="{collapsible: collapsibleNav === 'true', collapsed: collapsedNav}" ng-cloak>
     <nav class="rx-app-menu">
         <header class="site-branding">
             <h1 class="site-title">{{ siteTitle || 'Encore' }}</h1>