weifuwu 0.18.10 → 0.18.12

package/dist/index.js

@@ -404,6 +404,7 @@ var Router = class _Router {
       ctx.mountPath = (ctx.mountPath || "") + base;
       return next(req, ctx);
     };
+    this.globalMws.push(...sub.globalMws);
     const routes = [];
     this._collect(sub.root, "", routes, []);
     for (const { method, path: path2, handler, middlewares } of routes) {
@@ -5478,17 +5479,6 @@ function ssr(path2) {
   return r;
 }
 
-// layout.ts
-function layout(path2) {
-  return async (req, ctx, next) => {
-    const mod = await compileTsx(path2);
-    const Component = mod.default;
-    if (!Component) throw new Error(`Layout ${path2} has no default export`);
-    ctx.layoutStack = [...ctx.layoutStack || [], { path: path2, component: Component }];
-    return next(req, ctx);
-  };
-}
-
 // tailwind.ts
 import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync } from "node:fs";
 import { join as join3, relative, resolve as resolve5 } from "node:path";
@@ -5533,23 +5523,14 @@ function liveReload(opts) {
 // tailwind.ts
 var isDev2 = process.env.NODE_ENV !== "production";
 var extraSources = /* @__PURE__ */ new Set();
-function addTailwindSource(dir) {
-  extraSources.add(resolve5(dir));
-}
 function tailwind(dir) {
   const cssDir = resolve5(dir);
   const cssPath = join3(cssDir, "app.css");
   let compiledCss = "";
   let twWatcher = null;
-  return async (req, ctx, next) => {
-    const url = new URL(req.url);
+  const r = new Router();
+  r.use(async (req, ctx, next) => {
     if (!compiledCss) compiledCss = await compile(cssPath, cssDir);
-    const stylePath = (ctx.mountPath || "") + "/__wfw/style.css";
-    if (url.pathname === stylePath) {
-      return new Response(compiledCss || "", {
-        headers: { "content-type": "text/css; charset=utf-8" }
-      });
-    }
     ctx.compiledTailwindCss = compiledCss;
     if (isDev2 && !twWatcher) {
       twWatcher = watchFile(cssPath, () => {
@@ -5558,7 +5539,14 @@ function tailwind(dir) {
       });
     }
     return next(req, ctx);
-  };
+  });
+  r.get("/__wfw/style.css", async (req, ctx) => {
+    if (!compiledCss) compiledCss = await compile(cssPath, cssDir);
+    return new Response(compiledCss || "", {
+      headers: { "content-type": "text/css; charset=utf-8" }
+    });
+  });
+  return r;
 }
 async function compile(cssPath, cssDir) {
   try {
@@ -5592,6 +5580,17 @@ function watchFile(path2, onChange) {
   return watcher;
 }
 
+// layout.ts
+function layout(path2) {
+  return async (req, ctx, next) => {
+    const mod = await compileTsx(path2);
+    const Component = mod.default;
+    if (!Component) throw new Error(`Layout ${path2} has no default export`);
+    ctx.layoutStack = [...ctx.layoutStack || [], { path: path2, component: Component }];
+    return next(req, ctx);
+  };
+}
+
 // opencode/session.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { join as join4 } from "node:path";
@@ -6227,7 +6226,7 @@ async function buildRouter4(deps) {
   });
   try {
     const uiDir = new URL("../opencode/ui/", import.meta.url).pathname;
-    addTailwindSource(uiDir);
+    router.use(tailwind(uiDir));
     router.use(layout(join5(uiDir, "layout.tsx")));
     router.get("/", ssr(join5(uiDir, "page.tsx")));
   } catch (e) {

package/dist/tailwind.d.ts

@@ -1,3 +1,3 @@
-import type { Middleware } from './types.ts';
+import { Router } from './router.ts';
 export declare function addTailwindSource(dir: string): void;
-export declare function tailwind(dir: string): Middleware;
+export declare function tailwind(dir: string): Router;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weifuwu",
-  "version": "0.18.10",
+  "version": "0.18.12",
   "description": "Web-standard HTTP framework for Node.js — (req, ctx) => Response",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",