dinou 4.0.5 → 4.0.7

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.7]
+
+### Fixed
+
+- env vars in getProps and json files in esbuild.
+
+## [4.0.6]
+
+### Fixed
+
+- Execute page_functions on not_found page too in getJSX.
+
 ## [4.0.5]
 
 ### Fixed

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/core/render-app-to-html.js

@@ -9,7 +9,7 @@ function toFileUrl(p) {
 }
 
 const registerLoaderPath = toFileUrl(
-  path.join(__dirname, "register-loader.mjs")
+  path.join(__dirname, "register-loader.mjs"),
 );
 const renderHtmlPath = path.resolve(__dirname, "render-html.js");
 
@@ -33,7 +33,7 @@ function renderAppToHtml(
   contextForChild,
   res,
   capturedStatus = null,
-  isDynamic = false
+  isDynamic = false,
 ) {
   const jsxJson = getJSXJSON(reqPath);
   const hasJsxJson = hasJSXJSON(reqPath);
@@ -52,15 +52,15 @@ function renderAppToHtml(
     renderHtmlPath, // ⬅️ CHANGE 2: The script (path) is the first argument of fork (no need for "node")
     scriptArgs, // Positional arguments for the script (process.argv)
     {
-      env: {
-        NODE_ENV: process.env.NODE_ENV,
-        DINOU_BUILD_TOOL: process.env.DINOU_BUILD_TOOL,
-      }, // You can pass other environment variables if necessary
+      // env: {
+      //   NODE_ENV: process.env.NODE_ENV,
+      //   DINOU_BUILD_TOOL: process.env.DINOU_BUILD_TOOL,
+      // }, // You can pass other environment variables if necessary
       // ⬅️ CHANGE 3: Apply Whitelist to execArgv, resetting inherited options
       execArgv: childExecArgv,
       // ⬅️ CHANGE 4: stdio needs 'ipc' for fork to work and for the future communication channel
       stdio: ["ignore", "pipe", "pipe", "ipc"], // stdin, stdout, stderr, ipc
-    }
+    },
   );
 
   // 💡 on('message') Implementation (IPC Channel)
@@ -88,7 +88,7 @@ function renderAppToHtml(
           if (command === "redirect") {
             const url = args.length === 1 ? args[0] : args[1];
             console.log(
-              `[Dinou] Streaming active. Redirecting via JavaScript to: ${url}`
+              `[Dinou] Streaming active. Redirecting via JavaScript to: ${url}`,
             );
             const safeUrl = JSON.stringify(url);
             res.write(`<script>window.location.href = ${safeUrl};</script>`);
@@ -99,7 +99,7 @@ function renderAppToHtml(
           // --- STATUS (Warning) ---
           if (command === "status") {
             console.warn(
-              `[Dinou Warning] HTTP status '${args[0]}' ignored because streaming started.`
+              `[Dinou Warning] HTTP status '${args[0]}' ignored because streaming started.`,
             );
             if (capturedStatus) capturedStatus.value = args[0];
             return;
@@ -110,12 +110,12 @@ function renderAppToHtml(
             const [name, options] = args;
             const path = options && options.path ? options.path : "/";
             console.log(
-              `[Dinou] Streaming active. Clearing cookie '${name}' via JS.`
+              `[Dinou] Streaming active. Clearing cookie '${name}' via JS.`,
             );
             const safeName = JSON.stringify(name);
             const safePath = JSON.stringify(path);
             res.write(
-              `<script>document.cookie = ${safeName} + "=; Max-Age=0; path=" + ${safePath} + ";";</script>`
+              `<script>document.cookie = ${safeName} + "=; Max-Age=0; path=" + ${safePath} + ";";</script>`,
             );
             return;
           }
@@ -129,13 +129,13 @@ function renderAppToHtml(
             if (options && options.httpOnly) {
               console.error(
                 `[Dinou Error] Cannot set HttpOnly cookie '${name}' because streaming has already started. ` +
-                  `Headers are sent, and document.cookie cannot write HttpOnly cookies.`
+                  `Headers are sent, and document.cookie cannot write HttpOnly cookies.`,
               );
               return; // We do nothing because it would fail silently in the browser
             }
 
             console.log(
-              `[Dinou] Streaming active. Setting cookie '${name}' via JS.`
+              `[Dinou] Streaming active. Setting cookie '${name}' via JS.`,
             );
 
             // We build the cookie string manually for JS
@@ -148,7 +148,7 @@ function renderAppToHtml(
               if (options.maxAge) cookieStr += `; max-age=${options.maxAge}`;
               if (options.expires)
                 cookieStr += `; expires=${new Date(
-                  options.expires
+                  options.expires,
                 ).toUTCString()}`;
               if (options.secure) cookieStr += `; secure`;
               if (options.sameSite)
@@ -164,7 +164,7 @@ function renderAppToHtml(
           // --- SET HEADER (Warning) ---
           if (command === "setHeader") {
             console.warn(
-              `[Dinou Warning] Cannot set header '${args[0]}' because streaming started.`
+              `[Dinou Warning] Cannot set header '${args[0]}' because streaming started.`,
             );
             return;
           }
@@ -202,7 +202,7 @@ function renderAppToHtml(
             finalUrl = rawUrl;
           } else {
             console.warn(
-              `[Dinou Security] Blocked unsafe redirect to: ${rawUrl}`
+              `[Dinou Security] Blocked unsafe redirect to: ${rawUrl}`,
             );
             // finalUrl remains "/"
           }

package/dinou/esbuild/helpers-esbuild/get-esbuild-entries.mjs

@@ -33,7 +33,7 @@ export default async function getEsbuildEntries({
     code,
     baseFilePath,
     visited = new Set(),
-    isTopLevelClientComponent = false
+    isTopLevelClientComponent = false,
   ) {
     if (visited.has(baseFilePath)) {
       return { imports: [], assets: [], csss: [] };
@@ -75,7 +75,7 @@ export default async function getEsbuildEntries({
       } catch (err) {
         console.warn(
           `[get-esbuild-entries] Could not read import: ${absImportPathWithExt}`,
-          err.message
+          err.message,
         );
         continue;
       }
@@ -111,6 +111,12 @@ export default async function getEsbuildEntries({
         continue;
       }
 
+      // 🚨 LA SOLUCIÓN: Si es un JSON, lo añadimos pero NO lo parseamos con Babel
+      if (absImportPathWithExt.endsWith(".json")) {
+        imports.add(absImportPathWithExt);
+        continue; // Esto evita que pase a la recursividad de Babel
+      }
+
       imports.add(absImportPathWithExt);
 
       // Procesar imports recursivamente para módulos no-client
@@ -119,7 +125,7 @@ export default async function getEsbuildEntries({
           importedCode,
           absImportPathWithExt,
           visited,
-          isTopLevelClientComponent
+          isTopLevelClientComponent,
         );
         nested.imports.forEach((p) => imports.add(p));
         nested.assets.forEach((p) => assets.add(p));
@@ -127,7 +133,7 @@ export default async function getEsbuildEntries({
       } catch (err) {
         console.warn(
           `[get-esbuild-entries] Could not process imports of: ${absImportPathWithExt}`,
-          err.message
+          err.message,
         );
       }
     }
@@ -203,7 +209,7 @@ export default async function getEsbuildEntries({
         code,
         absPath,
         new Set(),
-        true
+        true,
       );
       const clientComponentRegex = /\.(js|jsx|ts|tsx)$/i;
       imports.forEach((imp) => {
@@ -218,14 +224,14 @@ export default async function getEsbuildEntries({
     } else if (isPageOrLayout(absPath)) {
       if (!isAsyncDefaultExport(code)) {
         console.warn(
-          `[react-client-manifest] The file ${normalizedPath} is a page or layout without "use client" directive, but its default export is not an async function.`
+          `[react-client-manifest] The file ${normalizedPath} is a page or layout without "use client" directive, but its default export is not an async function.`,
         );
       }
       serverModules.add(normalizedPath);
       try {
         const { imports, assets, csss } = await getImportsAndAssetsAndCsss(
           code,
-          absPath
+          absPath,
         );
 
         if (csss.length > 0) {
@@ -233,7 +239,7 @@ export default async function getEsbuildEntries({
             ...csss.map((cssPath) => ({
               absPath: normalizePath(cssPath),
               name: path.basename(cssPath, path.extname(cssPath)),
-            }))
+            })),
           );
         }
 

package/dinou/package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dinou",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "description": "Full-Stack React 19 framework with React Server Components, Server Functions, and Streaming SSR.",
   "main": "index.js",
   "bin": {