weifuwu 0.19.6 → 0.19.8

package/cli/template/ui/components/Greeting.tsx

@@ -1,3 +1,3 @@
 export default function Greeting({ name }: { name: string }) {
-  return <span className="text-red-500 font-bold">{name}!</span>
+  return <span className="text-green-500 font-bold">{name}!</span>
 }

package/dist/index.d.ts

@@ -73,3 +73,5 @@ export { layout } from './layout.ts';
 export { notFound } from './not-found.ts';
 export { errorBoundary } from './error-boundary.ts';
 export { clearCompileCache } from './compile.ts';
+export { ssrEntries } from './ssr-entries.ts';
+export type { SsrEntry } from './ssr-entries.ts';

package/dist/index.js

@@ -5192,7 +5192,7 @@ async function compileHotComponent(path2) {
   });
   let code = new TextDecoder().decode(result.outputFiles[0].contents);
   if (code.includes("__require") && (code.includes('"react"') || code.includes("'react'"))) {
-    code = `import __r from '/__wfw/v/bundle';
+    code = `import * as __r from 'react';
 ` + code.replace(/__require\(["']react["']\)/g, "__r");
   }
   return { hash: h, code };
@@ -5212,16 +5212,18 @@ function getPublicEnv() {
   return _publicEnv;
 }
 function buildHeadPayload(opts) {
-  const { ctx, base, compiledTailwindCss, isDev: isDev2 } = opts;
+  const { ctx, compiledTailwindCss, isDev: isDev2 } = opts;
+  const rb = opts.rootBase || "";
   let result = "";
   if (isDev2) {
+    const vUrl = `${rb}/__wfw/v/bundle`;
     result += `<script type="importmap">{
   "imports": {
-    "react": "/__wfw/v/bundle",
-    "react-dom": "/__wfw/v/bundle",
-    "react-dom/client": "/__wfw/v/bundle",
-    "react/jsx-runtime": "/__wfw/v/bundle",
-    "weifuwu/react": "/__wfw/v/bundle"
+    "react": "${vUrl}",
+    "react-dom": "${vUrl}",
+    "react-dom/client": "${vUrl}",
+    "react/jsx-runtime": "${vUrl}",
+    "weifuwu/react": "${vUrl}"
   }
 }</script>
 `;
@@ -5231,8 +5233,8 @@ function buildHeadPayload(opts) {
 `;
   }
   if (compiledTailwindCss) {
-    const cssUrl = ctx.tailwindCssUrl || "/__wfw/style.css";
-    result += `<link rel="stylesheet" href="${cssUrl}" />
+    const cssUrl = ctx.tailwindCssUrl;
+    if (cssUrl) result += `<link rel="stylesheet" href="${cssUrl}" />
 `;
   }
   const localeData = ctx.parsed?.__localeData ?? globalThis.__LOCALE_DATA__;
@@ -5313,9 +5315,12 @@ function streamResponse(reactStream, opts) {
         const body = buildBodyScripts(opts);
         if (body) controller.enqueue(encoder2.encode("\n" + body));
         if (opts.isDev) {
+          const rb = opts.rootBase || "";
+          const wsUrl = `${rb}/__weifuwu/livereload`;
+          const hbUrl = `${rb}/__wfw/h/`;
           controller.enqueue(encoder2.encode(
             `
-<script>(function(){var ws=new WebSocket((location.protocol==='https:'?'wss:':'ws:')+'//'+location.host+'/__weifuwu/livereload');var t=0;ws.onmessage=function(e){try{var m=JSON.parse(e.data);if(m.type==='component'){if(m.entry&&m.entry!==window.__WFW_ENTRY)return;import('/__wfw/h/'+m.hash+'?'+Date.now()).catch(function(){location.reload()});if(m.css){var s=document.querySelector('style[data-lr]')||function(){var x=document.createElement('style');x.setAttribute('data-lr','');document.head.appendChild(x);return x}();s.textContent=m.css}return}if(m.type==='css'){var s=document.querySelector('style[data-lr]')||function(){var x=document.createElement('style');x.setAttribute('data-lr','');document.head.appendChild(x);return x}();s.textContent=m.css;return}}catch(_){}if(e.data==='reload'&&Date.now()-t>1e3){t=Date.now();location.reload()}};ws.onclose=function(){if(Date.now()-t>1e3){t=Date.now();setTimeout(function(){location.reload()},500)}}})()</script>`
+<script>(function(){var ws=new WebSocket((location.protocol==='https:'?'wss:':'ws:')+'//'+location.host+'${wsUrl}');var t=0;ws.onmessage=function(e){try{var m=JSON.parse(e.data);if(m.type==='component'){if(m.entry&&m.entry!==window.__WFW_ENTRY)return;import('${hbUrl}'+m.hash+'?'+Date.now()).catch(function(){location.reload()});if(m.css){var s=document.querySelector('style[data-lr]')||function(){var x=document.createElement('style');x.setAttribute('data-lr','');document.head.appendChild(x);return x}();s.textContent=m.css}return}if(m.type==='css'){var s=document.querySelector('style[data-lr]')||function(){var x=document.createElement('style');x.setAttribute('data-lr','');document.head.appendChild(x);return x}();s.textContent=m.css;return}}catch(_){}if(e.data==='reload'&&Date.now()-t>1e3){t=Date.now();location.reload()}};ws.onclose=function(){if(Date.now()-t>1e3){t=Date.now();setTimeout(function(){location.reload()},500)}}})()</script>`
           ));
         }
       } catch {
@@ -5332,6 +5337,9 @@ function streamResponse(reactStream, opts) {
   });
 }
 
+// ssr-entries.ts
+var ssrEntries = /* @__PURE__ */ new Map();
+
 // ssr.ts
 var als = new AsyncLocalStorage();
 __registerAls(() => als.getStore());
@@ -5408,7 +5416,9 @@ async function buildClientBundle(entryPath, layoutPaths) {
   }
 }
 function ssr(path2) {
-  const entryId = id2(resolve4(path2));
+  const absPath = resolve4(path2);
+  const entryId = id2(absPath);
+  ssrEntries.set(entryId, { path: absPath });
   const bundleKey = `/__ssr/${entryId}.js`;
   const r = new Router();
   r.get("/__ssr/:path", (req, ctx) => {
@@ -5481,6 +5491,7 @@ function ssr(path2) {
       return streamResponse(stream, {
         ctx,
         base,
+        rootBase: ctx.rootLayoutBase || "",
         isDev,
         bundle,
         loaderData,
@@ -5556,7 +5567,7 @@ ${src}`;
 // live.ts
 import chokidar from "chokidar";
 import { existsSync as existsSync4 } from "node:fs";
-import { join as join4, resolve as resolve6 } from "node:path";
+import { dirname as dirname3, join as join4, resolve as resolve6 } from "node:path";
 var clients = /* @__PURE__ */ new Set();
 var hotBundleCache = /* @__PURE__ */ new Map();
 var hotKeys = [];
@@ -5619,6 +5630,24 @@ function liveReload(dir) {
     ignored: /(^|[/\\])\.|node_modules|[/\\]\.weifuwu[/\\]/,
     ignoreInitial: true
   });
+  function findEntries(changedPath) {
+    const matched = [];
+    for (const [, entry] of ssrEntries) {
+      if (!entry.path.startsWith(resolved)) continue;
+      if (entry.path === changedPath) {
+        matched.push(entry.path);
+      } else {
+        const ed = dirname3(entry.path);
+        if (changedPath.startsWith(ed)) matched.push(entry.path);
+      }
+    }
+    if (matched.length === 0) {
+      for (const [, entry] of ssrEntries) {
+        if (entry.path.startsWith(resolved)) matched.push(entry.path);
+      }
+    }
+    return matched;
+  }
   watcher.on("change", async (filePath) => {
     if (/\.tsx?$/i.test(filePath)) {
       if (filePath.endsWith("layout.tsx")) {
@@ -5626,25 +5655,28 @@ function liveReload(dir) {
       }
       clearCompileCache();
       markClientBundleDirty();
+      const targets = existsSync4(entryPath) ? [entryPath] : findEntries(resolve6(filePath));
+      if (targets.length === 0) return broadcastReload();
       try {
-        const target = existsSync4(entryPath) ? entryPath : filePath;
-        await compileTsxDev(target);
-        const { hash, code } = await compileHotComponent(target);
-        setHot(hash, code);
         let css;
         const cssPath = join4(resolved, "app.css");
         if (existsSync4(cssPath)) {
           css = await compileTailwindCss(cssPath, resolved);
         }
-        const entry = id(entryPath);
-        const msg = { type: "component", hash, entry };
-        if (css) msg.css = css;
-        const str = JSON.stringify(msg);
-        for (const ws of clients) {
-          try {
-            ws.send(str);
-          } catch {
-            clients.delete(ws);
+        for (const target of targets) {
+          await compileTsxDev(target);
+          const { hash, code } = await compileHotComponent(target);
+          setHot(hash, code);
+          const entry = id(target);
+          const msg = { type: "component", hash, entry };
+          if (css) msg.css = css;
+          const str = JSON.stringify(msg);
+          for (const ws of clients) {
+            try {
+              ws.send(str);
+            } catch {
+              clients.delete(ws);
+            }
           }
         }
       } catch (e) {
@@ -5675,6 +5707,7 @@ function rootLayout(dir) {
   r.use(async (req, ctx, next) => {
     const mod = await compile(layoutPath);
     if (mod?.default) ctx.layoutStack = [{ path: layoutPath, component: mod.default }];
+    ctx.rootLayoutBase = (ctx.mountPath || "").replace(/\/$/, "");
     return next(req, ctx);
   });
   if (existsSync5(join5(resolved, "app.css"))) {
@@ -5986,7 +6019,7 @@ function createReadTool(ctx) {
 import { tool as tool5 } from "ai";
 import { z as z7 } from "zod";
 import { writeFileSync as writeFileSync2, mkdirSync as mkdirSync3 } from "node:fs";
-import { resolve as resolve9, dirname as dirname3 } from "node:path";
+import { resolve as resolve9, dirname as dirname4 } from "node:path";
 function createWriteTool(ctx) {
   return tool5({
     description: "Create or overwrite a file. Parent directories are created automatically.",
@@ -5999,7 +6032,7 @@ function createWriteTool(ctx) {
       if (!isPathAllowed(resolved, ctx.workspace, ctx.permissions)) {
         return { error: "Path not allowed" };
       }
-      mkdirSync3(dirname3(resolved), { recursive: true });
+      mkdirSync3(dirname4(resolved), { recursive: true });
       writeFileSync2(resolved, content, "utf-8");
       return { path: path2, size: content.length };
     }
@@ -8491,6 +8524,7 @@ export {
   setCookie,
   smoothStream,
   ssr,
+  ssrEntries,
   streamObject,
   streamText,
   tenant,

package/dist/react.js

@@ -192,7 +192,7 @@ async function navigate(href) {
       location.href = href;
       return;
     }
-    const bundleMatch = html.match(/src="(\/__wfw\/client\/[^"]+\.js)"/);
+    const bundleMatch = html.match(/src="(\/__ssr\/[^"]+\.js)"/);
     const bundleUrl = bundleMatch ? bundleMatch[1] : null;
     applyHead(html);
     const currentRoot = document.getElementById("__weifuwu_root");

package/dist/ssr-entries.d.ts

@@ -0,0 +1,4 @@
+export interface SsrEntry {
+    path: string;
+}
+export declare const ssrEntries: Map<string, SsrEntry>;

package/dist/stream.d.ts

@@ -2,6 +2,7 @@ import type { Context } from './types.ts';
 export interface StreamOpts {
     ctx: Context;
     base: string;
+    rootBase?: string;
     compiledTailwindCss?: string;
     isDev: boolean;
     status?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weifuwu",
-  "version": "0.19.6",
+  "version": "0.19.8",
   "description": "Web-standard HTTP framework for Node.js — (req, ctx) => Response",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,6 +20,8 @@
     "LICENSE"
   ],
   "scripts": {
+    "dev": "node --watch ./cli/template/index.ts",
+    "start": "NODE_ENV=production node ./cli/template/index.ts",
     "build": "esbuild index.ts --bundle --format=esm --platform=node --outfile=dist/index.js --packages=external && esbuild cli.ts --bundle --format=esm --platform=node --outfile=dist/cli.js --packages=external && esbuild react.ts --bundle --format=esm --outfile=dist/react.js --external:react --external:react-dom",
     "prepublishOnly": "npm run build && tsc --emitDeclarationOnly --outdir dist",
     "test": "node --test 'test/**/*.test.ts'"