use utils-merge module to mixin object properties

lib/application.js

@@ -3,6 +3,7 @@
  */
 
 var connect = require('connect')
+  , mixin = require('utils-merge')
   , Router = require('./router')
   , methods = require('methods')
   , middleware = require('./middleware')
@@ -407,13 +408,13 @@ app.render = function(name, options, fn){
   }
 
   // merge app.locals
-  utils.merge(opts, this.locals);
+  mixin(opts, this.locals);
 
   // merge options._locals
-  if (options._locals) utils.merge(opts, options._locals);
+  if (options._locals) mixin(opts, options._locals);
 
   // merge options
-  utils.merge(opts, options);
+  mixin(opts, options);
 
   // set .cache unless explicitly provided
   opts.cache = null == opts.cache

lib/express.js

@@ -2,14 +2,15 @@
  * Module dependencies.
  */
 
-var merge = require('merge-descriptors');
 var connect = require('connect')
-  , proto = require('./application')
+  , merge = require('merge-descriptors')
+  , mixin = require('utils-merge')
+
+var proto = require('./application')
   , Route = require('./router/route')
   , Router = require('./router')
   , req = require('./request')
   , res = require('./response')
-  , utils = connect.utils;
 
 /**
  * Expose `createApplication()`.
@@ -32,7 +33,7 @@ exports.mime = connect.mime;
 
 function createApplication() {
   var app = connect();
-  utils.merge(app, proto);
+  mixin(app, proto);
   app.request = { __proto__: req, app: app };
   app.response = { __proto__: res, app: app };
   app.init();

lib/response.js

@@ -5,6 +5,7 @@
 var http = require('http')
   , path = require('path')
   , connect = require('connect')
+  , mixin = require('utils-merge')
   , utils = connect.utils
   , sign = require('cookie-signature').sign
   , normalizeType = require('./utils').normalizeType
@@ -557,7 +558,7 @@ res.get = function(field){
 res.clearCookie = function(name, options){
   var opts = { expires: new Date(1), path: '/' };
   return this.cookie(name, '', options
-    ? utils.merge(opts, options)
+    ? mixin(opts, options)
     : opts);
 };
 
@@ -585,7 +586,7 @@ res.clearCookie = function(name, options){
  */
 
 res.cookie = function(name, val, options){
-  options = utils.merge({}, options);
+  options = mixin({}, options);
   var secret = this.req.secret;
   var signed = options.signed;
   if (signed && !secret) throw new Error('connect.cookieParser("secret") required for signed cookies');

package.json

@@ -33,6 +33,7 @@
     "send": "0.1.4",
     "cookie-signature": "1.0.1",
     "merge-descriptors": "0.0.1",
+    "utils-merge": "1.0.0",
     "debug": ">= 0.7.3 < 1"
   },
   "devDependencies": {

test/res.cookie.js

@@ -1,7 +1,7 @@
 
 var express = require('../')
   , request = require('./support/http')
-  , utils = require('connect').utils
+  , mixin = require('utils-merge')
   , cookie = require('cookie');
 
 describe('res', function(){
@@ -114,7 +114,7 @@ describe('res', function(){
         var app = express();
 
         var options = { maxAge: 1000 };
-        var optionsCopy = utils.merge({}, options);
+        var optionsCopy = mixin({}, options);
 
         app.use(function(req, res){
           res.cookie('name', 'tobi', options)