Merge pull request #15 from weeezes/dev

Correct usage of usemin when running grunt build
sgmeyer · May 7, 2014 · c23d543 · c23d543
2 parents ea2f15f + 506da0b
commit c23d543
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/app/templates/_Gruntfile.js b/app/templates/_Gruntfile.js
@@ -130,30 +130,18 @@ module.exports = function (grunt) {
         }
       }
     },<% } %>
-    uglify: {
-      options: {
-        mangle: false
-      },
-      dist: {
-        files: {
-          '<%%= yeoman.dist %>/scripts/combined-scripts.min.js': ['<%%= yeoman.dist %>/scripts/combined-scripts.js']
-        }
-      }
-    },
     rev: {
       dist: {
         files: {
           src: [
             '<%%= yeoman.dist %>/scripts/{,*/}*.js',
-            '<%%= yeoman.dist %>/styles/{,*/}*.css',
-            '<%%= yeoman.dist %>/images/{,*/}*.{png,jpg,jpeg,gif,webp}',
-            '<%%= yeoman.dist %>/styles/fonts/*'
+            '<%%= yeoman.dist %>/styles/{,*/}*.css'
           ]
         }
       }
     },
     useminPrepare: {
-      html: '.tmp/index.html',
+      html: '<%%= yeoman.app %>/index.html',
       options: {
         dest: '<%%= yeoman.dist %>'
       }
@@ -220,9 +208,7 @@ module.exports = function (grunt) {
             '*.{ico,txt}',
             '.htaccess',
             'images/{,*/}*.{webp,gif}',
-            'styles/fonts/*',
-            'libs/**',
-            'bower_components/**'
+            'styles/fonts/*'
           ]
         }]
       }
@@ -256,7 +242,7 @@ module.exports = function (grunt) {
           }
         },
         src: '<%%= yeoman.app %>/scripts/app.js',
-        dest: '<%%= yeoman.dist %>/scripts/combined-scripts.js'
+        dest: '.tmp/scripts/combined-scripts.js'
       },
     }
   });
@@ -294,6 +280,7 @@ module.exports = function (grunt) {
     'useminPrepare',
     'concurrent:dist',
     'neuter:dist',
+    'concat',
     'cssmin',
     'uglify',
     'copy',

diff --git a/app/templates/_package.json b/app/templates/_package.json
@@ -9,6 +9,7 @@
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-contrib-clean": "~0.5.0",
+    "grunt-contrib-concat": "~0.3.0",
     "grunt-contrib-uglify": "~0.2.4",
     "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-connect": "~0.5.0",
@@ -19,7 +20,7 @@
     "grunt-contrib-htmlmin": "~0.1.3",
     "grunt-contrib-imagemin": "~0.2.0",
     "grunt-rev": "~0.1.0",
-    "grunt-usemin": "~0.1.12",
+    "grunt-usemin": "~2.1.1",
     "grunt-open": "~0.2.0",
     "grunt-svgmin": "~0.2.0",
     "grunt-concurrent": "~0.3.0",