ISSUE-203

Author: aspacca

Gruntfile.js

@@ -133,24 +133,49 @@ module.exports = function (grunt) {
             server: {
                 cwd: '<%= yeoman.app %>',
                 src: ['*.html', 'includes/*.html'],
-                dest: '.tmp/',
+                dest: '.tmp',
                 options: {
                     flatten: true,
                     banner: ''
                 }
             }
         },
-        // not used since Uglify task does concat,
-        // but still available if needed
-        /*concat: {
-      dist: {}
-    },*/
-        // not enabled since usemin task does concat and uglify
-        // check index.html to edit your build targets
-        // enable this task if you prefer defining your build targets here
-        /*uglify: {
-      dist: {}
-    },*/
+        concat: {
+            generated: {
+                files: [
+                    {
+                        dest: '.tmp/scripts/main.js',
+                        src: ['<%= yeoman.app %>/scripts/main.js']
+                    },
+                    {
+                        dest: '.tmp/scripts/vendor/modernizr.js',
+                        src: ['<%= yeoman.app %>/scripts/vendor/modernizr.js']
+                    },
+                    {
+                        dest: '.tmp/scripts/vendor/video.js',
+                        src: ['<%= yeoman.app %>/scripts/vendor/video.js']
+                    }
+                ]
+            }
+        },
+        uglify: {
+            generated: {
+                files: [
+                    {
+                        dest: '<%= yeoman.dist %>/scripts/main.js',
+                        src: ['.tmp/scripts/main.js']
+                    },
+                    {
+                        dest: '<%= yeoman.dist %>/scripts/vendor/modernizr.js',
+                        src: ['.tmp/scripts/vendor/modernizr.js']
+                    },
+                    {
+                        dest: '<%= yeoman.dist %>/scripts/vendor/video.js',
+                        src: ['.tmp/scripts/vendor/video.js']
+                    }
+                ]
+            }
+        },
         rev: {
             dist: {
                 files: {
@@ -232,7 +257,8 @@ module.exports = function (grunt) {
                 }
             }
         }
-        ,copy: {
+        ,
+        copy: {
             dist: {
                 files: [{
                     expand: true,
@@ -300,12 +326,12 @@ module.exports = function (grunt) {
         'clean:server',
         'less',
         'copy:server',
-        'connect:test',
+        'connect:test'
     ]);
 
     grunt.registerTask('build', [
         'clean:dist',
-        'npm-command',
+        //'npm-command',
         'copy:server',
         'useminPrepare',
         'concurrent',
@@ -314,8 +340,7 @@ module.exports = function (grunt) {
         'includes:build',
         'uglify',
         'copy',
-        'usemin',
-
+        'usemin'
     ]);
 
     grunt.registerTask('default', [

README.md

@@ -5,7 +5,7 @@ This repository contains the web frontend for [transfer.sh](https://github.com/d
 
 ## How to use it 
 
-You must specify `web-path`directory, pointing to `dist` generated folder (Grunt & bindata)
+You must specify `web-path` directory, pointing to `dist` generated folder (Grunt & bindata)
 
 Sample :
 ```

bindata_gen.go

@@ -2,31 +2,31 @@
   "name": "transfer.sh",
   "version": "0.0.0",
   "dependencies": {
-    "wiredep": "^1.8.6"
+    "wiredep": "^4.0.0"
   },
   "devDependencies": {
-    "grunt": "~0.4.5",
+    "grunt": "^1.0.4",
     "grunt-concurrent": "~1.0.0",
     "grunt-contrib-clean": "~0.6.0",
     "grunt-contrib-concat": "~0.5.0",
-    "grunt-contrib-connect": "~0.8.0",
+    "grunt-contrib-connect": "^2.0.0",
     "grunt-contrib-copy": "~0.6.0",
-    "grunt-contrib-cssmin": "~0.10.0",
-    "grunt-contrib-htmlmin": "~0.3.0",
-    "grunt-contrib-imagemin": "0.8.1",
-    "grunt-contrib-jshint": "~0.10.0",
-    "grunt-contrib-less": "~0.11.4",
-    "grunt-contrib-uglify": "~0.6.0",
-    "grunt-contrib-watch": "~0.6.1",
+    "grunt-contrib-cssmin": "^3.0.0",
+    "grunt-contrib-htmlmin": "^3.0.0",
+    "grunt-contrib-imagemin": "^3.1.0",
+    "grunt-contrib-jshint": "^2.1.0",
+    "grunt-contrib-less": "^2.0.0",
+    "grunt-contrib-uglify": "^4.0.1",
+    "grunt-contrib-watch": "^1.1.0",
     "grunt-include-replace": "^2.0.0",
     "grunt-includes": "^0.4.5",
     "grunt-npm-command": "^0.1.2",
     "grunt-rev": "~0.1.0",
-    "grunt-svgmin": "1.0.0",
-    "grunt-usemin": "~2.4.0",
+    "grunt-svgmin": "^6.0.0",
+    "grunt-usemin": "^3.1.1",
     "jshint-stylish": "~1.0.0",
-    "load-grunt-tasks": "~0.6.0",
-    "matchdep": "~0.3.0",
+    "load-grunt-tasks": "^4.0.0",
+    "matchdep": "^2.0.0",
     "time-grunt": "~1.0.0"
   },
   "engines": {