Skip to content

Commit

Permalink
feat: remove setprototypeof and use Object.setPrototypeOf instead
Browse files Browse the repository at this point in the history
  • Loading branch information
joeyguerra committed Dec 23, 2023
1 parent 5a3a9ef commit c92f9ca
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
5 changes: 5 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
6.x
===

* deps: Remove setprototypeof

5.x
===

Expand Down
17 changes: 8 additions & 9 deletions lib/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ var compileQueryParser = require('./utils').compileQueryParser;
var compileTrust = require('./utils').compileTrust;
var merge = require('utils-merge');
var resolve = require('path').resolve;
var setPrototypeOf = require('setprototypeof')
var slice = Array.prototype.slice;

/**
Expand Down Expand Up @@ -109,10 +108,10 @@ app.defaultConfiguration = function defaultConfiguration() {
}

// inherit protos
setPrototypeOf(this.request, parent.request)
setPrototypeOf(this.response, parent.response)
setPrototypeOf(this.engines, parent.engines)
setPrototypeOf(this.settings, parent.settings)
Object.setPrototypeOf(this.request, parent.request)
Object.setPrototypeOf(this.response, parent.response)
Object.setPrototypeOf(this.engines, parent.engines)
Object.setPrototypeOf(this.settings, parent.settings)
});

// setup locals
Expand Down Expand Up @@ -160,8 +159,8 @@ app.handle = function handle(req, res, callback) {
res.req = req;

// alter the prototypes
setPrototypeOf(req, this.request)
setPrototypeOf(res, this.response)
Object.setPrototypeOf(req, this.request)
Object.setPrototypeOf(res, this.response)

// setup locals
if (!res.locals) {
Expand Down Expand Up @@ -224,8 +223,8 @@ app.use = function use(fn) {
router.use(path, function mounted_app(req, res, next) {
var orig = req.app;
fn.handle(req, res, function (err) {
setPrototypeOf(req, orig.request)
setPrototypeOf(res, orig.response)
Object.setPrototypeOf(req, orig.request)
Object.setPrototypeOf(res, orig.response)
next(err);
});
});
Expand Down
1 change: 0 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
"router": "2.0.0-beta.1",
"send": "^1.0.0-beta.1",
"serve-static": "2.0.0-beta.1",
"setprototypeof": "^1.2.0",
"statuses": "^2.0.1",
"type-is": "^1.6.18",
"utils-merge": "^1.0.1",
Expand Down

0 comments on commit c92f9ca

Please sign in to comment.