dinou 4.0.3 → 4.0.5

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

@@ -20,7 +20,7 @@ async function getCSSEntries({
   assetInclude = assetRegex,
   manifest = {},
 } = {}) {
-  // const detectedClientEntries = new Set();
+  const detectedClientEntries = new Set();
   const detectedCSSEntries = new Set();
   // const detectedAssetEntries = new Set();
   // const serverModules = new Set();
@@ -29,7 +29,7 @@ async function getCSSEntries({
     code,
     baseFilePath,
     visited = new Set(),
-    isTopLevelClientComponent = false
+    isTopLevelClientComponent = false,
   ) {
     if (visited.has(baseFilePath)) {
       return { imports: [], assets: [], csss: [] };
@@ -71,7 +71,7 @@ async function getCSSEntries({
       } catch (err) {
         console.warn(
           `[get-esbuild-entries] Could not read import: ${absImportPathWithExt}`,
-          err.message
+          err.message,
         );
         continue;
       }
@@ -115,7 +115,7 @@ async function getCSSEntries({
           importedCode,
           absImportPathWithExt,
           visited,
-          isTopLevelClientComponent
+          isTopLevelClientComponent,
         );
         nested.imports.forEach((p) => imports.add(p));
         nested.assets.forEach((p) => assets.add(p));
@@ -123,7 +123,7 @@ async function getCSSEntries({
       } catch (err) {
         console.warn(
           `[get-esbuild-entries] Could not process imports of: ${absImportPathWithExt}`,
-          err.message
+          err.message,
         );
       }
     }
@@ -188,10 +188,32 @@ async function getCSSEntries({
     const normalizedPath = normalizePath(absPath);
 
     if (isClientModule) {
+      const name = path.basename(absPath, path.extname(absPath));
+
+      detectedClientEntries.add({
+        absPath: normalizedPath,
+        name,
+      });
+      const { imports } = await getImportsAndAssetsAndCsss(
+        code,
+        absPath,
+        new Set(),
+        true,
+      );
+      const clientComponentRegex = /\.(js|jsx|ts|tsx)$/i;
+      imports.forEach((imp) => {
+        if (clientComponentRegex.test(imp) && !imp.includes("node_modules")) {
+          const name = path.basename(imp, path.extname(imp));
+          detectedClientEntries.add({
+            absPath: normalizePath(imp),
+            name,
+          });
+        }
+      });
     } 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.`
+          `[react-client-manifest] The file ${normalizedPath} is a page or layout without "use client" directive, but its default export is not an async function.`,
         );
       }
       // serverModules.add({
@@ -206,7 +228,7 @@ async function getCSSEntries({
             ...csss.map((cssPath) => ({
               absPath: normalizePath(cssPath),
               name: path.basename(cssPath, path.extname(cssPath)),
-            }))
+            })),
           );
         }
 
@@ -225,6 +247,13 @@ async function getCSSEntries({
     }
   } // end for files
 
+  for (const dCE of detectedClientEntries) {
+    const hash = hashFilePath(dCE.absPath);
+    const outfileName = `${dCE.name}-${hash}`;
+    dCE.outfile = `${outfileName}.js`;
+    dCE.outfileName = outfileName;
+  }
+
   for (const dCSSE of detectedCSSEntries) {
     const hash = hashFilePath(dCSSE.absPath);
     const outfileName = `${dCSSE.name}-${hash}`;
@@ -240,7 +269,7 @@ async function getCSSEntries({
   // }
 
   // console.log("detectedCssEntries", detectedCSSEntries);
-  return [detectedCSSEntries];
+  return [detectedCSSEntries, detectedClientEntries];
 }
 
 module.exports = getCSSEntries;

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

@@ -4,15 +4,10 @@ const parseExports = require("../../core/parse-exports.js");
 const { useServerRegex } = require("../../constants.js");
 
 module.exports = function (source) {
-  // Detect "use server"
-  const lines = source.split("\n");
   let hasUseServer = false;
 
-  for (const line of lines) {
-    if (useServerRegex.test(line.trim())) {
-      hasUseServer = true;
-      break;
-    }
+  if (useServerRegex.test(source)) {
+    hasUseServer = true;
   }
 
   if (!hasUseServer) return source;
@@ -45,7 +40,7 @@ const loadProxy = new Function('return import("/"+"__SERVER_FUNCTION_PROXY__")')
 export default (...args) =>
   loadProxy().then(mod =>
     (mod.default ?? mod ?? window.__SERVER_FUNCTION_PROXY_LIB__).createServerFunctionProxy(${JSON.stringify(
-      key
+      key,
     )})(...args)
   );
 `;
@@ -53,7 +48,7 @@ export default (...args) =>
       proxyCode += `
 export const ${exp} = (...args) =>
   loadProxy().then(mod => (mod.default ?? mod ?? window.__SERVER_FUNCTION_PROXY_LIB__).createServerFunctionProxy(${JSON.stringify(
-    key
+    key,
   )})(...args)
   );
 `;
@@ -68,7 +63,7 @@ export const ${exp} = (...args) =>
 
   this.emitFile(
     `server-functions/${normalizedPath}.json`,
-    JSON.stringify(manifestEntry, null, 2)
+    JSON.stringify(manifestEntry, null, 2),
   );
 
   return proxyCode;

package/dinou/webpack/webpack.config.js

@@ -37,7 +37,24 @@ console.log(
     : "📦 [Dinou] Library Mode detected (Webpack: Using node_modules)",
 );
 
+const projectRoot = process.cwd();
+
+const outputDirs = [
+  path.resolve(projectRoot, "public"),
+  path.resolve(projectRoot, "dist3"),
+];
+
+function cleanDir(dir) {
+  if (fs.existsSync(dir)) {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+}
+
 module.exports = async () => {
+  const outputDir = path.resolve(process.cwd(), outputDirectory);
+
+  // 🔥 CLEAN HARD
+  cleanDir(outputDir);
   const [cssEntries] = await getCSSEntries();
   return {
     performance: {
@@ -90,45 +107,31 @@ module.exports = async () => {
       // chunkFilename: "[name]-[contenthash].js",
     },
     module: {
-      noParse: [/dist3/, /public/],
+      // noParse: [/[\\/]dist3[\\/]/, /[\\/]public[\\/]/],
       rules: [
-        // {
-        //   test: /\.(js|jsx|ts|tsx)$/,
-        //   include: path.resolve(process.cwd(), "dist3"),
-        //   use: "null-loader",
-        // },
-
         {
-          test: /\.(js|jsx|ts|tsx)$/,
+          test: /\.[jt]sx?$/,
           // include: [
           //   path.resolve(process.cwd(), "src"),
-          //   path.resolve(__dirname, "../core"),
-          //   path.resolve(process.cwd(), "node_modules/dinou"),
           //   isEjected && path.resolve(process.cwd(), "dinou"),
+          //   path.resolve(__dirname, "../core"),
           // ].filter(Boolean),
-          use: {
-            loader: "babel-loader",
-            options: {
-              presets: [
-                ["@babel/preset-react", { runtime: "automatic" }],
-                "@babel/preset-typescript",
-              ],
-              plugins: [
-                "@babel/plugin-syntax-import-meta",
-                // isDevelopment && require.resolve("react-refresh/babel"),
-              ].filter(Boolean),
-            },
-          },
-          exclude: [
-            /node_modules\/(?!dinou)/,
-            path.resolve(process.cwd(), "dist3"),
-            path.resolve(process.cwd(), "public"),
-          ],
-        },
-        {
-          test: /\.[jt]sx?$/,
-          include: path.resolve(process.cwd(), "src"),
+          exclude: [/node_modules\/(?!dinou)/, ...outputDirs],
           use: [
+            {
+              loader: "babel-loader",
+              options: {
+                presets: [
+                  ["@babel/preset-react", { runtime: "automatic" }],
+                  "@babel/preset-typescript",
+                ],
+                plugins: [
+                  "babel-plugin-react-compiler",
+                  "@babel/plugin-syntax-import-meta",
+                  // isDevelopment && require.resolve("react-refresh/babel"),
+                ].filter(Boolean),
+              },
+            },
             {
               loader: path.resolve(
                 __dirname,
@@ -214,8 +217,13 @@ module.exports = async () => {
         filename: "[name].css",
       }),
       manifestGeneratorPlugin,
-      // Ignore any imports that reference the output folders
-      new webpack.IgnorePlugin({ resourceRegExp: /(dist3|public)/ }),
+      new webpack.IgnorePlugin({
+        checkResource(resource, context) {
+          if (!context) return false;
+
+          return outputDirs.some((dir) => context.startsWith(dir));
+        },
+      }),
       new ServerFunctionsPlugin({
         manifest: manifestGeneratorPlugin.manifestData,
       }),
@@ -268,7 +276,8 @@ module.exports = async () => {
           // Rest of node_modules
           defaultVendors: {
             test: /[\\/]node_modules[\\/]/,
-            name: "vendors",
+            // name: "vendors",
+            name: false,
             priority: 20,
             chunks: "all",
             reuseExistingChunk: true,
@@ -277,7 +286,7 @@ module.exports = async () => {
       },
     },
     watchOptions: {
-      ignored: ["public/", "dist3/"],
+      ignored: outputDirs.map((dir) => `${dir}/**`),
     },
     stats: "normal", // or 'verbose' in dev
     infrastructureLogging: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dinou",
-  "version": "4.0.3",
-  "description": "Modern Full-Stack React 19 framework with React Server Components, Server Functions, and Streaming SSR.",
+  "version": "4.0.5",
+  "description": "Full-Stack React 19 framework with React Server Components, Server Functions, and Streaming SSR.",
   "main": "index.js",
   "bin": {
     "dinou": "./cli.js"
@@ -54,9 +54,11 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-replace": "^6.0.2",
+    "@swc/core": "^1.15.10",
     "@tailwindcss/postcss": "^4.1.10",
     "autoprefixer": "^10.4.21",
     "babel-loader": "^10.0.0",
+    "babel-plugin-react-compiler": "^1.0.0",
     "chokidar": "^4.0.3",
     "commander": "^14.0.0",
     "concurrently": "^9.2.0",
@@ -72,6 +74,7 @@
     "generic-names": "^4.0.0",
     "loader-utils": "^3.3.1",
     "mini-css-extract-plugin": "^2.9.4",
+    "multer": "^2.0.2",
     "postcss": "^8.5.5",
     "postcss-import": "^16.1.1",
     "postcss-loader": "^8.2.0",