From 3b2590220f07bb4724e40cb106d7e58fac82bbfa Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Mon, 2 Dec 2024 10:41:49 +0100
Subject: [PATCH] Replace `utils-merge` dependency with `Object.assign()`

Signed-off-by: Jon Koops <jonkoops@gmail.com>
---
 History.md         | 1 +
 lib/application.js | 7 +++----
 lib/response.js    | 3 +--
 package.json       | 1 -
 test/res.cookie.js | 3 +--
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/History.md b/History.md
index e2dfbc84d7..963a9488de 100644
--- a/History.md
+++ b/History.md
@@ -5,6 +5,7 @@ unreleased
 * cleanup: remove AsyncLocalStorage check from tests
 * cleanup: remove unnecessary require for global Buffer
 * perf: use loop for acceptParams
+* Replace `utils-merge` dependency with `Object.assign()`
 
 5.0.1 / 2024-10-08
 ==========
diff --git a/lib/application.js b/lib/application.js
index b19055ec82..eac9a6c715 100644
--- a/lib/application.js
+++ b/lib/application.js
@@ -21,7 +21,6 @@ var http = require('http');
 var compileETag = require('./utils').compileETag;
 var compileQueryParser = require('./utils').compileQueryParser;
 var compileTrust = require('./utils').compileTrust;
-var merge = require('utils-merge');
 var resolve = require('path').resolve;
 var once = require('once')
 var Router = require('router');
@@ -535,15 +534,15 @@ app.render = function render(name, options, callback) {
   }
 
   // merge app.locals
-  merge(renderOptions, this.locals);
+  Object.assign(renderOptions, this.locals);
 
   // merge options._locals
   if (opts._locals) {
-    merge(renderOptions, opts._locals);
+    Object.assign(renderOptions, opts._locals);
   }
 
   // merge options
-  merge(renderOptions, opts);
+  Object.assign(renderOptions, opts);
 
   // set .cache unless explicitly provided
   if (renderOptions.cache == null) {
diff --git a/lib/response.js b/lib/response.js
index e439a06ae8..1886178960 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -22,7 +22,6 @@ var mime = require('mime-types')
 var path = require('path');
 var pathIsAbsolute = require('path').isAbsolute;
 var statuses = require('statuses')
-var merge = require('utils-merge');
 var sign = require('cookie-signature').sign;
 var normalizeType = require('./utils').normalizeType;
 var normalizeTypes = require('./utils').normalizeTypes;
@@ -732,7 +731,7 @@ res.clearCookie = function clearCookie(name, options) {
  */
 
 res.cookie = function (name, value, options) {
-  var opts = merge({}, options);
+  var opts = Object.assign({}, options);
   var secret = this.req.secret;
   var signed = opts.signed;
 
diff --git a/package.json b/package.json
index 54b4bb5704..a5913578e7 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,6 @@
     "serve-static": "^2.1.0",
     "statuses": "2.0.1",
     "type-is": "^2.0.0",
-    "utils-merge": "1.0.1",
     "vary": "~1.1.2"
   },
   "devDependencies": {
diff --git a/test/res.cookie.js b/test/res.cookie.js
index c837820605..69b3871c0c 100644
--- a/test/res.cookie.js
+++ b/test/res.cookie.js
@@ -3,7 +3,6 @@
 var express = require('../')
   , request = require('supertest')
   , cookieParser = require('cookie-parser')
-var merge = require('utils-merge');
 
 describe('res', function(){
   describe('.cookie(name, object)', function(){
@@ -130,7 +129,7 @@ describe('res', function(){
         var app = express();
 
         var options = { maxAge: 1000 };
-        var optionsCopy = merge({}, options);
+        var optionsCopy = Object.assign({}, options);
 
         app.use(function(req, res){
           res.cookie('name', 'tobi', options)