Slight changes to the rjs task, moving config to gruntfile

Author: mklabs

tasks/h5bp.js

@@ -32,6 +32,7 @@ module.exports = function(grunt) {
   grunt.registerTask('default', 'build:default');
   grunt.registerTask('reload', 'default connect watch:reload');
 
+  // XXX move targets to the gruntfile? easier for user to tweak build profiles
   var targets = {
     default:  'concat css min img rev usemin manifest',
     text:     'concat css min     rev usemin manifest',

tasks/rjs.js

@@ -1,25 +1,35 @@
-var fs = require('fs'),
-	path = require('path'),
-	rjs = require('requirejs');
+var path = require('path'),
+  rjs = require('requirejs');
 
 module.exports = function(grunt) {
-	grunt.task.registerMultiTask('rjs', 'Optimizes javascript that actually is built with requirejs.', function () {
-		this.requiresConfig('rjs');
+  grunt.task.registerTask('rjs', 'Optimizes javascript that actually is built with requirejs.', function () {
+    this.requiresConfig(this.name);
+    grunt.helper('rjs:optimize:js', grunt.config(this.name), this.async());
+  });
 
-		grunt.helper('rjs:optimize:js', this.data, this.async());
-	});
+  grunt.registerHelper('rjs:optimize:js', function(options, cb) {
+    if(!cb) { cb = options; options = {}; }
+    grunt.log.subhead('Options:');
+    grunt.helper('inspect', options);
 
-	grunt.registerHelper('rjs:optimize:js', function(file, options, cb) {
-		if(!cb) { cb = options; options = {}; }
-		options.baseUrl = './';
-		options.appDir = 'js';
-		options.dir = grunt.config('output')+options.appDir;
-		options.modules = [{
-			name: file
-		}];
-		rjs.optimize(options, function() {
-			cb();
-		});
-	});
+    var originals = options.modules.map(function(m) {
+      return {
+        name: m.name,
+        body: grunt.file.read(path.join(options.baseUrl, options.appDir, m.name + '.js'))
+      };
+    });
+
+    rjs.optimize(options, function() {
+      originals.forEach(function(m) {
+        var filepath = path.join(options.dir, m.name + '.js');
+        grunt.log
+          .writeln('rjs optimized module ' + m.name)
+          .writeln('>> ' + filepath);
+        grunt.helper('min_max_info', grunt.file.read(filepath), m.body);
+      });
+
+      cb();
+    });
+  });
 
 };