From 26d8a121c4f00f416af9f6f7a3f6c5224f30f94b Mon Sep 17 00:00:00 2001 From: Joseph Race Date: Thu, 11 Sep 2014 12:51:34 +0100 Subject: [PATCH] Use ng-annotate instead of ngmin --- gruntfile.js | 10 +++++----- package.json | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gruntfile.js b/gruntfile.js index ca48bbd883..ef6e332254 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -3,7 +3,7 @@ module.exports = function(grunt) { // Unified Watch Object var watchFiles = { - serverViews: ['app/views/**/*.*'], + serverViews: ['app/views/**/*.*'], serverJS: ['gruntfile.js', 'server.js', 'config/**/*.js', 'app/**/*.js'], clientViews: ['public/modules/**/views/**/*.html'], clientJS: ['public/js/*.js', 'public/modules/**/*.js'], @@ -105,7 +105,7 @@ module.exports = function(grunt) { } } }, - ngmin: { + ngAnnotate: { production: { files: { 'public/dist/application.js': '<%= applicationJavaScriptFiles %>' @@ -138,7 +138,7 @@ module.exports = function(grunt) { } }); - // Load NPM tasks + // Load NPM tasks require('load-grunt-tasks')(grunt); // Making grunt default to force in order not to break the project. @@ -163,8 +163,8 @@ module.exports = function(grunt) { grunt.registerTask('lint', ['jshint', 'csslint']); // Build task(s). - grunt.registerTask('build', ['lint', 'loadConfig', 'ngmin', 'uglify', 'cssmin']); + grunt.registerTask('build', ['lint', 'loadConfig', 'ngAnnotate', 'uglify', 'cssmin']); // Test task. grunt.registerTask('test', ['env:test', 'mochaTest', 'karma:unit']); -}; \ No newline at end of file +}; diff --git a/package.json b/package.json index dbf3c63688..34cde127bf 100755 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "grunt-contrib-watch": "~0.6.1", "grunt-contrib-jshint": "~0.10.0", "grunt-contrib-csslint": "^0.2.0", - "grunt-ngmin": "0.0.3", + "grunt-ng-annotate": "~0.3.2", "grunt-contrib-uglify": "~0.5.1", "grunt-contrib-cssmin": "~0.10.0", "grunt-nodemon": "~0.3.0", @@ -69,4 +69,4 @@ "karma-firefox-launcher": "~0.1.3", "karma-phantomjs-launcher": "~0.1.2" } -} \ No newline at end of file +}