Merge remote-tracking branch 'origin/main' into riya-amemiya/enable-fallback

Author: riya-amemiya

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 1.4.6 - 3 Nov 2025
+Bug fix:
+- normalize path only when unsafe
+- cache `crypto` package import
+
+# 1.4.5 - 1 Nov 2025
+Bug fix:
+- [#52](https://github.com/elysiajs/elysia-static/pull/52) resolve static paths correctly on Windows
+
 # 1.4.4 - 14 Oct 2025
 Bug fix:
 - fix cjs main import

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@elysiajs/static",
-    "version": "1.4.4",
+    "version": "1.4.6",
     "license": "MIT",
     "scripts": {
         "dev": "bun run --watch example/index.ts",

src/index.ts

@@ -48,6 +48,11 @@ export async function staticPlugin<const Prefix extends string = '/prefix'>({
     if (!builtinModule) return new Elysia()
 
     const [fs, path] = builtinModule
+    const isUnsafeSep = path.sep !== '/'
+
+    const normalizePath = isUnsafeSep
+        ? (p: string) => p.replace(/\\/g, '/')
+        : (p: string) => p
 
     const fileCache = new LRUCache<string, Response>()
 
@@ -78,7 +83,7 @@ export async function staticPlugin<const Prefix extends string = '/prefix'>({
                 if (decodeURI)
                     relativePath = fastDecodeURI(relativePath) ?? relativePath
 
-                let pathName = path.join(prefix, relativePath)
+                let pathName = normalizePath(path.join(prefix, relativePath))
 
                 if (isBun && absolutePath.endsWith('.html')) {
                     const htmlBundle = await import(absolutePath)
@@ -94,7 +99,9 @@ export async function staticPlugin<const Prefix extends string = '/prefix'>({
                 }
 
                 if (!extension)
-                    pathName = pathName.slice(0, pathName.lastIndexOf('.'))
+                    pathName = normalizePath(
+                        pathName.slice(0, pathName.lastIndexOf('.'))
+                    )
 
                 const file: Awaited<ReturnType<typeof getFile>> = isBun
                     ? getFile(absolutePath)
@@ -180,7 +187,6 @@ export async function staticPlugin<const Prefix extends string = '/prefix'>({
 
                     return response.clone()
                 }
-
                 app.get(
                     pathName,
                     useETag
@@ -225,8 +231,7 @@ export async function staticPlugin<const Prefix extends string = '/prefix'>({
                 if (!absolutePath || shouldIgnore(absolutePath)) continue
 
                 let relativePath = absolutePath.replace(assetsDir, '')
-                const pathName = path.join(prefix, relativePath)
-
+                const pathName = normalizePath(path.join(prefix, relativePath))
                 const htmlBundle = await import(absolutePath)
 
                 app.get(pathName, htmlBundle.default)
@@ -239,25 +244,25 @@ export async function staticPlugin<const Prefix extends string = '/prefix'>({
         }
 
         const serveStaticFile = async (pathName: string, requestHeaders?: Record<string, string | undefined>) => {
-            // Normalize for ignore matching
-            const rel = pathName.startsWith(assetsDir)
-                ? pathName.slice(assetsDir.length)
-                : pathName
+            const normalizedPath = normalizePath(pathName)
+            const rel = normalizedPath.startsWith(assetsDir)
+                ? normalizedPath.slice(assetsDir.length)
+                : normalizedPath
             if (shouldIgnore(rel)) return null
 
-            const cache = fileCache.get(pathName)
+            const cache = fileCache.get(normalizedPath)
             if (cache) return cache.clone()
 
-            const fileStat = await fs.stat(pathName).catch(() => null)
+            const fileStat = await fs.stat(normalizedPath).catch(() => null)
             if (!fileStat) return null
 
             if (!indexHTML && fileStat.isDirectory()) return null
 
             let file: NonNullable<Awaited<ReturnType<typeof getFile>>> | undefined
-            let targetPath = pathName
+            let targetPath = normalizedPath
 
             if (!isBun && indexHTML) {
-                const htmlPath = path.join(pathName, 'index.html')
+                const htmlPath = path.join(normalizedPath, 'index.html')
                 const cache = fileCache.get(htmlPath)
                 if (cache) return cache.clone()
 
@@ -267,8 +272,8 @@ export async function staticPlugin<const Prefix extends string = '/prefix'>({
                 }
             }
 
-            if (!file && !fileStat.isDirectory() && (await fileExists(pathName)))
-                file = await getFile(pathName)
+            if (!file && !fileStat.isDirectory() && (await fileExists(normalizedPath)))
+                file = await getFile(normalizedPath)
 
             if (!file) return null
 
@@ -299,7 +304,7 @@ export async function staticPlugin<const Prefix extends string = '/prefix'>({
                 )
             })
 
-            fileCache.set(pathName, response)
+            fileCache.set(normalizedPath, response)
             return response.clone()
         }
 

src/utils.ts

@@ -203,8 +203,8 @@ export async function generateETag(file: BunFile | Buffer<ArrayBufferLike>) {
             .update(await (file as BunFile).arrayBuffer())
             .digest('base64')
 
-    if (!crypto) Crypto = process.getBuiltinModule('crypto')
-    if (!crypto)
+    if (!Crypto) Crypto = process.getBuiltinModule('crypto')
+    if (!Crypto)
         return void console.warn(
             '[@elysiajs/static] crypto is required to generate etag.'
         )