Skip to content

Commit

Permalink
Update grunt-express-server
Browse files Browse the repository at this point in the history
  • Loading branch information
ericclemmons committed May 10, 2013
1 parent 92d7e40 commit f2b8cb4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = (grunt)->

# Run `grunt server` for live-reloading development environment
grunt.registerTask('server', [ 'build', 'livereload-start', 'karma:background', 'express-server', 'regarde' ])
grunt.registerTask('server', [ 'build', 'livereload-start', 'karma:background', 'express', 'regarde' ])

# Run `grunt test` (used by `npm test`) for continuous integration (e.g. Travis)
grunt.registerTask('test', [ 'build', 'karma:unit' ])
Expand Down Expand Up @@ -165,17 +165,18 @@ module.exports = (grunt)->
# Changes to server-side code should validate, restart the server, & refresh the browser
server:
files: '<%= SERVER_DIR + ALL_FILES %>'
tasks: [ 'parallel:jshint', 'express-server', 'livereload' ]
tasks: [ 'parallel:jshint', 'express', 'livereload' ]

# Changes to app templates should re-copy & re-compile them, triggering `regarde:build`
templates:
files: '<%= CLIENT_DIR + HTML_FILES %>'
tasks: [ 'copy:templates', 'ngtemplates' ]

# Express requires `server.script` to reload from changes
server:
script: '<%= SERVER_DIR %>/server.js'
port: process.env.PORT || 3000
express:
server:
options:
script: '<%= SERVER_DIR %>/server.js'

# Output for optimized app index
usemin:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"grunt-contrib-livereload": "~0.1.1",
"grunt-contrib-mincss": "~0.4.0",
"grunt-contrib-uglify": "~0.1.1",
"grunt-express-server": "~0.1.0",
"grunt-express-server": "~0.3.1",
"grunt-karma": "~0.4.4",
"grunt-parallel": "0.0.2",
"grunt-regarde": "~0.1.1",
Expand Down

0 comments on commit f2b8cb4

Please sign in to comment.