OSSForks/express
1
0
Fork 0
mirror of https://github.com/zebrajr/express.git synced 2025-12-06 00:19:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Remove utils-merge dependency - use spread syntax instead (#6091)

Browse Source
This commit is contained in:
Phillip Barta 2025-01-08 16:56:16 +01:00 committed by GitHub
parent b11122be85
commit 246f6f5aee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
History.md
View File

@ -1,6 +1,7 @@
unreleased unreleased
======================== ========================
* Remove `utils-merge` dependency - use spread syntax instead
* Remove `Object.setPrototypeOf` polyfill * Remove `Object.setPrototypeOf` polyfill
* cleanup: remove AsyncLocalStorage check from tests * cleanup: remove AsyncLocalStorage check from tests
* cleanup: remove unnecessary require for global Buffer * cleanup: remove unnecessary require for global Buffer

12
lib/application.js
View File

@ -21,7 +21,6 @@ var methods = require('./utils').methods;
var compileETag = require('./utils').compileETag; var compileETag = require('./utils').compileETag;
var compileQueryParser = require('./utils').compileQueryParser; var compileQueryParser = require('./utils').compileQueryParser;
var compileTrust = require('./utils').compileTrust; var compileTrust = require('./utils').compileTrust;
var merge = require('utils-merge');
var resolve = require('path').resolve; var resolve = require('path').resolve;
var once = require('once') var once = require('once')
var Router = require('router'); var Router = require('router');
@ -525,7 +524,6 @@ app.render = function render(name, options, callback) {
var done = callback; var done = callback;
var engines = this.engines; var engines = this.engines;
var opts = options; var opts = options;
var renderOptions = {};
var view; var view;
// support callback function as second arg // support callback function as second arg
@ -534,16 +532,8 @@ app.render = function render(name, options, callback) {
opts = {}; opts = {};
} }
// merge app.locals
merge(renderOptions, this.locals);
// merge options._locals
if (opts._locals) {
merge(renderOptions, opts._locals);
}
// merge options // merge options
merge(renderOptions, opts); var renderOptions = { ...this.locals, ...opts._locals, ...opts };
// set .cache unless explicitly provided // set .cache unless explicitly provided
if (renderOptions.cache == null) { if (renderOptions.cache == null) {

3
lib/response.js
View File

@ -22,7 +22,6 @@ var mime = require('mime-types')
var path = require('path'); var path = require('path');
var pathIsAbsolute = require('path').isAbsolute; var pathIsAbsolute = require('path').isAbsolute;
var statuses = require('statuses') var statuses = require('statuses')
var merge = require('utils-merge');
var sign = require('cookie-signature').sign; var sign = require('cookie-signature').sign;
var normalizeType = require('./utils').normalizeType; var normalizeType = require('./utils').normalizeType;
var normalizeTypes = require('./utils').normalizeTypes; var normalizeTypes = require('./utils').normalizeTypes;
@ -732,7 +731,7 @@ res.clearCookie = function clearCookie(name, options) {
*/ */
res.cookie = function (name, value, options) { res.cookie = function (name, value, options) {
var opts = merge({}, options); var opts = { ...options };
var secret = this.req.secret; var secret = this.req.secret;
var signed = opts.signed; var signed = opts.signed;

1
package.json
View File

@ -59,7 +59,6 @@
"serve-static": "^2.1.0", "serve-static": "^2.1.0",
"statuses": "2.0.1", "statuses": "2.0.1",
"type-is": "^2.0.0", "type-is": "^2.0.0",
"utils-merge": "1.0.1",
"vary": "~1.1.2" "vary": "~1.1.2"
}, },
"devDependencies": { "devDependencies": {

3
test/res.cookie.js
View File

@ -3,7 +3,6 @@
var express = require('../') var express = require('../')
, request = require('supertest') , request = require('supertest')
, cookieParser = require('cookie-parser') , cookieParser = require('cookie-parser')
var merge = require('utils-merge');
describe('res', function(){ describe('res', function(){
describe('.cookie(name, object)', function(){ describe('.cookie(name, object)', function(){
@ -130,7 +129,7 @@ describe('res', function(){
var app = express(); var app = express();
var options = { maxAge: 1000 }; var options = { maxAge: 1000 };
var optionsCopy = merge({}, options); var optionsCopy = { ...options };
app.use(function(req, res){ app.use(function(req, res){
res.cookie('name', 'tobi', options) res.cookie('name', 'tobi', options)