From 04c17f649de8b08999f5ab428ba373f969d03ca6 Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Thu, 7 Sep 2023 17:39:41 +0100 Subject: [PATCH 1/2] perf: use `node:` prefix to bypass require.cache call for builtins --- README.md | 6 +++--- example/server-compress.js | 2 +- example/server-dir-list.js | 2 +- example/server-hidden-file.js | 2 +- example/server.js | 2 +- index.js | 8 ++++---- lib/dirList.js | 4 ++-- test/content-type.test.js | 2 +- test/dir-list.test.js | 4 ++-- test/static.test.js | 8 ++++---- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 3e55dcc2..d8cb4294 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Plugin for serving static files as fast as possible. Supports Fastify version `4 ```js const fastify = require('fastify')({logger: true}) -const path = require('path') +const path = require('node:path') fastify.register(require('@fastify/static'), { root: path.join(__dirname, 'public'), @@ -57,7 +57,7 @@ fastify.listen({ port: 3000 }, (err, address) => { ```js const fastify = require('fastify')() const fastifyStatic = require('@fastify/static') -const path = require('path') +const path = require('node:path') // first plugin fastify.register(fastifyStatic, { root: path.join(__dirname, 'public') @@ -76,7 +76,7 @@ fastify.register(fastifyStatic, { ```js const fastify = require('fastify')() -const path = require('path') +const path = require('node:path') fastify.register(require('@fastify/static'), { root: path.join(__dirname, 'public'), diff --git a/example/server-compress.js b/example/server-compress.js index 29560874..2dd5b252 100644 --- a/example/server-compress.js +++ b/example/server-compress.js @@ -1,6 +1,6 @@ 'use strict' -const path = require('path') +const path = require('node:path') const fastify = require('fastify')({ logger: { level: 'trace' } }) fastify diff --git a/example/server-dir-list.js b/example/server-dir-list.js index 0f380472..6dd92936 100644 --- a/example/server-dir-list.js +++ b/example/server-dir-list.js @@ -1,6 +1,6 @@ 'use strict' -const path = require('path') +const path = require('node:path') const Handlebars = require('handlebars') const fastify = require('fastify')({ logger: { level: 'trace' } }) diff --git a/example/server-hidden-file.js b/example/server-hidden-file.js index 4c9470bc..fe1f3afb 100644 --- a/example/server-hidden-file.js +++ b/example/server-hidden-file.js @@ -1,6 +1,6 @@ 'use strict' -const path = require('path') +const path = require('node:path') const fastify = require('fastify')({ logger: { level: 'trace' } }) fastify diff --git a/example/server.js b/example/server.js index 243f305d..f587183b 100644 --- a/example/server.js +++ b/example/server.js @@ -1,6 +1,6 @@ 'use strict' -const path = require('path') +const path = require('node:path') const fastify = require('fastify')({ logger: { level: 'trace' } }) fastify diff --git a/index.js b/index.js index aa50b3f6..06462a69 100644 --- a/index.js +++ b/index.js @@ -1,9 +1,9 @@ 'use strict' -const path = require('path') -const { fileURLToPath } = require('url') -const { statSync } = require('fs') -const { promisify } = require('util') +const path = require('node:path') +const { fileURLToPath } = require('node:url') +const { statSync } = require('node:fs') +const { promisify } = require('node:util') const glob = require('glob') const globPromise = promisify(glob) const { PassThrough } = require('readable-stream') diff --git a/lib/dirList.js b/lib/dirList.js index 0e61ac88..12d75b23 100644 --- a/lib/dirList.js +++ b/lib/dirList.js @@ -1,7 +1,7 @@ 'use strict' -const path = require('path') -const fs = require('fs').promises +const path = require('node:path') +const fs = require('node:fs/promises') const pLimit = require('p-limit') const dirList = { diff --git a/test/content-type.test.js b/test/content-type.test.js index d9fa32c5..80a124c7 100644 --- a/test/content-type.test.js +++ b/test/content-type.test.js @@ -2,7 +2,7 @@ /* eslint n/no-deprecated-api: "off" */ -const path = require('path') +const path = require('node:path') const { test } = require('tap') const simple = require('simple-get') const Fastify = require('fastify') diff --git a/test/dir-list.test.js b/test/dir-list.test.js index 1017d48c..b6e7b56e 100644 --- a/test/dir-list.test.js +++ b/test/dir-list.test.js @@ -2,8 +2,8 @@ /* eslint n/no-deprecated-api: "off" */ -const fs = require('fs') -const path = require('path') +const fs = require('node:fs') +const path = require('node:path') const t = require('tap') const simple = require('simple-get') const Fastify = require('fastify') diff --git a/test/static.test.js b/test/static.test.js index 8f86e6cf..16dfd23f 100644 --- a/test/static.test.js +++ b/test/static.test.js @@ -2,10 +2,10 @@ /* eslint n/no-deprecated-api: "off" */ -const path = require('path') -const fs = require('fs') -const url = require('url') -const http = require('http') +const path = require('node:path') +const fs = require('node:fs') +const url = require('node:url') +const http = require('node:http') const t = require('tap') const simple = require('simple-get') const Fastify = require('fastify') From b5efebfe5106a24635360ec84fea19c71dd137da Mon Sep 17 00:00:00 2001 From: Uzlopak Date: Fri, 8 Sep 2023 11:09:24 +0200 Subject: [PATCH 2/2] fix test --- test/static.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/static.test.js b/test/static.test.js index 16dfd23f..24ac5dd3 100644 --- a/test/static.test.js +++ b/test/static.test.js @@ -2823,7 +2823,7 @@ t.test( 'register with rootpath that causes statSync to fail with non-ENOENT code', (t) => { const fastifyStatic = proxyquire('../', { - fs: { + 'node:fs': { statSync: function statSyncStub (path) { throw new Error({ code: 'MOCK' }) }