Merge 46bbdc8 into f151f73

fastify · May 11, 2022 · 2fb4cb8 · 2fb4cb8
2 parents f151f73 + 46bbdc8
commit 2fb4cb8
Show file tree

Hide file tree

Showing 75 changed files with 157 additions and 157 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,9 +14,9 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 12
           - 14
           - 16
+          - 18
         os:
           - macos-latest
           - ubuntu-latest

diff --git a/index.js b/index.js
@@ -179,7 +179,7 @@ module.exports = fp(function from (fastify, opts, next) {
   })
 
   next()
-}, '>=3')
+}, '4.x')
 
 function getQueryString (search, reqUrl, opts) {
   if (typeof opts.queryString === 'function') {

diff --git a/package.json b/package.json
@@ -31,12 +31,12 @@
   },
   "homepage": "https://github.com/fastify/fastify-reply-from#readme",
   "devDependencies": {
-    "@fastify/formbody": "^6.0.0",
-    "@fastify/multipart": "^6.0.0",
+    "@fastify/formbody": "^7.0.0",
+    "@fastify/multipart": "^7.0.0",
     "@sinonjs/fake-timers": "^9.0.0",
     "@types/node": "^17.0.0",
     "@types/tap": "^15.0.3",
-    "fastify": "^3.17.0",
+    "fastify": "^4.0.0-rc.2",
     "form-data": "^4.0.0",
     "got": "^11.8.2",
     "h2url": "^0.2.0",

diff --git a/test/async-route-handler.js b/test/async-route-handler.js
@@ -29,14 +29,14 @@ instance.get('/', async (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From, {
     base: `http://localhost:${target.address().port}`
   })
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {

diff --git a/test/base-get.js b/test/base-get.js
@@ -27,14 +27,14 @@ instance.get('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From, {
     base: `http://localhost:${target.address().port}`
   })
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {

diff --git a/test/base-path.js b/test/base-path.js
@@ -26,7 +26,7 @@ instance.register(From, {
   undici: false
 })
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
   get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {

diff --git a/test/base-querystring.js b/test/base-querystring.js
@@ -27,14 +27,14 @@ instance.get('/hello', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From, {
     base: `http://localhost:${target.address().port}`
   })
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {

diff --git a/test/core-with-path-in-base.js b/test/core-with-path-in-base.js
@@ -28,15 +28,15 @@ instance.get('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From, {
     base: `http://localhost:${target.address().port}/hello`,
     http: true
   })
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {

diff --git a/test/custom-undici-instance.js b/test/custom-undici-instance.js
@@ -21,7 +21,7 @@ const target = http.createServer((req, res) => {
 t.test('use a custom instance of \'undici\'', async t => {
   t.teardown(target.close.bind(target))
 
-  await new Promise((resolve, reject) => target.listen(0, err => err ? reject(err) : resolve()))
+  await new Promise((resolve, reject) => target.listen({ port: 0 }, err => err ? reject(err) : resolve()))
 
   t.test('custom Pool', t => {
     const instance = Fastify()
@@ -35,7 +35,7 @@ t.test('use a custom instance of \'undici\'', async t => {
       reply.from()
     })
 
-    instance.listen(0, (err) => {
+    instance.listen({ port: 0 }, (err) => {
       t.error(err)
 
       get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {
@@ -61,7 +61,7 @@ t.test('use a custom instance of \'undici\'', async t => {
       reply.from()
     })
 
-    instance.listen(0, (err) => {
+    instance.listen({ port: 0 }, (err) => {
       t.error(err)
 
       get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {

diff --git a/test/fastify-multipart-incompatibility.js b/test/fastify-multipart-incompatibility.js
@@ -56,7 +56,7 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
   logStream.on('data', (log) => {
@@ -68,7 +68,7 @@ instance.listen(0, (err) => {
     }
   })
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     const form = new FormData()

diff --git a/test/full-get.js b/test/full-get.js
@@ -28,10 +28,10 @@ instance.get('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {

diff --git a/test/full-https-get.js b/test/full-https-get.js
@@ -35,10 +35,10 @@ instance.get('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

diff --git a/test/full-post-extended-content-type.js b/test/full-post-extended-content-type.js
@@ -35,10 +35,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get.concat({

diff --git a/test/full-post-http2.js b/test/full-post-http2.js
@@ -28,14 +28,14 @@ test('http -> http2', async function (t) {
 
   t.teardown(target.close.bind(target))
 
-  await target.listen(0)
+  await target.listen({ port: 0 })
 
   instance.register(From, {
     base: `http://localhost:${target.server.address().port}`,
     http2: true
   })
 
-  await instance.listen(0)
+  await instance.listen({ port: 0 })
 
   const { headers, body, statusCode } = await got(`http://localhost:${instance.server.address().port}`, {
     method: 'POST',

diff --git a/test/full-post-stream-core.js b/test/full-post-stream-core.js
@@ -43,10 +43,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

diff --git a/test/full-post-stream.js b/test/full-post-stream.js
@@ -41,10 +41,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

diff --git a/test/full-post.js b/test/full-post.js
@@ -35,10 +35,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

diff --git a/test/full-querystring-rewrite-option-complex.js b/test/full-querystring-rewrite-option-complex.js
@@ -29,12 +29,12 @@ instance.get('/hello', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From)
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {

diff --git a/test/full-querystring-rewrite-option-function.js b/test/full-querystring-rewrite-option-function.js
@@ -32,12 +32,12 @@ instance.get('/hello', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From)
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {

diff --git a/test/full-querystring-rewrite-option.js b/test/full-querystring-rewrite-option.js
@@ -29,12 +29,12 @@ instance.get('/hello', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From)
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {

diff --git a/test/full-querystring-rewrite-string.js b/test/full-querystring-rewrite-string.js
@@ -27,12 +27,12 @@ instance.get('/hello', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From)
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {

diff --git a/test/full-querystring-rewrite.js b/test/full-querystring-rewrite.js
@@ -27,12 +27,12 @@ instance.get('/hello', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From)
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {

diff --git a/test/full-querystring.js b/test/full-querystring.js
@@ -27,12 +27,12 @@ instance.get('/hello', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From)
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {

diff --git a/test/full-rewrite-body-content-type.js b/test/full-rewrite-body-content-type.js
@@ -38,10 +38,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

diff --git a/test/full-rewrite-body-http.js b/test/full-rewrite-body-http.js
@@ -42,10 +42,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

diff --git a/test/full-rewrite-body-to-empty-string.js b/test/full-rewrite-body-to-empty-string.js
@@ -40,10 +40,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

diff --git a/test/full-rewrite-body-to-null.js b/test/full-rewrite-body-to-null.js
@@ -40,10 +40,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({