major: update to Fastify v4 (#309)

fastify · May 10, 2022 · 10371e1 · 10371e1
1 parent de2e09b
commit 10371e1
Show file tree

Hide file tree

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

diff --git a/index.js b/index.js
@@ -464,7 +464,7 @@ function fastifyView (fastify, opts, next) {
           this.send(e)
         }
       } else {
-        getPartials(type, { partials: options.partials || {}, requestedPath: requestedPath }, (err, partialsObject) => {
+        getPartials(type, { partials: options.partials || {}, requestedPath }, (err, partialsObject) => {
           if (err) {
             this.send(err)
             return
@@ -505,7 +505,7 @@ function fastifyView (fastify, opts, next) {
         this.send(err)
         return
       }
-      getPartials(page, { partials: options.partials || {}, requestedPath: requestedPath }, (err, partialsObject) => {
+      getPartials(page, { partials: options.partials || {}, requestedPath }, (err, partialsObject) => {
         if (err) {
           this.send(err)
           return
@@ -707,6 +707,6 @@ function fastifyView (fastify, opts, next) {
 }
 
 module.exports = fp(fastifyView, {
-  fastify: '3.x',
+  fastify: '4.x',
   name: 'point-of-view'
 })
diff --git a/package.json b/package.json
@@ -45,14 +45,14 @@
     "ejs": "^3.1.2",
     "eta": "^1.11.0",
     "express": "^4.17.1",
-    "fastify": "^3.0.0",
+    "fastify": "^4.0.0-rc.2",
     "handlebars": "^4.7.6",
     "html-minifier": "^4.0.0",
     "html-minify-stream": "^2.0.0",
     "liquidjs": "^9.15.1",
     "mustache": "^4.0.1",
     "nunjucks": "^3.2.1",
-    "pino": "^6.7.0",
+    "pino": "^7.0.0",
     "pre-commit": "^1.2.2",
     "proxyquire": "^2.1.3",
     "pug": "^3.0.0",

diff --git a/test/helper.js b/test/helper.js
@@ -34,7 +34,7 @@ module.exports.dotHtmlMinifierTests = function (t, compileOptions, withMinifierO
 
     fastify.register(POV, {
       engine: {
-        dot: dot
+        dot
       },
       root: 'templates',
       options: {
@@ -47,7 +47,7 @@ module.exports.dotHtmlMinifierTests = function (t, compileOptions, withMinifierO
       reply.view('testdot', data)
     })
 
-    fastify.listen(0, err => {
+    fastify.listen({ port: 0 }, err => {
       t.error(err)
 
       sget({
@@ -70,7 +70,7 @@ module.exports.dotHtmlMinifierTests = function (t, compileOptions, withMinifierO
 
     fastify.register(POV, {
       engine: {
-        dot: dot
+        dot
       },
       root: 'templates',
       options: {
@@ -84,7 +84,7 @@ module.exports.dotHtmlMinifierTests = function (t, compileOptions, withMinifierO
       reply.view('testdot', data)
     })
 
-    fastify.listen(0, err => {
+    fastify.listen({ port: 0 }, err => {
       t.error(err)
 
       sget({
@@ -112,7 +112,7 @@ module.exports.etaHtmlMinifierTests = function (t, withMinifierOptions) {
 
     fastify.register(POV, {
       engine: {
-        eta: eta
+        eta
       },
       options: {
         useHtmlMinifier: minifier,
@@ -124,7 +124,7 @@ module.exports.etaHtmlMinifierTests = function (t, withMinifierOptions) {
       reply.view('templates/index.eta', data)
     })
 
-    fastify.listen(0, err => {
+    fastify.listen({ port: 0 }, err => {
       t.error(err)
 
       sget({
@@ -146,7 +146,7 @@ module.exports.etaHtmlMinifierTests = function (t, withMinifierOptions) {
 
     fastify.register(POV, {
       engine: {
-        eta: eta
+        eta
       },
       options: {
         useHtmlMinifier: minifier,
@@ -159,7 +159,7 @@ module.exports.etaHtmlMinifierTests = function (t, withMinifierOptions) {
       reply.view('templates/index.eta', data)
     })
 
-    fastify.listen(0, err => {
+    fastify.listen({ port: 0 }, err => {
       t.error(err)
 
       sget({
@@ -187,7 +187,7 @@ module.exports.handleBarsHtmlMinifierTests = function (t, withMinifierOptions) {
 
     fastify.register(POV, {
       engine: {
-        handlebars: handlebars
+        handlebars
       },
       options: {
         useHtmlMinifier: minifier,
@@ -230,7 +230,7 @@ module.exports.liquidHtmlMinifierTests = function (t, withMinifierOptions) {
       reply.view('./templates/index.liquid', data)
     })
 
-    fastify.listen(0, err => {
+    fastify.listen({ port: 0 }, err => {
       t.error(err)
 
       sget({
@@ -270,7 +270,7 @@ module.exports.liquidHtmlMinifierTests = function (t, withMinifierOptions) {
       reply.view('./templates/index.liquid', data)
     })
 
-    fastify.listen(0, err => {
+    fastify.listen({ port: 0 }, err => {
       t.error(err)
 
       sget({
@@ -302,7 +302,7 @@ module.exports.nunjucksHtmlMinifierTests = function (t, withMinifierOptions) {
 
     fastify.register(POV, {
       engine: {
-        nunjucks: nunjucks
+        nunjucks
       },
       templates: 'templates',
       options: {
@@ -315,7 +315,7 @@ module.exports.nunjucksHtmlMinifierTests = function (t, withMinifierOptions) {
       reply.view('./index.njk', data)
     })
 
-    fastify.listen(0, err => {
+    fastify.listen({ port: 0 }, err => {
       t.error(err)
 
       sget({
@@ -338,7 +338,7 @@ module.exports.nunjucksHtmlMinifierTests = function (t, withMinifierOptions) {
 
     fastify.register(POV, {
       engine: {
-        nunjucks: nunjucks
+        nunjucks
       },
       templates: 'templates',
       options: {
@@ -352,7 +352,7 @@ module.exports.nunjucksHtmlMinifierTests = function (t, withMinifierOptions) {
       reply.view('./index.njk', data)
     })
 
-    fastify.listen(0, err => {
+    fastify.listen({ port: 0 }, err => {
       t.error(err)
 
       sget({
@@ -381,7 +381,7 @@ module.exports.pugHtmlMinifierTests = function (t, withMinifierOptions) {
 
     fastify.register(POV, {
       engine: {
-        pug: pug
+        pug
       },
       options: {
         useHtmlMinifier: minifier,
@@ -393,7 +393,7 @@ module.exports.pugHtmlMinifierTests = function (t, withMinifierOptions) {
       reply.view('./templates/index.pug', data)
     })
 
-    fastify.listen(0, err => {
+    fastify.listen({ port: 0 }, err => {
       t.error(err)
 
       sget({
@@ -415,7 +415,7 @@ module.exports.pugHtmlMinifierTests = function (t, withMinifierOptions) {
 
     fastify.register(POV, {
       engine: {
-        pug: pug
+        pug
       },
       options: {
         useHtmlMinifier: minifier,
@@ -428,7 +428,7 @@ module.exports.pugHtmlMinifierTests = function (t, withMinifierOptions) {
       reply.view('./templates/index.pug', data)
     })
 
-    fastify.listen(0, err => {
+    fastify.listen({ port: 0 }, err => {
       t.error(err)
 
       sget({
@@ -468,7 +468,7 @@ module.exports.twigHtmlMinifierTests = function (t, withMinifierOptions) {
       reply.view('./templates/index.twig', data)
     })
 
-    fastify.listen(0, err => {
+    fastify.listen({ port: 0 }, err => {
       t.error(err)
 
       sget({
@@ -506,7 +506,7 @@ module.exports.twigHtmlMinifierTests = function (t, withMinifierOptions) {
       reply.view('./templates/index.twig', data)
     })
 
-    fastify.listen(0, err => {
+    fastify.listen({ port: 0 }, err => {
       t.error(err)
 
       sget({

diff --git a/test/test-art-template.js b/test/test-art-template.js
@@ -23,7 +23,7 @@ test('reply.view with art-template engine and custom templates folder', t => {
     reply.view('./index.art', data)
   })
 
-  fastify.listen(10086, err => {
+  fastify.listen({ port: 10086 }, err => {
     t.error(err)
 
     sget({
@@ -59,7 +59,7 @@ test('reply.view for art-template without data-parameter and defaultContext', t
     reply.view('./index.art')
   })
 
-  fastify.listen(10086, err => {
+  fastify.listen({ port: 10086 }, err => {
     t.error(err)
 
     sget({
@@ -97,7 +97,7 @@ test('reply.view for art-template without data-parameter but with defaultContext
     reply.view('./index.art')
   })
 
-  fastify.listen(10086, err => {
+  fastify.listen({ port: 10086 }, err => {
     t.error(err)
 
     sget({
@@ -135,7 +135,7 @@ test('reply.view with art-template engine and defaultContext', t => {
     reply.view('./index.art', {})
   })
 
-  fastify.listen(10086, err => {
+  fastify.listen({ port: 10086 }, err => {
     t.error(err)
 
     sget({
@@ -176,7 +176,7 @@ test('reply.view for art-template engine without data-parameter and defaultConte
     reply.view('./templates/index.art')
   })
 
-  fastify.listen(0, err => {
+  fastify.listen({ port: 0 }, err => {
     t.error(err)
 
     sget({
@@ -218,7 +218,7 @@ test('reply.view for art-template engine without defaultContext but with reply.l
     reply.view('./templates/index.art', data)
   })
 
-  fastify.listen(0, err => {
+  fastify.listen({ port: 0 }, err => {
     t.error(err)
 
     sget({
@@ -261,7 +261,7 @@ test('reply.view for art-template engine without data-parameter but with reply.l
     reply.view('./templates/index.art')
   })
 
-  fastify.listen(0, err => {
+  fastify.listen({ port: 0 }, err => {
     t.error(err)
 
     sget({
@@ -305,7 +305,7 @@ test('reply.view for art-template engine with data-parameter and reply.locals an
     reply.view('./templates/index.art', data)
   })
 
-  fastify.listen(0, err => {
+  fastify.listen({ port: 0 }, err => {
     t.error(err)
 
     sget({
@@ -343,7 +343,7 @@ test('reply.view with art-template engine and full path templates folder', t =>
     reply.view('./index.art', data)
   })
 
-  fastify.listen(0, err => {
+  fastify.listen({ port: 0 }, err => {
     t.error(err)
 
     sget({
@@ -381,7 +381,7 @@ test('reply.view with art-template engine and includeViewExtension is true', t =
     reply.view('./templates/index', data)
   })
 
-  fastify.listen(0, err => {
+  fastify.listen({ port: 0 }, err => {
     t.error(err)
 
     sget({
@@ -422,7 +422,7 @@ test('fastify.view with art-template engine and full path templates folder', t =
     })
   })
 
-  fastify.listen(0, err => {
+  fastify.listen({ port: 0 }, err => {
     t.error(err)
 
     sget({
@@ -480,7 +480,7 @@ test('reply.view with art-template should return 500 if render fails', t => {
     reply.view('./templates/index')
   })
 
-  fastify.listen(0, err => {
+  fastify.listen({ port: 0 }, err => {
     t.error(err)
 
     sget({