Merge pull request #4162 from angular-ui/feature/gruntLess

chore(build): Adds Less files to release

Author: JLLeitschuh

grunt/aliases.js

@@ -48,10 +48,10 @@ module.exports = function (grunt, options) {
   var currentTag = semver.clean( util.getCurrentTag() );
 
   if (currentTag) {
-    baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'cut-release', 'copy:less_dist', 'gh-pages:ui-grid-site', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
+    baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release', 'gh-pages:ui-grid-site', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
   }
   else {
-    baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'cut-release', 'copy:less_dist', 'gh-pages:ui-grid-site'];
+    baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release', 'gh-pages:ui-grid-site'];
   }
 
   return baseTasks;

grunt/copy.js

@@ -1,3 +1,6 @@
+var util = require('../lib/grunt/utils.js');
+var semver = require('semver');
+var currentTag = semver.clean( util.getCurrentTag() );
 module.exports = function ( grunt ) {
   return {
     site: {
@@ -21,7 +24,23 @@ module.exports = function ( grunt ) {
           expand: true,
           cwd: 'src/less',
           src: '**/*.less',
-          dest: '<%= dist %>/release/src/less'
+          dest: '<%= dist %>/release/less'
+        },
+        {
+          expand: true,
+          cwd: 'src/features',
+          src: '**/*.less',
+          dest: '<%= dist %>/release/less'
+        }
+      ]
+    },
+    less_cut_release: {
+      files: [
+        {
+          expand: true,
+          cwd: '<%= dist %>/release/less',
+          src: '**/*.less',
+          dest: '<%= dist %>/release/' + currentTag + '/less'
         }
       ]
     }

grunt/cut-release.js

@@ -1,11 +1,14 @@
 module.exports = {
   options: {
     cleanup: true,
-    keepUnstable: false
+    keepUnstable: false,
+    stableTasks: [
+      'copy:less_cut_release'
+    ]
   },
   dist: {
     files: [
-      { src: '<%= dist %>/release/*.{js,css,svg,woff,ttf,eot}', dest: '<%= dist %>/release/' }
+      { src: '<%= dist %>/release/*.{js,css,svg,woff,ttf,eot}', dest: '<%= dist %>/release/' },
     ]
   }
 };

lib/grunt/plugins.js

@@ -175,6 +175,7 @@ module.exports = function(grunt) {
     grunt.task.requires(['build']);
 
     var options = this.options({
+      stableSuffix: '',
       unstableSuffix: '-unstable',
       cleanup: false
     });
@@ -228,7 +229,13 @@ module.exports = function(grunt) {
         }
 
         // Skip file if it was already released
-        var re = new RegExp('(' + options.unstableSuffix + ')');
+        var exp;
+        if (options.stableSuffix !== ''){
+          exp = '(' + options.stableSuffix + '|' + options.unstableSuffix + ')';
+        } else {
+          exp = '(' + options.unstableSuffix + ')';
+        }
+        var re = new RegExp(exp);
         if (basename.match(re)) {
           grunt.log.writeln("Skipping file: " + f);
           return;
@@ -272,6 +279,11 @@ module.exports = function(grunt) {
           shell.rm(f);
         }
       });
+      
+      //Run tasks for a stable release
+      if (currentTag && options.stableTasks) {
+        grunt.task.run(options.stableTasks);
+      }
     });
 
     done();