@quintype/framework 7.34.6 → 7.34.7-handle-500-issue.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.34.6",
+  "version": "7.34.7-handle-500-issue.1",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {

package/server/handlers/isomorphic-handler.js

@@ -125,7 +125,7 @@ function loadDataForPageType(
     .then((result) => {
       if (result && result.data) {
         if (result.data[ABORT_HANDLER] || (result.data.error && result.data.error.message)) {
-          return null
+          return null;
         }
       }
       return result;
@@ -485,6 +485,14 @@ exports.handleIsomorphicRoute = function handleIsomorphicRoute(
       });
       return res.redirect(301, result.data.location);
     }
+
+    // For server errors (>=500),send statuss
+    if (statusCode >= 500) {
+      res.status(statusCode);
+      res.setHeader("Content-Type", "text/html; charset=utf-8");
+      return res.sendStatus(statusCode);
+    }
+
     const seoInstance = getSeoInstance(seo, config, result.pageType);
     const seoTags = seoInstance && seoInstance.getMetaTags(config, result.pageType || match.pageType, result, { url });
 

package/test/integration/isomorphic-handler-test.js

@@ -168,17 +168,7 @@ describe("Isomorphic Handler", function () {
         }),
       }
     );
-
-    supertest(app)
-      .get("/")
-      .expect("Content-Type", /html/)
-      .expect(500)
-      .then((res) => {
-        const response = JSON.parse(res.text);
-        assert.equal('<div data-page-type="not-found">foobar</div>', response.content);
-        assert.equal(true, response.store.qt.disableIsomorphicComponent);
-      })
-      .then(done, done);
+    supertest(app).get("/").expect(500, done);
   });
 
   it("Throws a 500 if loadData and loadErrorData both crash", function (done) {
@@ -194,7 +184,7 @@ describe("Isomorphic Handler", function () {
       }
     );
 
-    supertest(app).get("/").expect("Content-Type", /html/).expect(500, done);
+    supertest(app).get("/").expect(500, done);
   });
 
   it("Cache headers are set", function (done) {