From b8f589515fdfdd9034b0d43e55689d646168dc7a Mon Sep 17 00:00:00 2001 From: jlukic Date: Sat, 28 Sep 2013 08:28:22 -0400 Subject: [PATCH] Updates commenting in gruntfile for new pull request concat task Former-commit-id: 9c908d7f7cd4498d2642db7dd9a3f49386f98fb4 Former-commit-id: 4901f9249949d2b63967d6ef4a21e1250e5a6cde --- node/Gruntfile.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/node/Gruntfile.js b/node/Gruntfile.js index 005aff00b..933cfea97 100755 --- a/node/Gruntfile.js +++ b/node/Gruntfile.js @@ -39,7 +39,11 @@ module.exports = function(grunt) { // creates custom license in header 'cssmin:addBanner', - 'concat', + // create concatenated css release + 'concat:concatenateCSS', + + // create concatenated js release + 'concat:concatenateJS', // creates minified js of each file 'uglify:minifyJS', @@ -254,20 +258,20 @@ module.exports = function(grunt) { ] } }, - + concat: { options: { }, - css_uncompressed: { + concatenateCSS: { src: ["../build/uncompressed/**/*.css"], dest: "../build/packaged/css/semantic.css" }, - js_uncompressed: { + concatenateJS: { src: ["../build/uncompressed/**/*.js"], dest: "../build/packaged/javascript/semantic.js" - }, + }, }, - + cssmin: { // copy minified css to minified release @@ -368,7 +372,6 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-docco'); - grunt.loadNpmTasks('grunt-contrib-concat'); grunt.initConfig(config);