Usemin without uglify plus non-ugly testification

Gruntfile.js

@@ -19,7 +19,7 @@ module.exports = function(grunt) {
         files: [{
           expand: true,
           cwd: 'test/fixtures',
-          src: ['usemin.html', 'usemin/*'],
+          src: ['usemin.html', 'useminUgly.html', 'usemin/*', 'useminUgly/*'],
           dest: 'tmp/'
         }]
       }
@@ -47,13 +47,39 @@ module.exports = function(grunt) {
       }
     },
     usemin: {
+      html: 'tmp/useminUgly.html'
+    },
+    useminWithoutUglify: {
       html: 'tmp/usemin.html'
     },
     useminPrepare: {
+      html: 'test/fixtures/useminUgly.html',
+      options: {
+        dest: 'tmp',
+        staging: 'tmp',
+        flow: {
+          html: {
+            steps: {
+              js: ['concat', 'uglify'],
+              css: ['concat', 'cssmin']
+            }
+          }
+        }
+      }
+    },
+    useminPrepareWithoutUglify: {
       html: 'test/fixtures/usemin.html',
       options: {
         dest: 'tmp',
-        staging: 'tmp'
+        staging: 'tmp',
+        flow: {
+          html: {
+            steps: {
+              js: ['concat'],
+              css: ['concat']
+            }
+          }
+        }
       }
     },
     cssmin: {},
@@ -93,15 +119,15 @@ module.exports = function(grunt) {
         src: ['test/fixtures/one.html', 'test/fixtures/two/**/*.html'],
         dest: 'tmp/custom_concat_usemin.js',
         options: {
-          usemin: 'usemin/all.js'
+          usemin: 'useminUgly/all.js'
         }
       },
 
       custom_usemin_not_found: {
         src: ['test/fixtures/one.html', 'test/fixtures/two/**/*.html'],
         dest: 'tmp/custom_concat_usemin_not_found.js',
         options: {
-          usemin: 'usemin/not_found.js'
+          usemin: 'useminUgly/not_found.js'
         }
       },
 
@@ -264,10 +290,62 @@ module.exports = function(grunt) {
       regexp: {
         src: 'test/fixtures/regexp.html',
         dest: 'tmp/regexp.js'
+      },
+
+      usemin_no_uglify: {
+        src: ['test/fixtures/one.html', 'test/fixtures/two/**/*.html'],
+        dest: 'tmp/custom_concat_usemin_no_uglify.js',
+        options: {
+          usemin: 'usemin/all.js'
+        }
       }
     }
   });
 
+  grunt.registerTask('useminPrepareWithoutUglify', function () {
+    grunt.config.set('concat.generated', null);
+    grunt.config.set('uglify.generated', null);
+    var useminPrepareWithoutUglify = grunt.config('useminPrepareWithoutUglify');
+    grunt.config.set('useminPrepare', useminPrepareWithoutUglify);
+    grunt.task.run('useminPrepare');
+  });
+
+  grunt.registerTask('useminWithoutUglify', function () {
+    var useminWithoutUglify = grunt.config('useminWithoutUglify');
+    grunt.config.set('usemin', useminWithoutUglify);
+    grunt.task.run('usemin');
+  });
+
+  var prettyTemplates = [
+    'usemin_no_uglify'
+  ];
+
+  grunt.registerTask('uglyTemplates', function(){
+    var templateKeys = Object.keys(grunt.config('ngtemplates'));
+    var tasks = [];
+
+    for(var i in templateKeys){
+      if(prettyTemplates.indexOf(templateKeys[i]) === -1){
+        tasks.push('ngtemplates:' + templateKeys[i]);
+      }
+    }
+
+    grunt.task.run(tasks);
+  });
+
+  grunt.registerTask('prettyTemplates', function(){
+    var templateKeys = Object.keys(grunt.config('ngtemplates'));
+    var tasks = [];
+
+    for(var i in templateKeys){
+      if(prettyTemplates.indexOf(templateKeys[i]) !== -1){
+        tasks.push('ngtemplates:' + templateKeys[i]);
+      }
+    }
+
+    grunt.task.run(tasks);
+  });
+
   // Load local tasks.
   grunt.loadTasks('tasks');
   grunt.loadNpmTasks('grunt-contrib-clean');
@@ -279,5 +357,20 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-usemin');
 
-  grunt.registerTask('default', ['jshint', 'clean', 'copy', 'useminPrepare', 'ngtemplates', 'concat', 'uglify', 'cssmin', 'usemin', 'nodeunit']);
+  grunt.registerTask('default', [
+    'jshint',
+    'clean',
+    'copy',
+    'useminPrepare',
+    'uglyTemplates',
+    'concat',
+    'uglify',
+    'cssmin',
+    'usemin',
+    'useminPrepareWithoutUglify',
+    'prettyTemplates',
+    'concat',
+    'useminWithoutUglify',
+    'nodeunit'
+  ]);
 };

tasks/lib/appender.js

@@ -70,9 +70,14 @@ var Appender = function(grunt) {
    */
   this.concatUseminFiles = function(path, file) {
     var config = grunt.config('uglify.generated');
+    var willUglify = !!config;
 
     if (!config) {
-      grunt.log.warn('Usemin has not created ' + 'uglify.generated'.red + ' yet!');
+      config = grunt.config('concat.generated');
+    }
+
+    if (!config) {
+      grunt.log.warn('Usemin has not created ' + 'uglify.generated'.red + ' or ' + 'concat.generated'.red + ' yet!');
 
       return false;
     }
@@ -101,11 +106,11 @@ var Appender = function(grunt) {
       grunt.log.warn('Multiple matches for ' + path.yellow + '.  Using ' + match.dest);
     }
 
-    var uglified = match.src.pop();
+    var target =  willUglify ? match.src.pop() : match.dest;
 
     // Finally, modify concat target sourced by matching uglify target
     return this.concatFiles('generated', file, function(files) {
-      return uglified === files.dest;
+      return target === files.dest;
     });
   };
 

test/angular-templates_test.js

@@ -38,10 +38,22 @@ exports.ngtemplates = {
   custom_usemin: function(test) {
     test.expect(5);
 
+    test.equal(grunt.file.read('test/expected/useminUgly.html'), grunt.file.read('tmp/useminUgly.html'));
+    test.equal(grunt.file.read('test/expected/useminUgly/foo.js').slice(0, -1), grunt.file.read('tmp/useminUgly/foo.js'));
+    test.equal(grunt.file.read('test/expected/useminUgly/bar.js').slice(0, -1), grunt.file.read('tmp/useminUgly/bar.js'));
+    test.equal(grunt.file.read('test/expected/useminUgly/all.js').slice(0, -1), grunt.file.read('tmp/useminUgly/all.js'));
+    test.equal(grunt.file.read('test/expected/useminUgly/bar.css'), grunt.file.read('tmp/useminUgly/bar.css'));
+
+    test.done();
+  },
+
+  custom_usemin_no_uglify: function(test) {
+    test.expect(5);
+
     test.equal(grunt.file.read('test/expected/usemin.html'), grunt.file.read('tmp/usemin.html'));
-    test.equal(grunt.file.read('test/expected/usemin/foo.js').slice(0, -1), grunt.file.read('tmp/usemin/foo.js'));
-    test.equal(grunt.file.read('test/expected/usemin/bar.js').slice(0, -1), grunt.file.read('tmp/usemin/bar.js'));
-    test.equal(grunt.file.read('test/expected/usemin/all.js').slice(0, -1), grunt.file.read('tmp/usemin/all.js'));
+    test.equal(grunt.file.read('test/expected/usemin/foo.js'), grunt.file.read('tmp/usemin/foo.js'));
+    test.equal(grunt.file.read('test/expected/usemin/bar.js'), grunt.file.read('tmp/usemin/bar.js'));
+    test.equal(grunt.file.read('test/expected/usemin/all.js'), grunt.file.read('tmp/usemin/all.js'));
     test.equal(grunt.file.read('test/expected/usemin/bar.css'), grunt.file.read('tmp/usemin/bar.css'));
 
     test.done();
@@ -240,5 +252,5 @@ exports.ngtemplates = {
     test.equal(expected, actual);
     test.done();
   }
-  
+
 };

test/expected/usemin/all.js

@@ -1 +1,37 @@
-var Foo=function(){},Bar="bar";angular.module("custom_usemin").run(["$templateCache",function(a){"use strict";a.put("test/fixtures/one.html",'<h1>One</h1>\n\n<p class="">I am one.</p>\n\n<script type="text/javascript">\n  // Test\n  /* comments */\n  var foo = \'bar\';\n</script>\n'),a.put("test/fixtures/two/two.html",'<h2>Two</h2>\n\n<!-- Comment for two -->\n\n<textarea readonly="readonly">We are two.</textarea>\n')}]);
+/**
+ * foo.js
+ */
+
+var Foo = function() {};
+
+/**
+ * bar.js
+ */
+
+var Bar = 'bar';
+
+angular.module('usemin_no_uglify').run(['$templateCache', function($templateCache) {
+  'use strict';
+
+  $templateCache.put('test/fixtures/one.html',
+    "<h1>One</h1>\n" +
+    "\n" +
+    "<p class=\"\">I am one.</p>\n" +
+    "\n" +
+    "<script type=\"text/javascript\">\n" +
+    "  // Test\n" +
+    "  /* comments */\n" +
+    "  var foo = 'bar';\n" +
+    "</script>\n"
+  );
+
+
+  $templateCache.put('test/fixtures/two/two.html',
+    "<h2>Two</h2>\n" +
+    "\n" +
+    "<!-- Comment for two -->\n" +
+    "\n" +
+    "<textarea readonly=\"readonly\">We are two.</textarea>\n"
+  );
+
+}]);

test/expected/usemin/bar.css

@@ -1 +1,8 @@
-body{color:#000;background:#fff}
+/**
+ * bar.css
+ */
+
+body {
+    color: #000;
+    background: #fff;
+}

test/expected/usemin/bar.js

@@ -1 +1,5 @@
-var Bar="bar";
+/**
+ * bar.js
+ */
+
+var Bar = 'bar';

test/expected/usemin/foo.js

@@ -1 +1,5 @@
-var Foo=function(){};
+/**
+ * foo.js
+ */
+
+var Foo = function() {};

test/expected/useminUgly.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+    <head>
+        <link rel="stylesheet" href="styles/main.css">
+        <script src="scripts/vendor/modernizr.min.js"></script>
+    </head>
+    <body>
+
+    <script src="useminUgly/foo.js"></script>
+
+    <script src="useminUgly/bar.js"></script>
+
+    <script src="useminUgly/all.js"></script>
+
+    <script src="duplicate/useminUgly/all.js"></script>
+
+    <link rel="stylesheet" href="useminUgly/bar.css">
+</body>
+</html>

test/expected/useminUgly/bar.css

@@ -0,0 +1 @@
+body{color:#000;background:#fff}

test/expected/useminUgly/bar.js

@@ -0,0 +1 @@
+var Bar="bar";

test/expected/useminUgly/foo.js

@@ -0,0 +1 @@
+var Foo=function(){};

test/fixtures/useminUgly.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+    <head>
+        <link rel="stylesheet" href="styles/main.css">
+        <script src="scripts/vendor/modernizr.min.js"></script>
+    </head>
+    <body>
+
+    <!-- build:js useminUgly/foo.js -->
+    <script src="useminUgly/foo.js"></script>
+    <!-- endbuild -->
+
+    <!-- build:js useminUgly/bar.js -->
+    <script src="useminUgly/bar.js"></script>
+    <!-- endbuild -->
+
+    <!-- build:js useminUgly/all.js -->
+    <script src="useminUgly/foo.js"></script>
+    <script src="useminUgly/bar.js"></script>
+    <!-- endbuild -->
+
+    <!-- build:js duplicate/useminUgly/all.js -->
+    <script src="useminUgly/foo.js"></script>
+    <script src="useminUgly/bar.js"></script>
+    <!-- endbuild -->
+
+    <!-- build:css useminUgly/bar.css -->
+    <script src="useminUgly/bar.css"></script>
+    <!-- endbuild -->
+</body>
+</html>

test/fixtures/useminUgly/bar.css

@@ -0,0 +1,8 @@
+/**
+ * bar.css
+ */
+
+body {
+    color: #000;
+    background: #fff;
+}

test/fixtures/useminUgly/bar.js

@@ -0,0 +1,5 @@
+/**
+ * bar.js
+ */
+
+var Bar = 'bar';

test/fixtures/useminUgly/foo.js

@@ -0,0 +1,5 @@
+/**
+ * foo.js
+ */
+
+var Foo = function() {};