honox 0.1.42 → 0.1.44

package/dist/server/server.js

@@ -17,7 +17,7 @@ const createApp = (options) => {
   const getRootPath = (dir) => filePathToPath(dir.replace(rootRegExp, ""));
   const app = options.app ?? new Hono();
   const trailingSlash = options.trailingSlash ?? false;
-  const appliedMiddleware = /* @__PURE__ */ new Set();
+  const appliedMiddlewaresByDirectory = /* @__PURE__ */ new Map();
   app.use(async function ShareContext(c, next) {
     await contextStorage.run(c, () => next());
   });
@@ -85,24 +85,41 @@ const createApp = (options) => {
       const findMiddleware = (directory) => Object.keys(MIDDLEWARE_FILE).find(
         (x) => new RegExp(escapeDir(directory) + "/_middleware.tsx?").test(x)
       );
+      const isMiddlewareAppliedToAncestor = (middlewarePath, currentDir) => {
+        const dirParts = currentDir.split("/");
+        const ancestorDirs = [];
+        for (let i = dirParts.length - 1; i > 0; i--) {
+          ancestorDirs.push(dirParts.slice(0, i).join("/"));
+        }
+        return ancestorDirs.some(
+          (ancestorDir) => appliedMiddlewaresByDirectory.get(ancestorDir)?.has(middlewarePath)
+        );
+      };
       let middlewareFile = findMiddleware(dir);
       if (!middlewareFile) {
         const dirParts = dir.split("/");
         for (let i = dirParts.length - 1; i >= 0; i--) {
           const parentDir = dirParts.slice(0, i).join("/");
-          middlewareFile = findMiddleware(parentDir);
-          if (middlewareFile) break;
+          if (!parentDir.includes(root)) {
+            break;
+          }
+          const parentMiddleware = findMiddleware(parentDir);
+          if (!parentMiddleware) continue;
+          if (isMiddlewareAppliedToAncestor(parentMiddleware, dir)) continue;
+          middlewareFile = parentMiddleware;
+          break;
         }
       }
       if (middlewareFile) {
         const middleware = MIDDLEWARE_FILE[middlewareFile];
         const middlewareDir = middlewareFile.replace("/_middleware.tsx", "").replace("/_middleware.ts", "");
-        const shouldApply = middlewareDir === dir || !appliedMiddleware.has(middlewareFile) && dir.startsWith(middlewareDir + "/");
+        const shouldApply = middlewareDir === dir || dir.startsWith(middlewareDir + "/");
         if (middleware.default && shouldApply) {
-          if (!appliedMiddleware.has(middlewareFile)) {
-            appliedMiddleware.add(middlewareFile);
-          }
           subApp.use(...middleware.default);
+          if (!appliedMiddlewaresByDirectory.has(dir)) {
+            appliedMiddlewaresByDirectory.set(dir, /* @__PURE__ */ new Set());
+          }
+          appliedMiddlewaresByDirectory.get(dir)?.add(middlewareFile);
         }
       }
       for (const [filename, route] of Object.entries(content)) {
@@ -151,7 +168,7 @@ const createApp = (options) => {
       }
       let rootPath = getRootPath(dir);
       if (trailingSlash) {
-        rootPath = /\/$/.test(rootPath) ? rootPath : rootPath + "/";
+        rootPath = rootPath.endsWith("/") ? rootPath : rootPath + "/";
       }
       app.route(rootPath, subApp);
     }

package/dist/server/utils/file.js

@@ -1,6 +1,6 @@
 const filePathToPath = (filePath) => {
-  filePath = filePath.replace(/\.tsx?$/g, "").replace(/\.mdx?$/g, "").replace(/^\/?index$/, "/").replace(/\/index$/, "").replace(/\[\.{3}.+\]/, "*").replace(/\((.+?)\)/g, "").replace(/\[(.+?)\]/g, ":$1").replace(/\/\//g, "/");
-  return /^\//.test(filePath) ? filePath : "/" + filePath;
+  filePath = filePath.replace(/\.tsx?$/g, "").replace(/\.mdx?$/g, "").replace(/^\/?index$/, "/").replace(/\/index$/, "").replace(/\[\.{3}.+\]/, "*").replace(/\((.+?)\)/g, "").replace(/\[(.+?)\]/g, ":$1").replace(/\/\/+/g, "/");
+  return filePath.startsWith("/") ? filePath : "/" + filePath;
 };
 const groupByDirectory = (files) => {
   const organizedFiles = {};

package/dist/vite/index.d.ts

@@ -1,5 +1,4 @@
 import { DevServerOptions } from '@hono/vite-dev-server';
-export { defaultOptions as devServerDefaultOptions } from '@hono/vite-dev-server';
 import { PluginOption } from 'vite';
 import { ClientOptions } from './client.js';
 import { IslandComponentsOptions } from './island-components.js';
@@ -14,6 +13,14 @@ type Options = {
     external?: string[];
 };
 declare const defaultOptions: Options;
+declare const devServerDefaultOptions: {
+    exclude: (string | RegExp)[];
+    handleHotUpdate: () => undefined;
+    entry: string;
+    export: string;
+    injectClientScript: boolean;
+    ignoreWatching: (string | RegExp)[];
+};
 declare function honox(options?: Options): PluginOption[];
 
-export { honox as default, defaultOptions };
+export { honox as default, defaultOptions, devServerDefaultOptions };

package/dist/vite/index.js

@@ -1,4 +1,4 @@
-import devServer, { defaultOptions as devServerDefaultOptions } from "@hono/vite-dev-server";
+import devServer, { defaultOptions as viteDevServerDefaultOptions } from "@hono/vite-dev-server";
 import path from "path";
 import client from "./client.js";
 import { injectImportingIslands } from "./inject-importing-islands.js";
@@ -8,21 +8,25 @@ const defaultOptions = {
   islands: true,
   entry: path.join(process.cwd(), "./app/server.ts")
 };
+const devServerDefaultOptions = {
+  ...viteDevServerDefaultOptions,
+  exclude: [
+    ...viteDevServerDefaultOptions.exclude,
+    /^\/app\/.+\.tsx?/,
+    /^\/favicon.ico/,
+    /^\/static\/.+/
+  ],
+  handleHotUpdate: () => {
+    return void 0;
+  }
+};
 function honox(options) {
   const plugins = [];
   const entry = options?.entry ?? defaultOptions.entry;
   plugins.push(
     devServer({
+      ...devServerDefaultOptions,
       entry,
-      exclude: [
-        ...devServerDefaultOptions.exclude,
-        /^\/app\/.+\.tsx?/,
-        /^\/favicon.ico/,
-        /^\/static\/.+/
-      ],
-      handleHotUpdate: () => {
-        return void 0;
-      },
       ...options?.devServer
     })
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "honox",
-  "version": "0.1.42",
+  "version": "0.1.44",
   "main": "dist/index.js",
   "type": "module",
   "scripts": {