got grunt application.min.js generation working again

This commit is contained in:
David Baldwynn 2015-07-27 14:40:00 -07:00
parent f50ddc7b39
commit c499a7edf5
4 changed files with 506 additions and 729 deletions

View file

@ -18,20 +18,20 @@ module.exports = {
} }
}, },
assets: { assets: {
lib: { // lib: {
css: [ // css: [
'public/lib/bootstrap/dist/css/bootstrap.min.css', // 'public/lib/bootstrap/dist/css/bootstrap.min.css',
'public/lib/bootstrap/dist/css/bootstrap-theme.min.css', // 'public/lib/bootstrap/dist/css/bootstrap-theme.min.css',
], // ],
js: [ // js: [
'public/lib/angular/angular.min.js', // 'public/lib/angular/angular.min.js',
'public/lib/angular-resource/angular-resource.min.js', // 'public/lib/angular-resource/angular-resource.min.js',
'public/lib/angular-animate/angular-animate.min.js', // 'public/lib/angular-animate/angular-animate.min.js',
'public/lib/angular-ui-router/release/angular-ui-router.min.js', // 'public/lib/angular-ui-router/release/angular-ui-router.min.js',
'public/lib/angular-ui-utils/ui-utils.min.js', // 'public/lib/angular-ui-utils/ui-utils.min.js',
'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js' // 'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js'
] // ]
}, // },
css: 'public/dist/application.min.css', css: 'public/dist/application.min.css',
js: 'public/dist/application.min.js' js: 'public/dist/application.min.js'
}, },

View file

@ -114,13 +114,13 @@ module.exports = function(grunt) {
} }
} }
}, },
// ngAnnotate: { ngAnnotate: {
// production: { production: {
// files: { files: {
// 'public/dist/application.js': '<%= applicationJavaScriptFiles %>' 'public/dist/application.js': '<%= applicationJavaScriptFiles %>'
// } }
// } }
// }, },
concurrent: { concurrent: {
default: ['nodemon', 'watch'], default: ['nodemon', 'watch'],
debug: ['nodemon', 'watch', 'node-inspector'], debug: ['nodemon', 'watch', 'node-inspector'],
@ -182,7 +182,7 @@ module.exports = function(grunt) {
grunt.registerTask('lint', ['newer:jshint', 'newer:csslint']); grunt.registerTask('lint', ['newer:jshint', 'newer:csslint']);
// Build task(s). // Build task(s).
grunt.registerTask('build', ['lint', 'loadConfig', 'uglify', 'cssmin']); //'ngAnnotate', ]); grunt.registerTask('build', ['lint', 'loadConfig', 'uglify', 'cssmin', 'ngAnnotate' ]);
// Test task. // Test task.
grunt.registerTask('test', ['test:server', 'test:client']); grunt.registerTask('test', ['test:server', 'test:client']);

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long