From f290e610564f1cf47907fe7967bfa4d2c2c5da61 Mon Sep 17 00:00:00 2001
From: Joe Turgeon <jturgeon@phase2technology.com>
Date: Tue, 23 Jun 2015 17:01:58 -0500
Subject: [PATCH] Fixing error with 'grunt serve' due to drush:serve not being
 defined.

---
 tasks/serve.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/tasks/serve.js b/tasks/serve.js
index fcc3fe6a..a786b5f9 100644
--- a/tasks/serve.js
+++ b/tasks/serve.js
@@ -4,11 +4,12 @@ module.exports = function(grunt) {
    * Define tasks to quickly get Drupal running.
    *
    * grunt serve
-   *   Run Drupal via the PHP webserver and active watch tasks.
+   *   Run Drupal via the PHP webserver and activate watch tasks.
    * grunt serve:demo
    *   Run Drupal via the PHP webserver without running watch tasks.
    * grunt serve:test
-   *   Run Drupal via the PHP webserver without running watch tasks or opening the browser.
+   *   Run Drupal via the PHP webserver without running watch tasks or opening
+   *   the browser.
    */
   grunt.loadNpmTasks('grunt-drush');
 
@@ -30,13 +31,14 @@ module.exports = function(grunt) {
     }, cmd)
   });
 
+  grunt.config(['drush', 'serve'], {
+    args: ['runserver', ':' + (grunt.config('serve.port') || 8080)],
+    options: _.extend({
+      cwd: '<%= config.buildPaths.html %>'
+    }, cmd)
+  });
+
   grunt.registerTask('serve', 'Run Drupal using the PHP built-in webserver. serve:demo to run without watch tasks and serve:test for grunt-drupal-tasks development.', function() {
-    grunt.config(['drush', 'serve'], {
-      args: ['runserver', ':' + (grunt.config('serve.port') || 8080)],
-      options: _.extend({
-        cwd: '<%= config.buildPaths.html %>'
-      }, cmd)
-    });
 
     if (this.args[0] != 'test') {
       // Unlike the test version, this one allows port overriding and opens the site in a new tab.