dinou 7.3.0 → 8.0.0

package/CHANGELOG.md

@@ -5,6 +5,28 @@ 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/).
 
+## [8.0.0] - 2026-10-20
+
+### ⚠️ Breaking Changes
+> **Note**: For standard Dinou applications using `import` and the Dinou CLI, upgrading from v7 to v8 is completely seamless and requires zero code changes.
+
+- **Native ESM Framework (`"type": "module"`)**: Dinou is now distributed and executed strictly as native ECMAScript Modules (ESM). `package.json` includes `"type": "module"`, allowing all framework and consumer code to run with modern ESM semantics.
+- **Source & Extension Unification (`.mjs` -> `.js`)**: Eliminated the hybrid extension fragmentation (`.mjs` vs `.js`). All framework build scripts, CLI commands, adapters, and entrypoints now use standard `.js` extension across the codebase.
+- **Package Exports Modernization**: Dropped legacy CommonJS conditional exports (`"require"`) and `.mjs` targets in `package.json`. All public subpaths (`dinou`, `dinou/server`, `dinou/config`, `dinou/adapters/*`) resolve directly to standard ESM `.js` targets.
+- **Universal Edge Renderer Singleton (`__DINOU_EDGE_RENDERER__`)**: Replaced dynamic module resolution in dual-bundle compilation with an explicit global singleton (`globalThis.__DINOU_EDGE_RENDERER__`), guaranteeing that React 19 RSC streaming and Server Function serialization share identical context across runtime engines.
+
+### Changed
+- **CLI & Eject Architecture Modernization**:
+  - Migrated `cli.js` to native ESM imports using Commander.
+  - Refactored `eject.js` into an idiomatic ESM module exporting `eject()`.
+  - Updated all ejected `npm run` scripts to reference standard `.js` entry points across all adapters and bundlers (Esbuild, Rollup, Webpack).
+- **Core Cleanup & Canonical Config Resolution**:
+  - Removed obsolete root wrapper `dinou/config.js`, establishing `dinou/core/config.js` as the sole canonical implementation for the `"dinou/config"` export.
+  - Formatted and aligned root `package.json` fields according to modern ecosystem conventions.
+
+### Fixed
+- **Layout `allowISG: false` False 404 on Static Routes**: Fixed a bug in `handler.js` where setting `allowISG: false` in layout functions caused production requests to prematurely return an unconditional `404 Not Found`. The handler now properly verifies parameter matches against `staticPathsSet` (`getStaticPaths`) and confirms whether pre-rendered layout artifacts (`layout.rsc`) exist on disk before blocking unauthorized dynamic paths.
+
 ## [7.3.0]
 
 ### Added

package/README.md

@@ -1,6 +1,6 @@
 # **Dinou**
 
-[![Documentation](https://img.shields.io/badge/docs-dinou.dev-blue?style=flat-square)](https://dinou.dev) [![Version](https://img.shields.io/badge/version-7.3.0-orange?style=flat-square)](https://www.npmjs.com/package/dinou)
+[![Documentation](https://img.shields.io/badge/docs-dinou.dev-blue?style=flat-square)](https://dinou.dev) [![Version](https://img.shields.io/badge/version-8.0.0-orange?style=flat-square)](https://www.npmjs.com/package/dinou)
 
 ### **Full-Stack React 19 Framework**
 

package/cli.js

@@ -1,9 +1,11 @@
 #!/usr/bin/env node
 
-const { program } = require("commander");
-const { execSync } = require("child_process");
-const path = require("path");
-
+import { program } from "commander";
+import { execSync } from "node:child_process";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const dinouPath = path.resolve(__dirname, "dinou");
 const projectRoot = process.cwd();
 
@@ -25,28 +27,28 @@ program
   .command("dev")
   .description("Start development server with Esbuild")
   .action(() => {
-    runCommand(`cross-env DINOU_BUILD_TOOL=esbuild node ${p("node/dev.mjs")}`);
+    runCommand(`cross-env DINOU_BUILD_TOOL=esbuild node ${p("node/dev.js")}`);
   });
 
 program
   .command("dev:esbuild")
   .description("Start development server with Esbuild")
   .action(() => {
-    runCommand(`cross-env DINOU_BUILD_TOOL=esbuild node ${p("node/dev.mjs")}`);
+    runCommand(`cross-env DINOU_BUILD_TOOL=esbuild node ${p("node/dev.js")}`);
   });
 
 program
   .command("dev:rollup")
   .description("Start development server with Rollup")
   .action(() => {
-    runCommand(`cross-env DINOU_BUILD_TOOL=rollup node ${p("node/dev.mjs")}`);
+    runCommand(`cross-env DINOU_BUILD_TOOL=rollup node ${p("node/dev.js")}`);
   });
 
 program
   .command("dev:webpack")
   .description("Start development server with Webpack")
   .action(() => {
-    runCommand(`cross-env DINOU_BUILD_TOOL=webpack node ${p("node/dev.mjs")}`);
+    runCommand(`cross-env DINOU_BUILD_TOOL=webpack node ${p("node/dev.js")}`);
   });
 
 // --- NODE (BUILD & START) ---
@@ -55,70 +57,70 @@ program
   .command("build")
   .description("Build the app for Node.js production (using esbuild)")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production node ${p("esbuild/build.mjs")} && node ${p("node/build.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production node ${p("esbuild/build.js")} && node ${p("node/build.js")}`);
   });
 
 program
   .command("build:node")
   .description("Build the app for Node.js production (using esbuild)")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production node ${p("esbuild/build.mjs")} && node ${p("node/build.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production node ${p("esbuild/build.js")} && node ${p("node/build.js")}`);
   });
 
 program
   .command("build:node:esbuild")
   .description("Build the app for Node.js with Esbuild")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production node ${p("esbuild/build.mjs")} && node ${p("node/build.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production node ${p("esbuild/build.js")} && node ${p("node/build.js")}`);
   });
 
 program
   .command("build:node:rollup")
   .description("Build the app for Node.js with Rollup")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production npx rollup -c ${p("rollup/rollup.config.js")} && node ${p("node/build.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production npx rollup -c ${p("rollup/rollup.config.js")} && node ${p("node/build.js")}`);
   });
 
 program
   .command("build:node:webpack")
   .description("Build the app for Node.js with Webpack")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production npx webpack --config ${p("webpack/webpack.config.js")} && cross-env DINOU_BUILD_TOOL=webpack node ${p("node/build.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production npx webpack --config ${p("webpack/webpack.config.js")} && cross-env DINOU_BUILD_TOOL=webpack node ${p("node/build.js")}`);
   });
 
 program
   .command("start")
   .description("Start the app in production mode (Node.js)")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production node ${p("adapters/node.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production node ${p("adapters/node.js")}`);
   });
 
 program
   .command("start:node")
   .description("Start the app in production mode (Node.js)")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production node ${p("adapters/node.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production node ${p("adapters/node.js")}`);
   });
 
 program
   .command("start:node:esbuild")
   .description("Start the app in production mode (Esbuild build)")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production node ${p("adapters/node.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production node ${p("adapters/node.js")}`);
   });
 
 program
   .command("start:node:rollup")
   .description("Start the app in production mode (Rollup build)")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production node ${p("adapters/node.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production node ${p("adapters/node.js")}`);
   });
 
 program
   .command("start:node:webpack")
   .description("Start the app in production mode (Webpack build)")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production DINOU_BUILD_TOOL=webpack node ${p("adapters/node.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production DINOU_BUILD_TOOL=webpack node ${p("adapters/node.js")}`);
   });
 
 // --- NODE (COMPILE VIA BUN) ---
@@ -136,10 +138,10 @@ const runNodeBuild = (bundler) => {
     ? `cross-env NODE_ENV=production npx rollup -c ${p("rollup/rollup.config.js")}`
     : bundler === "webpack"
     ? `cross-env NODE_ENV=production npx webpack --config ${p("webpack/webpack.config.js")}`
-    : `cross-env NODE_ENV=production node ${p("esbuild/build.mjs")}`;
+    : `cross-env NODE_ENV=production node ${p("esbuild/build.js")}`;
 
   const envPrefix = bundler === "webpack" ? "cross-env DINOU_BUILD_TOOL=webpack " : "";
-  return `${bundlerCmd} && ${envPrefix}node ${p("node/build.mjs")}`;
+  return `${bundlerCmd} && ${envPrefix}node ${p("node/build.js")}`;
 };
 
 for (const t of nodeTargets) {
@@ -162,12 +164,12 @@ for (const t of nodeTargets) {
 
 const runNodePureBuild = (bundler) => {
   if (bundler === "rollup") {
-    return `cross-env NODE_ENV=production npx rollup -c ${p("rollup/rollup.config.js")} && bun ${p("node/build.mjs")}`;
+    return `cross-env NODE_ENV=production npx rollup -c ${p("rollup/rollup.config.js")} && bun ${p("node/build.js")}`;
   }
   if (bundler === "webpack") {
-    return `cross-env NODE_ENV=production npx webpack --config ${p("webpack/webpack.config.js")} && cross-env DINOU_BUILD_TOOL=webpack bun ${p("node/build.mjs")}`;
+    return `cross-env NODE_ENV=production npx webpack --config ${p("webpack/webpack.config.js")} && cross-env DINOU_BUILD_TOOL=webpack bun ${p("node/build.js")}`;
   }
-  return `cross-env NODE_ENV=production bun ${p("esbuild/build.mjs")} && bun ${p("node/build.mjs")}`;
+  return `cross-env NODE_ENV=production bun ${p("esbuild/build.js")} && bun ${p("node/build.js")}`;
 };
 
 program
@@ -212,28 +214,28 @@ program
   .command("build:cloudflare")
   .description("Build the app for Cloudflare Workers (using esbuild)")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production node ${p("esbuild/build.mjs")} && node ${p("cloudflare/build.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production node ${p("esbuild/build.js")} && node ${p("cloudflare/build.js")}`);
   });
 
 program
   .command("build:cloudflare:esbuild")
   .description("Build the app for Cloudflare Workers with Esbuild")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production node ${p("esbuild/build.mjs")} && node ${p("cloudflare/build.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production node ${p("esbuild/build.js")} && node ${p("cloudflare/build.js")}`);
   });
 
 program
   .command("build:cloudflare:rollup")
   .description("Build the app for Cloudflare Workers with Rollup")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production npx rollup -c ${p("rollup/rollup.config.js")} && node ${p("cloudflare/build.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production npx rollup -c ${p("rollup/rollup.config.js")} && node ${p("cloudflare/build.js")}`);
   });
 
 program
   .command("build:cloudflare:webpack")
   .description("Build the app for Cloudflare Workers with Webpack")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production npx webpack --config ${p("webpack/webpack.config.js")} && cross-env DINOU_BUILD_TOOL=webpack node ${p("cloudflare/build.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production npx webpack --config ${p("webpack/webpack.config.js")} && cross-env DINOU_BUILD_TOOL=webpack node ${p("cloudflare/build.js")}`);
   });
 
 // --- DENO DEPLOY / EDGE ---
@@ -243,10 +245,10 @@ const runDenoBuild = (bundler) => {
     ? `cross-env NODE_ENV=production npx rollup -c ${p("rollup/rollup.config.js")}`
     : bundler === "webpack"
     ? `cross-env NODE_ENV=production npx webpack --config ${p("webpack/webpack.config.js")}`
-    : `cross-env NODE_ENV=production node ${p("esbuild/build.mjs")}`;
+    : `cross-env NODE_ENV=production node ${p("esbuild/build.js")}`;
 
   const envPrefix = bundler === "webpack" ? "cross-env DINOU_BUILD_TOOL=webpack " : "";
-  return `${bundlerCmd} && ${envPrefix}node ${p("deno/build.mjs")} && deno run --unstable-kv --allow-net --allow-read --allow-write --allow-env ${p("deno/seed-kv.js")}`;
+  return `${bundlerCmd} && ${envPrefix}node ${p("deno/build.js")} && deno run --unstable-kv --allow-net --allow-read --allow-write --allow-env ${p("deno/seed-kv.js")}`;
 };
 
 program
@@ -308,10 +310,10 @@ const runBunBuild = (bundler) => {
     ? `cross-env NODE_ENV=production npx rollup -c ${p("rollup/rollup.config.js")}`
     : bundler === "webpack"
     ? `cross-env NODE_ENV=production npx webpack --config ${p("webpack/webpack.config.js")}`
-    : `cross-env NODE_ENV=production node ${p("esbuild/build.mjs")}`;
+    : `cross-env NODE_ENV=production node ${p("esbuild/build.js")}`;
 
   const envPrefix = bundler === "webpack" ? "cross-env DINOU_BUILD_TOOL=webpack " : "";
-  return `${bundlerCmd} && ${envPrefix}node ${p("bun/build.mjs")}`;
+  return `${bundlerCmd} && ${envPrefix}node ${p("bun/build.js")}`;
 };
 
 program
@@ -390,12 +392,12 @@ for (const t of bunTargets) {
 
 const runBunPureBuild = (bundler) => {
   if (bundler === "rollup") {
-    return `cross-env NODE_ENV=production npx rollup -c ${p("rollup/rollup.config.js")} && bun ${p("bun/build.mjs")}`;
+    return `cross-env NODE_ENV=production npx rollup -c ${p("rollup/rollup.config.js")} && bun ${p("bun/build.js")}`;
   }
   if (bundler === "webpack") {
-    return `cross-env NODE_ENV=production npx webpack --config ${p("webpack/webpack.config.js")} && cross-env DINOU_BUILD_TOOL=webpack bun ${p("bun/build.mjs")}`;
+    return `cross-env NODE_ENV=production npx webpack --config ${p("webpack/webpack.config.js")} && cross-env DINOU_BUILD_TOOL=webpack bun ${p("bun/build.js")}`;
   }
-  return `cross-env NODE_ENV=production bun ${p("esbuild/build.mjs")} && bun ${p("bun/build.mjs")}`;
+  return `cross-env NODE_ENV=production bun ${p("esbuild/build.js")} && bun ${p("bun/build.js")}`;
 };
 
 program
@@ -440,28 +442,28 @@ program
   .command("export-static")
   .description("Export standalone static website (using esbuild)")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production node ${p("esbuild/build.mjs")} && node ${p("core/export-static.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production node ${p("esbuild/build.js")} && node ${p("core/export-static.js")}`);
   });
 
 program
   .command("export-static:esbuild")
   .description("Export standalone static website with Esbuild")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production node ${p("esbuild/build.mjs")} && node ${p("core/export-static.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production node ${p("esbuild/build.js")} && node ${p("core/export-static.js")}`);
   });
 
 program
   .command("export-static:rollup")
   .description("Export standalone static website with Rollup")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production npx rollup -c ${p("rollup/rollup.config.js")} && node ${p("core/export-static.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production npx rollup -c ${p("rollup/rollup.config.js")} && node ${p("core/export-static.js")}`);
   });
 
 program
   .command("export-static:webpack")
   .description("Export standalone static website with Webpack")
   .action(() => {
-    runCommand(`cross-env NODE_ENV=production npx webpack --config ${p("webpack/webpack.config.js")} && node ${p("core/export-static.mjs")}`);
+    runCommand(`cross-env NODE_ENV=production npx webpack --config ${p("webpack/webpack.config.js")} && node ${p("core/export-static.js")}`);
   });
 
 // --- EJECT ---
@@ -469,9 +471,10 @@ program
 program
   .command("eject")
   .description("Copy the framework to the root of the project")
-  .action(() => {
-    console.log("Executing eject...");
-    require("./eject");
+  .action(async () => {
+    console.log("Executing eject...");
+    const { eject } = await import("./eject.js");
+    eject();
   });
 
 program.parse(process.argv);

package/dinou/adapters/netlify.js

@@ -6,6 +6,7 @@ Object.assign(process.env, { NODE_ENV: "production" });
 import path from "node:path";
 import Module from "node:module";
 
+const require = Module.createRequire(import.meta.url);
 
 let reactServerPath, reactDomServerPath, reactJsxRuntimePath, reactJsxDevRuntimePath;
 let roggcServerNodePath, webpackServerNodePath;

package/dinou/adapters/{node.mjs → node.js}

@@ -1,4 +1,4 @@
-// dinou/adapters/node.mjs
+// dinou/adapters/node.js
 // Native Node.js Pre-Bundled Adapter for Dinou v7.
 // Serves the standalone pre-bundled server from .dinou/node/server.mjs.
 
@@ -12,10 +12,16 @@ if (typeof globalThis.AsyncLocalStorage === "undefined" && typeof AsyncLocalStor
 }
 
 const cwd = typeof process !== "undefined" && typeof process.cwd === "function" ? process.cwd() : ".";
-const bundlePath = path.resolve(cwd, ".dinou/node/server.mjs");
+let bundlePath = path.resolve(cwd, ".dinou/node/server.js");
+if (!fs.existsSync(bundlePath)) {
+  const mjsFallback = path.resolve(cwd, ".dinou/node/server.mjs");
+  if (fs.existsSync(mjsFallback)) {
+    bundlePath = mjsFallback;
+  }
+}
 
 if (!fs.existsSync(bundlePath)) {
-  console.error("❌ [Dinou Node Adapter] .dinou/node/server.mjs not found. Please run 'npm run build:node' first.");
+  console.error("❌ [Dinou Node Adapter] .dinou/node/server.js not found. Please run 'npm run build:node' first.");
   process.exit(1);
 }
 

package/dinou/bun/{build.mjs → build.js}

@@ -7,20 +7,19 @@
 import fs from "node:fs";
 import path from "node:path";
 import esbuild from "esbuild";
-import { createRequire } from "node:module";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
-const require = createRequire(import.meta.url);
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const { generateRouteModulesCode, generateRouteTypes } = require("../core/route-generator.js");
-const parseExports = require("../core/parse-exports.js");
-const { useClientRegex, useServerRegex } = require("../constants.js");
-const {
+import { generateRouteModulesCode, generateRouteTypes } from "../core/route-generator.js";
+import parseExports from "../core/parse-exports.js";
+import { useClientRegex, useServerRegex } from "../constants.js";
+import {
   isSupportedClientModule,
   scanProjectDependenciesForClientComponents,
-} = require("../core/scan-dependency-components.js");
-const { getDinouConfig } = require("../core/load-dinou-config.js");
-const { resolveSetupFiles } = require("../core/resolve-setup-files.js");
+} from "../core/scan-dependency-components.js";
+import { getDinouConfig } from "../core/load-dinou-config.js";
+import { resolveSetupFiles } from "../core/resolve-setup-files.js";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const projectRoot = process.cwd();
 const bunDir = path.resolve(projectRoot, ".dinou/bun");
@@ -669,6 +668,8 @@ fs.writeFileSync(ssrClientManifestPath, ssrManifestCode, "utf8");
 const rscEntryContent = `// Auto-generated RSC Engine entry for Bun (Dual-Bundle)
 import "./env-setup.js";
 import "./route-modules.js";
+import * as edgeRenderer from "react-server-dom-webpack/server.edge";
+globalThis.__DINOU_EDGE_RENDERER__ = edgeRenderer;
 export { handleRequest } from "${dinouDirSlash}/core/handler.js";
 `;
 const rscEntryPath = path.join(bunDir, "rsc-entry.js");

package/dinou/cloudflare/{build.mjs → build.js}

@@ -7,20 +7,19 @@
 import fs from "node:fs";
 import path from "node:path";
 import esbuild from "esbuild";
-import { createRequire } from "node:module";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
-const require = createRequire(import.meta.url);
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const { generateRouteModulesCode, generateRouteTypes } = require("../core/route-generator.js");
-const parseExports = require("../core/parse-exports.js");
-const { useClientRegex, useServerRegex } = require("../constants.js");
-const {
+import { generateRouteModulesCode, generateRouteTypes } from "../core/route-generator.js";
+import parseExports from "../core/parse-exports.js";
+import { useClientRegex, useServerRegex } from "../constants.js";
+import {
   isSupportedClientModule,
   scanProjectDependenciesForClientComponents,
-} = require("../core/scan-dependency-components.js");
-const { getDinouConfig } = require("../core/load-dinou-config.js");
-const { resolveSetupFiles } = require("../core/resolve-setup-files.js");
+} from "../core/scan-dependency-components.js";
+import { getDinouConfig } from "../core/load-dinou-config.js";
+import { resolveSetupFiles } from "../core/resolve-setup-files.js";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const projectRoot = process.cwd();
 const cloudflareDir = path.resolve(projectRoot, ".dinou/cloudflare");
@@ -696,6 +695,8 @@ fs.writeFileSync(ssrClientManifestPath, ssrManifestCode, "utf8");
 const rscEntryContent = `// Auto-generated RSC Engine entry for Cloudflare Workers
 import "./env-setup.js";
 import "./route-modules.js";
+import * as edgeRenderer from "react-server-dom-webpack/server.edge";
+globalThis.__DINOU_EDGE_RENDERER__ = edgeRenderer;
 export { handleRequest } from "${dinouDirSlash}/core/handler.js";
 `;
 const rscEntryPath = path.join(cloudflareDir, "rsc-entry.js");
@@ -1070,6 +1071,7 @@ try {
       "process.env.NODE_ENV": '"production"',
       "process.env.DINOU_RUNTIME": '"edge"',
       "process.env.DINOU_BUILD_TOOL": JSON.stringify(isWebpackBuild ? "webpack" : (process.env.DINOU_BUILD_TOOL || "esbuild")),
+      "import.meta.url": '"file:///worker.js"',
     },
     logLevel: "warning",
   });
@@ -1094,6 +1096,7 @@ try {
       "process.env.NODE_ENV": '"production"',
       "process.env.DINOU_RUNTIME": '"edge"',
       "process.env.DINOU_BUILD_TOOL": JSON.stringify(isWebpackBuild ? "webpack" : (process.env.DINOU_BUILD_TOOL || "esbuild")),
+      "import.meta.url": '"file:///worker.js"',
     },
     logLevel: "warning",
   });
@@ -1118,6 +1121,7 @@ try {
       "process.env.NODE_ENV": '"production"',
       "process.env.DINOU_RUNTIME": '"edge"',
       "process.env.DINOU_BUILD_TOOL": JSON.stringify(isWebpackBuild ? "webpack" : (process.env.DINOU_BUILD_TOOL || "esbuild")),
+      "import.meta.url": '"file:///worker.js"',
     },
     logLevel: "warning",
   });

package/dinou/cloudflare/shims/fs.js

@@ -77,6 +77,7 @@ export const statSync = (p) => {
 export const mkdirSync = () => {};
 export const writeFileSync = () => {};
 export const rmSync = () => {};
+export const copyFileSync = () => {};
 
 export const promises = {
   readFile: async (p) => readFileSync(p),
@@ -85,6 +86,7 @@ export const promises = {
   stat: async (p) => statSync(p),
   mkdir: async () => {},
   rm: async () => {},
+  copyFile: async () => {},
 };
 
 export default {
@@ -95,5 +97,6 @@ export default {
   mkdirSync,
   writeFileSync,
   rmSync,
+  copyFileSync,
   promises,
 };

package/dinou/constants.js

@@ -11,7 +11,7 @@ function hasDirective(code, directive) {
   );
 }
 
-const useClientRegex = {
+export const useClientRegex = {
   test(code) {
     return hasDirective(code, "use client");
   },
@@ -20,7 +20,7 @@ const useClientRegex = {
   },
 };
 
-const useServerRegex = {
+export const useServerRegex = {
   test(code) {
     return hasDirective(code, "use server");
   },
@@ -29,4 +29,4 @@ const useServerRegex = {
   },
 };
 
-module.exports = { useClientRegex, useServerRegex };
+export default { useClientRegex, useServerRegex };

package/dinou/core/asset-extensions.js

@@ -1,4 +1,4 @@
-const extensions = [
+export const extensions = [
   "png",
   "jpg",
   "jpeg",
@@ -22,12 +22,12 @@ const extensions = [
   "mjpg",
 ];
 
-const globPattern = `**/*.{${extensions.join(",")}}`;
+export const globPattern = `**/*.{${extensions.join(",")}}`;
 
 // 🔹 regex useful for Rollup/PostCSS type plugins
-const regex = new RegExp(`\\.(${extensions.join("|")})$`, "i");
+export const regex = new RegExp(`\\.(${extensions.join("|")})$`, "i");
 
 // 🔹 version with dot for direct comparisons
-const extensionsWithDot = extensions.map((ext) => `.${ext}`);
+export const extensionsWithDot = extensions.map((ext) => `.${ext}`);
 
-module.exports = { extensions, extensionsWithDot, regex, globPattern };
+export default { extensions, extensionsWithDot, regex, globPattern };

package/dinou/core/bailout-proxy.js

@@ -1,4 +1,4 @@
-const { isPprBuildActive, isInsideSuspense, markDynamicAccess } = require("./ppr-context.js");
+import { isPprBuildActive, isInsideSuspense, markDynamicAccess } from "./ppr-context.js";
 
 function triggerBailout(label, onBailout) {
   if (isPprBuildActive() && isInsideSuspense()) {
@@ -17,7 +17,7 @@ function triggerBailout(label, onBailout) {
  * @param {Function} onBailout - Callback invoked when property access occurs
  * @returns {Proxy}
  */
-function createBailoutProxy(target, label = "Context", onBailout) {
+export function createBailoutProxy(target, label = "Context", onBailout) {
   const safeTarget = target || {};
 
   return new Proxy(safeTarget, {
@@ -56,6 +56,6 @@ function createBailoutProxy(target, label = "Context", onBailout) {
   });
 }
 
-module.exports = {
+export default {
   createBailoutProxy,
 };

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

@@ -1,16 +1,15 @@
-const path = require("path");
-const { existsSync, readdirSync, mkdirSync, rmSync } = require("fs");
-const React = require("react");
-const { asyncRenderJSXToClientJSX } = require("./render-jsx-to-client-jsx");
-const {
-  getFilePathAndDynamicParams,
-} = require("./get-file-path-and-dynamic-params");
-const importModule = require("./import-module");
-const { requestStorage } = require("./request-context.js");
-const { getLayoutProps, resolveLayoutFunctionsConfig } = require("./layout-functions");
-const { runWithPprContext, getRegisteredHoles } = require("./ppr-context.js");
-const { resolveModulePpr } = require("./resolve-module-ppr");
-const { getDinouConfig } = require("./load-dinou-config");
+import path from "node:path";
+import { existsSync, readdirSync, mkdirSync, rmSync } from "node:fs";
+import React from "react";
+import { asyncRenderJSXToClientJSX } from "./render-jsx-to-client-jsx.js";
+import { getFilePathAndDynamicParams } from "./get-file-path-and-dynamic-params.js";
+import importModule from "./import-module.js";
+import { requestStorage } from "./request-context.js";
+import { getLayoutProps, resolveLayoutFunctionsConfig, getLayoutFunctionsPath } from "./layout-functions.js";
+import { runWithPprContext, getRegisteredHoles } from "./ppr-context.js";
+import { resolveModulePpr } from "./resolve-module-ppr.js";
+import { getDinouConfig } from "./load-dinou-config.js";
+import { createBailoutProxy } from "./bailout-proxy.js";
 
 async function resolveBuildPprForRoute(segments, pagePath, pageFunctionsPath, srcFolder) {
   const globalCfg = await getDinouConfig();
@@ -76,7 +75,6 @@ async function isDynamicRoute(revalidate) {
   return typeof val === "number" && val < 1;
 }
 
-const { createBailoutProxy } = require("./bailout-proxy.js");
 
 /**
  * Compiles all static pages in the application.
@@ -108,7 +106,6 @@ async function buildStaticPages(onProgress = null) {
       const candidateLayout = path.join(currentPath, `layout${ext}`);
       if (existsSync(candidateLayout)) {
         const routePath = segments.length ? "/" + segments.join("/") : "/";
-        const { resolveLayoutFunctionsConfig } = require("./layout-functions");
         const layoutConfig = await resolveLayoutFunctionsConfig(candidateLayout, params);
         if (!layoutConfig.isDynamic) {
           staticLayouts.set(routePath, {
@@ -552,7 +549,6 @@ async function buildStaticPages(onProgress = null) {
             getStaticPaths = module.getStaticPaths || defMod?.getStaticPaths;
             revalidate = module.revalidate || defMod?.revalidate;
           }
-          const { getLayoutFunctionsPath } = require("./layout-functions");
           const lfPath = getLayoutFunctionsPath(dynamicPath);
           if (lfPath) {
             const lmod = await importModule(lfPath);
@@ -1507,7 +1503,15 @@ function getStaticLayouts() {
   return Array.from(staticLayouts.values());
 }
 
-module.exports = {
+export {
+  buildStaticPages,
+  buildStaticPage,
+  getStaticPaths,
+  getStaticMetadata,
+  getStaticLayouts,
+  isDynamicRoute,
+};
+export default {
   buildStaticPages,
   buildStaticPage,
   getStaticPaths,