@ozdao/martyrs 0.2.477 → 0.2.479

package/src/builder/rspack/{rspack.config.client.js → rspack.config.ssr.client.js}

@@ -1,16 +1,14 @@
-const path = require("path");
-const glob = require('glob-all');
-const { rspack } = require('@rspack/core');
-const { merge } = require("webpack-merge");
-const { StatsWriterPlugin } = require("webpack-stats-plugin");
-const { GenerateSW, InjectManifest } = require('@aaroon/workbox-rspack-plugin')
-const { PurgeCSSPlugin } = require("purgecss-webpack-plugin");
+import path from "path";
+import glob from 'glob-all';
+import { rspack } from '@rspack/core';
+import { merge } from "webpack-merge";
+import { StatsWriterPlugin } from "webpack-stats-plugin";
+import { GenerateSW, InjectManifest } from '@aaroon/workbox-rspack-plugin';
+import { PurgeCSSPlugin } from "purgecss-webpack-plugin";
+import baseConfig from './rspack.config.base.js';
 
-const baseConfig = require('./rspack.config.base');
-
-module.exports = (projectRoot) => {
+export default (projectRoot) => {
   const isProd = process.env.NODE_ENV === "production";
-
   const config = {
     mode: !isProd ? "development" : "production",
     devtool: !isProd ? "inline-source-map" : "source-map",
@@ -43,7 +41,6 @@ module.exports = (projectRoot) => {
           path.join(projectRoot, '/node_modules/@ozdao/martyrs/src/**/*.js'),
           path.join(projectRoot, '/node_modules/@vuepic/vue-datepicker/**/*.js')
         ]),
-
         safelist: { 
           standard: ["safelisted", /^html/, /^:root/],
           deep: [/^safelisted-deep-/, /^html/, /^:root/],
@@ -86,6 +83,5 @@ module.exports = (projectRoot) => {
       ],
     },
   };
-
   return merge(baseConfig(projectRoot), config);
 };

package/src/builder/rspack/{rspack.config.ssr.js → rspack.config.ssr.server.js}

@@ -1,16 +1,16 @@
-const path = require("path");
-const { rspack } = require('@rspack/core');
-const nodeExternals = require('webpack-node-externals');
-const { merge } = require("webpack-merge");
-const { RspackManifestPlugin } = require('rspack-manifest-plugin');
+import path from "path";
+import { rspack } from '@rspack/core';
+import nodeExternals from 'webpack-node-externals';
+import { merge } from "webpack-merge";
+import { RspackManifestPlugin } from 'rspack-manifest-plugin';
 
-const getBaseConfig = require("./rspack.config.base.js");
+import getBaseConfig from "./rspack.config.base.js";
 
-module.exports = (projectRoot) => {
+export default (projectRoot) => {
   const isProd = process.env.NODE_ENV === "production";
 
   const ssrConfig = {
-    target: "node",
+    target: ["node", "es2022"], // Явно указываем современную версию Node.js с поддержкой ESM
     mode: !isProd ? "development" : "production",
     entry: {
       main: path.resolve(projectRoot, "src/client.js"),
@@ -18,8 +18,19 @@ module.exports = (projectRoot) => {
     output: {
       filename: "main.js",
       path: path.resolve(projectRoot, "builds/web/server"),
-      libraryTarget: "commonjs2",
-      clean: true
+      // Явно указываем формат чанков
+      chunkFormat: "module",
+      library: {
+        type: "module"
+      },
+      clean: true,
+      module: true,
+      environment: {
+        module: true
+      }
+    },
+    experiments: {
+      outputModule: true
     },
     module: {
       rules: [
@@ -40,6 +51,7 @@ module.exports = (projectRoot) => {
           /\.(vue)$/,
           /\.(html)$/,
         ],
+        importType: 'module'
       })
     ],
     plugins: [

package/src/builder/ssr/ssr-render-html.js

@@ -1,39 +1,40 @@
-const Mustache = require("mustache");
-const template = require("../templates/page.js");
+import Mustache from 'mustache';
+import template from '../templates/page.js';
 
-const renderHtml = async (stuff) => {
+const renderHtml = async stuff => {
   const data = {
     ...stuff,
     googleTagId: process.env.GOOGLE_TAG_ID,
     facebookPixelId: process.env.FACEBOOK_PIXEL_ID,
     facebookDomainVerification: process.env.FACEBOOK_DOMAIN_VERIFICATION,
-    googleMapApiKey: process.env.GOOGLE_MAPS_API_KEY
+    googleMapApiKey: process.env.GOOGLE_MAPS_API_KEY,
   };
-  
   return Mustache.render(template, data);
 };
 
-const createHtmlRenderer = (onTemplateUpdate) => {
+const createHtmlRenderer = onTemplateUpdate => {
   setInterval(() => {
-    delete require.cache[template];
+    // Для ES модулей нам не нужно вручную удалять кэш
+    // При изменении файла импорт сам обновится при следующем импорте
     if (onTemplateUpdate) {
       onTemplateUpdate();
     }
   }, 1000);
-
-  return async (stuff) => {
+  
+  return async stuff => {
     const data = {
       ...stuff,
       googleTagId: process.env.GOOGLE_TAG_ID,
       facebookPixelId: process.env.FACEBOOK_PIXEL_ID,
       facebookDomainVerification: process.env.FACEBOOK_DOMAIN_VERIFICATION,
-      googleMapApiKey: process.env.GOOGLE_MAPS_API_KEY
+      googleMapApiKey: process.env.GOOGLE_MAPS_API_KEY,
     };
     return Mustache.render(template, data);
   };
 };
 
-module.exports = {
+export { createHtmlRenderer, renderHtml };
+export default {
   createHtmlRenderer,
-  renderHtml
+  renderHtml,
 };

package/src/builder/ssr/ssr-transform-webpack-stats.js

@@ -1,54 +1,66 @@
-const normalizeAssets = (assets) => {
+const normalizeAssets = assets => {
   if (Array.isArray(assets)) return assets;
-  if (typeof assets === "object") return Object.values(assets);
+  if (typeof assets === 'object') return Object.values(assets);
   return [assets];
 };
 
+const extractAssets = (stats, publicPath) => {
+  const jsAssets = [];
+  const cssAssets = [];
+
+  const assets = stats.assets || [];
+
+  for (const asset of assets) {
+    if (asset.name.endsWith(".js")) {
+      jsAssets.push(`<script src="${publicPath}${asset.name}"></script>`);
+    }
+    if (asset.name.endsWith(".css")) {
+      cssAssets.push(`<link rel="stylesheet" href="${publicPath}${asset.name}">`);
+    }
+  }
+
+  return {
+    head: cssAssets.join('\n'),
+    body: jsAssets.join('\n'),
+  };
+};
+
 const transformDevStats = (stats, outputFileSystem) => {
   const {
     assetsByChunkName: { main },
     outputPath,
     publicPath,
   } = stats;
-
   const head = `
       <style>
       ${normalizeAssets(main)
-        .filter((path) => path.endsWith(".css"))
-        .map((path) =>
-          outputFileSystem.readFileSync(path.join(outputPath, path))
-        )
-        .join("\n")}
+        .filter(path => path.endsWith('.css'))
+        .map(path => outputFileSystem.readFileSync(path.join(outputPath, path)))
+        .join('\n')}
       </style>
     `;
-
   const body = normalizeAssets(main)
-    .filter((path) => path.endsWith(".js"))
-    .map((path) => `<script src="${publicPath}${path}"></script>`)
-    .join("\n");
-
+    .filter(path => path.endsWith('.js'))
+    .map(path => `<script src="${publicPath}${path}"></script>`)
+    .join('\n');
   return { head, body };
 };
-
 const transformProdStats = ({ stats, publicPath }) => {
   const {
     assetsByChunkName: { main },
   } = stats;
-
   const head = normalizeAssets(main)
-    .filter((path) => path.endsWith(".css"))
-    .map((path) => `<link rel="stylesheet" href="${publicPath}${path}">`)
-    .join("\n");
-
+    .filter(path => path.endsWith('.css'))
+    .map(path => `<link rel="stylesheet" href="${publicPath}${path}">`)
+    .join('\n');
   const body = normalizeAssets(main)
-    .filter((path) => path.endsWith(".js"))
-    .map((path) => `<script src="${publicPath}${path}"></script>`)
-    .join("\n");
-
+    .filter(path => path.endsWith('.js'))
+    .map(path => `<script src="${publicPath}${path}"></script>`)
+    .join('\n');
   return { head, body };
 };
-
-module.exports = {
+export { extractAssets, transformDevStats, transformProdStats };
+export default {
   transformDevStats,
   transformProdStats,
 };

package/src/builder/ssr/utils.js

@@ -1,8 +1,6 @@
-// @ts-check
-const crypto = require('crypto');
-const Module = require('module');
-const path = require('path');
-
+import crypto from 'crypto';
+import Module from 'module';
+import path from 'path';
 /**
  * Normalizes assets from webpack stats
  * @param {Array|string} assets - Assets to normalize
@@ -12,17 +10,14 @@ function normalizeAssets(assets) {
   if (typeof assets === 'string') {
     return [assets];
   }
-
   if (Array.isArray(assets)) {
     return assets;
   }
-
   const object = assets;
   return Object.keys(object).reduce((result, key) => {
     return result.concat(object[key]);
   }, []);
 }
-
 /**
  * Creates a hash from a string
  * @param {string} str - String to hash
@@ -31,7 +26,6 @@ function normalizeAssets(assets) {
 function hash(str) {
   return crypto.createHash('md5').update(str).digest('hex');
 }
-
 /**
  * Requires a module from a string
  * @param {string} src - Module source code
@@ -43,12 +37,11 @@ function requireFromString(src, filename = '') {
   m.filename = filename;
   m.paths = Module._nodeModulePaths(path.dirname(filename));
   m._compile(src, filename);
-  
   return m.exports;
 }
-
-module.exports = {
+export { hash, normalizeAssets, requireFromString };
+export default {
   normalizeAssets,
   requireFromString,
-  hash
-};
+  hash,
+};

package/src/builder/templates/page.js

@@ -1,4 +1,4 @@
-module.exports = `
+export default `
   <html {{{ meta.htmlAttrs }}}>
     <head {{{ meta.headAttrs }}}>
       {{{ meta.headTags }}}
@@ -64,4 +64,4 @@ module.exports = `
       {{{ meta.body }}} {{{ body }}}
     </body>
   </html>
-`;
+`;

package/src/builder/templates/screen.js

@@ -1,4 +1,4 @@
-module.exports = `
+export default `
   <!-- <!DOCTYPE html> -->
     <html lang="en">
     <head {{{ meta.headAttrs }}}>
@@ -42,4 +42,4 @@ module.exports = `
       {{{ meta.body }}} {{{ body }}}
     </body>
   </html>
-`;
+`;

package/src/builder/utils/hot-reload.js

@@ -1,4 +1,4 @@
-const webpackHotMiddlewareClient = require("webpack-hot-middleware/client?noInfo=true&reload=true");
+// import webpackHotMiddlewareClient from 'webpack-hot-middleware/client?noInfo=true&reload=true';
 
 webpackHotMiddlewareClient.subscribe(({ reload }) => {
   if (reload) {

package/src/builder/vite/index.js

@@ -1,13 +1,13 @@
-const baseConfig = require('./vite.config.base');
-const clientConfig = require('./vite.config.client');
-const serverConfig = require('./vite.config.server');
-const spaConfig = require('./vite.config.spa');
-const ssrConfig = require('./vite.config.ssr');
-
-module.exports = {
+import baseConfig from './vite.config.base.js';
+import clientConfig from './vite.config.client.js';
+import serverConfig from './vite.config.server.js';
+import spaConfig from './vite.config.spa.js';
+import ssrConfig from './vite.config.ssr.js';
+export { baseConfig, clientConfig, serverConfig, spaConfig, ssrConfig };
+export default {
   baseConfig,
   clientConfig,
   serverConfig,
   spaConfig,
   ssrConfig,
-};
+};

package/src/builder/vite/vite.config.base.js

@@ -1,8 +1,8 @@
-const path = require('path');
-const vue = require('@vitejs/plugin-vue');
-const dotenv = require('dotenv');
-const fs = require('fs');
-
+import vue from '@vitejs/plugin-vue';
+import dotenv from 'dotenv';
+import fs from 'fs';
+import path from 'path';
+import rollupPluginVisualizer from 'rollup-plugin-visualizer';
 // Функция для загрузки переменных окружения
 function loadEnv(mode) {
   const envFile = `.env.${mode}`;
@@ -13,65 +13,59 @@ function loadEnv(mode) {
     }
   }
 }
-
-module.exports = (projectRoot) => {
+export default projectRoot => {
   // Загружаем переменные окружения
   loadEnv(process.env.NODE_ENV || 'development');
-
   return {
     root: projectRoot,
-    
     resolve: {
       alias: {
         '@': path.resolve(projectRoot, 'src'),
         '@martyrs': path.resolve(projectRoot, 'martyrs'),
-        'vue': path.resolve(projectRoot, 'node_modules/vue'),
+        vue: path.resolve(projectRoot, 'node_modules/vue'),
         'vue-router': path.resolve(projectRoot, 'node_modules/vue-router'),
         'vue-i18n': path.resolve(projectRoot, 'node_modules/vue-i18n'),
-      }
+      },
     },
-    
     plugins: [
       vue({
-        // Опции для Vue 3
-        // Эквивалент experimentalInlineMatchResource
         template: {
           compilerOptions: {
             // Настройки компилятора Vue
-          }
-        }
+          },
+        },
       }),
       // Дополнительные плагины для анализа бандла по условию
-      ...(process.env.BUNDLE_ANALYZER ? [
-        {
-          name: 'bundle-analyzer',
-          configResolved(config) {
-            // Динамически импортируем rollup-plugin-visualizer только когда нужно
-            const { visualizer } = require('rollup-plugin-visualizer');
-            config.plugins.push(
-              visualizer({
-                open: true,
-                filename: 'stats.html',
-                gzipSize: true,
-                brotliSize: true,
-              })
-            );
-          }
-        }
-      ] : [])
+      ...(process.env.BUNDLE_ANALYZER
+        ? [
+            {
+              name: 'bundle-analyzer',
+              configResolved(config) {
+                // Динамически импортируем rollup-plugin-visualizer только когда нужно
+                const { visualizer } = rollupPluginVisualizer;
+                config.plugins.push(
+                  visualizer({
+                    open: true,
+                    filename: 'stats.html',
+                    gzipSize: true,
+                    brotliSize: true,
+                  })
+                );
+              },
+            },
+          ]
+        : []),
     ],
-    
     // Настройки для CSS
     css: {
       preprocessorOptions: {
         scss: {
           sourceMap: true,
-        }
+        },
       },
       // Экстракция CSS в продакшн
       // В Vite это делается автоматически в production режиме
     },
-    
     // Настройки сборки
     build: {
       outDir: 'dist',
@@ -83,10 +77,9 @@ module.exports = (projectRoot) => {
           entryFileNames: 'assets/[name].[hash].js',
           chunkFileNames: 'assets/[name].[hash].js',
           assetFileNames: 'assets/[name].[hash].[ext]',
-        }
-      }
+        },
+      },
     },
-    
     // Определение глобальных переменных для Vue
     define: {
       __VUE_I18N_LEGACY_API__: false,
@@ -96,26 +89,23 @@ module.exports = (projectRoot) => {
       __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: true,
       __VUE_I18N_FULL_INSTALL__: true,
       __INTLIFY_PROD_DEVTOOLS__: false,
-      __MOBILE_APP__: process.env.MODE === "SPA" ? true : false,
+      __MOBILE_APP__: process.env.MODE === 'SPA' ? true : false,
     },
-    
     // Настройки лога
     logLevel: 'info', // 'info' | 'warn' | 'error' | 'silent'
-    
     // Настройка для assets
     assetsInclude: ['**/*.ico', '**/*.gif', '**/*.png', '**/*.jpg', '**/*.jpeg', '**/*.mp4', '**/*.webp', '**/*.webm', '**/*.svg', '**/*.woff', '**/*.woff2', '**/*.eot', '**/*.ttf', '**/*.otf'],
-    
     // Опция для URL в CSS, аналогичная той что была в Rspack
     experimental: {
       // Vite по умолчанию обрабатывает asset URLs в CSS
-      // Если нужно отключить обработку URL для определенных файлов, 
+      // Если нужно отключить обработку URL для определенных файлов,
       // это можно сделать через свой плагин
       renderBuiltUrl(filename, { hostType }) {
         if (filename.includes('/fonts/')) {
           return { relative: true }; // Не обрабатывать URL для фонтов
         }
         return { relative: true }; // Для остальных использовать относительные пути
-      }
-    }
+      },
+    },
   };
-};
+};