@fastify/static 6.11.1 → 6.12.0

package/.eslintrc.json

@@ -1,51 +1,31 @@
 {
-    "extends": [
-      "eslint:recommended",
-      "plugin:@typescript-eslint/eslint-recommended",
-      "plugin:@typescript-eslint/recommended",
-      "standard"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "plugins": ["@typescript-eslint"],
-    "env": { "node": true },
-    "parserOptions": {
-      "ecmaVersion": 6,
-      "sourceType": "module",
-      "project": "./tsconfig.eslint.json",
-      "createDefaultProgram": true
-    },
-    "rules": {
-      "no-console": "off",
-      "@typescript-eslint/indent": ["error", 2],
-      "semi": ["error", "never"],
-      "import/export": "off" // this errors on multiple exports (overload interfaces)
-    },
-    "overrides": [
-      {
-        "files": ["*.d.ts","*.test-d.ts"],
-        "rules": {
-          "no-use-before-define": "off",
-          "no-redeclare": "off",
-          "@typescript-eslint/no-explicit-any": "off"
-        }
+  "plugins": ["@typescript-eslint"],
+  "extends": ["eslint:recommended", "standard"],
+  "overrides": [
+    {
+      "files": ["types/*.test-d.ts", "types/*.d.ts"],
+      "parser": "@typescript-eslint/parser",
+      "parserOptions": {
+        "project": ["./tsconfig.eslint.json"]
       },
-      {
-        "files": ["*.test-d.ts"],
-        "rules": {
-          "@typescript-eslint/no-var-requires": "off",
-          "no-unused-vars": "off",
-          "n/handle-callback-err": "off",
-          "@typescript-eslint/no-empty-function": "off",
-          "@typescript-eslint/explicit-function-return-type": "off",
-          "@typescript-eslint/no-unused-vars": "off",
-          "@typescript-eslint/no-non-null-assertion": "off",
-          "@typescript-eslint/no-misused-promises": ["error", {
-            "checksVoidReturn": false
-          }]
-        },
-        "globals": {
-          "NodeJS": "readonly"
-        }
+      "extends": [
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@typescript-eslint/recommended-requiring-type-checking"
+      ],
+      "rules": {
+        "no-use-before-define": "off",
+        "@typescript-eslint/no-var-requires": "off",
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-floating-promises": "off",
+        "@typescript-eslint/no-unsafe-assignment": "off",
+        "@typescript-eslint/no-unsafe-argument": "off",
+        "@typescript-eslint/no-unsafe-member-access": "off",
+        "@typescript-eslint/no-unsafe-call": "off",
+        "@typescript-eslint/no-misused-promises": ["error", {
+          "checksVoidReturn": false
+        }]
       }
-    ]
-  }
+    }
+  ]
+}

package/index.js

@@ -14,12 +14,12 @@ const contentDisposition = require('content-disposition')
 
 const dirList = require('./lib/dirList')
 
-const winSeparatorRegex = new RegExp(`\\${path.win32.sep}`, 'g')
-const backslashRegex = /\\/g
-const startForwardSlashRegex = /^\//
-const endForwardSlashRegex = /\/$/
-const doubleForwardSlashRegex = /\/\//g
-const asteriskRegex = /\*/g
+const winSeparatorRegex = new RegExp(`\\${path.win32.sep}`, 'gu')
+const backslashRegex = /\\/gu
+const startForwardSlashRegex = /^\//u
+const endForwardSlashRegex = /\/$/u
+const doubleForwardSlashRegex = /\/\//gu
+const asteriskRegex = /\*/gu
 
 const supportedEncodings = ['br', 'gzip', 'deflate']
 send.mime.default_type = 'application/octet-stream'
@@ -396,7 +396,9 @@ async function fastifyStatic (fastify, opts) {
   }
 
   function serveFileHandler (req, reply) {
-    const routeConfig = req.routeOptions.config
+    // TODO: remove the fallback branch when bump major
+    /* istanbul ignore next */
+    const routeConfig = req.routeOptions?.config || req.routeConfig
     pumpSendToReply(req, reply, routeConfig.file, routeConfig.rootPath)
   }
 }
@@ -434,7 +436,7 @@ function checkRootPathForErrors (fastify, rootPath) {
       throw new Error('"root" option array requires one or more paths')
     }
 
-    if ([...new Set(rootPath)].length !== rootPath.length) {
+    if (new Set(rootPath).size !== rootPath.length) {
       throw new Error(
         '"root" option array contains one or more duplicate paths'
       )
@@ -496,7 +498,7 @@ function findIndexFile (pathname, root, indexFiles = ['index.html']) {
       try {
         const stats = statSync(p)
         return !stats.isDirectory()
-      } catch (e) {
+      } catch {
         return false
       }
     })
@@ -540,7 +542,7 @@ function getRedirectUrl (url) {
     const parsed = new URL(url, 'http://localhost.com/')
     const parsedPathname = parsed.pathname
     return parsedPathname + (parsedPathname[parsedPathname.length - 1] !== '/' ? '/' : '') + (parsed.search || '')
-  } catch (error) {
+  } catch {
     // the try-catch here is actually unreachable, but we keep it for safety and prevent DoS attack
     /* istanbul ignore next */
     const err = new Error(`Invalid redirect URL: ${url}`)
@@ -552,7 +554,7 @@ function getRedirectUrl (url) {
 }
 
 module.exports = fp(fastifyStatic, {
-  fastify: '^4.23.0',
+  fastify: '4.x',
   name: '@fastify/static'
 })
 module.exports.default = fastifyStatic

package/lib/dirList.js

@@ -27,7 +27,7 @@ const dirList = {
       let stats
       try {
         stats = await fs.stat(path.join(dir, filename))
-      } catch (error) {
+      } catch {
         return
       }
       const entry = { name: filename, stats }
@@ -58,7 +58,7 @@ const dirList = {
           let stats
           try {
             stats = await fs.stat(filePath)
-          } catch (error) {
+          } catch {
             return
           }
 
@@ -112,7 +112,7 @@ const dirList = {
     let entries
     try {
       entries = await dirList.list(dir, options, dotfiles)
-    } catch (error) {
+    } catch {
       return reply.callNotFound()
     }
     const format = reply.request.query.format || options.format
@@ -146,7 +146,7 @@ const dirList = {
       route = path.normalize(path.join(route, '..'))
     }
     return {
-      href: path.join(prefix, route, entry.name).replace(/\\/g, '/'),
+      href: path.join(prefix, route, entry.name).replace(/\\/gu, '/'),
       name: entry.name,
       stats: entry.stats,
       extendedInfo: entry.extendedInfo

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@fastify/static",
-  "version": "6.11.1",
+  "version": "6.12.0",
   "description": "Plugin for serving static files as fast as possible.",
   "main": "index.js",
+  "type": "commonjs",
   "types": "types/index.d.ts",
   "scripts": {
     "coverage": "npm run test:unit -- --coverage-report=html",

package/test/static.test.js

@@ -1000,7 +1000,7 @@ t.test('sendFile disabled', (t) => {
   fastify.register(fastifyStatic, pluginOptions)
 
   fastify.get('/foo/bar', function (req, reply) {
-    if (typeof reply.sendFile === 'undefined') {
+    if (reply.sendFile === undefined) {
       reply.send('pass')
     } else {
       reply.send('fail')
@@ -1277,7 +1277,7 @@ t.test('sendFile disabled', (t) => {
   fastify.register(fastifyStatic, pluginOptions)
 
   fastify.get('/foo/bar', function (req, reply) {
-    if (typeof reply.sendFile === 'undefined') {
+    if (reply.sendFile === undefined) {
       reply.send('pass')
     } else {
       reply.send('fail')
@@ -1316,7 +1316,7 @@ t.test('download disabled', (t) => {
   fastify.register(fastifyStatic, pluginOptions)
 
   fastify.get('/foo/bar', function (req, reply) {
-    if (typeof reply.download === 'undefined') {
+    if (reply.download === undefined) {
       t.equal(reply.download, undefined)
       reply.send('pass')
     } else {

package/tsconfig.eslint.json

@@ -1,13 +1,10 @@
 {
-    "compilerOptions": {
-      "target": "es6",
-      "lib": [ "es2015" ],
-      "module": "commonjs",
-      "noEmit": true,
-      "strict": true
-    },
-    "include": [
-      "types/*.test-d.ts",
-      "types/*.d.ts"
-    ]
-  }
+  "compilerOptions": {
+    "target": "es6",
+    "lib": ["ES2018"],
+    "module": "commonjs",
+    "noEmit": true,
+    "strict": true
+  },
+  "include": ["types/*.test-d.ts", "types/*.d.ts"]
+}