dinou 5.1.2 → 6.0.0

package/CHANGELOG.md

@@ -5,6 +5,35 @@ 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/).
 
+## [6.0.0] - 2026-09-13
+
+### Changed
+- **Unified `.dinou/` Directory for Build Artifacts & Manifests**: Relocated all compiler outputs, client/server bundles, and runtime metadata under a single `.dinou/` root directory instead of generating multiple folders across the project root.
+  * **Build Artifacts Relocation**:
+    - `dist2` (pre-rendered static & ISR HTML/RSC payloads) moved to `.dinou/dist2`
+    - `dist3` (production bundles & manifests) moved to `.dinou/dist3`
+    - `public` (development client bundles & compiled CSS) moved to `.dinou/public`
+    - `react_client_manifest` moved to `.dinou/react_client_manifest`
+    - `server_functions_manifest` moved to `.dinou/server_functions_manifest`
+  * **Clean Project Root & Improved DX**: Eliminates root-level clutter, giving projects a clean, minimal, and production-ready structure.
+  * **User Assets Isolation**: The root `public/` directory is now exclusively reserved for user static assets (images, favicons, fonts), preventing compiler bundles from mixing with user files.
+  * **Simplified `.gitignore`**: Projects now only require a single `.dinou/` entry in `.gitignore` instead of managing multiple build directory rules.
+  * **Effortless Cache Invalidation**: Wiping the compilation cache or performing clean builds can now be done in one command by deleting `.dinou/` (`rm -rf .dinou`).
+  * **Full Multi-Bundler Alignment**: Updated all Rollup, Esbuild, and Webpack compiler runners and custom manifest plugins to resolve into `.dinou/` seamlessly across development and production environments.
+
+## [5.2.0] - 2026-07-13
+
+### Added
+- **Lightweight Plugin System & `dinou.config.js` support**: Added native support for extending the framework without manually modifying the core Express server.
+  * **Config Loader**: Automatically loads a `dinou.config.js` file at the root of the project to initialize custom plugins.
+  * **`onServerInit(app)` Hook**: Allows plugins to register global Express middlewares, custom endpoints (like webhooks), or API routes.
+  * **`onRequestContext(req, res, context)` Hook**: Allows plugins to inject custom properties (like `locale` or `userId`) into the RSC context across standard page requests, Server Actions, and dynamic compilation child processes.
+  * **Try-Catch Isolation**: Wrapped plugin hooks in safe boundaries with named logging to prevent third-party plugin errors from crashing the server.
+
+### Fixed
+- **URL resolution for search params**: Fixed `useSearchParams` and `usePathname` to work correctly with URL hashes.
+- **Server Actions with FormData**: Fixed server actions to correctly handle FormData arguments, supporting formData in any position in the args list.
+
 ## [5.1.2] - 2026-07-12
 
 ### Fixed

package/README.md

@@ -1522,7 +1522,7 @@ Dinou is flexible and integrates with three major bundlers: **esbuild** (default
 
 ### Development
 
-Starts the development server with hot reloading. Files are emitted to the `public` folder.
+Starts the development server with hot reloading. Files are emitted to the `./dinou/public` folder.
 
 | Command               | Bundler     | Description                |
 | :-------------------- | :---------- | :------------------------- |
@@ -1533,7 +1533,7 @@ Starts the development server with hot reloading. Files are emitted to the `publ
 
 ### Production Build
 
-Compiles the application for production. Files are emitted to the `dist3` folder.
+Compiles the application for production. Files are emitted to the `.dinou/dist3` folder.
 
 | Command                 | Bundler                |
 | :---------------------- | :--------------------- |
@@ -1544,7 +1544,7 @@ Compiles the application for production. Files are emitted to the `dist3` folder
 
 ### Start Production Server
 
-Runs the built application from the `dist3` folder.
+Runs the built application from the `.dinou/dist3` folder.
 
 | Command                 | Description                         |
 | :---------------------- | :---------------------------------- |

package/dinou/core/cache-revalidate.js

@@ -39,7 +39,7 @@ async function revalidatePath(reqPath) {
       if (referer) {
         try {
           currentPathname = new URL(referer).pathname;
-        } catch (e) {}
+        } catch (e) { }
       } else {
         currentPathname = ctx.req.path || "/";
       }
@@ -55,7 +55,7 @@ async function revalidatePath(reqPath) {
     cleanPath = cleanPath.slice(0, -1);
   }
 
-  const dist2Folder = path.resolve(process.cwd(), "dist2");
+  const dist2Folder = path.resolve(process.cwd(), ".dinou/dist2");
   const reqPathWithSlash = cleanPath.endsWith("/") ? cleanPath : cleanPath + "/";
 
   // Check if there is an existing page to copy to _old
@@ -89,7 +89,7 @@ async function revalidatePath(reqPath) {
     if (!rscResult.success) {
       console.warn(`⚠️ [Revalidate] RSC generation failed for ${cleanPath}.`);
       if (rscResult.tempPath && existsSync(rscResult.tempPath)) {
-        await fs.unlink(rscResult.tempPath).catch(() => {});
+        await fs.unlink(rscResult.tempPath).catch(() => { });
       }
       return;
     }
@@ -104,7 +104,7 @@ async function revalidatePath(reqPath) {
     } else {
       console.warn(`⚠️ [Revalidate] HTML generation failed for ${cleanPath}.`);
       if (pageResult.tempPath && existsSync(pageResult.tempPath)) {
-        await fs.unlink(pageResult.tempPath).catch(() => {});
+        await fs.unlink(pageResult.tempPath).catch(() => { });
       }
     }
   } catch (e) {
@@ -114,7 +114,7 @@ async function revalidatePath(reqPath) {
 
 async function revalidateTag(tag) {
   console.log(`[Revalidate] Starting on-demand revalidation for tag: "${tag}"...`);
-  const dist2Folder = path.resolve(process.cwd(), "dist2");
+  const dist2Folder = path.resolve(process.cwd(), ".dinou/dist2");
   if (!existsSync(dist2Folder)) return;
 
   const metadataFiles = await walkMetadataFiles(dist2Folder);

package/dinou/core/generate-static-page.js

@@ -5,7 +5,7 @@ const renderAppToHtml = require("./render-app-to-html.js");
 const { getStaticMetadata } = require("./build-static-pages.js");
 const { processMetadata } = require("./get-ssg-metadata.js");
 
-const OUT_DIR = path.resolve("dist2");
+const OUT_DIR = path.resolve(".dinou/dist2");
 
 async function generateStaticPage(reqPath) {
   const finalReqPath = reqPath.endsWith("/") ? reqPath : reqPath + "/";
@@ -52,9 +52,9 @@ async function generateStaticPage(reqPath) {
       status: (code) => {
         capturedStatus.value = code;
       },
-      setHeader: () => {},
-      clearCookie: () => {},
-      redirect: () => {},
+      setHeader: () => { },
+      clearCookie: () => { },
+      redirect: () => { },
     };
 
     htmlStream = renderAppToHtml(
@@ -112,7 +112,7 @@ async function generateStaticPage(reqPath) {
       status: status,
     };
   } catch (error) {
-    await fs.unlink(tempHtmlPath).catch(() => {});
+    await fs.unlink(tempHtmlPath).catch(() => { });
     return { success: false, tempPath: tempHtmlPath };
   }
 }

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

@@ -7,7 +7,7 @@ const { getStaticMetadata } = require("./build-static-pages.js");
 const { processMetadata } = require("./get-ssg-metadata.js");
 const { updateStatus } = require("./status-manifest.js");
 
-const OUT_DIR = path.resolve("dist2");
+const OUT_DIR = path.resolve(".dinou/dist2");
 
 async function generateStaticPages(routes) {
   for (const route of routes) {
@@ -57,9 +57,9 @@ async function generateStaticPages(routes) {
             console.warn(`[SSG] Status ${code} ignored for ${reqPath}`);
           capturedStatus.value = code;
         },
-        setHeader: () => {},
-        clearCookie: () => {},
-        redirect: () => {},
+        setHeader: () => { },
+        clearCookie: () => { },
+        redirect: () => { },
       };
 
       htmlStream = renderAppToHtml(

package/dinou/core/generate-static-rsc.js

@@ -9,7 +9,7 @@ const { renderToPipeableStream } = isWebpack
   : require("@roggc/react-server-dom-esm/server");
 const { requestStorage } = require("./request-context.js");
 
-const OUT_DIR = path.resolve("dist2");
+const OUT_DIR = path.resolve(".dinou/dist2");
 // const isWebpack = process.env.DINOU_BUILD_TOOL === "webpack";
 
 async function generateStaticRSC(reqPath) {
@@ -83,8 +83,8 @@ async function generateStaticRSC(reqPath) {
       fs.readFileSync(
         path.resolve(
           isWebpack
-            ? "dist3/react-client-manifest.json"
-            : "react_client_manifest/react-client-manifest.json"
+            ? ".dinou/dist3/react-client-manifest.json"
+            : ".dinou/react_client_manifest/react-client-manifest.json"
         ),
         "utf8"
       )

package/dinou/core/generate-static-rscs.js

@@ -11,7 +11,7 @@ const { renderToPipeableStream } = isWebpack
 // 👇 Your context storage
 const { requestStorage } = require("./request-context.js");
 
-const OUT_DIR = path.resolve("dist2");
+const OUT_DIR = path.resolve(".dinou/dist2");
 // const isWebpack = process.env.DINOU_BUILD_TOOL === "webpack";
 
 async function generateStaticRSCs(routes) {
@@ -19,8 +19,8 @@ async function generateStaticRSCs(routes) {
     fs.readFileSync(
       path.resolve(
         isWebpack
-          ? "dist3/react-client-manifest.json"
-          : "react_client_manifest/react-client-manifest.json"
+          ? ".dinou/dist3/react-client-manifest.json"
+          : ".dinou/react_client_manifest/react-client-manifest.json"
       ),
       "utf8"
     )

package/dinou/core/generate-static.js

@@ -5,11 +5,11 @@ const generateStaticPages = require("./generate-static-pages");
 const { buildStaticPages, getStaticPaths } = require("./build-static-pages");
 
 async function generateStatic() {
-  const distFolder2 = path.resolve(process.cwd(), "dist2");
+  const distFolder2 = path.resolve(process.cwd(), ".dinou/dist2");
 
   if (existsSync(distFolder2)) {
     rmSync(distFolder2, { recursive: true, force: true });
-    console.log("Deleted existing dist2 folder");
+    console.log("Deleted existing .dinou/dist2 folder");
   }
 
   await buildStaticPages();

package/dinou/core/generating-isg.js

@@ -9,7 +9,7 @@ const { safeRename } = require("./safe-rename");
 const { updateStatus } = require("./status-manifest");
 
 function generatingISG(reqPath, isDynamicFromServer) {
-  const dist2Folder = path.resolve(process.cwd(), "dist2");
+  const dist2Folder = path.resolve(process.cwd(), ".dinou/dist2");
   // 1. Concurrency Protection
   if (regenerating.has(reqPath)) return;
   try {
@@ -45,7 +45,7 @@ function generatingISG(reqPath, isDynamicFromServer) {
       const rscResult = await generateStaticRSC(reqPath);
       if (!rscResult.success) {
         console.warn(`⚠️ [ISG] RSC generation failed for ${reqPath}. Aborting.`);
-        await fs.unlink(rscResult.tempPath).catch(() => {});
+        await fs.unlink(rscResult.tempPath).catch(() => { });
         return;
       }
 
@@ -59,7 +59,7 @@ function generatingISG(reqPath, isDynamicFromServer) {
         isDynamicFromServer.value = false;
         console.log(`✅ [ISG] Successfully promoted ${reqPath} to static.`);
       } else {
-        await fs.unlink(pageResult.tempPath).catch(() => {});
+        await fs.unlink(pageResult.tempPath).catch(() => { });
         console.warn(`⚠️ [ISG] HTML generation failed for ${reqPath}. Aborting commit.`);
       }
 

package/dinou/core/get-asset-from-manifest.js

@@ -7,13 +7,13 @@ const isWebpack = process.env.DINOU_BUILD_TOOL === "webpack";
 
 function getAssetFromManifest(name) {
   if (process.env.NODE_ENV === "production" && !read) {
-    const manifestPath = path.resolve(process.cwd(), "dist3/manifest.json");
+    const manifestPath = path.resolve(process.cwd(), ".dinou/dist3/manifest.json");
     if (fs.existsSync(manifestPath)) {
       manifest = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
       read = true;
     }
   } else if (isWebpack && !read) {
-    const manifestPath = path.resolve(process.cwd(), "public/manifest.json");
+    const manifestPath = path.resolve(process.cwd(), ".dinou/public/manifest.json");
     if (fs.existsSync(manifestPath)) {
       manifest = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
       read = true;

package/dinou/core/navigation.js

@@ -126,7 +126,7 @@ export function usePathname() {
     return "";
   }
 
-  const path = fullRoute.split("?")[0];
+  const path = fullRoute.split("#")[0].split("?")[0];
   return normalizePath(path);
 }
 
@@ -165,6 +165,6 @@ export function useSearchParams() {
 
   if (typeof fullRoute !== "string") return new URLSearchParams();
 
-  const searchPart = fullRoute.split("?")[1] || "";
+  const searchPart = (fullRoute.split("?")[1] || "").split("#")[0];
   return new URLSearchParams(searchPart);
 }

package/dinou/core/render-app-to-html.js

@@ -15,8 +15,8 @@ const { renderToPipeableStream } = isWebpack
 const manifestPath = path.resolve(
   process.cwd(),
   isWebpack
-    ? (isDevelopment ? "public/react-client-manifest.json" : "dist3/react-client-manifest.json")
-    : "react_client_manifest/react-client-manifest.json"
+    ? (isDevelopment ? ".dinou/public/react-client-manifest.json" : ".dinou/dist3/react-client-manifest.json")
+    : ".dinou/react_client_manifest/react-client-manifest.json"
 );
 
 let cachedManifest = null;
@@ -189,7 +189,7 @@ function renderAppToHtml(
   );
 
   const query = JSON.parse(paramsString || "{}");
-  const rscPath = path.resolve(process.cwd(), "dist2", reqPath.replace(/^\//, ""), "rsc.rsc");
+  const rscPath = path.resolve(process.cwd(), ".dinou/dist2", reqPath.replace(/^\//, ""), "rsc.rsc");
   const hasStaticRsc = !isDynamic && fs.existsSync(rscPath);
 
   if (hasStaticRsc) {

package/dinou/core/render-html.js

@@ -144,7 +144,7 @@ function getImportMapHtml() {
 
   const manifestPath = path.resolve(
     process.cwd(),
-    "react_client_manifest/react-client-manifest.json"
+    ".dinou/react_client_manifest/react-client-manifest.json"
   );
 
   if (!fs.existsSync(manifestPath)) {
@@ -184,11 +184,11 @@ function getSsrManifest() {
     const path = require("path");
     const ssrManifestPath = path.resolve(
       process.cwd(),
-      isDevelopment ? "public/react-ssr-manifest.json" : "dist3/react-ssr-manifest.json"
+      isDevelopment ? ".dinou/public/react-ssr-manifest.json" : ".dinou/dist3/react-ssr-manifest.json"
     );
     const clientManifestPath = path.resolve(
       process.cwd(),
-      isDevelopment ? "public/react-client-manifest.json" : "dist3/react-client-manifest.json"
+      isDevelopment ? ".dinou/public/react-client-manifest.json" : ".dinou/dist3/react-client-manifest.json"
     );
 
     const ssrContent = fs.readFileSync(ssrManifestPath, "utf8");
@@ -204,7 +204,7 @@ function getSsrManifest() {
         if (entry && entry.id !== undefined) {
           try {
             requireMap[entry.id] = fileURLToPath(fileUrl);
-          } catch {}
+          } catch { }
         }
       }
       global.__webpack_require_map__ = requireMap;
@@ -294,10 +294,10 @@ async function renderToStream(
               const errorStream = renderToPipeableStream(errorJSX, {
                 onShellReady() {
                   const isWebpack = process.env.DINOU_BUILD_TOOL === "webpack";
-          if (!isWebpack) {
-            const importMapHtml = getImportMapHtml();
-            process.stdout.write(importMapHtml);
-          }
+                  if (!isWebpack) {
+                    const importMapHtml = getImportMapHtml();
+                    process.stdout.write(importMapHtml);
+                  }
                   errorStream.pipe(process.stdout);
                 },
                 onError(err) {

package/dinou/core/revalidating.js

@@ -10,7 +10,7 @@ const { updateStatus } = require("./status-manifest");
 const regenerating = new Set();
 
 function revalidating(reqPath, isDynamicFromServer) {
-  const dist2Folder = path.resolve(process.cwd(), "dist2");
+  const dist2Folder = path.resolve(process.cwd(), ".dinou/dist2");
   const metadataPath = path.join(dist2Folder, reqPath, "metadata.json");
 
   if (regenerating.has(reqPath)) return;
@@ -46,49 +46,49 @@ function revalidating(reqPath, isDynamicFromServer) {
         (async () => {
           try {
             console.log(`[ISR] Starting regeneration for ${reqPath}...`);
-        const isDynamic = {};
-        await buildStaticPage(reqPath, isDynamic);
-        if (isDynamic.value) {
-          isDynamicFromServer.value = true;
-          console.log(
-            `[ISR] Bailout detected for ${reqPath}. Switching to Dynamic.`
-          );
+            const isDynamic = {};
+            await buildStaticPage(reqPath, isDynamic);
+            if (isDynamic.value) {
+              isDynamicFromServer.value = true;
+              console.log(
+                `[ISR] Bailout detected for ${reqPath}. Switching to Dynamic.`
+              );
 
-          return;
-        }
+              return;
+            }
 
-        const rscResult = await generateStaticRSC(reqPath);
-        if (!rscResult.success) {
-          console.warn(`⚠️ [ISR] RSC generation failed for ${reqPath}. Aborting.`);
-          await fs.unlink(rscResult.tempPath).catch(() => {});
-          return;
-        }
+            const rscResult = await generateStaticRSC(reqPath);
+            if (!rscResult.success) {
+              console.warn(`⚠️ [ISR] RSC generation failed for ${reqPath}. Aborting.`);
+              await fs.unlink(rscResult.tempPath).catch(() => { });
+              return;
+            }
 
-        // Commit the RSC payload immediately so that generateStaticPage can read it
-        await safeRename(rscResult.tempPath, rscResult.finalPath);
+            // 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);
-          updateStatus(reqPath, pageResult.status);
-          isDynamicFromServer.value = false;
-          console.log(
-            `✅ [ISR] Successfully committed ${reqPath} (Status: ${pageResult.status})`
-          );
-        } else {
-          console.warn(
-            `⚠️ [ISR] HTML generation failed for ${reqPath}. Aborting commit.`
-          );
-          await fs.unlink(pageResult.tempPath).catch(() => {});
-        }
-      } catch (e) {
-        console.error(`[ISR] Critical error regenerating ${reqPath}:`, e);
-      } finally {
-        regenerating.delete(reqPath);
+            const pageResult = await generateStaticPage(reqPath);
+            if (pageResult.success) {
+              await safeRename(pageResult.tempPath, pageResult.finalPath);
+              updateStatus(reqPath, pageResult.status);
+              isDynamicFromServer.value = false;
+              console.log(
+                `✅ [ISR] Successfully committed ${reqPath} (Status: ${pageResult.status})`
+              );
+            } else {
+              console.warn(
+                `⚠️ [ISR] HTML generation failed for ${reqPath}. Aborting commit.`
+              );
+              await fs.unlink(pageResult.tempPath).catch(() => { });
+            }
+          } catch (e) {
+            console.error(`[ISR] Critical error regenerating ${reqPath}:`, e);
+          } finally {
+            regenerating.delete(reqPath);
+          }
+        })();
       }
-    })();
-  }
-  }).catch((err) => {});
+    }).catch((err) => { });
 }
 
 module.exports = { revalidating, regenerating };

package/dinou/core/server-function-proxy-webpack.js

@@ -22,13 +22,17 @@ function createServerFunctionProxy(id) {
         "x-server-function-call": "1",
       };
 
-      if (args[0] instanceof FormData) {
-        const formData = args[0];
+      const formDataIndex = args.findIndex((arg) => arg instanceof FormData);
+
+      if (formDataIndex !== -1) {
+        const formData = args[formDataIndex];
 
         formData.append("__dinou_func_id", id);
+        formData.append("__dinou_formData_index", String(formDataIndex));
 
         if (args.length > 1) {
-          formData.append("__dinou_args", JSON.stringify(args.slice(1)));
+          const serializedArgs = args.map((arg, i) => (i === formDataIndex ? null : arg));
+          formData.append("__dinou_args", JSON.stringify(serializedArgs));
         }
 
         body = formData;

package/dinou/core/server-function-proxy.js

@@ -1,4 +1,3 @@
-// public/server-function-proxy.js
 import { createFromFetch } from "@roggc/react-server-dom-esm/client";
 
 function isSafeRedirect(url) {
@@ -16,20 +15,24 @@ function executeRedirect(url) {
 }
 
 export function createServerFunctionProxy(id) {
-  return new Proxy(() => {}, {
+  return new Proxy(() => { }, {
     apply: async (_target, _thisArg, args) => {
       let body;
       const headers = {
         "x-server-function-call": "1",
       };
 
-      if (args[0] instanceof FormData) {
-        const formData = args[0];
+      const formDataIndex = args.findIndex((arg) => arg instanceof FormData);
+
+      if (formDataIndex !== -1) {
+        const formData = args[formDataIndex];
 
         formData.append("__dinou_func_id", id);
+        formData.append("__dinou_formData_index", String(formDataIndex));
 
         if (args.length > 1) {
-          formData.append("__dinou_args", JSON.stringify(args.slice(1)));
+          const serializedArgs = args.map((arg, i) => (i === formDataIndex ? null : arg));
+          formData.append("__dinou_args", JSON.stringify(serializedArgs));
         }
 
         body = formData;

package/dinou/core/server.js

@@ -72,10 +72,22 @@ addHook({
 });
 const importModule = require("./import-module");
 const generateStatic = require("./generate-static.js");
+
+// Load Dinou configuration and plugins
+let dinouConfig = { plugins: [] };
+const dinouConfigPath = path.resolve(process.cwd(), "dinou.config.js");
+if (existsSync(dinouConfigPath)) {
+  try {
+    dinouConfig = require(dinouConfigPath);
+  } catch (err) {
+    console.error("[Dinou] Error loading dinou.config.js:", err);
+  }
+}
+
 const renderAppToHtml = require("./render-app-to-html.js");
 const { revalidating, regenerating } = require("./revalidating.js");
 const isDevelopment = process.env.NODE_ENV !== "production";
-const outputFolder = isDevelopment ? "public" : "dist3";
+const outputFolder = isDevelopment ? ".dinou/public" : ".dinou/dist3";
 const chokidar = require("chokidar");
 const { fileURLToPath, pathToFileURL } = require("url");
 const parseExports = require("./parse-exports.js");
@@ -89,11 +101,11 @@ if (isDevelopment) {
     process.cwd(),
     isWebpack
       ? `${outputFolder}/react-client-manifest.json`
-      : `react_client_manifest/react-client-manifest.json`,
+      : `.dinou/react_client_manifest/react-client-manifest.json`,
   );
   const manifestFolderPath = path.resolve(
     process.cwd(),
-    isWebpack ? outputFolder : "react_client_manifest",
+    isWebpack ? outputFolder : ".dinou/react_client_manifest",
   );
 
   let manifestWatcher = null;
@@ -266,7 +278,7 @@ if (!isDevelopment) {
     process.cwd(),
     isWebpack
       ? `${outputFolder}/server-functions-manifest.json`
-      : `server_functions_manifest/server-functions-manifest.json`,
+      : `.dinou/server_functions_manifest/server-functions-manifest.json`,
   ); // Adjust 'dist/' to your outdir
   if (existsSync(manifestPath)) {
     serverFunctionsManifest = JSON.parse(readFileSync(manifestPath, "utf8"));
@@ -283,6 +295,21 @@ const cookieParser = require("cookie-parser");
 const appUseCookieParser = cookieParser();
 const app = express();
 app.use(appUseCookieParser);
+
+// Run plugins onServerInit hook
+if (dinouConfig.plugins && Array.isArray(dinouConfig.plugins)) {
+  for (const plugin of dinouConfig.plugins) {
+    if (typeof plugin.onServerInit === "function") {
+      try {
+        plugin.onServerInit(app);
+        console.log(`[Dinou] Plugin initialized: "${plugin.name || "unnamed"}"`);
+      } catch (err) {
+        console.error(`[Dinou] Error initializing plugin "${plugin.name || "unnamed"}":`, err);
+      }
+    }
+  }
+}
+
 app.use(express.json());
 
 // ============================================================
@@ -406,6 +433,20 @@ function getContext(req, res) {
       redirect: (...args) => safeResCall("redirect", ...args),
     },
   };
+
+  // Run plugins onRequestContext hook
+  if (dinouConfig.plugins && Array.isArray(dinouConfig.plugins)) {
+    for (const plugin of dinouConfig.plugins) {
+      if (typeof plugin.onRequestContext === "function") {
+        try {
+          plugin.onRequestContext(req, res, context);
+        } catch (err) {
+          console.error(`[Dinou] Error running onRequestContext in plugin "${plugin.name || "unnamed"}":`, err);
+        }
+      }
+    }
+  }
+
   return context;
 }
 
@@ -534,6 +575,20 @@ function getContextForServerFunctionEndpoint(req, res) {
       },
     },
   };
+
+  // Run plugins onRequestContext hook
+  if (dinouConfig.plugins && Array.isArray(dinouConfig.plugins)) {
+    for (const plugin of dinouConfig.plugins) {
+      if (typeof plugin.onRequestContext === "function") {
+        try {
+          plugin.onRequestContext(req, res, context);
+        } catch (err) {
+          console.error(`[Dinou] Error running onRequestContext in plugin "${plugin.name || "unnamed"}":`, err);
+        }
+      }
+    }
+  }
+
   return context;
 }
 
@@ -543,7 +598,7 @@ const clientManifestResolvedPath = path.resolve(
   process.cwd(),
   isWebpack
     ? `${outputFolder}/react-client-manifest.json`
-    : `react_client_manifest/react-client-manifest.json`,
+    : `.dinou/react_client_manifest/react-client-manifest.json`,
 );
 
 function isManifestReady() {
@@ -583,7 +638,7 @@ if (!isDevelopment) {
         process.cwd(),
         isWebpack
           ? `${outputFolder}/react-client-manifest.json`
-          : `react_client_manifest/react-client-manifest.json`,
+          : `.dinou/react_client_manifest/react-client-manifest.json`,
       ),
       "utf8",
     ),
@@ -624,7 +679,7 @@ async function serveRSCPayload(req, res, isOld = false, isStatic = false) {
     if ((!isDevelopment && !dynamicState.value) || isStatic) {
       let currentGeneratedAt = null;
       try {
-        const metadataPath = path.join("dist2", reqPath, "metadata.json");
+        const metadataPath = path.join(".dinou/dist2", reqPath, "metadata.json");
         if (existsSync(metadataPath)) {
           const metaObj = JSON.parse(readFileSync(metadataPath, "utf8"));
           currentGeneratedAt = metaObj.generatedAt || null;
@@ -639,12 +694,12 @@ async function serveRSCPayload(req, res, isOld = false, isStatic = false) {
           req.query.buildId !== String(currentGeneratedAt));
 
       const payloadPath = path.resolve(
-        "dist2",
+        ".dinou/dist2",
         reqPath.replace(/^\//, ""),
         useOld ? "rsc._old.rsc" : "rsc.rsc",
       );
 
-      const distDir = path.resolve("dist2");
+      const distDir = path.resolve(".dinou/dist2");
 
       if (!payloadPath.startsWith(distDir)) {
         return res.status(403).end();
@@ -748,7 +803,7 @@ async function serveRSCPayload(req, res, isOld = false, isStatic = false) {
             if (isDevelopment) {
               isPathBlocked = true;
             } else {
-              const htmlPath = path.join("dist2", reqPath, "index.html");
+              const htmlPath = path.join(".dinou/dist2", reqPath, "index.html");
               if (!existsSync(htmlPath)) {
                 isPathBlocked = true;
               }
@@ -784,7 +839,7 @@ async function serveRSCPayload(req, res, isOld = false, isStatic = false) {
               process.cwd(),
               isWebpack
                 ? `${outputFolder}/react-client-manifest.json`
-                : `react_client_manifest/react-client-manifest.json`,
+                : `.dinou/react_client_manifest/react-client-manifest.json`,
             ),
             "utf8",
           ),
@@ -819,7 +874,7 @@ async function serveRSCPayload(req, res, isOld = false, isStatic = false) {
                 process.cwd(),
                 isWebpack
                   ? `${outputFolder}/react-client-manifest.json`
-                  : `react_client_manifest/react-client-manifest.json`,
+                  : `.dinou/react_client_manifest/react-client-manifest.json`,
               ),
               "utf8",
             ),
@@ -875,7 +930,7 @@ app.post(/^\/____rsc_payload_error____\/.*\/?$/, async (req, res) => {
               process.cwd(),
               isWebpack
                 ? `${outputFolder}/react-client-manifest.json`
-                : `react_client_manifest/react-client-manifest.json`,
+                : `.dinou/react_client_manifest/react-client-manifest.json`,
             ),
             "utf8",
           ),
@@ -990,7 +1045,7 @@ app.get(/^\/.*\/?$/, async (req, res) => {
             if (isDevelopment) {
               isPathBlocked = true;
             } else {
-              const htmlPath = path.join("dist2", req.path, "index.html");
+              const htmlPath = path.join(".dinou/dist2", req.path, "index.html");
               if (!existsSync(htmlPath)) {
                 isPathBlocked = true;
               }
@@ -1017,9 +1072,9 @@ app.get(/^\/.*\/?$/, async (req, res) => {
       let htmlPathOld;
       if (regenerating.has(reqPath)) {
         // Still regenerating, serve old HTML if exists
-        htmlPathOld = path.join("dist2", reqPath, "index._old.html");
+        htmlPathOld = path.join(".dinou/dist2", reqPath, "index._old.html");
       }
-      const htmlPath = path.join("dist2", reqPath, "index.html");
+      const htmlPath = path.join(".dinou/dist2", reqPath, "index.html");
       // Decide which file to read
       const fileToRead = htmlPathOld || htmlPath;
 
@@ -1037,7 +1092,7 @@ app.get(/^\/.*\/?$/, async (req, res) => {
           let htmlContent = readFileSync(fileToRead, "utf8");
           let buildId = "";
           try {
-            const metadataPath = path.join("dist2", reqPath, "metadata.json");
+            const metadataPath = path.join(".dinou/dist2", reqPath, "metadata.json");
             if (existsSync(metadataPath)) {
               const metaObj = JSON.parse(readFileSync(metadataPath, "utf8"));
               buildId = metaObj.generatedAt || "";
@@ -1084,6 +1139,20 @@ app.get(/^\/.*\/?$/, async (req, res) => {
       },
       // Do not include res here
     };
+
+    // Run plugins onRequestContext hook
+    if (dinouConfig.plugins && Array.isArray(dinouConfig.plugins)) {
+      for (const plugin of dinouConfig.plugins) {
+        if (typeof plugin.onRequestContext === "function") {
+          try {
+            plugin.onRequestContext(req, res, contextForChild);
+          } catch (err) {
+            console.error(`[Dinou] Error running onRequestContext in plugin "${plugin.name || "unnamed"}":`, err);
+          }
+        }
+      }
+    }
+
     processLimiter
       .run(async () => {
         const isDynamic = true;
@@ -1211,7 +1280,12 @@ app.post("/____server_function____", async (req, res) => {
       const formData = new FormData();
 
       for (const key in req.body) {
-        if (key === "__dinou_func_id" || key === "__dinou_args") continue;
+        if (
+          key === "__dinou_func_id" ||
+          key === "__dinou_args" ||
+          key === "__dinou_formData_index"
+        )
+          continue;
         formData.append(key, req.body[key]);
       }
 
@@ -1222,15 +1296,22 @@ app.post("/____server_function____", async (req, res) => {
         }
       }
 
-      args = [formData];
-
       if (req.body.__dinou_args) {
         try {
-          const extraArgs = JSON.parse(req.body.__dinou_args);
-          args.push(...extraArgs);
+          const parsedArgs = JSON.parse(req.body.__dinou_args);
+          if (req.body.__dinou_formData_index !== undefined) {
+            const formDataIndex = parseInt(req.body.__dinou_formData_index, 10);
+            parsedArgs[formDataIndex] = formData;
+            args = parsedArgs;
+          } else {
+            args = [formData, ...parsedArgs];
+          }
         } catch (e) {
-          console.error("Error parsing extra args in multipart request");
+          console.error("Error parsing extra args in multipart request", e);
+          args = [formData];
         }
+      } else {
+        args = [formData];
       }
     } else {
       id = req.body.id;
@@ -1382,7 +1463,7 @@ app.post("/____server_function____", async (req, res) => {
       process.cwd(),
       isWebpack
         ? `${outputFolder}/react-client-manifest.json`
-        : `react_client_manifest/react-client-manifest.json`,
+        : `.dinou/react_client_manifest/react-client-manifest.json`,
     );
     // Verify that the manifest exists to avoid errors
     if (!existsSync(manifestPath)) {

package/dinou/esbuild/build.mjs

@@ -9,10 +9,10 @@ import { updateManifestForModule } from "./helpers-esbuild/update-manifest-for-m
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-const outdir = "dist3";
+const outdir = ".dinou/dist3";
 await fs.rm(outdir, { recursive: true, force: true });
-await fs.rm("react_client_manifest", { recursive: true, force: true });
-await fs.rm("server_functions_manifest", { recursive: true, force: true });
+await fs.rm(".dinou/react_client_manifest", { recursive: true, force: true });
+await fs.rm(".dinou/server_functions_manifest", { recursive: true, force: true });
 
 const absPathToClientRedirect = path.resolve(
   __dirname,

package/dinou/esbuild/dev.mjs

@@ -13,10 +13,10 @@ import { useServerRegex } from "../constants.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-const outdir = "public";
+const outdir = ".dinou/public";
 await fs.rm(outdir, { recursive: true, force: true });
-await fs.rm("react_client_manifest", { recursive: true, force: true });
-await fs.rm("server_functions_manifest", { recursive: true, force: true });
+await fs.rm(".dinou/react_client_manifest", { recursive: true, force: true });
+await fs.rm(".dinou/server_functions_manifest", { recursive: true, force: true });
 
 let currentCtx = null; // Track the active esbuild context
 let debounceTimer = null; // For debouncing recreations

package/dinou/esbuild/helpers-esbuild/get-config-esbuild-prod.mjs

@@ -13,7 +13,7 @@ const manifestData = {};
 
 export default function getConfigEsbuildProd({
   entryPoints,
-  outdir = "dist3",
+  outdir = ".dinou/dist3",
   manifest = {},
 }) {
   let plugins = [
@@ -22,7 +22,7 @@ export default function getConfigEsbuildProd({
     cssProcessorPlugin({ outdir }),
     reactClientManifestPlugin({
       manifest,
-      manifestPath: `react_client_manifest/react-client-manifest.json`,
+      manifestPath: `.dinou/react_client_manifest/react-client-manifest.json`,
     }),
     assetsPlugin(),
     manifestGeneratorPlugin(manifestData),

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

@@ -11,7 +11,7 @@ import { existsSync } from "node:fs";
 
 export default function getConfigEsbuild({
   entryPoints,
-  outdir = "public",
+  outdir = ".dinou/public",
   manifest = {},
   changedIds,
   hmrEngine,

package/dinou/esbuild/plugins-esbuild/css-processor-plugin.mjs

@@ -11,7 +11,7 @@ import { pathToFileURL } from "node:url";
 import resolve from "resolve";
 import createPostCSSExtractPlugin from "../plugins-postcss/postcss-extract-plugin.js";
 
-export default function cssProcessorPlugin({ outdir = "public" } = {}) {
+export default function cssProcessorPlugin({ outdir = ".dinou/public" } = {}) {
   const { finalize, plugin: extractor } = createPostCSSExtractPlugin({
     outputFile: `${outdir}/styles.css`,
   });

package/dinou/esbuild/plugins-esbuild/react-client-manifest-plugin.mjs

@@ -7,7 +7,7 @@ import parseExports from "../../core/parse-exports.js";
 import { useClientRegex } from "../../constants.js";
 
 export default function reactClientManifestPlugin({
-  manifestPath = "react_client_manifest/react-client-manifest.json",
+  manifestPath = ".dinou/react_client_manifest/react-client-manifest.json",
   manifest = {},
 } = {}) {
   return {

package/dinou/esbuild/plugins-esbuild/server-functions-plugin.mjs

@@ -77,7 +77,7 @@ export default function serverFunctionsPlugin(manifestData = {}) {
 
         // Write the server functions manifest JSON file to the output directory
         const manifestPath = path.join(
-          "server_functions_manifest",
+          ".dinou/server_functions_manifest",
           "server-functions-manifest.json"
         );
         await fs.mkdir(path.dirname(manifestPath), { recursive: true });

package/dinou/esbuild/react-refresh/esm-hmr-plugin.mjs

@@ -20,7 +20,7 @@ export default function esmHmrPlugin({
     name: "esm-hmr",
 
     setup(build) {
-      const outdir = build.initialOptions.outdir || "public";
+      const outdir = build.initialOptions.outdir || ".dinou/public";
       const entryPoints = build.initialOptions.entryPoints;
 
       const entrySources = [];

package/dinou/package.json

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

package/dinou/rollup/rollup-plugins/rollup-plugin-react-client-manifest.js

@@ -39,7 +39,7 @@ function getDefaultExportName(code) {
 
 function reactClientManifestPlugin({
   srcDir = path.resolve("src"),
-  manifestPath = "react_client_manifest/react-client-manifest.json",
+  manifestPath = ".dinou/react_client_manifest/react-client-manifest.json",
   assetInclude = regex,
 } = {}) {
   const manifest = {};

package/dinou/rollup/rollup-plugins/rollup-plugin-server-functions.js

@@ -71,7 +71,7 @@ function serverFunctionsPlugin() {
 
       // Write the manifest to the specified folder (e.g. same place as other assets)
       const manifestPath = path.join(
-        "server_functions_manifest",
+        ".dinou/server_functions_manifest",
         "server-functions-manifest.json"
       );
       try {

package/dinou/rollup/rollup.config.js

@@ -18,7 +18,7 @@ const { regex } = require("../core/asset-extensions.js");
 const manifestGeneratorPlugin = require("./rollup-plugins/manifest-generator-plugin.js");
 
 const isDevelopment = process.env.NODE_ENV !== "production";
-const outputDirectory = isDevelopment ? "public" : "dist3";
+const outputDirectory = isDevelopment ? ".dinou/public" : ".dinou/dist3";
 
 const localDinouPath = path.resolve(process.cwd(), "dinou");
 const isEjected = fs.existsSync(localDinouPath);
@@ -96,8 +96,8 @@ module.exports = async function () {
       del({
         targets: [
           `${outputDirectory}/*`,
-          "react_client_manifest/*",
-          "server_functions_manifest/*",
+          ".dinou/react_client_manifest/*",
+          ".dinou/server_functions_manifest/*",
         ],
         runOnce: true,
         hook: "buildStart",
@@ -157,7 +157,7 @@ module.exports = async function () {
       }),
       reactClientManifest({
         manifestPath: path.join(
-          "react_client_manifest",
+          ".dinou/react_client_manifest",
           "react-client-manifest.json",
         ),
       }),
@@ -168,9 +168,9 @@ module.exports = async function () {
     ].filter(Boolean),
     watch: {
       exclude: [
-        "public/**",
-        "react_client_manifest/**",
-        "server_functions_manifest/**",
+        ".dinou/public/**",
+        ".dinou/react_client_manifest/**",
+        ".dinou/server_functions_manifest/**",
       ],
     },
     onwarn(warning, warn) {

package/dinou/webpack/webpack.config.js

@@ -13,7 +13,7 @@ const { regex } = require("../core/asset-extensions");
 const getCSSEntries = require("./helpers/get-webpack-entries");
 
 const isDevelopment = process.env.NODE_ENV !== "production";
-const outputDirectory = isDevelopment ? "public" : "dist3";
+const outputDirectory = isDevelopment ? ".dinou/public" : ".dinou/dist3";
 
 function getConfigFileIfExists() {
   const tsconfigPath = path.resolve(process.cwd(), "tsconfig.json");
@@ -39,8 +39,8 @@ console.log(
 const projectRoot = process.cwd();
 
 const outputDirs = [
-  path.resolve(projectRoot, "public"),
-  path.resolve(projectRoot, "dist3"),
+  path.resolve(projectRoot, ".dinou/public"),
+  path.resolve(projectRoot, ".dinou/dist3"),
 ];
 
 function cleanDir(dir) {
@@ -54,7 +54,7 @@ function cleanDir(dir) {
     } catch (e) {
       try {
         fs.rmSync(dir, { recursive: true, force: true });
-      } catch (err) {}
+      } catch (err) { }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dinou",
-  "version": "5.1.2",
+  "version": "6.0.0",
   "description": "Lightweight-Ejectable Full-Stack React 19 Framework with support for React Server Components (RSC), Server Functions, Server-Side Rendering (SSR), Static Generation (SSG), Incremental Static Generation (ISG), and Incremental Static Regeneration (ISR)",
   "main": "index.js",
   "bin": {