Merge branch 'v3' into depedencies

Author: bjohansebas

lib/read-body.js

@@ -4,7 +4,6 @@ import { promisify } from 'node:util'
 
 import Busboy from '@fastify/busboy'
 import { createWriteStream } from 'fs-temp'
-import hasOwnProperty from 'has-own-property'
 import _onFinished from 'on-finished'
 import FileType from 'stream-file-type'
 
@@ -29,7 +28,7 @@ function collectFields (busboy, limits) {
       if (valueTruncated) return reject(new MulterError('LIMIT_FIELD_VALUE', fieldname))
 
       // Work around bug in Busboy (https://github.com/mscdex/busboy/issues/6)
-      if (limits && hasOwnProperty(limits, 'fieldNameSize') && fieldname.length > limits.fieldNameSize) {
+      if (limits && Object.hasOwn(limits, 'fieldNameSize') && fieldname.length > limits.fieldNameSize) {
         return reject(new MulterError('LIMIT_FIELD_KEY'))
       }
 
@@ -54,7 +53,7 @@ function collectFiles (busboy, limits, fileFilter) {
       })
 
       // Work around bug in Busboy (https://github.com/mscdex/busboy/issues/6)
-      if (limits && hasOwnProperty(limits, 'fieldNameSize') && fieldname.length > limits.fieldNameSize) {
+      if (limits && Object.hasOwn(limits, 'fieldNameSize') && fieldname.length > limits.fieldNameSize) {
         return reject(new MulterError('LIMIT_FIELD_KEY'))
       }
 

package.json

@@ -25,7 +25,6 @@
     "append-field": "^2.0.0",
     "bytes": "^3.1.0",
     "fs-temp": "^2.0.1",
-    "has-own-property": "^2.0.0",
     "on-finished": "^2.4.1",
     "stream-file-type": "^0.6.1",
     "type-is": "^2.0.1"
@@ -50,6 +49,6 @@
     "lib/"
   ],
   "scripts": {
-    "test": "standard && c8 --check-coverage --statements 100 mocha"
+    "test": "standard && c8 --check-coverage --statements 100 mocha --exit"
   }
 }

test/body.js

@@ -5,7 +5,6 @@ import stream from 'node:stream'
 import { promisify } from 'node:util'
 
 import FormData from 'form-data'
-import hasOwnProperty from 'has-own-property'
 import recursiveNullify from 'recursive-nullify'
 import testData from 'testdata-w3c-json-form'
 
@@ -72,8 +71,8 @@ describe('body', () => {
 
     await promisify(parser)(req, null)
 
-    assert.strictEqual(hasOwnProperty(req, 'body'), false)
-    assert.strictEqual(hasOwnProperty(req, 'files'), false)
+    assert.strictEqual(Object.hasOwn(req, 'body'), false)
+    assert.strictEqual(Object.hasOwn(req, 'files'), false)
   })
 
   it('should not process non-multipart GET request', async () => {
@@ -88,8 +87,8 @@ describe('body', () => {
 
     await promisify(parser)(req, null)
 
-    assert.strictEqual(hasOwnProperty(req, 'body'), false)
-    assert.strictEqual(hasOwnProperty(req, 'files'), false)
+    assert.strictEqual(Object.hasOwn(req, 'body'), false)
+    assert.strictEqual(Object.hasOwn(req, 'files'), false)
   })
 
   for (const test of testData) {