poops 1.9.1 → 1.9.2

package/lib/server.js

@@ -63,16 +63,25 @@ export function parseRange(header, size) {
 }
 
 export function createStaticHandler(base) {
+  // Drop any trailing separator — `serve.base: "/"` resolves to `<cwd>/`, and the
+  // containment check below would then compare against `<cwd>//` and reject everything
+  base = path.resolve(base)
   const notFoundPage = path.join(base, '404.html')
 
   const notFound = (res) => {
     res.statusCode = 404
-    if (pathExists(notFoundPage)) {
-      res.setHeader('Content-Type', 'text/html; charset=utf-8')
-      fs.createReadStream(notFoundPage).on('error', () => res.destroy()).pipe(res)
-    } else {
-      res.end('Not Found')
+    if (!pathExists(notFoundPage)) return res.end('Not Found')
+    res.setHeader('Content-Type', 'text/html; charset=utf-8')
+    // 404.html lives at the site root but is served at any depth — its relative
+    // asset paths would resolve against /a/ for /a/b, so pin them with <base>
+    let html
+    try {
+      html = fs.readFileSync(notFoundPage, 'utf8')
+    } catch {
+      return res.end('Not Found')
     }
+    if (!/<base[\s>]/i.test(html)) html = html.replace(/<head([^>]*)>/i, '<head$1><base href="/">')
+    res.end(html)
   }
 
   return (req, res) => {
@@ -100,7 +109,13 @@ export function createStaticHandler(base) {
     try {
       stat = fs.statSync(filePath)
     } catch {
-      return notFound(res)
+      // GitHub Pages-style extensionless URLs: /a/b serves a/b.html, URL unchanged
+      try {
+        stat = fs.statSync(filePath + '.html')
+        filePath += '.html'
+      } catch {
+        return notFound(res)
+      }
     }
 
     if (stat.isDirectory()) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "poops",
   "description": "Straightforward, no-bullshit bundler for the web.",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "license": "MIT",
   "type": "module",
   "main": "poops.js",