simplify and revert name change

fastify · Feb 4, 2024 · ae10ffe · ae10ffe
1 parent 0e4fbea
commit ae10ffe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -26,7 +26,8 @@ async function fastifyStatic (fastify, opts) {
   opts.root = normalizeRoot(opts.root)
   checkRootPathForErrors(fastify, opts.root)
 
-  if (opts.setHeaders !== undefined && typeof opts.setHeaders !== 'function') {
+  const setHeaders = opts.setHeaders
+  if (setHeaders !== undefined && typeof setHeaders !== 'function') {
     throw new TypeError('The `setHeaders` option must be a function')
   }
 
@@ -156,9 +157,11 @@ async function fastifyStatic (fastify, opts) {
           rootPath += '/'
         }
 
-        for (let file of new Glob('**/**', {
+        const globIterable = new Glob('**/**', {
           cwd: rootPath, absolute: false, follow: true, nodir: true, dot: opts.serveDotFiles
-        })) {
+        })
+
+        for (let file of globIterable) {
           file = file.split(path.win32.sep).join(path.posix.sep)
           const route = opts.hash ? getHashedAsset(file) : prefix + file
 

diff --git a/lib/hash.js b/lib/hash.js
@@ -41,9 +41,11 @@ async function generateHashes (rootPaths, includeDotFiles = false, ignore = ['no
     const queuePromises = []
     const files = []
 
-    for await (const file of new Glob('**/**', {
+    const globAsyncIterable = new Glob('**/**', {
       cwd: rootPath, absolute: true, follow: true, nodir: true, dot: includeDotFiles, ignore
-    })) {
+    })
+
+    for await (const file of globAsyncIterable) {
       const normalizedFile = file.split(path.win32.sep).join(path.posix.sep)
       files.push(normalizedFile)
       queuePromises.push(queue.push(normalizedFile))