honox 0.1.21 → 0.1.22

package/dist/server/server.js

@@ -49,6 +49,7 @@ const createApp = (options) => {
     paths.sort((a, b) => a.split("/").length - b.split("/").length);
     return paths;
   };
+  const errorHandlerMap = {};
   for (const map of routesMap) {
     for (const [dir, content] of Object.entries(map)) {
       const subApp = new Hono();
@@ -105,7 +106,16 @@ const createApp = (options) => {
           });
         }
       }
-      applyError(subApp, dir, errorMap);
+      const errorHandler = getErrorHandler(dir, errorMap);
+      if (errorHandler) {
+        errorHandlerMap[dir] = errorHandler;
+      }
+      for (const [path, errorHandler2] of Object.entries(errorHandlerMap)) {
+        const regExp = new RegExp(`^${path}`);
+        if (regExp.test(dir) && errorHandler2) {
+          subApp.onError(errorHandler2);
+        }
+      }
       let rootPath = getRootPath(dir);
       if (trailingSlash) {
         rootPath = /\/$/.test(rootPath) ? rootPath : rootPath + "/";
@@ -143,20 +153,23 @@ function applyNotFound(app, dir, map) {
     }
   }
 }
-function applyError(app, dir, map) {
+function getErrorHandler(dir, map) {
   for (const [mapDir, content] of Object.entries(map)) {
     if (dir === mapDir) {
       const errorFile = content[ERROR_FILENAME];
       if (errorFile) {
-        const errorHandler = errorFile.default;
-        app.onError(async (error, c) => {
-          const importingIslands = errorFile[IMPORTING_ISLANDS_ID];
-          if (importingIslands) {
-            c.set(IMPORTING_ISLANDS_ID, importingIslands);
-          }
-          c.status(500);
-          return errorHandler(error, c);
-        });
+        const matchedErrorHandler = errorFile.default;
+        if (matchedErrorHandler) {
+          const errorHandler = async (error, c) => {
+            const importingIslands = errorFile[IMPORTING_ISLANDS_ID];
+            if (importingIslands) {
+              c.set(IMPORTING_ISLANDS_ID, importingIslands);
+            }
+            c.status(500);
+            return matchedErrorHandler(error, c);
+          };
+          return errorHandler;
+        }
       }
     }
   }

package/dist/server/with-defaults.js

@@ -19,8 +19,8 @@ const createApp = (options) => {
     }),
     ROUTES: options?.ROUTES ?? import.meta.glob(
       [
-        "/app/routes/**/!(_*|*.test|*.spec).(ts|tsx|md|mdx)",
-        "/app/routes/.well-known/!(_*|*.test|*.spec).(ts|tsx|md|mdx)"
+        "/app/routes/**/!(_*|$*|*.test|*.spec).(ts|tsx|md|mdx)",
+        "/app/routes/.well-known/!(_*|$*|*.test|*.spec).(ts|tsx|md|mdx)"
       ],
       {
         eager: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "honox",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "main": "dist/index.js",
   "type": "module",
   "scripts": {
@@ -112,7 +112,7 @@
     "@babel/parser": "^7.23.6",
     "@babel/traverse": "^7.23.6",
     "@babel/types": "^7.23.6",
-    "@hono/vite-dev-server": "^0.12.1",
+    "@hono/vite-dev-server": "^0.12.2",
     "jsonc-parser": "^3.2.1",
     "precinct": "^12.0.2"
   },