feat: use node's built-in globbing tool

index.js

@@ -3,7 +3,7 @@
 const path = require('node:path')
 const { fileURLToPath } = require('node:url')
 const { statSync } = require('node:fs')
-const { glob } = require('glob')
+const { glob, stat } = require('node:fs/promises')
 const fp = require('fastify-plugin')
 const send = require('@fastify/send')
 const encodingNegotiator = require('@fastify/accept-negotiator')
@@ -139,11 +139,23 @@
       for (let rootPath of roots) {
         rootPath = rootPath.split(path.win32.sep).join(path.posix.sep)
         !rootPath.endsWith('/') && (rootPath += '/')
-        const files = await glob('**/**', {
-          cwd: rootPath, absolute: false, follow: true, nodir: true, dot: opts.serveDotFiles, ignore: opts.globIgnore
+
+        const patterns = ['**/**']
+        if (opts.serveDotFiles) {
+          patterns.push('**/.*/**')
+        }
+
+        const globStream = glob(patterns, {
+          cwd: rootPath, withFileTypes: true, exclude: opts.globIgnore
         })
 
-        for (let file of files) {
+        for await (const entry of globStream) {
+          const isFile = entry.isFile()
+          if (!isFile) { continue }
+          if (!opts.serveDotFiles && entry.name.startsWith('.')) { continue }
+          const fullPath = path.join(entry.parentPath, entry.name)
+          let file = path.relative(rootPath, fullPath)
+
           file = file.split(path.win32.sep).join(path.posix.sep)
           const route = prefix + file
 

package.json

@@ -62,8 +62,7 @@
     "@fastify/send": "^4.0.0",
     "content-disposition": "^1.0.1",
     "fastify-plugin": "^5.0.0",
-    "fastq": "^1.17.1",
-    "glob": "^11.0.0"
+    "fastq": "^1.17.1"
   },
   "devDependencies": {
     "@fastify/compress": "^8.0.0",

test/static.test.js

@@ -1577,7 +1577,7 @@
   })
 })
 
 test('fastify with exposeHeadRoutes', async t => {
   t.plan(1)
 
   const pluginOptions = {
@@ -1604,7 +1604,7 @@
   })
 })
 
 test('register with wildcard false', async t => {
   t.plan(8)
 
   const pluginOptions = {
@@ -1702,7 +1702,7 @@
   })
 })
 
 test('register with wildcard false (trailing slash in the root)', async t => {
   t.plan(5)
 
   const pluginOptions = {
@@ -1810,7 +1810,7 @@
   await t.assert.rejects(fastify.listen({ port: 0 }))
 })
 
 test('register with wildcard false and alternative index', async t => {
   t.plan(10)
 
   const pluginOptions = {
@@ -1933,7 +1933,7 @@
   })
 })
 
 test('register /static with wildcard false and alternative index', async t => {
   t.plan(10)
 
   const pluginOptions = {
@@ -2185,7 +2185,7 @@
   })
 })
 
 test('register /static with redirect true and wildcard false', async t => {
   t.plan(7)
 
   const pluginOptions = {
@@ -2437,13 +2437,18 @@
 
 test('register with failing glob handler', async (t) => {
   const fastifyStatic = proxyquire.noCallThru()('../', {
-    glob: function globStub (_pattern, _options, cb) {
-      process.nextTick(function () {
-        return cb(new Error('mock glob error'))
-      })
+    'node:fs/promises': {
+      glob: function globStub (_pattern, _options) {
+        return {
+          [Symbol.asyncIterator] () {
+            return {
+              next: async () => { throw new Error('mock glob error') }
+            }
+          }
+        }
+      }
     }
   })
-
   const pluginOptions = {
     root: path.join(__dirname, '/static'),
     serve: true,
@@ -2582,7 +2587,7 @@
   )
 })
 
 test('register /static and /static2 without wildcard', async t => {
   t.plan(2)
 
   const pluginOptions = {
@@ -2765,7 +2770,7 @@
   }
 )
 
 test(
   'will serve pre-compressed files with .br at the highest priority (with wildcard: false)',
   async (t) => {
     const pluginOptions = {
@@ -2795,7 +2800,7 @@
   }
 )
 
 test(
   'will serve pre-compressed files and fallback to .gz if .br is not on disk (with wildcard: false)',
   async (t) => {
     const pluginOptions = {
@@ -2825,7 +2830,7 @@
   }
 )
 
 test(
   'will serve pre-compressed files with .gzip if * directive used (with wildcard: false)',
   async (t) => {
     const pluginOptions = {
@@ -3269,7 +3274,7 @@
   t.assert.deepStrictEqual(response.status, 200)
 
   const response2 = await fetch('http://localhost:' + fastify.server.address().port + '/dir/symlink/subdir/subdir/index.html')
   t.assert.ok(response2.ok)
   t.assert.deepStrictEqual(response2.status, 200)
 })
 
@@ -3290,7 +3295,7 @@
   fastify.server.unref()
 
   const response = await fetch('http://localhost:' + fastify.server.address().port + '/.hidden/sample.json')
   t.assert.ok(response.ok)
   t.assert.deepStrictEqual(response.status, 200)
   t.assert.deepStrictEqual(await response.text(), jsonHiddenContent)
   t.assert.ok(/application\/(json)/.test(response.headers.get('content-type')))