From 8657e5f3f071f67e7e85cd20f149f88f1c2ea606 Mon Sep 17 00:00:00 2001 From: insik-han Date: Sun, 3 Jul 2022 11:38:53 +0900 Subject: [PATCH 1/3] update examples/custom-server-fastify and replace depreaction --- examples/custom-server-fastify/package.json | 10 ++++++---- examples/custom-server-fastify/server.js | 19 ++++++++++--------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/examples/custom-server-fastify/package.json b/examples/custom-server-fastify/package.json index 4842b59849db..bd53b3773057 100644 --- a/examples/custom-server-fastify/package.json +++ b/examples/custom-server-fastify/package.json @@ -6,10 +6,12 @@ "start": "cross-env NODE_ENV=production node ./server.js" }, "dependencies": { - "cross-env": "^7.0.2", - "fastify": "^3.19.1", + "fastify": "^4.2.0", "next": "latest", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "react": "^18.2.0", + "react-dom": "^18.2.0" + }, + "devDependencies": { + "cross-env": "^7.0.3" } } diff --git a/examples/custom-server-fastify/server.js b/examples/custom-server-fastify/server.js index d0bff35e677d..2d9891b8494e 100644 --- a/examples/custom-server-fastify/server.js +++ b/examples/custom-server-fastify/server.js @@ -1,3 +1,4 @@ +/** @type {import('fastify').FastifyInstance} */ const fastify = require('fastify')({ logger: { level: 'error' }, pluginTimeout: 0, @@ -16,32 +17,32 @@ fastify.register((fastify, opts, next) => { if (dev) { fastify.get('/_next/*', (req, reply) => { return handle(req.raw, reply.raw).then(() => { - reply.sent = true + reply.hijack() }) }) } fastify.get('/a', (req, reply) => { return app.render(req.raw, reply.raw, '/a', req.query).then(() => { - reply.sent = true + reply.hijack() }) }) fastify.get('/b', (req, reply) => { return app.render(req.raw, reply.raw, '/b', req.query).then(() => { - reply.sent = true + reply.hijack() }) }) fastify.all('/*', (req, reply) => { return handle(req.raw, reply.raw).then(() => { - reply.sent = true + reply.hijack() }) }) fastify.setNotFoundHandler((request, reply) => { return app.render404(request.raw, reply.raw).then(() => { - reply.sent = true + reply.hijack() }) }) @@ -50,7 +51,7 @@ fastify.register((fastify, opts, next) => { .catch((err) => next(err)) }) -fastify.listen(port, (err) => { - if (err) throw err - console.log(`> Ready on http://localhost:${port}`) -}) +fastify.listen({ port }, err => { + if (err) throw err; + console.log(`> Ready on http://localhost:${port}`); +}); From 5302bf6fdd2edf623406084da58d31392149d859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= Date: Wed, 6 Jul 2022 15:33:08 +0200 Subject: [PATCH 2/3] Apply suggestions from code review --- examples/custom-server-fastify/server.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/custom-server-fastify/server.js b/examples/custom-server-fastify/server.js index 2d9891b8494e..5dccbaeb87de 100644 --- a/examples/custom-server-fastify/server.js +++ b/examples/custom-server-fastify/server.js @@ -51,7 +51,7 @@ fastify.register((fastify, opts, next) => { .catch((err) => next(err)) }) -fastify.listen({ port }, err => { - if (err) throw err; - console.log(`> Ready on http://localhost:${port}`); -}); +fastify.listen({ port }, (err) => { + if (err) throw err + console.log(`> Ready on http://localhost:${port}`) +}) From 149434683bbc4f379d38b1f30db016752c0507e4 Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Sun, 7 Aug 2022 11:26:51 -0500 Subject: [PATCH 3/3] lint-fix --- examples/custom-server-fastify/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/custom-server-fastify/package.json b/examples/custom-server-fastify/package.json index 8de7200294ba..d3804bd97676 100644 --- a/examples/custom-server-fastify/package.json +++ b/examples/custom-server-fastify/package.json @@ -12,4 +12,4 @@ "react": "^18.2.0", "react-dom": "^18.2.0" } -} \ No newline at end of file +}