Skip to content

Commit 90d3ae7

Browse files
authored
Merge pull request #6 from hubot-friends/remove-setprototypeof
feat: remove setprototypeof and use Object.setPrototypeOf instead
2 parents 5a3a9ef + c92f9ca commit 90d3ae7

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

History.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
6.x
2+
===
3+
4+
* deps: Remove setprototypeof
5+
16
5.x
27
===
38

lib/application.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ var compileQueryParser = require('./utils').compileQueryParser;
2424
var compileTrust = require('./utils').compileTrust;
2525
var merge = require('utils-merge');
2626
var resolve = require('path').resolve;
27-
var setPrototypeOf = require('setprototypeof')
2827
var slice = Array.prototype.slice;
2928

3029
/**
@@ -109,10 +108,10 @@ app.defaultConfiguration = function defaultConfiguration() {
109108
}
110109

111110
// inherit protos
112-
setPrototypeOf(this.request, parent.request)
113-
setPrototypeOf(this.response, parent.response)
114-
setPrototypeOf(this.engines, parent.engines)
115-
setPrototypeOf(this.settings, parent.settings)
111+
Object.setPrototypeOf(this.request, parent.request)
112+
Object.setPrototypeOf(this.response, parent.response)
113+
Object.setPrototypeOf(this.engines, parent.engines)
114+
Object.setPrototypeOf(this.settings, parent.settings)
116115
});
117116

118117
// setup locals
@@ -160,8 +159,8 @@ app.handle = function handle(req, res, callback) {
160159
res.req = req;
161160

162161
// alter the prototypes
163-
setPrototypeOf(req, this.request)
164-
setPrototypeOf(res, this.response)
162+
Object.setPrototypeOf(req, this.request)
163+
Object.setPrototypeOf(res, this.response)
165164

166165
// setup locals
167166
if (!res.locals) {
@@ -224,8 +223,8 @@ app.use = function use(fn) {
224223
router.use(path, function mounted_app(req, res, next) {
225224
var orig = req.app;
226225
fn.handle(req, res, function (err) {
227-
setPrototypeOf(req, orig.request)
228-
setPrototypeOf(res, orig.response)
226+
Object.setPrototypeOf(req, orig.request)
227+
Object.setPrototypeOf(res, orig.response)
229228
next(err);
230229
});
231230
});

package-lock.json

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
"router": "2.0.0-beta.1",
5757
"send": "^1.0.0-beta.1",
5858
"serve-static": "2.0.0-beta.1",
59-
"setprototypeof": "^1.2.0",
6059
"statuses": "^2.0.1",
6160
"type-is": "^1.6.18",
6261
"utils-merge": "^1.0.1",

0 commit comments

Comments
 (0)