Currect the behavior if root is set and path is /favicon.ico

Author: yusukebe

src/serve-static.ts

@@ -86,15 +86,12 @@ export const serveStatic = <E extends Env = any>(
     const requestPath = options.rewriteRequestPath
       ? options.rewriteRequestPath(filename, c)
       : filename
-    let path: string
-
-    if (optionPath) {
-      // Use path option directly if specified
-      path = resolve(root, optionPath)
-    } else {
-      // Build with root + requestPath
-      path = resolve(join(root, requestPath))
-    }
+
+    let path = optionPath
+      ? options.root
+        ? resolve(join(root, optionPath))
+        : optionPath
+      : resolve(join(root, requestPath))
 
     let stats = getStats(path)
 

test/serve-static.test.ts

@@ -269,23 +269,26 @@ describe('Serve Static Middleware', () => {
       path.join(__dirname, 'assets'),
       __dirname + path.sep + '..' + path.sep + 'test' + path.sep + 'assets',
     ]
+    const optionPaths = ['favicon.ico', '/favicon.ico']
     rootPaths.forEach((root) => {
-      describe(root, () => {
-        const app = new Hono()
-        const server = createAdaptorServer(app)
-
-        app.use(
-          '/favicon.ico',
-          serveStatic({
-            root: './test/assets',
-            path: 'favicon.ico',
+      optionPaths.forEach((optionPath) => {
+        describe(`${root} + ${optionPath}`, () => {
+          const app = new Hono()
+          const server = createAdaptorServer(app)
+
+          app.use(
+            '/favicon.ico',
+            serveStatic({
+              root,
+              path: optionPath,
+            })
+          )
+
+          it('Should return 200 response if both root and path set', async () => {
+            const res = await request(server).get('/favicon.ico')
+            expect(res.status).toBe(200)
+            expect(res.headers['content-type']).toBe('image/x-icon')
           })
-        )
-
-        it('Should return 200 response if both root and path set', async () => {
-          const res = await request(server).get('/favicon.ico')
-          expect(res.status).toBe(200)
-          expect(res.headers['content-type']).toBe('image/x-icon')
         })
       })
     })