Skip to content

Commit ed0a2f8

Browse files
committed
Merge pull request #443 from toddhgardner/master
ignoring bower_modules and fixing grunt dev task
2 parents cbd8c02 + 8594326 commit ed0a2f8

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ build
33

44
# common
55
node_modules
6+
bower_components
67
.DS_Store
78
*~
89

Gruntfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ module.exports = function (grunt) {
9696
grunt.registerTask('build', 'Perform a normal build', ['concat', 'uglify']);
9797
grunt.registerTask('dist', 'Perform a clean build and generate documentation', ['clean', 'build', 'jsdoc']);
9898
grunt.registerTask('release', 'Tag and perform a release', ['prepare-release', 'dist', 'perform-release']);
99-
grunt.registerTask('dev', 'Run dev server and watch for changes', ['build', 'connect', 'karma:background', 'watch']);
99+
grunt.registerTask('dev', 'Run dev server and watch for changes', ['build', 'connect:server', 'karma:background', 'watch']);
100100
grunt.registerTask('sample', 'Run connect server with keepalive:true for sample app development', ['connect:sample']);
101101

102102
grunt.registerTask('jsdoc', 'Generate documentation', function () {

0 commit comments

Comments
 (0)