From a610228fa7a7db9bc4cae473fe2ee2f1abf81e27 Mon Sep 17 00:00:00 2001 From: Vit Brunner Date: Sat, 1 Nov 2014 12:53:17 +0100 Subject: [PATCH] Grunt copy over fonts when minimizing --- Gruntfile.coffee | 26 ++++++++++++++++---------- source/index.html.jade | 4 ++-- source/tests.html.jade | 6 +++--- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index de41ad9..3daa3ea 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -45,7 +45,7 @@ module.exports = (grunt) -> } test: { files: 'source/tests/the_raven/*' - tasks: 'copy:main' + tasks: 'copy:main_raven' } jade: { files: 'source/**/*.jade' @@ -59,7 +59,7 @@ module.exports = (grunt) -> min: { test_min: { files: 'source/tests/the_raven/*' - tasks: 'copy:min' + tasks: 'copy:min_raven' } jade_min: { files: 'source/**/*.jade' @@ -104,25 +104,31 @@ module.exports = (grunt) -> } copy: { - main: { + main_raven: { expand: true cwd: 'source' src: 'tests/the_raven/*' dest: 'build' } - min: { + min_raven: { expand: true cwd: 'source' src: 'tests/the_raven/*' dest: 'build-min' } + min_fonts: { + expand: true + cwd: 'build/bower_components/fontawesome/fonts' + src: '*' + dest: 'build-min/fonts/' + } } cssmin: { min: { files: { - 'build-min/styles.css': ('build/' + style for style in vars.styles) - 'build-min/test_styles.css': ('build/' + style for style in vars.test_styles) + 'build-min/css/styles.css': ('build/' + style for style in vars.styles) + 'build-min/css/test_styles.css': ('build/' + style for style in vars.test_styles) } } } @@ -175,8 +181,8 @@ module.exports = (grunt) -> uglify: { min: { files: { - 'build-min/scripts.js': ('build/' + script for script in vars.scripts) - 'build-min/test_scripts.js': ('build/' + script for script in vars.test_scripts) + 'build-min/js/scripts.js': ('build/' + script for script in vars.scripts) + 'build-min/js/test_scripts.js': ('build/' + script for script in vars.test_scripts) } } } @@ -194,8 +200,8 @@ module.exports = (grunt) -> grunt.loadNpmTasks('grunt-contrib-watch'); # Register tasks - grunt.registerTask 'default', [ 'coffee:main', 'copy:main', 'jade:main', 'stylus:main' ] - grunt.registerTask 'min', [ 'jade:min', 'copy:min', 'uglify:min', 'cssmin:min' ] + grunt.registerTask 'default', [ 'coffee:main', 'copy:main_raven', 'jade:main', 'stylus:main' ] + grunt.registerTask 'min', [ 'jade:min', 'copy:min_raven', 'copy:min_fonts', 'uglify:min', 'cssmin:min' ] grunt.registerTask 'test', [ 'default', 'min', 'connect', 'qunit' ] grunt.registerTask 'serve', () -> diff --git a/source/index.html.jade b/source/index.html.jade index ceacbe8..742ee42 100644 --- a/source/index.html.jade +++ b/source/index.html.jade @@ -6,8 +6,8 @@ html(ng-app="sideBySide") link(rel="stylesheet", type="text/css", href="//fonts.googleapis.com/css?family=Noticia+Text:400,700,400italic,700italic") if min == true - link(rel="stylesheet", type="text/css", href="styles.css") - script(src="scripts.js") + link(rel="stylesheet", type="text/css", href="css/styles.css") + script(src="js/scripts.js") else for style in styles link(rel="stylesheet", type="text/css", href="#{style}") diff --git a/source/tests.html.jade b/source/tests.html.jade index cf24c59..25bd046 100644 --- a/source/tests.html.jade +++ b/source/tests.html.jade @@ -5,9 +5,9 @@ html meta(charset="utf-8") if min == true - link(rel="stylesheet", type="text/css", href="test_styles.css") - script(src="scripts.js") - script(src="test_scripts.js") + link(rel="stylesheet", type="text/css", href="css/test_styles.css") + script(src="js/scripts.js") + script(src="js/test_scripts.js") else for script in scripts script(src="#{script}")