dinou 7.3.0 → 8.0.0

package/dinou/rollup/rollup.config.js

@@ -1,23 +1,29 @@
-const path = require("path");
-const fs = require("fs");
-const postcss = require("rollup-plugin-postcss");
-const babel = require("@rollup/plugin-babel").default;
-const resolve = require("@rollup/plugin-node-resolve").default;
-const commonjs = require("@rollup/plugin-commonjs");
-const copy = require("rollup-plugin-copy");
-const reactClientManifest = require("./rollup-plugins/rollup-plugin-react-client-manifest.js");
-const createScopedName = require("../core/createScopedName.js");
-const replace = require("@rollup/plugin-replace");
-const json = require("@rollup/plugin-json");
-const reactRefreshWrapModules = require("./react-refresh/react-refresh-wrap-modules.js");
-const { esmHmrPlugin } = require("./react-refresh/rollup-plugin-esm-hmr.js");
-const dinouAssetPlugin = require("./rollup-plugins/dinou-asset-plugin.js");
-const tsconfigPaths = require("rollup-plugin-tsconfig-paths");
-const serverFunctionsPlugin = require("./rollup-plugins/rollup-plugin-server-functions");
-const { regex } = require("../core/asset-extensions.js");
-const manifestGeneratorPlugin = require("./rollup-plugins/manifest-generator-plugin.js");
-const rollupMemoryPlugin = require("./rollup-plugins/rollup-plugin-memory.js");
-const rollupSwcPlugin = require("./rollup-plugins/rollup-plugin-swc.js");
+import path from "node:path";
+import fs from "node:fs";
+import { execSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import postcss from "rollup-plugin-postcss";
+import babelModule from "@rollup/plugin-babel";
+import resolveModule from "@rollup/plugin-node-resolve";
+import commonjs from "@rollup/plugin-commonjs";
+import copy from "rollup-plugin-copy";
+import reactClientManifest from "./rollup-plugins/rollup-plugin-react-client-manifest.js";
+import createScopedName from "../core/createScopedName.js";
+import replace from "@rollup/plugin-replace";
+import json from "@rollup/plugin-json";
+import reactRefreshWrapModules from "./react-refresh/react-refresh-wrap-modules.js";
+import { esmHmrPlugin } from "./react-refresh/rollup-plugin-esm-hmr.js";
+import dinouAssetPlugin from "./rollup-plugins/dinou-asset-plugin.js";
+import tsconfigPaths from "rollup-plugin-tsconfig-paths";
+import serverFunctionsPlugin from "./rollup-plugins/rollup-plugin-server-functions.js";
+import { regex } from "../core/asset-extensions.js";
+import manifestGeneratorPlugin from "./rollup-plugins/manifest-generator-plugin.js";
+import rollupMemoryPlugin from "./rollup-plugins/rollup-plugin-memory.js";
+import rollupSwcPlugin from "./rollup-plugins/rollup-plugin-swc.js";
+
+const babel = babelModule?.default || babelModule;
+const resolve = resolveModule?.default || resolveModule;
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const localDinouPath = path.resolve(process.cwd(), "dinou");
 const isEjected = fs.existsSync(localDinouPath);
@@ -28,7 +34,7 @@ console.log(
     : "📦 [Dinou] Library Mode detected (Using node_modules)",
 );
 
-module.exports = async function () {
+export default async function () {
   const isDevelopment = process.env.NODE_ENV !== "production";
   const outputDirectory = isDevelopment ? ".dinou/public" : ".dinou/dist3";
   const shouldWriteToDisk = process.env.DINOU_WRITE_TO_DISK === "true" || !isDevelopment;
@@ -284,12 +290,10 @@ module.exports = async function () {
       {
         name: "post-build-server",
         closeBundle() {
-          const fs = require("fs");
           fs.writeFileSync(
             path.resolve(process.cwd(), ".dinou/dist3/server/package.json"),
             JSON.stringify({ type: "module" }, null, 2)
           );
-          const { execSync } = require("child_process");
           execSync(`"${process.execPath}" --conditions=react-server "${path.resolve(__dirname, "../core/run-ssg.js")}"`, {
             stdio: "inherit",
             env: { ...process.env, NODE_ENV: "production" },

package/dinou/server.js

@@ -1,29 +1,24 @@
-const {
-  StorageAdapter,
-  FileSystemStorage,
-  CloudflareKVStorage,
-  DenoKVStorage,
-  MemoryStorage,
-  RedisStorage,
-  getStorageAdapter,
-  setStorageAdapter,
-} = require("./core/storage-adapter.js");
-const { DinouCacheSlot } = require("./core/cache-slot.js");
+export async function revalidatePath(path, options) {
+  const { revalidatePath: fn } = await import("./core/cache-revalidate.js");
+  return fn(path, options);
+}
+
+export async function revalidatePage(path) {
+  const { revalidatePage: fn } = await import("./core/cache-revalidate.js");
+  return fn(path);
+}
+
+export async function revalidateTag(tag, options) {
+  const { revalidateTag: fn } = await import("./core/cache-revalidate.js");
+  return fn(tag, options);
+}
+
+export async function DinouCacheSlot(props) {
+  const { DinouCacheSlot: fn } = await import("./core/cache-slot.js");
+  return fn(props);
+}
 
-module.exports = {
-  DinouCacheSlot,
-  revalidatePath: async function (path, options) {
-    const { revalidatePath: fn } = require("./core/cache-revalidate.js");
-    return fn(path, options);
-  },
-  revalidatePage: async function (path) {
-    const { revalidatePage: fn } = require("./core/cache-revalidate.js");
-    return fn(path);
-  },
-  revalidateTag: async function (tag, options) {
-    const { revalidateTag: fn } = require("./core/cache-revalidate.js");
-    return fn(tag, options);
-  },
+export {
   StorageAdapter,
   FileSystemStorage,
   CloudflareKVStorage,
@@ -32,4 +27,4 @@ module.exports = {
   RedisStorage,
   getStorageAdapter,
   setStorageAdapter,
-};
+} from "./core/storage-adapter.js";

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

@@ -1,13 +1,15 @@
-const { readFileSync } = require("fs");
-const path = require("node:path");
-const glob = require("fast-glob");
-const { pathToFileURL } = require("node:url");
-const parser = require("@babel/parser");
-const traverse = require("@babel/traverse");
-const crypto = require("node:crypto");
-const { regex: assetRegex } = require("../../core/asset-extensions.js");
-const { getAbsPathWithExt } = require("../../core/get-abs-path-with-ext.js");
-const { useClientRegex, useServerRegex } = require("../../constants.js");
+import { readFileSync } from "node:fs";
+import path from "node:path";
+import glob from "fast-glob";
+import { pathToFileURL } from "node:url";
+import parser from "@babel/parser";
+import _traverseRaw from "@babel/traverse";
+import crypto from "node:crypto";
+import { regex as assetRegex } from "../../core/asset-extensions.js";
+import { getAbsPathWithExt } from "../../core/get-abs-path-with-ext.js";
+import { useClientRegex, useServerRegex } from "../../constants.js";
+
+const traverse = typeof _traverseRaw === "function" ? _traverseRaw : (_traverseRaw.default || _traverseRaw);
 
 const normalizePath = (p) => p.split(path.sep).join(path.posix.sep);
 
@@ -203,4 +205,5 @@ async function getCSSEntries({
   return [detectedCSSEntries, detectedClientEntries, serverFiles];
 }
 
-module.exports = getCSSEntries;
+export { getCSSEntries };
+export default getCSSEntries;

package/dinou/webpack/loaders/server-functions-loader.js

@@ -1,10 +1,9 @@
-const path = require("path");
+import path from "node:path";
+import { normalizePathCase } from "../../core/path-utils.js";
+import parseExports from "../../core/parse-exports.js";
+import { useServerRegex } from "../../constants.js";
 
-const { normalizePathCase } = require("../../core/path-utils.js");
-const parseExports = require("../../core/parse-exports.js");
-const { useServerRegex } = require("../../constants.js");
-
-module.exports = function (source) {
+export default function (source) {
   const options = this.getOptions ? this.getOptions() : {};
   const norm = path.resolve(this.resourcePath).replace(/\\/g, "/").toLowerCase();
 

package/dinou/webpack/loaders/swc-loader.js

@@ -2,8 +2,10 @@
 // Ultra-fast SWC transpilation loader for Webpack.
 // Replaces heavy Babel pipeline in development and eliminates multi-second rebuild latencies.
 
-const path = require("path");
+import path from "node:path";
+import { createRequire } from "node:module";
 
+const require = createRequire(import.meta.url);
 let swc = null;
 try {
   swc = require("@swc/core");
@@ -11,7 +13,7 @@ try {
   // Handled on first invocation
 }
 
-module.exports = function (source, inputSourceMap) {
+export default function (source, inputSourceMap) {
   if (this.cacheable) this.cacheable(true);
 
   if (!swc) {

package/dinou/webpack/plugins/manifest-generator-plugin.js

@@ -43,4 +43,6 @@ class ManifestGeneratorPlugin {
   }
 }
 
-module.exports = new ManifestGeneratorPlugin();
+const instance = new ManifestGeneratorPlugin();
+export { ManifestGeneratorPlugin, instance };
+export default instance;

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

@@ -1,5 +1,5 @@
-const path = require("path");
-const manifestGeneratorPlugin = require("./manifest-generator-plugin");
+import path from "node:path";
+import manifestGeneratorPlugin from "./manifest-generator-plugin.js";
 
 class WebpackServerFunctionsPluginSimple {
   constructor() {
@@ -130,4 +130,5 @@ class WebpackServerFunctionsPluginSimple {
   }
 }
 
-module.exports = WebpackServerFunctionsPluginSimple;
+export { WebpackServerFunctionsPluginSimple };
+export default WebpackServerFunctionsPluginSimple;

package/dinou/webpack/plugins/webpack-memory-plugin.js

@@ -2,7 +2,7 @@
 // Captures Webpack client assets, chunks, manifests, and sourcemaps in memory (globalThis.__DINOU_MEM_FILES__)
 // and sets global raw manifests in dev mode to prevent massive disk writes.
 
-const path = require("path");
+import path from "node:path";
 
 class WebpackMemoryPlugin {
   constructor(options = {}) {
@@ -63,4 +63,5 @@ class WebpackMemoryPlugin {
   }
 }
 
-module.exports = WebpackMemoryPlugin;
+export { WebpackMemoryPlugin };
+export default WebpackMemoryPlugin;

package/dinou/webpack/postcss.config.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   plugins: {
     "@tailwindcss/postcss": {},
     autoprefixer: {},

package/dinou/webpack/webpack.config.js

@@ -1,22 +1,26 @@
-require("dotenv/config");
-const path = require("path");
-const fs = require("fs");
-const ReactServerWebpackPlugin = require("react-server-dom-webpack/plugin");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const createScopedName = require("../core/createScopedName");
-const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
-const manifestGeneratorPlugin = require("./plugins/manifest-generator-plugin");
-const ServerFunctionsPlugin = require("./plugins/server-functions-plugin");
-const WebpackMemoryPlugin = require("./plugins/webpack-memory-plugin");
-const webpack = require("webpack");
-const { regex } = require("../core/asset-extensions");
-const getCSSEntries = require("./helpers/get-webpack-entries");
-const {
+import "dotenv/config";
+import path from "node:path";
+import fs from "node:fs";
+import { execSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import ReactServerWebpackPlugin from "react-server-dom-webpack/plugin";
+import CopyWebpackPlugin from "copy-webpack-plugin";
+import MiniCssExtractPlugin from "mini-css-extract-plugin";
+import createScopedName from "../core/createScopedName.js";
+import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";
+import manifestGeneratorPlugin from "./plugins/manifest-generator-plugin.js";
+import ServerFunctionsPlugin from "./plugins/server-functions-plugin.js";
+import WebpackMemoryPlugin from "./plugins/webpack-memory-plugin.js";
+import webpack from "webpack";
+import { regex } from "../core/asset-extensions.js";
+import getCSSEntries from "./helpers/get-webpack-entries.js";
+import {
   scanProjectDependenciesForClientComponents,
   scanProjectDependenciesForClientComponentsAsync,
-} = require("../core/scan-dependency-components.js");
-const { useClientRegex } = require("../constants.js");
+} from "../core/scan-dependency-components.js";
+import { useClientRegex } from "../constants.js";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const isDevelopment = process.env.NODE_ENV !== "production";
 const outputDirectory = isDevelopment ? ".dinou/public" : ".dinou/dist3";
@@ -67,7 +71,7 @@ function cleanDir(dir) {
   }
 }
 
-module.exports = async () => {
+export default async () => {
   const outputDir = path.resolve(process.cwd(), outputDirectory);
 
   const shouldWriteToDisk =
@@ -101,14 +105,12 @@ module.exports = async () => {
   function runPostBuild() {
     if (clientDone && serverDone && !ssgExecuted) {
       ssgExecuted = true;
-      const fs = require("fs");
       const serverDir = path.resolve(process.cwd(), ".dinou/dist3/server");
       fs.mkdirSync(serverDir, { recursive: true });
       fs.writeFileSync(
         path.join(serverDir, "package.json"),
         JSON.stringify({ type: "module" }, null, 2)
       );
-      const { execSync } = require("child_process");
       execSync(`"${process.execPath}" --conditions=react-server "${path.resolve(__dirname, "../core/run-ssg.js")}"`, {
         stdio: "inherit",
         env: { ...process.env, NODE_ENV: "production", DINOU_BUILD_TOOL: "webpack" },