@ozdao/martyrs 0.2.477 → 0.2.479

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.477",
+  "version": "0.2.479",
   "description": "Fullstack framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",
@@ -15,6 +15,7 @@
     "vue3",
     "express"
   ],
+  "type": "module",
   "main": "./dist/library/martyrs.es.js",
   "module": "./dist/library/martyrs.cjs.js",
   "browser": {
@@ -30,8 +31,8 @@
       "require": "./dist/martyrs.cjs.js"
     },
     "./builder": {
-      "import": "./dist/builder.mjs",
-      "require": "./dist/builder.js"
+      "import": "./dist/builder.js",
+      "require": "./dist/builder.cjs"
     },
     "./dist/main.css": {
       "require": "./dist/main.css",
@@ -42,8 +43,8 @@
       "import": "./dist/style.css"
     },
     "./modules/*/server": {
-      "require": "./dist/*.server.js",
-      "import": "./dist/*.server.mjs"
+      "require": "./dist/*.server.cjs",
+      "import": "./dist/*.server.js"
     },
     "./modules/*/client": {
       "require": "./dist/martyrs/src/modules/*/*.client.cjs",
@@ -94,7 +95,7 @@
     "@rsdoctor/rspack-plugin": "^0.4.13",
     "@rspack/cli": "^1.2.8",
     "@rspack/core": "^1.2.8",
-    "@vitejs/plugin-vue": "^5.2.2",
+    "@vitejs/plugin-vue": "^5.2.3",
     "connect-history-api-fallback": "^2.0.0",
     "css-minimizer-webpack-plugin": "^7.0.2",
     "dotenv-webpack": "^8.1.0",

package/src/builder/builder.js

@@ -1,16 +1,22 @@
-const webpackConfigs = require('./webpack');
-const createSsrDevServer = require('./modes/ssr.dev.js');
-const createSsrProdServer = require('./modes/ssr.prod.js');
-const createSpaDevServer = require('./modes/spa.dev.js');
-const createSpaProdServer = require('./modes/spa.prod.js');
+import createSpaDevServer from './modes/spa.dev.js';
+import createSpaProdServer from './modes/spa.prod.js';
+import createSsrDevServer from './modes/ssr.dev.js';
+import createSsrProdServer from './modes/ssr.prod.js';
+import createSsrRspackDevServer from './modes/ssr.rspack.dev.js';
+import rspackConfigs from './rspack/index.js';
+import webpackConfigs from './webpack/index.js';
 
-const rspackConfigs = require('./rspack');
-const createSsrRspackDevServer = require('./modes/ssr.rspack.dev.js');
-
-// const viteConfigs = require('./vite');
-// const createSsrViteDevServer = require('./modes/ssr.vite.dev.js');
+export {
+  rspackConfigs,
+  createSsrRspackDevServer,
+  webpackConfigs,
+  createSsrDevServer,
+  createSsrProdServer,
+  createSpaDevServer,
+  createSpaProdServer,
+};
 
-module.exports = {
+export default {
   rspackConfigs,
   createSsrRspackDevServer,
   webpackConfigs,
@@ -18,6 +24,5 @@ module.exports = {
   createSsrProdServer,
   createSpaDevServer,
   createSpaProdServer,
-  // viteConfigs,
-  // createSsrViteDevServer
-};
+};
+

package/src/builder/modes/spa.dev.js

@@ -1,38 +1,27 @@
-const path = require("path");
-const webpack = require("webpack");
-// const compression = require('compression');
-// const readline = require('readline');
-const devMiddleware = require("webpack-dev-middleware");
-// const hotMiddleware = require("webpack-hot-middleware");
-const history = require('connect-history-api-fallback');
-const express = require('express');
-
-module.exports = function createSpaDevServer(projectRoot, { spaConfig, serverConfig, createServerPath }) {
+import * as history from 'connect-history-api-fallback';
+import path from 'path';
+import webpack from 'webpack';
+import devMiddleware from 'webpack-dev-middleware';
+export default (function createSpaDevServer(projectRoot, { spaConfig, apiConfig, createServer }) {
   const spaCompiler = webpack(spaConfig);
-  const serverCompiler = webpack(serverConfig);
-
+  const serverCompiler = webpack(apiConfig);
   const createDevRenderer = () => {
     // Нативные ANSI escape коды для цветов
     const colors = {
-      reset: "\x1b[0m",
-      greenBright: "\x1b[92;1m", // яркий зеленый + жирный
-      blueBright: "\x1b[94m",    // яркий синий
-      yellow: "\x1b[33m"         // желтый
+      reset: '\x1b[0m',
+      greenBright: '\x1b[92;1m', // яркий зеленый + жирный
+      blueBright: '\x1b[94m', // яркий синий
+      yellow: '\x1b[33m', // желтый
     };
-    
     const progressPlugin = new webpack.ProgressPlugin((percentage, message, ...args) => {
       // readline.clearLine(process.stdout, 0);
       // readline.cursorTo(process.stdout, 0);
       process.stdout.write(
-        colors.greenBright + `${(percentage * 100).toFixed(2)}% ` + colors.reset +
-        colors.blueBright + message + colors.reset +
-        ' ' +
-        args.map(arg => colors.yellow + arg + colors.reset).join(' ')
+        colors.greenBright + `${(percentage * 100).toFixed(2)}% ` + colors.reset + colors.blueBright + message + colors.reset + ' ' + args.map(arg => colors.yellow + arg + colors.reset).join(' ')
       );
     });
     spaConfig.plugins.push(progressPlugin);
   };
-
   let serverInstance;
   const clientDevMiddleware = devMiddleware(spaCompiler, {
     publicPath: spaConfig.output.publicPath,
@@ -42,34 +31,25 @@ module.exports = function createSpaDevServer(projectRoot, { spaConfig, serverCon
   //   heartbeat: 5000,
   //   log: false
   // });
-
   const port = process.env.PORT || 8080;
-
   // Функция для запуска сервера
-   const startServer = async () => {
+  const startServer = async () => {
     if (serverInstance) {
       serverInstance.close();
     }
     // Очистка кэша модуля и всех его зависимостей
-    Object.keys(require.cache).forEach((id) => {
+    Object.keys(require.cache).forEach(id => {
       delete require.cache[id];
     });
-    
-    const { createServer } = createServerPath;
-
+    const { createServer } = createServer;
     let { app, server, env } = await createServer();
-
     // Используем connect-history-api-fallback перед другими middleware
     app.use(history());
-    
     app.use(clientDevMiddleware);
     // app.use(clientHotMiddleware);
-    
     // app.use(compression());
-
     // Удаляем статическое обслуживание файлов
     // app.use(express.static(path.resolve(projectRoot, "builds/web/client")));
-
     // Обрабатываем все маршруты
     app.get('*', (req, res, next) => {
       const filename = path.join(spaCompiler.outputPath, 'index.html');
@@ -82,7 +62,6 @@ module.exports = function createSpaDevServer(projectRoot, { spaConfig, serverCon
         res.end();
       });
     });
-
     serverInstance = server;
     try {
       await server.listen(port);
@@ -92,18 +71,16 @@ module.exports = function createSpaDevServer(projectRoot, { spaConfig, serverCon
       process.exit(1);
     }
   };
-
   // Настройка наблюдения за изменениями
   serverCompiler.watch({}, async (err, stats) => {
     if (err) {
       console.error(err);
       return;
     }
-    console.log(stats.toString(serverConfig.stats));
+    console.log(stats.toString(apiConfig.stats));
     console.log('Server.js has changed, updating...');
     await startServer();
   });
-
   createDevRenderer();
   return startServer;
-};
+});

package/src/builder/modes/spa.prod.js

@@ -1,51 +1,41 @@
-const fs = require("fs");
-const path = require("path");
-// const compression = require('compression');
-const express = require('express');
-const history = require('connect-history-api-fallback');
-
-module.exports = function createSpaProdServer(projectRoot, { createServerPath }) {
+import * as history from 'connect-history-api-fallback';
+import * as express from 'express';
+import fs from 'fs';
+import path from 'path';
+export default (function createSpaProdServer(projectRoot, { createServer }) {
   let serverInstance;
   const port = process.env.PORT || 8080;
-
   // Функция для запуска сервера
   const startServer = async () => {
-    const { createServer } = createServerPath;
-
+    const { createServer } = createServer;
     let { app, server } = await createServer();
-
     // Включаем сжатие ответов
     // app.use(compression());
-
     // Статическое обслуживание сбилженных файлов
-    app.use(express.static(path.resolve(projectRoot, "builds/web/spa")));
-
-    app.use(history({
-      index: '/index.html'
-    }));
-
+    app.use(express.static(path.resolve(projectRoot, 'builds/web/spa')));
+    app.use(
+      history({
+        index: '/index.html',
+      })
+    );
     app.get('*', (req, res) => {
       fs.readFile(path.resolve(projectRoot, 'builds/web/spa', 'index.html'), 'utf-8', (err, content) => {
         if (err) {
           console.log('We cannot open "index.html" file.');
           res.writeHead(500, {
-            'Content-Type': 'text/plain; charset=utf-8'
+            'Content-Type': 'text/plain; charset=utf-8',
           });
           res.end('Internal Server Error');
           return;
         }
-
         res.writeHead(200, {
-          'Content-Type': 'text/html; charset=utf-8'
+          'Content-Type': 'text/html; charset=utf-8',
         });
-
         res.end(content);
       });
     });
-
     // Запуск сервера
     serverInstance = server;
-
     try {
       await server.listen(port);
       console.log(`Production server started at http://localhost:${port}\n`);
@@ -54,6 +44,5 @@ module.exports = function createSpaProdServer(projectRoot, { createServerPath })
       process.exit(1);
     }
   };
-
   return startServer;
-};
+});

package/src/builder/modes/ssr.dev.js

@@ -1,157 +1,173 @@
-const path = require("path");
-const webpack = require("webpack");
-const compression = require('compression');
-const readline = require('readline');
-const chalk = require('chalk');
-
-const devMiddleware = require("webpack-dev-middleware");
-
-const { createHtmlRenderer } = require("../ssr/ssr-render-html.js");
-const { transformDevStats } = require("../ssr/ssr-transform-webpack-stats.js");
-
-module.exports = function createSsrDevServer(projectRoot, { clientConfig, serverConfig, ssrConfig, createServerPath }) {
-  const clientCompiler = webpack(clientConfig);
-  const ssrCompiler = webpack(ssrConfig);
+import path from "path";
+import chalk from "chalk";
+import { rspack, ProgressPlugin } from "@rspack/core";
+import { createHtmlRenderer } from "../ssr/ssr-render-html.js";
+import { transformDevStats } from "../ssr/ssr-transform-webpack-stats.js";
+
+export default function createSsrDevServer(projectRoot, { clientConfig, apiConfig, ssrConfig, createServer }) {
+  // Добавляем HMR плагины в клиентскую конфигурацию
+  const addHmrToClientConfig = (config) => {
+    config.plugins = config.plugins || [];
+    // Встроенный HMR плагин от Rspack
+    config.plugins.push(new rspack.HotModuleReplacementPlugin());
+    // Добавляем HMR entry
+    config.entry = {
+      main: [
+        "webpack-hot-middleware/client?path=/__webpack_hmr&timeout=20000",
+        ...(Array.isArray(config.entry.main) ? config.entry.main : [config.entry.main])
+      ]
+    };
+    return config;
+  };
 
-  const createDevRenderer = (onUpdate) => {
+  // Применяем HMR к клиентской конфигурации
+  const clientConfigWithHmr = addHmrToClientConfig({ ...clientConfig });
+  const clientCompiler = rspack(clientConfigWithHmr);
+  const ssrCompiler = rspack(ssrConfig);
 
+  const createDevRenderer = () => {
     const createHotReloadingServerRenderer = (config) => {
-      const progressPlugin = new webpack.ProgressPlugin((percentage, message, ...args) => {
-        
-        readline.clearLine(process.stdout, 0);
-        readline.cursorTo(process.stdout, 0);
-        
-        process.stdout.write(
-          chalk.greenBright.bold(`${(percentage * 100).toFixed(2)}% `) +
+      // Добавляем прогресс-плагин для отображения процесса сборки
+      const progressPlugin = new ProgressPlugin((percentage, message, ...args) => {
+        console.log(
+          chalk.greenBright(`${(percentage * 100).toFixed(2)}% `) +
           chalk.blueBright(message) +
-          ' ' +
-          args.map(arg => chalk.yellow(arg)).join(' ')
+          " " +
+          args.map((arg) => chalk.yellow(arg)).join(" ")
         );
       });
-      
+
       config.plugins = config.plugins || [];
       config.plugins.push(progressPlugin);
-
+      
       let renderApp = null;
       let setCompilationDone = null;
-
-      let ssrCompilation = new Promise((resolve) => {
-        setCompilationDone = resolve;
-      });
-
-      ssrCompiler.watch(
-        {
-          "info-verbosity": "none",
-        },
-        (error, stats) => {
-          if (error) {
-            console.error(chalk.red("Server critical error"));
-            console.error(JSON.stringify(error, null, 2)); //
-            throw error;
-            return
-          }
-
-          const jsonStats = stats.toJson();
-
-          if (stats.hasErrors()) {
-            console.error(chalk.red("Client compilation error"));
-            jsonStats.errors.forEach((err) => { 
-              if (err.details) console.error(chalk.red(err.details))
-              else console.error(chalk.red(err.stack))
-            });
-            return;
-          }
-
-          const { entrypoints, outputPath } = jsonStats;
-          const { main: { assets: [mainChunkPath] }} = entrypoints;
-          const { render } = require(path.resolve(outputPath, mainChunkPath.name));
-          renderApp = render;
-          setCompilationDone();
+      let ssrCompilation = new Promise((resolve) => { setCompilationDone = resolve });
+
+      // Запускаем наблюдение за SSR сборкой
+      ssrCompiler.watch({ "info-verbosity": "none" }, async (error, stats) => {
+        if (error) {
+          console.error(chalk.red("Server critical error"));
+          console.error(JSON.stringify(error, null, 2));
+          throw error;
         }
-      );
 
+        const jsonStats = stats.toJson();
+
+        if (stats.hasErrors()) {
+          console.error(chalk.red("Server compilation error"));
+          jsonStats.errors.forEach((err) => {
+            if (err.details) {
+              console.error(err.details);
+            } else if (typeof err === 'object') {
+              try {
+                console.error(JSON.stringify(err, null, 2));
+              } catch (e) {
+                console.error(e);
+              }
+            } else {
+              console.error(chalk.red(err.slice()));
+            }
+          });
+          return;
+        }
+        
+        // Получаем путь к собранному SSR бандлу
+        const { entrypoints, outputPath } = jsonStats;
+        const { main: { assets: [mainChunkPath] } } = entrypoints;
+        const mainModulePath = path.resolve(outputPath, mainChunkPath.name);
+        
+        // Динамический импорт для ESM совместимости
+        const module = await import(mainModulePath);
+        renderApp = module.render;
+        setCompilationDone();
+      });
+      
       return async (stuff) => {
         await ssrCompilation;
-        
-        const result = await renderApp(stuff);
-
-        return result;
+        return await renderApp(stuff);
       };
     };
 
     const renderApp = createHotReloadingServerRenderer(ssrConfig);
-    const renderHtml = createHtmlRenderer(onUpdate);
+    const renderHtml = createHtmlRenderer();
 
-    return async (stuff, { stats, outputFileSystem }) => {
+    return async (stuff, stats) => {
       const { html, meta, state, statusCode } = await renderApp(stuff);
-
-      const { head, body } = transformDevStats(stats.toJson(), outputFileSystem);
+      
+      // Трансформируем статистику для вставки в HTML
+     const publicPath = clientConfigWithHmr.output.publicPath;
+    const { head, body } = extractAssets(stats, publicPath);
 
       const initialState = JSON.stringify(state);
-
+      
+      // Рендерим финальный HTML
       const completeHtml = await renderHtml({
         appHtml: html,
         meta,
         head,
         body,
-        initialState
+        initialState,
       });
+      
       return { html: completeHtml, statusCode };
     };
   };
-  
+
   let serverInstance;
   let rendererInstance;
-
-  const clientDevMiddleware = devMiddleware(clientCompiler, {
-    publicPath: clientConfig.output.publicPath,
-    serverSideRender: true,
-    stats: false,
-  });
-
   const port = process.env.PORT || 8080;
 
-  // Функция для запуска сервера
+  // Функция запуска сервера
   const startServer = async () => {
     if (serverInstance) {
       serverInstance.close();
     }
 
-    Object.keys(require.cache).forEach(key => {
-      if (!key.includes('node_modules/webpack')) {
-        delete require.cache[key];
-      }
+    // Создаем экземпляр сервера с помощью предоставленной функции
+    const { app, server } = await createServer.createServer();
+    
+    // Инициализируем Dev middleware с использованием встроенного в Rspack middleware
+    const devMiddleware = clientCompiler.devMiddleware(app, {
+      publicPath: clientConfigWithHmr.output.publicPath,
+      stats: false,
     });
 
-    const { createServer } = createServerPath;
-
-    let { app, server, env } = await createServer();
-
-    app.use(clientDevMiddleware);
-    // Код для SSR клиентской части. Этот блок компилирует приложение
+    // Инициализируем Hot middleware с использованием встроенного в Rspack middleware
+    clientCompiler.hotMiddleware(app);
+    
+    // Создаем рендерер для SSR, если его еще нет
     if (!rendererInstance) {
-      rendererInstance = createDevRenderer(() => {
-        clientCompiler.hooks.done.tap("reload", () => {
-          setTimeout(() => {
-            // require("webpack-hot-middleware/client").reload();
-          }, 500);
-        });
+      rendererInstance = createDevRenderer();
+      
+      // Обновляем страницу при изменениях в клиентском коде
+      clientCompiler.hooks.done.tap("reload", (stats) => {
+        // Инвалидация кеша клиентского кода происходит автоматически с HMR
       });
     }
 
-    // и сервит его по всем роутам, а там внутри приложения мы уже разбираемся че показывать.
+    // Обрабатываем все запросы через SSR
     app.use("/*", async (req, res) => {
-      const result = await rendererInstance({
-        url: req.originalUrl,
-        cookies: req.cookies,
-        languages: req.acceptsLanguages()
-      }, res.locals.webpack.devMiddleware);
-
-      // тут отправляем статус код и сгенерированный html
-      res.status(result.statusCode).header("Content-Type", "text/html; charset=utf-8").send(result.html);
-    });
+      try {
+        const stats = clientCompiler.getStats().toJson();
+        
+        const result = await rendererInstance(
+          {
+            url: req.originalUrl,
+            cookies: req.cookies,
+            languages: req.acceptsLanguages(),
+          },
+          stats
+        );
 
-    app.use(compression());
+        res.status(result.statusCode)
+          .header("Content-Type", "text/html; charset=utf-8")
+          .send(result.html);
+      } catch (err) {
+        console.error(err);
+        res.status(500).send("Internal Server Error");
+      }
+    });
 
     serverInstance = server;
 
@@ -165,4 +181,4 @@ module.exports = function createSsrDevServer(projectRoot, { clientConfig, server
   };
 
   return startServer;
-};
+}

package/src/builder/modes/ssr.prod.js

@@ -1,61 +1,42 @@
-const path = require("path");
-const express = require("express");
+import path from 'path';
+import express from 'express';
 
-const { transformProdStats } = require('../ssr/ssr-transform-webpack-stats.js');
+import { renderHtml } from '../ssr/ssr-render-html.js';
+import { transformProdStats } from '../ssr/ssr-transform-webpack-stats.js';
 
-const { renderHtml } = require('../ssr/ssr-render-html.js');
-
-module.exports = function createSsrProdServer(projectRoot, {clientConfig,serverConfig, createServerPath}) {
-
-  const clientStats = require(path.join(projectRoot, "builds/web/client/stats.json"));
-  const serverManifest = require(path.join(projectRoot, "builds/web/server/manifest.json"));
-  
-  const { createServer } = createServerPath;
+export default (function createSsrProdServer(projectRoot, { clientConfig, apiConfig, createServer }) {
 
   const startServer = async () => {
-    const { app, server, env } = await createServer();
-
+    const { app, server, env } = await createServer.createServer();
     app.use(
-      clientConfig.output.publicPath, 
-      express.static(path.resolve(projectRoot, "builds/web/client"), {
-        maxAge: '1d' // Кэширование на 1 день
+      clientConfig.output.publicPath,
+      express.static(path.resolve(projectRoot, 'builds/web/client'), {
+        maxAge: '1d', // Кэширование на 1 день
       })
     );
-
-    const { render } = require(path.join(
-      serverConfig.output.path,
-      serverManifest["main.js"]
-    ));
-
     const { head, body } = transformProdStats({
       stats: clientStats,
       publicPath: clientConfig.output.publicPath,
     });
-
-    app.use("/*", async (req, res) => {
-      const { html, meta, state, statusCode } = await render({ 
-        url: req.originalUrl, 
-        cookies: req.cookies, 
-        languages: req.acceptsLanguages() 
+    app.use('/*', async (req, res) => {
+      const { html, meta, state, statusCode } = await render({
+        url: req.originalUrl,
+        cookies: req.cookies,
+        languages: req.acceptsLanguages(),
       });
-
       if (state.NotFound) {
         res.status(404);
       }
-
       const initialState = JSON.stringify(state);
-
       const completeHtml = await renderHtml({
         appHtml: html,
-        meta, 
+        meta,
         head,
         body,
-        initialState
+        initialState,
       });
-
-      res.status(statusCode).header("Content-Type", "text/html; charset=utf-8").send(completeHtml);
+      res.status(statusCode).header('Content-Type', 'text/html; charset=utf-8').send(completeHtml);
     });
-
     return server;
   };
 
@@ -63,7 +44,7 @@ module.exports = function createSsrProdServer(projectRoot, {clientConfig,serverC
 
   const start = async () => {
     const server = await startServer();
-    
+
     try {
       server.listen(port, () => console.log(`Server running on port ${port}`));
     } catch (err) {
@@ -73,4 +54,4 @@ module.exports = function createSsrProdServer(projectRoot, {clientConfig,serverC
   };
 
   return start;
-};
+});