primate 0.21.1 → 0.21.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.21.1",
+  "version": "0.21.2",
   "description": "Expressive, minimal and extensible web framework",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",

package/src/app.js

@@ -169,10 +169,14 @@ export default async (config, root, log) => {
     dispatch: dispatch(types),
   };
 
+  const error = await app.paths.routes.join("+error.js");
   const modules = await loaders.modules(app, root, config);
 
   return {...app,
     modules,
+    error: {
+      default: await error.exists ? (await import(error)).default : undefined,
+    },
     layoutDepth: Math.max(...app.routes.map(({layouts}) => layouts.length)) + 1,
     route: hooks.route({...app, modules}),
     parse: hooks.parse(dispatch(types)),

package/src/hooks/handle.js

@@ -14,7 +14,7 @@ export default app => {
   const route = async request => {
     const {pathname} = request.url;
     // if NoFileForPath is thrown, this will remain undefined
-    let errorHandler = undefined;
+    let errorHandler = app.error.default;
 
     return tryreturn(async _ => {
       const {path, guards, errors, layouts, handler} = invalid(pathname)
@@ -50,9 +50,9 @@ export default app => {
       }, request);
     }).orelse(async error => {
       app.log.auto(error);
-      console.log("HI")
+
       // the +error.js page itself could fail
-      return tryreturn(_ => respond(errorHandler())(app, {}, request))
+      return tryreturn(_ => respond(errorHandler(request))(app, {}, request))
         .orelse(_ => clientError()(app, {}, request));
     });
   };