dinou 4.0.16 → 5.0.1

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

@@ -11,6 +11,32 @@ const { getAbsPathWithExt } = require("../../core/get-abs-path-with-ext.js");
 const { useClientRegex } = require("../../constants.js");
 const parseExports = require("../../core/parse-exports.js");
 
+function getDefaultExportName(code) {
+  let name = null;
+  try {
+    const ast = parser.parse(code, {
+      sourceType: "module",
+      plugins: ["jsx", "typescript"],
+    });
+    traverse(ast, {
+      ExportDefaultDeclaration(p) {
+        const decl = p.node.declaration;
+        if (decl.type === "Identifier") {
+          name = decl.name;
+        } else if (
+          (decl.type === "FunctionDeclaration" || decl.type === "ClassDeclaration") &&
+          decl.id
+        ) {
+          name = decl.id.name;
+        }
+      },
+    });
+  } catch (e) {
+    // Ignore parse errors
+  }
+  return name;
+}
+
 function reactClientManifestPlugin({
   srcDir = path.resolve("src"),
   manifestPath = "react_client_manifest/react-client-manifest.json",
@@ -150,41 +176,6 @@ function reactClientManifestPlugin({
     return fileName.startsWith("page.") || fileName.startsWith("layout.");
   }
 
-  function isAsyncDefaultExport(code) {
-    const ast = parser.parse(code, {
-      sourceType: "module",
-      plugins: ["jsx", "typescript"],
-    });
-
-    let isAsync = false;
-
-    traverse(ast, {
-      ExportDefaultDeclaration(path) {
-        let decl = path.node.declaration;
-
-        if (decl.type === "Identifier") {
-          const binding = path.scope.getBinding(decl.name);
-          if (binding && binding.path) {
-            decl = binding.path.node;
-            if (decl.type === "VariableDeclarator") {
-              decl = decl.init;
-            }
-          }
-        }
-
-        if (
-          decl &&
-          (decl.type === "FunctionDeclaration" ||
-            decl.type === "ArrowFunctionExpression" ||
-            decl.type === "FunctionExpression")
-        ) {
-          isAsync = decl.async;
-        }
-      },
-    });
-
-    return isAsync;
-  }
 
   return {
     name: "react-client-manifest",
@@ -224,11 +215,6 @@ function reactClientManifestPlugin({
             name: path.basename(absPath, path.extname(absPath)),
           });
         } else if (isPageOrLayout(absPath)) {
-          if (!isAsyncDefaultExport(code)) {
-            this.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. Add "use client" if it's a client component, or make the default export async if it's a server component.`
-            );
-          }
           serverModules.add(normalizedPath);
           this.addWatchFile(absPath);
           const { imports, assets, csss } = await getImportsAndAssetsAndCsss(
@@ -258,6 +244,24 @@ function reactClientManifestPlugin({
         }
       }
     },
+    async transform(code, id) {
+      if (id.includes("\0") || id.startsWith("commonjsHelpers") || id.includes("node_modules/rollup") || id.includes("react-refresh")) return;
+      const normalizedId = id.split(path.sep).join(path.posix.sep);
+      const isClientModule = useClientRegex.test(code.trim());
+
+      if (isClientModule) {
+        // console.log("👉 [react-client-manifest] Found client module in transform:", normalizedId);
+        if (!clientModules.has(normalizedId)) {
+          clientModules.add(normalizedId);
+          updateManifestForModule(id, code, true);
+          this.emitFile({
+            type: "chunk",
+            id: id,
+            name: path.basename(id, path.extname(id)),
+          });
+        }
+      }
+    },
     async watchChange(id) {
       if (
         !id.endsWith(".tsx") &&
@@ -290,11 +294,6 @@ function reactClientManifestPlugin({
       } else {
         clientModules.delete(normalizedId);
         if (isPageOrLayout(id)) {
-          if (!isAsyncDefaultExport(code)) {
-            this.warn(
-              `[react-client-manifest] The file ${normalizedId} is a page or layout without "use client" directive, but its default export is not an async function. Add "use client" if it's a client component, or make the default export async if it's a server component.`
-            );
-          }
           serverModules.add(normalizedId);
           this.addWatchFile(id);
           const { imports, assets, csss } = await getImportsAndAssetsAndCsss(
@@ -322,12 +321,52 @@ function reactClientManifestPlugin({
     generateBundle(outputOptions, bundle) {
       for (const [fileName, chunk] of Object.entries(bundle)) {
         if (chunk.type !== "chunk") continue;
+
+        // Process entry point facadeModuleId for default export preservation
+        if (chunk.facadeModuleId) {
+          const absModulePath = path.resolve(chunk.facadeModuleId);
+          if (!absModulePath.includes("\0") && !absModulePath.startsWith("commonjsHelpers")) {
+            const fileUrl = pathToFileURL(absModulePath).href;
+            manifest[fileUrl] = {
+              id: "/" + fileName,
+              chunks: "default",
+              name: "default",
+            };
+            manifest[fileUrl + "#default"] = {
+              id: "/" + fileName,
+              chunks: "default",
+              name: "default",
+            };
+
+            if (!chunk.exports.includes("default")) {
+              try {
+                const originalCode = readFileSync(absModulePath, "utf8");
+                const defaultName = getDefaultExportName(originalCode);
+                if (defaultName && chunk.exports.includes(defaultName)) {
+                  chunk.code += `\nexport { ${defaultName} as default };\n`;
+                  chunk.exports.push("default");
+                  // console.log(`👉 [react-client-manifest] Appended default export alias to chunk ${fileName}: export { ${defaultName} as default };`);
+                }
+              } catch (err) {
+                // Ignore errors
+              }
+            }
+          }
+        }
+
+        // Map all modules in the chunk to this chunk in the manifest (only if they are client modules)
         for (const modulePath of Object.keys(chunk.modules)) {
+          if (modulePath.includes("\0") || modulePath.startsWith("commonjsHelpers")) continue;
           const absModulePath = path.resolve(modulePath);
-          const baseFileUrl = pathToFileURL(absModulePath).href;
-          for (const manifestKey in manifest) {
-            if (manifestKey.startsWith(baseFileUrl)) {
-              manifest[manifestKey].id = "/" + fileName;
+          const normalizedPath = absModulePath.split(path.sep).join(path.posix.sep);
+
+          if (clientModules.has(normalizedPath)) {
+            const fileUrl = pathToFileURL(absModulePath).href;
+            // Update the chunk id for all exports of this module
+            for (const key of Object.keys(manifest)) {
+              if (key === fileUrl || key.startsWith(fileUrl + "#")) {
+                manifest[key].id = "/" + fileName;
+              }
             }
           }
         }

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

@@ -47,7 +47,7 @@ function serverFunctionsPlugin() {
       };
     },
     // 🪄 After manifest exists, replace the placeholder with the final URL
-    generateBundle(options, bundle) {
+    async generateBundle(options, bundle) {
       const manifest = manifestGeneratorPlugin.manifestData;
       const hashedPath =
         "/" + (manifest["serverFunctionProxy.js"] || "serverFunctionProxy.js");
@@ -74,14 +74,12 @@ function serverFunctionsPlugin() {
         "server_functions_manifest",
         "server-functions-manifest.json"
       );
-      fs.mkdir(path.dirname(manifestPath), { recursive: true })
-        .then(() =>
-          fs.writeFile(manifestPath, JSON.stringify(manifestObj, null, 2))
-        )
-        .then(() => {
-          // console.log(`[rollup-server-functions] Generated manifest at ${manifestPath}`);
-        })
-        .catch(console.error);
+      try {
+        await fs.mkdir(path.dirname(manifestPath), { recursive: true });
+        await fs.writeFile(manifestPath, JSON.stringify(manifestObj, null, 2));
+      } catch (err) {
+        console.error(err);
+      }
     },
   };
 }

package/dinou/rollup/rollup.config.js

@@ -78,7 +78,7 @@ module.exports = async function () {
     },
     // 🛑 ADD THIS MAGIC LINE
     // Tells Rollup: "Keep entry point signatures (export names) intact"
-    preserveEntrySignatures: "exports-only",
+    preserveEntrySignatures: "strict",
     external: [
       "/refresh.js",
       "/__hmr_client__.js",
@@ -109,7 +109,6 @@ module.exports = async function () {
       }),
       commonjs({
         include: isEjected ? [/node_modules/, /dinou/] : /node_modules/,
-        transformMixedEsModules: true,
       }),
       dinouAssetPlugin({
         include: regex,

package/dinou/webpack/helpers/get-webpack-entries.js

@@ -138,41 +138,6 @@ async function getCSSEntries({
     return fileName.startsWith("page.") || fileName.startsWith("layout.");
   }
 
-  function isAsyncDefaultExport(code) {
-    const ast = parser.parse(code, {
-      sourceType: "module",
-      plugins: ["jsx", "typescript"],
-    });
-
-    let isAsync = false;
-
-    traverse.default(ast, {
-      ExportDefaultDeclaration(path) {
-        let decl = path.node.declaration;
-
-        if (decl.type === "Identifier") {
-          const binding = path.scope.getBinding(decl.name);
-          if (binding && binding.path) {
-            decl = binding.path.node;
-            if (decl.type === "VariableDeclarator") {
-              decl = decl.init;
-            }
-          }
-        }
-
-        if (
-          decl &&
-          (decl.type === "FunctionDeclaration" ||
-            decl.type === "ArrowFunctionExpression" ||
-            decl.type === "FunctionExpression")
-        ) {
-          isAsync = decl.async;
-        }
-      },
-    });
-
-    return isAsync;
-  }
 
   const files = await glob(["**/*.{js,jsx,ts,tsx}"], {
     cwd: srcDir,
@@ -209,11 +174,6 @@ async function getCSSEntries({
         }
       });
     } 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.`,
-        );
-      }
       try {
         const { csss } = await getImportsAndAssetsAndCsss(code, absPath);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dinou",
-  "version": "4.0.16",
-  "description": "Full-Stack React 19 framework with React Server Components, Server Functions, and Streaming SSR.",
+  "version": "5.0.1",
+  "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": {
     "dinou": "./cli.js"

package/dinou/core/babel-plugin-register-imports.js

@@ -1,50 +0,0 @@
-// babel-plugin-register-imports.js
-const { getAbsPathWithExt } = require("./get-abs-path-with-ext.js");
-const { pathToFileURL } = require("url");
-
-module.exports = function ({ types: t }) {
-  return {
-    visitor: {
-      ImportDeclaration(pathNode, state) {
-        const sourceValue = pathNode.node.source.value;
-        const currentFile = state.file.opts.filename;
-
-        // We try to get the absolute path
-        const resolvedPath = getAbsPathWithExt(sourceValue, {
-          parentURL: pathToFileURL(currentFile).href,
-        });
-
-        // If resolvedPath is null, it means it is a node_modules library
-        // (because your helper returns null if it doesn't start with . or alias)
-        const pathOrPackage = resolvedPath || sourceValue;
-        const isPackage = !resolvedPath;
-
-        const specifiers = pathNode.node.specifiers;
-        const injections = [];
-
-        specifiers.forEach((spec) => {
-          if (t.isImportSpecifier(spec) || t.isImportDefaultSpecifier(spec)) {
-            const localIdentifier = spec.local.name;
-
-            injections.push(
-              t.expressionStatement(
-                t.callExpression(
-                  t.identifier("global.__DINOU_REGISTER_MODULE"),
-                  [
-                    t.identifier(localIdentifier),
-                    t.stringLiteral(pathOrPackage),
-                    t.booleanLiteral(isPackage),
-                  ]
-                )
-              )
-            );
-          }
-        });
-
-        if (injections.length > 0) {
-          pathNode.insertAfter(injections);
-        }
-      },
-    },
-  };
-};

package/dinou/core/get-ssg-jsx-or-jsx.js

@@ -1,14 +0,0 @@
-const getJSX = require("./get-jsx.js");
-const getSSGJSX = require("./get-ssg-jsx.js");
-const { getJSXJSON } = require("./jsx-json.js");
-
-async function getSSGJSXOrJSX(reqPath, query, isDevelopment = false) {
-  const isNotFound = null;
-  const result = isDevelopment
-    ? await getJSX(reqPath, query, isNotFound, isDevelopment)
-    : (await getSSGJSX(getJSXJSON(reqPath))) ??
-    (await getJSX(reqPath, query, isNotFound, isDevelopment));
-  return result;
-}
-
-module.exports = getSSGJSXOrJSX;

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

@@ -1,83 +0,0 @@
-const path = require("path");
-const React = require("react");
-const importModule = require("./import-module");
-
-async function deserializeReactElement(serialized) {
-  if (
-    !serialized ||
-    typeof serialized !== "object" ||
-    !("props" in serialized)
-  ) {
-    return serialized;
-  }
-
-  const { type, modulePath, props, name, isPackage } = serialized;
-  let Component = type;
-
-  let isInvalidComponent = false;
-
-  if (modulePath) {
-    try {
-      const mod = await importModule(
-        isPackage ? modulePath : path.resolve(process.cwd(), modulePath)
-      );
-
-      if (name && name !== "default" && mod[name]) {
-        Component = mod[name];
-      } else {
-        Component = mod.default ?? mod;
-      }
-    } catch (err) {
-      console.error(`Error loading module ${modulePath}:`, err);
-      Component = React.Fragment;
-    }
-  } else if (type === "__clientComponent__") {
-    isInvalidComponent = true;
-  } else if (type === "Suspense") {
-    Component = React.Suspense;
-  } else if (type === "Fragment") {
-    Component = React.Fragment;
-  }
-
-  if (!Component) {
-    Component = React.Fragment;
-  }
-
-  if (isInvalidComponent) {
-    return undefined;
-  }
-
-  // Deserialize props
-  const deserializedProps = {};
-  for (const [key, value] of Object.entries(props)) {
-    if (key === "children") {
-      deserializedProps[key] = Array.isArray(value)
-        ? await Promise.all(
-            value.map((child) => deserializeReactElement(child))
-          )
-        : value
-        ? await deserializeReactElement(value)
-        : null;
-    } else if (
-      value &&
-      typeof value === "object" &&
-      "props" in value &&
-      "modulePath" in value
-    ) {
-      deserializedProps[key] = await deserializeReactElement(value);
-    } else {
-      deserializedProps[key] = value;
-    }
-  }
-
-  return React.createElement(Component, deserializedProps);
-}
-
-async function getSSGJSX(jsxJson) {
-  if (!jsxJson) return;
-  const { jsx } = jsxJson;
-  const deserializedJSX = await deserializeReactElement(jsx);
-  return deserializedJSX;
-}
-
-module.exports = getSSGJSX;

package/dinou/core/jsx-json.js

@@ -1,55 +0,0 @@
-// In-memory store
-const store = new Map();
-
-/**
- * Saves the result of the static generation.
- * @param {string} reqPath - The route (e.g., "/about/")
- * @param {object} json - { jsx, revalidate, generatedAt }
- */
-function setJSXJSON(reqPath, json) {
-  // We save the object directly in memory.
-  // As a reference, it is instantaneous.
-  store.set(reqPath, json);
-}
-
-/**
- * Gets the data to serve the RSC or check revalidation.
- * @param {string} reqPath
- * @returns {object|undefined}
- */
-function getJSXJSON(reqPath) {
-  return store.get(reqPath);
-}
-
-/**
- * Verifies if we have data for that route
- */
-function hasJSXJSON(reqPath) {
-  return store.has(reqPath);
-}
-
-/**
- * (Optional) Deletes data if a page no longer exists
- */
-function deleteJSXJSON(reqPath) {
-  store.delete(reqPath);
-}
-
-/**
- * 🆕 Gets all available static routes.
- * Replaces the old function that read the disk recursively.
- *
- * @returns {string[]} Array of routes (e.g., ["/", "/about/", "/blog/post-1/"])
- */
-function getStaticPaths() {
-  // Array.from converts the iterator of keys into a real Array
-  return Array.from(store.keys());
-}
-
-module.exports = {
-  setJSXJSON,
-  getJSXJSON,
-  hasJSXJSON,
-  deleteJSXJSON,
-  getStaticPaths,
-};

package/dinou/core/register-hooks.js

@@ -1,18 +0,0 @@
-// src/core/register-hooks.js
-if (!global.__DINOU_MODULE_MAP) {
-  global.__DINOU_MODULE_MAP = new WeakMap();
-}
-
-global.__DINOU_REGISTER_MODULE = function (mod, id, isPackage) {
-  if (!mod) return;
-
-  const meta = { id, isPackage };
-
-  if (typeof mod === "object" || typeof mod === "function") {
-    global.__DINOU_MODULE_MAP.set(mod, meta);
-  }
-
-  try {
-    if (mod.default) global.__DINOU_MODULE_MAP.set(mod.default, meta);
-  } catch (e) {}
-};