diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js index 9553f93325..e8b01fe52b 100644 --- a/src/Umbraco.Web.UI.Client/gruntFile.js +++ b/src/Umbraco.Web.UI.Client/gruntFile.js @@ -4,9 +4,8 @@ module.exports = function (grunt) { grunt.registerTask('default', ['jshint:dev','build','karma:unit']); grunt.registerTask('dev', ['jshint:dev', 'build', 'webserver', 'open:dev', 'watch']); - //run by the watch task - grunt.registerTask('watch-js', ['jshint:dev','concat','copy:app','copy:mocks','copy:app','karma:unit', 'copy:vs', 'copy:assets']); + grunt.registerTask('watch-js', ['jshint:dev','concat','copy:app','copy:mocks','copy:app','karma:unit', 'copy:vs']); grunt.registerTask('watch-less', ['recess:build','copy:assets','copy:vs']); grunt.registerTask('watch-html', ['copy:views', 'copy:vs']); @@ -63,7 +62,7 @@ module.exports = function (grunt) { ' * Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author %>;\n' + ' * Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %>\n */\n', src: { - js: ['src/**/*.js', '<%= distdir %>/templates/**/*.js'], + js: ['src/**/*.js'], common: ['src/common/**/*.js'], specs: ['test/**/*.spec.js'], scenarios: ['test/**/*.scenario.js'], @@ -94,7 +93,7 @@ module.exports = function (grunt) { }, app: { files: [ - { dest: '<%= distdir %>/js', src : '*.js', expand: true, cwd: 'src/' } + { dest: '<%= distdir %>/jshints', src : '*.js', expand: true, cwd: 'src/' } ] }, @@ -135,10 +134,6 @@ module.exports = function (grunt) { process: true } }, - angular: { - src:['vendor/angular/angular.min.js'], - dest: '<%= distdir %>/lib/angular/angular.min.js' - }, controllers: { src:['src/views/**/*.controller.js'], dest: '<%= distdir %>/js/umbraco.controllers.js', @@ -197,24 +192,6 @@ module.exports = function (grunt) { } }, - uglify: { - dist:{ - options: { - banner: "<%= banner %>" - }, - src:['<%= src.js %>'], - dest:'<%= distdir %>/<%= pkg.name %>.js' - }, - angular: { - src:['<%= concat.angular.src %>'], - dest: '<%= distdir %>/angular.js' - }, - jquery: { - src:['vendor/jquery/*.js'], - dest: '<%= distdir %>/jquery.js' - } - }, - recess: { build: { files: { @@ -322,7 +299,6 @@ module.exports = function (grunt) { smarttabs: true, globalstrict:true, globals:{$:false, jQuery:false,define:false,require:false,window:false} - } } } @@ -332,7 +308,6 @@ module.exports = function (grunt) { grunt.loadNpmTasks('grunt-contrib-concat'); grunt.loadNpmTasks('grunt-contrib-jshint'); - grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-clean'); grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-watch');