dinou 1.4.1 → 1.4.2

package/dinou/render-html.js

@@ -1,11 +1,14 @@
-const addHook = require("./asset-require-hook.js");
-const { register } = require("esbuild-register/dist/node");
-register({
-  target: "esnext",
-  format: "cjs",
+const babelRegister = require("@babel/register");
+babelRegister({
+  ignore: [/[\\\/](build|server|node_modules)[\\\/]/],
+  presets: [
+    ["@babel/preset-react", { runtime: "automatic" }],
+    "@babel/preset-typescript",
+  ],
+  plugins: ["@babel/transform-modules-commonjs"],
   extensions: [".js", ".jsx", ".ts", ".tsx"],
-  jsx: "automatic",
 });
+const addHook = require("./asset-require-hook.js");
 const createScopedName = require("./createScopedName");
 require("css-modules-require-hook")({
   generateScopedName: createScopedName,

package/dinou/server.js

@@ -5,7 +5,6 @@ const { readFileSync } = require("fs");
 const { renderToPipeableStream } = require("react-server-dom-webpack/server");
 const express = require("express");
 const { spawn } = require("child_process");
-const { register } = require("esbuild-register/dist/node");
 const webpack = require("webpack");
 const webpackDevMiddleware = require("webpack-dev-middleware");
 const webpackHotMiddleware = require("webpack-hot-middleware");
@@ -13,11 +12,15 @@ const webpackConfig = require(path.resolve(__dirname, "../webpack.config.js"));
 const { getSSGJSXOrJSX } = require("./get-jsx.js");
 const addHook = require("./asset-require-hook.js");
 webpackRegister();
-register({
-  target: "esnext",
-  format: "cjs",
+const babelRegister = require("@babel/register");
+babelRegister({
+  ignore: [/[\\\/](build|server|node_modules)[\\\/]/],
+  presets: [
+    ["@babel/preset-react", { runtime: "automatic" }],
+    "@babel/preset-typescript",
+  ],
+  plugins: ["@babel/transform-modules-commonjs"],
   extensions: [".js", ".jsx", ".ts", ".tsx"],
-  jsx: "automatic",
 });
 const createScopedName = require("./createScopedName");
 require("css-modules-require-hook")({
@@ -53,7 +56,6 @@ app.get(/^\/____rsc_payload____\/.*\/?$/, async (req, res) => {
     const reqPath = (
       req.path.endsWith("/") ? req.path : req.path + "/"
     ).replace("/____rsc_payload____", "");
-
     jsx = await getSSGJSXOrJSX(reqPath, { ...req.query });
     const manifest = readFileSync(
       path.resolve(process.cwd(), "____public____/react-client-manifest.json"),
@@ -106,13 +108,11 @@ function renderAppToHtml(reqPath, paramsString) {
 app.get(/^\/.*\/?$/, async (req, res) => {
   try {
     const reqPath = req.path.endsWith("/") ? req.path : req.path + "/";
-
     // Get the stream from the child process
     const appHtmlStream = await renderAppToHtml(
       reqPath,
       JSON.stringify({ ...req.query })
     );
-
     // Set headers for the response
     res.setHeader("Content-Type", "text/html");
 

package/dinou/ssg.js

@@ -1,12 +1,15 @@
-const { register } = require("esbuild-register/dist/node");
-const { buildStaticPages } = require("./build-static-pages");
-const addHook = require("./asset-require-hook.js");
-register({
-  target: "esnext",
-  format: "cjs",
+const babelRegister = require("@babel/register");
+babelRegister({
+  ignore: [/[\\\/](build|server|node_modules)[\\\/]/],
+  presets: [
+    ["@babel/preset-react", { runtime: "automatic" }],
+    "@babel/preset-typescript",
+  ],
+  plugins: ["@babel/transform-modules-commonjs"],
   extensions: [".js", ".jsx", ".ts", ".tsx"],
-  jsx: "automatic",
 });
+const { buildStaticPages } = require("./build-static-pages");
+const addHook = require("./asset-require-hook.js");
 const createScopedName = require("./createScopedName");
 require("css-modules-require-hook")({
   generateScopedName: createScopedName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dinou",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Minimal React 19 Framework",
   "main": "index.js",
   "bin": {
@@ -20,6 +20,12 @@
     "url": "https://github.com/roggc/dinou.git"
   },
   "dependencies": {
+    "@babel/core": "^7.27.4",
+    "@babel/plugin-syntax-import-meta": "^7.10.4",
+    "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+    "@babel/preset-react": "^7.27.1",
+    "@babel/preset-typescript": "^7.27.1",
+    "@babel/register": "^7.27.1",
     "@tailwindcss/postcss": "^4.1.10",
     "autoprefixer": "^10.4.21",
     "babel-loader": "^10.0.0",
@@ -29,8 +35,6 @@
     "css-loader": "^7.1.2",
     "css-modules-require-hook": "^4.2.3",
     "dotenv": "^16.5.0",
-    "esbuild-loader": "^4.3.0",
-    "esbuild-register": "^3.6.0",
     "express": "^5.1.0",
     "generic-names": "^4.0.0",
     "loader-utils": "^3.3.1",

package/webpack.config.js

@@ -7,7 +7,6 @@ const CopyWebpackPlugin = require("copy-webpack-plugin");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const createScopedName = require("./dinou/createScopedName");
 const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
-const { EsbuildPlugin } = require("esbuild-loader");
 
 const isDevelopment = process.env.NODE_ENV !== "production";
 
@@ -40,13 +39,19 @@ module.exports = {
   module: {
     rules: [
       {
-        // Match `.js`, `.jsx`, `.ts` or `.tsx` files
-        test: /\.[jt]sx?$/,
-        loader: "esbuild-loader",
-        options: {
-          // JavaScript version to compile to
-          target: "esnext",
-          jsx: "automatic", // Use React's automatic JSX runtime
+        test: /\.(js|jsx|ts|tsx)$/,
+        use: {
+          loader: "babel-loader",
+          options: {
+            presets: [
+              ["@babel/preset-react", { runtime: "automatic" }],
+              "@babel/preset-typescript",
+            ],
+            plugins: [
+              "@babel/plugin-transform-modules-commonjs",
+              "@babel/plugin-syntax-import-meta",
+            ],
+          },
         },
         exclude: [/node_modules\/(?!dinou)/],
       },
@@ -106,7 +111,7 @@ module.exports = {
 
             return `images/${scoped}[ext]`;
           },
-          publicPath: "/",
+          publicPath: "",
         },
       },
     ],
@@ -149,10 +154,6 @@ module.exports = {
         },
       },
     },
-    minimize: !isDevelopment,
-    minimizer: !isDevelopment
-      ? [new EsbuildPlugin({ target: "esnext", css: true })]
-      : [],
   },
   watchOptions: {
     ignored: /____public____/,