Fixes #58

11ty · Mar 13, 2023 · 9ff1596 · 9ff1596
1 parent 8d55ea9
commit 9ff1596
Showing 1 changed file with 22 additions and 20 deletions.
diff --git a/server.js b/server.js
@@ -427,27 +427,29 @@ class EleventyDevServer {
       },
     });
 
-    let match = this.mapUrlToFilePath(req.url);
-    debug( req.url, match );
-
-    if (match) {
-      if (match.statusCode === 200 && match.filepath) {
-        return this.renderFile(match.filepath, res);
-      }
-
-      // Redirects, usually for trailing slash to .html stuff
-      if (match.url) {
-        res.statusCode = match.statusCode;
-        res.setHeader("Location", match.url);
-        return res.end();
-      }
-
-      let raw404Path = this.getOutputDirFilePath("404.html");
-      if(match.statusCode === 404 && this.isOutputFilePathExists(raw404Path)) {
-        res.statusCode = match.statusCode;
-        return this.renderFile(raw404Path, res);
+    // middleware (maybe a serverless request) already set a body upstream, skip this part
+    if(!res._shouldForceEnd) {
+      let match = this.mapUrlToFilePath(req.url);
+      debug( req.url, match );
+
+      if (match) {
+        if (match.statusCode === 200 && match.filepath) {
+          return this.renderFile(match.filepath, res);
+        }
+
+        // Redirects, usually for trailing slash to .html stuff
+        if (match.url) {
+          res.statusCode = match.statusCode;
+          res.setHeader("Location", match.url);
+          return res.end();
+        }
+
+        let raw404Path = this.getOutputDirFilePath("404.html");
+        if(match.statusCode === 404 && this.isOutputFilePathExists(raw404Path)) {
+          res.statusCode = match.statusCode;
+          return this.renderFile(raw404Path, res);
+        }
       }
-
     }
 
     if(res.body && !res.bodyUsed) {