dinou 5.0.1 → 5.0.3

package/dinou/core/client-webpack.jsx

@@ -5,11 +5,13 @@ import {
   useTransition,
   useLayoutEffect,
   useMemo,
+  Component,
 } from "react";
 import { createFromFetch } from "react-server-dom-webpack/client";
 import { hydrateRoot } from "react-dom/client";
 import { RouterContext } from "./navigation.js";
 import { resolveUrl, isExternalUrl } from "./navigation-utils.js";
+import { createServerFunctionProxy } from "./server-function-proxy-webpack.js";
 
 // ====================================================================
 // 1. GLOBAL STATE (Outside the component)
@@ -81,11 +83,109 @@ const getRSCPayload = (rscKey, isPrefetch = false) => {
       }
       return res;
     }),
+    {
+      callServer: async (id, args) => {
+        const proxy = createServerFunctionProxy(id);
+        return proxy(...args);
+      }
+    }
   );
   cache.set(url, promise); // <--- KEY TO AVOID LOOP
   return promise;
 };
 
+const getErrorRSCPayload = (route, error) => {
+  const url = route.split("::")[0];
+  const cacheKey = `error::${url}::${error.message || String(error)}`;
+  if (cache.has(cacheKey)) {
+    return cache.get(cacheKey);
+  }
+
+  const payloadUrl = "/____rsc_payload_error____" + url;
+  const promise = createFromFetch(
+    fetch(payloadUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        error: {
+          message: error.message || "Unknown Error",
+          name: error.name,
+          stack: error.stack,
+        },
+      }),
+    }).then((res) => {
+      if (res.headers.has("x-rsc-redirect")) {
+        const redirectUrl = res.headers.get("x-rsc-redirect");
+        cache.delete(cacheKey);
+        if (window.__DINOU_ROUTER_NAVIGATE__) {
+          window.__DINOU_ROUTER_NAVIGATE__(redirectUrl, { replace: true });
+        } else {
+          window.location.href = redirectUrl;
+        }
+        return new Promise(() => {});
+      }
+      return res;
+    }),
+    {
+      callServer: async (id, args) => {
+        const proxy = createServerFunctionProxy(id);
+        return proxy(...args);
+      }
+    }
+  );
+  cache.set(cacheKey, promise);
+  return promise;
+};
+
+class ErrorBoundary extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { hasError: false, error: null };
+  }
+
+  static getDerivedStateFromError(error) {
+    return { hasError: true, error };
+  }
+
+  componentDidCatch(error, errorInfo) {
+    console.error("[Dinou] ErrorBoundary caught error:", error, errorInfo);
+    if (this.props.onError) {
+      this.props.onError(error);
+    }
+  }
+
+  render() {
+    if (this.state.hasError) {
+      if (this.props.fallback) {
+        return this.props.fallback(this.state.error);
+      }
+      const isDev = process.env.NODE_ENV !== "production";
+      return (
+        <div style={{ padding: "20px", fontFamily: "sans-serif" }}>
+          <h2>Application Error</h2>
+          <p>An unexpected error occurred on the client.</p>
+          <pre style={{ backgroundColor: "#f5f5f5", padding: "15px", borderRadius: "5px", overflowX: "auto" }}>
+            {isDev ? (
+              <>
+                <div style={{ fontWeight: "bold", marginBottom: "10px" }}>
+                  {this.state.error?.name || "Error"}: {this.state.error?.message || String(this.state.error)}
+                </div>
+                <div>{this.state.error?.stack}</div>
+              </>
+            ) : (
+              this.state.error?.message || String(this.state.error)
+            )}
+          </pre>
+        </div>
+      );
+    }
+    return this.props.children;
+  }
+}
+
+
 // ====================================================================
 // 3. ROUTER COMPONENT
 // ====================================================================
@@ -95,6 +195,7 @@ function Router() {
   const [isPopState, setIsPopState] = useState(false);
   const [isPending, startTransition] = useTransition();
   const [version, setVersion] = useState(0);
+  const [navError, setNavError] = useState(null);
 
   // 🧭 NAVIGATE FUNCTION (Core Logic)
   const navigate = (href, options = {}) => {
@@ -138,6 +239,7 @@ function Router() {
     startTransition(() => {
       setIsPopState(false);
       setRoute(finalPath);
+      setNavError(null);
     });
   };
 
@@ -174,6 +276,7 @@ function Router() {
     startTransition(() => {
       // 3. Increment version to force re-execution of useMemo
       setVersion((v) => v + 1);
+      setNavError(null);
     });
   };
 
@@ -220,6 +323,7 @@ function Router() {
       startTransition(() => {
         setIsPopState(true);
         setRoute(target);
+        setNavError(null);
       });
     };
 
@@ -265,7 +369,7 @@ function Router() {
 
   // RSC Logic
   const rscKey = route + "::" + version;
-  const content = getRSCPayload(rscKey);
+  const content = navError ? getErrorRSCPayload(route, navError) : getRSCPayload(rscKey);
 
   const contextValue = useMemo(
     () => ({
@@ -281,7 +385,12 @@ function Router() {
 
   return (
     <RouterContext.Provider value={contextValue}>
-      {use(content)}
+      <ErrorBoundary
+        key={navError ? "error" : "normal"}
+        onError={setNavError}
+      >
+        {use(content)}
+      </ErrorBoundary>
     </RouterContext.Provider>
   );
 }

package/dinou/core/client.jsx

@@ -6,11 +6,13 @@ import {
   useTransition,
   useLayoutEffect,
   useMemo,
+  Component,
 } from "react";
 import { createFromFetch } from "@roggc/react-server-dom-esm/client";
 import { hydrateRoot } from "react-dom/client";
 import { RouterContext } from "./navigation.js";
 import { resolveUrl, isExternalUrl } from "./navigation-utils.js";
+import { createServerFunctionProxy } from "./server-function-proxy.js";
 
 // ====================================================================
 // 1. GLOBAL STATE (Outside the component)
@@ -64,6 +66,12 @@ const getRSCPayload = (rscKey, isPrefetch = false) => {
     payloadUrl = "/____rsc_payload____" + url;
   }
 
+  const buildId = window.__DINOU_BUILD_ID__;
+  if (buildId) {
+    payloadUrl += (payloadUrl.includes("?") ? "&" : "?") + "buildId=" + buildId;
+    window.__DINOU_BUILD_ID__ = undefined;
+  }
+
   // 3. Fetch and Cache Storage
   const promise = createFromFetch(
     fetch(payloadUrl).then((res) => {
@@ -82,11 +90,109 @@ const getRSCPayload = (rscKey, isPrefetch = false) => {
       }
       return res;
     }),
+    {
+      callServer: async (id, args) => {
+        const proxy = createServerFunctionProxy(id);
+        return proxy(...args);
+      }
+    }
   );
   cache.set(url, promise); // <--- KEY TO AVOID LOOP
   return promise;
 };
 
+const getErrorRSCPayload = (route, error) => {
+  const url = route.split("::")[0];
+  const cacheKey = `error::${url}::${error.message || String(error)}`;
+  if (cache.has(cacheKey)) {
+    return cache.get(cacheKey);
+  }
+
+  const payloadUrl = "/____rsc_payload_error____" + url;
+  const promise = createFromFetch(
+    fetch(payloadUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        error: {
+          message: error.message || "Unknown Error",
+          name: error.name,
+          stack: error.stack,
+        },
+      }),
+    }).then((res) => {
+      if (res.headers.has("x-rsc-redirect")) {
+        const redirectUrl = res.headers.get("x-rsc-redirect");
+        cache.delete(cacheKey);
+        if (window.__DINOU_ROUTER_NAVIGATE__) {
+          window.__DINOU_ROUTER_NAVIGATE__(redirectUrl, { replace: true });
+        } else {
+          window.location.href = redirectUrl;
+        }
+        return new Promise(() => {});
+      }
+      return res;
+    }),
+    {
+      callServer: async (id, args) => {
+        const proxy = createServerFunctionProxy(id);
+        return proxy(...args);
+      }
+    }
+  );
+  cache.set(cacheKey, promise);
+  return promise;
+};
+
+class ErrorBoundary extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { hasError: false, error: null };
+  }
+
+  static getDerivedStateFromError(error) {
+    return { hasError: true, error };
+  }
+
+  componentDidCatch(error, errorInfo) {
+    console.error("[Dinou] ErrorBoundary caught error:", error, errorInfo);
+    if (this.props.onError) {
+      this.props.onError(error);
+    }
+  }
+
+  render() {
+    if (this.state.hasError) {
+      if (this.props.fallback) {
+        return this.props.fallback(this.state.error);
+      }
+      const isDev = process.env.NODE_ENV !== "production";
+      return (
+        <div style={{ padding: "20px", fontFamily: "sans-serif" }}>
+          <h2>Application Error</h2>
+          <p>An unexpected error occurred on the client.</p>
+          <pre style={{ backgroundColor: "#f5f5f5", padding: "15px", borderRadius: "5px", overflowX: "auto" }}>
+            {isDev ? (
+              <>
+                <div style={{ fontWeight: "bold", marginBottom: "10px" }}>
+                  {this.state.error?.name || "Error"}: {this.state.error?.message || String(this.state.error)}
+                </div>
+                <div>{this.state.error?.stack}</div>
+              </>
+            ) : (
+              this.state.error?.message || String(this.state.error)
+            )}
+          </pre>
+        </div>
+      );
+    }
+    return this.props.children;
+  }
+}
+
+
 // ====================================================================
 // 3. ROUTER COMPONENT
 // ====================================================================
@@ -96,6 +202,7 @@ function Router() {
   const [isPopState, setIsPopState] = useState(false);
   const [isPending, startTransition] = useTransition();
   const [version, setVersion] = useState(0);
+  const [navError, setNavError] = useState(null);
 
   // 🧭 NAVIGATE FUNCTION (Core Logic)
   const navigate = (href, options = {}) => {
@@ -139,6 +246,7 @@ function Router() {
     startTransition(() => {
       setIsPopState(false);
       setRoute(finalPath);
+      setNavError(null);
     });
   };
 
@@ -175,6 +283,7 @@ function Router() {
     startTransition(() => {
       // 3. Increment version to force re-execution of useMemo
       setVersion((v) => v + 1);
+      setNavError(null);
     });
   };
 
@@ -221,6 +330,7 @@ function Router() {
       startTransition(() => {
         setIsPopState(true);
         setRoute(target);
+        setNavError(null);
       });
     };
 
@@ -266,7 +376,7 @@ function Router() {
 
   // RSC Logic
   const rscKey = route + "::" + version;
-  const content = getRSCPayload(rscKey);
+  const content = navError ? getErrorRSCPayload(route, navError) : getRSCPayload(rscKey);
 
   const contextValue = useMemo(
     () => ({
@@ -282,7 +392,12 @@ function Router() {
 
   return (
     <RouterContext.Provider value={contextValue}>
-      {use(content)}
+      <ErrorBoundary
+        key={navError ? "error" : "normal"}
+        onError={setNavError}
+      >
+        {use(content)}
+      </ErrorBoundary>
     </RouterContext.Provider>
   );
 }

package/dinou/core/generating-isg.js

@@ -41,33 +41,28 @@ function generatingISG(reqPath, isDynamicFromServer) {
         return; // 👋 We exit without doing anything, the page is dynamic
       }
 
-      // B. Generate HTML and RSC (Same as ISR)
-      const [pageResult, rscResult] = await Promise.all([
-        generateStaticPage(reqPath),
-        generateStaticRSC(reqPath),
-      ]);
-
-      // C. Transactional Commit
-      if (pageResult.success && rscResult.success) {
-        await safeRename(pageResult.tempPath, pageResult.finalPath);
+      // B. Generate HTML and RSC sequentially (RSC first, then HTML)
+      const rscResult = await generateStaticRSC(reqPath);
+      if (!rscResult.success) {
+        console.warn(`⚠️ [ISG] RSC generation failed for ${reqPath}. Aborting.`);
+        await fs.unlink(rscResult.tempPath).catch(() => {});
+        return;
+      }
 
-        // 2. Rename RSC (.tmp -> .rsc)
-        // HERE is where the EPERM used to fail
-        await safeRename(rscResult.tempPath, rscResult.finalPath);
-        // // Rename .tmp -> Final
-        // await fs.rename(pageResult.tempPath, pageResult.finalPath);
-        // await fs.rename(rscResult.tempPath, rscResult.finalPath);
+      // Commit the RSC payload immediately so that generateStaticPage can read it
+      await safeRename(rscResult.tempPath, rscResult.finalPath);
 
-        // Update Manifest
+      const pageResult = await generateStaticPage(reqPath);
+      if (pageResult.success) {
+        await safeRename(pageResult.tempPath, pageResult.finalPath);
         updateStatus(reqPath, pageResult.status);
         isDynamicFromServer.value = false;
         console.log(`✅ [ISG] Successfully promoted ${reqPath} to static.`);
       } else {
-        // Cleanup if failed
-        await fs.unlink(pageResult.tempPath).catch(() => { });
-        await fs.unlink(rscResult.tempPath).catch(() => { });
-        console.warn(`⚠️ [ISG] Failed to generate HTML/RSC for ${reqPath}`);
+        await fs.unlink(pageResult.tempPath).catch(() => {});
+        console.warn(`⚠️ [ISG] HTML generation failed for ${reqPath}. Aborting commit.`);
       }
+
     } catch (e) {
       console.error(`[ISG] Critical error promoting ${reqPath}:`, e);
     } finally {

package/dinou/core/get-error-jsx.js

@@ -140,7 +140,7 @@ async function getErrorJSX(reqPath, query, error, isDevelopment = false) {
                 );
 
               if (slotErrorPath) {
-                const slotErrorModule = require(slotErrorPath);
+                const slotErrorModule = await importModule(slotErrorPath);
                 const SlotError = slotErrorModule.default ?? slotErrorModule;
 
                 const serializedError = {

package/dinou/core/get-jsx.js

@@ -196,7 +196,7 @@ async function getJSX(
               );
 
             if (slotErrorPath) {
-              const slotErrorModule = require(slotErrorPath);
+              const slotErrorModule = await importModule(slotErrorPath);
               const SlotError = slotErrorModule.default ?? slotErrorModule;
 
               const serializedError = {

package/dinou/core/path-utils.js

@@ -0,0 +1,10 @@
+function normalizePathCase(p) {
+  if (process.platform === "win32" && typeof p === "string" && p[1] === ":") {
+    return p.charAt(0).toLowerCase() + p.slice(1);
+  }
+  return p;
+}
+
+module.exports = {
+  normalizePathCase,
+};

package/dinou/core/revalidating.js

@@ -37,7 +37,9 @@ function revalidating(reqPath, isDynamicFromServer) {
               path.join(dist2Folder, reqPath, "rsc.rsc"),
               path.join(dist2Folder, reqPath, "rsc._old.rsc")
             );
-        } catch (e) {}
+        } catch (e) {
+          console.error("[ISR] copyFileSync error:", e);
+        }
 
         regenerating.add(reqPath);
 
@@ -55,14 +57,19 @@ function revalidating(reqPath, isDynamicFromServer) {
           return;
         }
 
-        const [pageResult, rscResult] = await Promise.all([
-          generateStaticPage(reqPath),
-          generateStaticRSC(reqPath),
-        ]);
+        const rscResult = await generateStaticRSC(reqPath);
+        if (!rscResult.success) {
+          console.warn(`⚠️ [ISR] RSC generation failed for ${reqPath}. Aborting.`);
+          await fs.unlink(rscResult.tempPath).catch(() => {});
+          return;
+        }
 
-        if (pageResult.success && rscResult.success) {
+        // Commit the RSC payload immediately so that generateStaticPage can read it
+        await safeRename(rscResult.tempPath, rscResult.finalPath);
+
+        const pageResult = await generateStaticPage(reqPath);
+        if (pageResult.success) {
           await safeRename(pageResult.tempPath, pageResult.finalPath);
-          await safeRename(rscResult.tempPath, rscResult.finalPath);
           updateStatus(reqPath, pageResult.status);
           isDynamicFromServer.value = false;
           console.log(
@@ -70,11 +77,9 @@ function revalidating(reqPath, isDynamicFromServer) {
           );
         } else {
           console.warn(
-            `⚠️ [ISR] Partial failure for ${reqPath}. Aborting commit.`
+            `⚠️ [ISR] HTML generation failed for ${reqPath}. Aborting commit.`
           );
-
           await fs.unlink(pageResult.tempPath).catch(() => {});
-          await fs.unlink(rscResult.tempPath).catch(() => {});
         }
       } catch (e) {
         console.error(`[ISR] Critical error regenerating ${reqPath}:`, e);