dinou 4.0.4 → 4.0.6

package/CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [4.0.6]
+
+### Fixed
+
+- Execute page_functions on not_found page too in getJSX.
+
+## [4.0.5]
+
+### Fixed
+
+- Pass props to RootLayout in BuildStaticPages.
+
 ## [4.0.4]
 
 ### Fixed

package/dinou/core/build-static-pages.js

@@ -902,7 +902,14 @@ async function buildStaticPages() {
             for (const [layoutPath, dParams, slots] of layouts.reverse()) {
               const layoutModule = await importModule(layoutPath);
               const Layout = layoutModule.default ?? layoutModule;
-              // if (!Layout.displayName) Layout.displayName = "Layout";
+              const layoutFolderPath = path.dirname(layoutPath);
+              const resetLayoutPath = getFilePathAndDynamicParams(
+                [],
+                {},
+                layoutFolderPath,
+                "reset_layout",
+                false,
+              )[0];
               const updatedSlots = {};
               for (const [slotName, slotElement] of Object.entries(slots)) {
                 const alreadyFoundPath = slotElement.props?.__modulePath;
@@ -916,21 +923,12 @@ async function buildStaticPages() {
                 params: dParams,
                 /*searchParams: {},*/ ...updatedSlots,
               };
-              if (index === layouts.length - 1) {
+              if (index === layouts.length - 1 || resetLayoutPath) {
                 props = { ...props, ...(pageFunctionsProps?.layout ?? {}) };
               }
               jsx = React.createElement(Layout, props, jsx);
               jsx = { ...jsx, __modulePath: layoutPath };
-              const layoutFolderPath = path.dirname(layoutPath);
-              if (
-                getFilePathAndDynamicParams(
-                  [],
-                  {},
-                  layoutFolderPath,
-                  "reset_layout",
-                  false,
-                )[0]
-              ) {
+              if (resetLayoutPath) {
                 break;
               }
               index++;
@@ -1177,6 +1175,14 @@ async function buildStaticPage(reqPath, isDynamic = null) {
           for (const [layoutPath, dParams, slots] of layouts.reverse()) {
             const layoutModule = await importModule(layoutPath);
             const Layout = layoutModule.default ?? layoutModule;
+            const layoutFolderPath = path.dirname(layoutPath);
+            const resetLayoutPath = getFilePathAndDynamicParams(
+              [],
+              {},
+              layoutFolderPath,
+              "reset_layout",
+              false,
+            )[0];
             const updatedSlots = {};
             for (const [slotName, slotElement] of Object.entries(slots)) {
               const alreadyFoundPath = slotElement.props?.__modulePath;
@@ -1191,7 +1197,7 @@ async function buildStaticPage(reqPath, isDynamic = null) {
               // searchParams: {},
               ...updatedSlots,
             };
-            if (index === layouts.length - 1) {
+            if (index === layouts.length - 1 || resetLayoutPath) {
               layoutProps = {
                 ...layoutProps,
                 ...(pageFunctionsProps?.layout ?? {}),
@@ -1199,16 +1205,7 @@ async function buildStaticPage(reqPath, isDynamic = null) {
             }
             jsx = React.createElement(Layout, layoutProps, jsx);
             jsx = { ...jsx, __modulePath: layoutPath };
-            const layoutFolderPath = path.dirname(layoutPath);
-            if (
-              getFilePathAndDynamicParams(
-                [],
-                {},
-                layoutFolderPath,
-                "reset_layout",
-                false,
-              )[0]
-            ) {
+            if (resetLayoutPath) {
               break;
             }
             index++;

package/dinou/core/get-jsx.js

@@ -11,7 +11,7 @@ async function getJSX(
   reqPath,
   query,
   isNotFound = null,
-  isDevelopment = false
+  isDevelopment = false,
 ) {
   const srcFolder = path.resolve(process.cwd(), "src");
   const reqSegments = reqPath.split("/").filter(Boolean);
@@ -43,7 +43,7 @@ async function getJSX(
     const [filePath, dParams] = getFilePathAndDynamicParams(
       reqSegments,
       query,
-      srcFolder
+      srcFolder,
     );
     pagePath = filePath;
     dynamicParams = dParams ?? {};
@@ -60,26 +60,43 @@ async function getJSX(
       srcFolder,
       "not_found",
       true,
-      false
+      false,
     );
     if (!notFoundPath) {
       jsx = React.createElement(
         "div",
         null,
-        `Page not found: no "page" file found for "${reqPath}"`
+        `Page not found: no "page" file found for "${reqPath}"`,
       );
     } else {
       const pageModule = await importModule(notFoundPath);
       const Page = pageModule.default ?? pageModule;
-      jsx = React.createElement(Page, {
+      let props = {
         params: dParams ?? {},
-        // searchParams: query,
-      });
-
+      };
       const notFoundDir = path.dirname(notFoundPath);
+
+      const [pageFunctionsPath] = getFilePathAndDynamicParams(
+        reqSegments,
+        query,
+        notFoundDir,
+        "page_functions",
+        true,
+        true,
+        undefined,
+        reqSegments.length,
+      );
+      if (pageFunctionsPath) {
+        const pageFunctionsModule = await importModule(pageFunctionsPath);
+        const getProps = pageFunctionsModule.getProps;
+        pageFunctionsProps = await getProps?.(dParams ?? {});
+        props = { ...props, ...(pageFunctionsProps?.page ?? {}) };
+      }
+
+      jsx = React.createElement(Page, props);
       const noLayoutNotFoundPath = path.join(
         notFoundDir,
-        `no_layout_not_found`
+        `no_layout_not_found`,
       );
       if (existsSync(noLayoutNotFoundPath)) {
         return jsx;
@@ -104,7 +121,7 @@ async function getJSX(
       true,
       true,
       undefined,
-      reqSegments.length
+      reqSegments.length,
     );
     if (pageFunctionsPath) {
       const pageFunctionsModule = await importModule(pageFunctionsPath);
@@ -122,7 +139,7 @@ async function getJSX(
       query,
       srcFolder,
       "no_layout",
-      false
+      false,
     )[0]
   ) {
     return jsx;
@@ -138,7 +155,7 @@ async function getJSX(
     undefined,
     0,
     {},
-    true
+    true,
   );
 
   if (layouts && Array.isArray(layouts)) {
@@ -151,7 +168,7 @@ async function getJSX(
         {},
         layoutFolderPath,
         "reset_layout",
-        false
+        false,
       )[0];
       const Layout = layoutModule.default ?? layoutModule;
       const updatedSlots = {};
@@ -175,7 +192,7 @@ async function getJSX(
                 true, // withExtension
                 true, // finalDestination
                 undefined, // lastFound
-                reqSegments.length
+                reqSegments.length,
               );
 
             if (slotErrorPath) {
@@ -196,13 +213,13 @@ async function getJSX(
               });
             } else {
               console.warn(
-                `[Dinou] Slot @${slotName} failed and does not have error.tsx`
+                `[Dinou] Slot @${slotName} failed and does not have error.tsx`,
               );
               updatedSlotElement = null;
             }
           } else {
             console.error(
-              `[Dinou] Could not locate the path of the slot @${slotName}`
+              `[Dinou] Could not locate the path of the slot @${slotName}`,
             );
             updatedSlotElement = null;
           }

package/dinou/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dinou-ejected",
-  "version": "4.0.4",
+  "version": "4.0.6",
   "main": "index.js",
   "private": true,
   "exports": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dinou",
-  "version": "4.0.4",
-  "description": "Modern Full-Stack React 19 framework with React Server Components, Server Functions, and Streaming SSR.",
+  "version": "4.0.6",
+  "description": "Full-Stack React 19 framework with React Server Components, Server Functions, and Streaming SSR.",
   "main": "index.js",
   "bin": {
     "dinou": "./cli.js"