Minify the site JavaScript

This commit is contained in:
Rowan Manning
2013-11-05 11:53:46 +00:00
parent 46d9f2ade8
commit 3bc9106942
4 changed files with 36 additions and 13 deletions

View File

@@ -29,10 +29,35 @@ module.exports = function (grunt) {
}
},
uglify: {
options: {
mangle: false
},
all: {
files: {
'public/js/site.min.js': [
'public/js/vendor/jquery/jquery.min.js',
'public/js/vendor/bootstrap/js/alert.js',
'public/js/vendor/bootstrap/js/dropdown.js',
'public/js/vendor/bootstrap/js/tooltip.js',
'public/js/vendor/flot/jquery.flot.js',
'public/js/vendor/flot/jquery.flot.categories.js',
'public/js/vendor/flot/jquery.flot.selection.js',
'public/js/vendor/flot/jquery.flot.resize.js',
'public/js/site.js'
]
}
}
},
watch: {
less: {
files: ['public/less/**/*.less'],
tasks: ['less']
},
js: {
files: ['public/js/**/*.js', '!public/js/site.min.js'],
tasks: ['uglify']
}
}
@@ -40,10 +65,11 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.registerTask('lint', ['jshint']);
grunt.registerTask('compile', ['less']);
grunt.registerTask('compile', ['less', 'uglify']);
grunt.registerTask('default', ['compile', 'lint']);
grunt.registerTask('ci', ['compile', 'lint']);

View File

@@ -34,6 +34,7 @@
"grunt": "~0.4",
"grunt-contrib-jshint": "~0.7",
"grunt-contrib-less": "~0.8",
"grunt-contrib-uglify": "~0.2",
"grunt-contrib-watch": "~0.5",
"supervisor": "~0.5"
},

6
public/js/site.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@@ -40,18 +40,8 @@
{{> page-footer}}
<!-- Javascript loveliness. -->
<script type="text/javascript" src="/js/vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="/js/vendor/bootstrap/js/alert.js"></script>
<script type="text/javascript" src="/js/vendor/bootstrap/js/dropdown.js"></script>
<script type="text/javascript" src="/js/vendor/bootstrap/js/tooltip.js"></script>
<!--[if lte IE 8]>
<script language="javascript" type="text/javascript" src="/js/vendor/flot/excanvas.min.js"></script><![endif]-->
<script src="/js/vendor/flot/jquery.flot.js"></script>
<script src="/js/vendor/flot/jquery.flot.categories.js"></script>
<script src="/js/vendor/flot/jquery.flot.selection.js"></script>
<script src="/js/vendor/flot/jquery.flot.resize.js"></script>
<script type="text/javascript" src="/js/site.js"></script>
<script type="text/javascript" src="/js/site.min.js"></script>
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="/js/vendor/flot/excanvas.min.js"></script><![endif]-->
</body>
</html>