@ozdao/martyrs 0.2.509 → 0.2.511

package/dist/auth.server.cjs

@@ -247,8 +247,7 @@ const controllerFactory$1 = (db) => {
         console.log(emailSent);
         res.status(500).send("Failed to send email");
       }
-    }
-    if (type === "phone") {
+    } else if (type === "phone") {
       const smsSent = await sendSms(req.body.phone, `Your ${process.env.APP_NAME} verification code: ${code}`);
       if (smsSent) {
         res.send({ code, type, method });

package/dist/auth.server.js

@@ -245,8 +245,7 @@ const controllerFactory$1 = (db) => {
         console.log(emailSent);
         res.status(500).send("Failed to send email");
       }
-    }
-    if (type === "phone") {
+    } else if (type === "phone") {
       const smsSent = await sendSms(req.body.phone, `Your ${process.env.APP_NAME} verification code: ${code}`);
       if (smsSent) {
         res.send({ code, type, method });

package/dist/builder.cjs

@@ -75,9 +75,8 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const history__namespace = /* @__PURE__ */ _interopNamespaceDefault(history);
-const express__namespace = /* @__PURE__ */ _interopNamespaceDefault(express);
 const purgecss__namespace = /* @__PURE__ */ _interopNamespaceDefault(purgecss);
-const createSpaDevServer = function createSpaDevServer2(projectRoot, { spaConfig: spaConfig2, apiConfig: apiConfig2, createServer }) {
+function createSpaDevServer$1(projectRoot, { spaConfig: spaConfig2, apiConfig: apiConfig2 }) {
   const spaCompiler = webpack(spaConfig2);
   const serverCompiler = webpack(apiConfig2);
   const createDevRenderer = () => {
@@ -98,6 +97,7 @@ const createSpaDevServer = function createSpaDevServer2(projectRoot, { spaConfig
     spaConfig2.plugins.push(progressPlugin);
   };
   let serverInstance;
+  let serverModule;
   const clientDevMiddleware = devMiddleware(spaCompiler, {
     publicPath: spaConfig2.output.publicPath,
     stats: false
@@ -107,12 +107,12 @@ const createSpaDevServer = function createSpaDevServer2(projectRoot, { spaConfig
     if (serverInstance) {
       serverInstance.close();
     }
-    Object.keys(require.cache).forEach((id) => {
-      delete require.cache[id];
-    });
-    const { createServer: createServer2 } = createServer2;
-    let { app, server, env } = await createServer2();
-    app.use(history__namespace());
+    if (!serverModule) {
+      console.error("Серверный модуль еще не скомпилирован");
+      return;
+    }
+    let { app, server, env } = await serverModule.createServer();
+    app.use(history());
     app.use(clientDevMiddleware);
     app.get("*", (req, res, next) => {
       const filename = path.join(spaCompiler.outputPath, "index.html");
@@ -141,20 +141,30 @@ const createSpaDevServer = function createSpaDevServer2(projectRoot, { spaConfig
       return;
     }
     console.log(stats.toString(apiConfig2.stats));
-    console.log("Server.js has changed, updating...");
-    await startServer();
+    try {
+      const { outputPath } = stats.toJson();
+      const entryName = Object.keys(stats.toJson().entrypoints)[0];
+      const assetName = stats.toJson().entrypoints[entryName].assets[0].name;
+      serverModule = await import(`file://${path.resolve(outputPath, assetName)}?t=${Date.now()}`);
+      if (typeof serverModule.createServer !== "function") {
+        throw new Error("Экспорт createServer не найден");
+      }
+      console.log("Сервер скомпилирован, перезапуск...");
+      await startServer();
+    } catch (error) {
+      console.error("Ошибка при загрузке серверного модуля:", error);
+    }
   });
   createDevRenderer();
   return startServer;
-};
-const createSpaProdServer = function createSpaProdServer2(projectRoot, { createServer }) {
+}
+function createSpaProdServer(projectRoot, config, createServer) {
   const port = process.env.PORT || 8080;
   const startServer = async () => {
-    const { createServer: createServer2 } = createServer2;
-    let { app, server } = await createServer2();
-    app.use(express__namespace.static(path.resolve(projectRoot, "builds/web/spa")));
+    let { app, server } = await createServer.createServer();
+    app.use(express.static(path.resolve(projectRoot, "builds/web/spa")));
     app.use(
-      history__namespace({
+      history({
         index: "/index.html"
       })
     );
@@ -184,7 +194,81 @@ const createSpaProdServer = function createSpaProdServer2(projectRoot, { createS
     }
   };
   return startServer;
-};
+}
+function createSpaDevServer(projectRoot, { spaConfig: spaConfig2, apiConfig: apiConfig2 }) {
+  const spaCompiler = core.rspack(spaConfig2);
+  const serverCompiler = core.rspack(apiConfig2);
+  const createDevRenderer = () => {
+    const progressPlugin = new core.ProgressPlugin((percentage, message, ...args) => {
+      console.log(
+        chalk.greenBright(`${(percentage * 100).toFixed(2)}% `) + chalk.blueBright(message) + " " + args.map((arg) => chalk.yellow(arg)).join(" ")
+      );
+    });
+    spaConfig2.plugins = spaConfig2.plugins || [];
+    spaConfig2.plugins.push(progressPlugin);
+  };
+  let serverInstance;
+  let serverModule;
+  const clientDevMiddleware = devMiddleware(spaCompiler, {
+    publicPath: spaConfig2.output.publicPath,
+    stats: false
+  });
+  const port = process.env.PORT || 8080;
+  const startServer = async () => {
+    if (serverInstance) {
+      serverInstance.close();
+    }
+    if (!serverModule) {
+      console.error("Серверный модуль еще не скомпилирован");
+      return;
+    }
+    let { app, server, env } = await serverModule.createServer();
+    app.use(history__namespace());
+    app.use(clientDevMiddleware);
+    app.get("*", (req, res, next) => {
+      const filename = path.join(spaCompiler.outputPath, "index.html");
+      spaCompiler.outputFileSystem.readFile(filename, (err, result) => {
+        if (err) {
+          return next(err);
+        }
+        res.set("content-type", "text/html");
+        res.send(result);
+        res.end();
+      });
+    });
+    serverInstance = server;
+    try {
+      await server.listen(port);
+      console.log(`Server started at http://localhost:${port}
+`);
+    } catch (err) {
+      console.error(err);
+      process.exit(1);
+    }
+  };
+  serverCompiler.watch({}, async (err, stats) => {
+    if (err) {
+      console.error(err);
+      return;
+    }
+    console.log(stats.toString(apiConfig2.stats));
+    try {
+      const { outputPath } = stats.toJson();
+      const entryName = Object.keys(stats.toJson().entrypoints)[0];
+      const assetName = stats.toJson().entrypoints[entryName].assets[0].name;
+      serverModule = await import(`file://${path.resolve(outputPath, assetName)}?t=${Date.now()}`);
+      if (typeof serverModule.createServer !== "function") {
+        throw new Error("Экспорт createServer не найден");
+      }
+      console.log("Сервер скомпилирован, перезапуск...");
+      await startServer();
+    } catch (error) {
+      console.error("Ошибка при загрузке серверного модуля:", error);
+    }
+  });
+  createDevRenderer();
+  return startServer;
+}
 const page = `
   <html {{{ meta.htmlAttrs }}}>
     <head {{{ meta.headAttrs }}}>
@@ -2124,11 +2208,13 @@ const builder = {
   createSsrDevServer: createSsrDevServer$1,
   createSsrViteDevServer,
   createSsrProdServer,
-  createSpaDevServer,
+  createSpaDevServer: createSpaDevServer$1,
+  createSpaRspackDevServer: createSpaDevServer,
   createSpaProdServer
 };
-exports.createSpaDevServer = createSpaDevServer;
+exports.createSpaDevServer = createSpaDevServer$1;
 exports.createSpaProdServer = createSpaProdServer;
+exports.createSpaRspackDevServer = createSpaDevServer;
 exports.createSsrDevServer = createSsrDevServer$1;
 exports.createSsrProdServer = createSsrProdServer;
 exports.createSsrRspackDevServer = createSsrDevServer;

package/dist/builder.js

@@ -1,9 +1,9 @@
 import * as history from "connect-history-api-fallback";
+import history__default from "connect-history-api-fallback";
 import path from "path";
 import webpack from "webpack";
 import devMiddleware from "webpack-dev-middleware";
-import * as express from "express";
-import express__default from "express";
+import express from "express";
 import fs, { readFileSync } from "fs";
 import chalk from "chalk";
 import core, { rspack as rspack$2, ProgressPlugin } from "@rspack/core";
@@ -35,7 +35,7 @@ import * as purgecss from "purgecss";
 import "workbox-webpack-plugin";
 import { builtinModules } from "module";
 import { createHtmlPlugin } from "vite-plugin-html";
-const createSpaDevServer = function createSpaDevServer2(projectRoot, { spaConfig: spaConfig2, apiConfig: apiConfig2, createServer: createServer2 }) {
+function createSpaDevServer$1(projectRoot, { spaConfig: spaConfig2, apiConfig: apiConfig2 }) {
   const spaCompiler = webpack(spaConfig2);
   const serverCompiler = webpack(apiConfig2);
   const createDevRenderer = () => {
@@ -56,6 +56,7 @@ const createSpaDevServer = function createSpaDevServer2(projectRoot, { spaConfig
     spaConfig2.plugins.push(progressPlugin);
   };
   let serverInstance;
+  let serverModule;
   const clientDevMiddleware = devMiddleware(spaCompiler, {
     publicPath: spaConfig2.output.publicPath,
     stats: false
@@ -65,12 +66,12 @@ const createSpaDevServer = function createSpaDevServer2(projectRoot, { spaConfig
     if (serverInstance) {
       serverInstance.close();
     }
-    Object.keys(require.cache).forEach((id) => {
-      delete require.cache[id];
-    });
-    const { createServer: createServer3 } = createServer3;
-    let { app, server, env } = await createServer3();
-    app.use(history());
+    if (!serverModule) {
+      console.error("Серверный модуль еще не скомпилирован");
+      return;
+    }
+    let { app, server, env } = await serverModule.createServer();
+    app.use(history__default());
     app.use(clientDevMiddleware);
     app.get("*", (req, res, next) => {
       const filename = path.join(spaCompiler.outputPath, "index.html");
@@ -99,20 +100,30 @@ const createSpaDevServer = function createSpaDevServer2(projectRoot, { spaConfig
       return;
     }
     console.log(stats.toString(apiConfig2.stats));
-    console.log("Server.js has changed, updating...");
-    await startServer();
+    try {
+      const { outputPath } = stats.toJson();
+      const entryName = Object.keys(stats.toJson().entrypoints)[0];
+      const assetName = stats.toJson().entrypoints[entryName].assets[0].name;
+      serverModule = await import(`file://${path.resolve(outputPath, assetName)}?t=${Date.now()}`);
+      if (typeof serverModule.createServer !== "function") {
+        throw new Error("Экспорт createServer не найден");
+      }
+      console.log("Сервер скомпилирован, перезапуск...");
+      await startServer();
+    } catch (error) {
+      console.error("Ошибка при загрузке серверного модуля:", error);
+    }
   });
   createDevRenderer();
   return startServer;
-};
-const createSpaProdServer = function createSpaProdServer2(projectRoot, { createServer: createServer2 }) {
+}
+function createSpaProdServer(projectRoot, config, createServer2) {
   const port = process.env.PORT || 8080;
   const startServer = async () => {
-    const { createServer: createServer3 } = createServer3;
-    let { app, server } = await createServer3();
+    let { app, server } = await createServer2.createServer();
     app.use(express.static(path.resolve(projectRoot, "builds/web/spa")));
     app.use(
-      history({
+      history__default({
         index: "/index.html"
       })
     );
@@ -142,7 +153,81 @@ const createSpaProdServer = function createSpaProdServer2(projectRoot, { createS
     }
   };
   return startServer;
-};
+}
+function createSpaDevServer(projectRoot, { spaConfig: spaConfig2, apiConfig: apiConfig2 }) {
+  const spaCompiler = rspack$2(spaConfig2);
+  const serverCompiler = rspack$2(apiConfig2);
+  const createDevRenderer = () => {
+    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(" ")
+      );
+    });
+    spaConfig2.plugins = spaConfig2.plugins || [];
+    spaConfig2.plugins.push(progressPlugin);
+  };
+  let serverInstance;
+  let serverModule;
+  const clientDevMiddleware = devMiddleware(spaCompiler, {
+    publicPath: spaConfig2.output.publicPath,
+    stats: false
+  });
+  const port = process.env.PORT || 8080;
+  const startServer = async () => {
+    if (serverInstance) {
+      serverInstance.close();
+    }
+    if (!serverModule) {
+      console.error("Серверный модуль еще не скомпилирован");
+      return;
+    }
+    let { app, server, env } = await serverModule.createServer();
+    app.use(history());
+    app.use(clientDevMiddleware);
+    app.get("*", (req, res, next) => {
+      const filename = path.join(spaCompiler.outputPath, "index.html");
+      spaCompiler.outputFileSystem.readFile(filename, (err, result) => {
+        if (err) {
+          return next(err);
+        }
+        res.set("content-type", "text/html");
+        res.send(result);
+        res.end();
+      });
+    });
+    serverInstance = server;
+    try {
+      await server.listen(port);
+      console.log(`Server started at http://localhost:${port}
+`);
+    } catch (err) {
+      console.error(err);
+      process.exit(1);
+    }
+  };
+  serverCompiler.watch({}, async (err, stats) => {
+    if (err) {
+      console.error(err);
+      return;
+    }
+    console.log(stats.toString(apiConfig2.stats));
+    try {
+      const { outputPath } = stats.toJson();
+      const entryName = Object.keys(stats.toJson().entrypoints)[0];
+      const assetName = stats.toJson().entrypoints[entryName].assets[0].name;
+      serverModule = await import(`file://${path.resolve(outputPath, assetName)}?t=${Date.now()}`);
+      if (typeof serverModule.createServer !== "function") {
+        throw new Error("Экспорт createServer не найден");
+      }
+      console.log("Сервер скомпилирован, перезапуск...");
+      await startServer();
+    } catch (error) {
+      console.error("Ошибка при загрузке серверного модуля:", error);
+    }
+  });
+  createDevRenderer();
+  return startServer;
+}
 const page = `
   <html {{{ meta.htmlAttrs }}}>
     <head {{{ meta.headAttrs }}}>
@@ -393,7 +478,7 @@ function createSsrProdServer(projectRoot, { clientConfig: clientConfig2, apiConf
     const { app, server, env } = await createServer2();
     app.use(
       clientConfig2.output.publicPath,
-      express__default.static(path.resolve(projectRoot, "builds/web/client"), {
+      express.static(path.resolve(projectRoot, "builds/web/client"), {
         maxAge: "1d"
         // Кэширование на 1 день
       })
@@ -2082,12 +2167,14 @@ const builder = {
   createSsrDevServer: createSsrDevServer$1,
   createSsrViteDevServer,
   createSsrProdServer,
-  createSpaDevServer,
+  createSpaDevServer: createSpaDevServer$1,
+  createSpaRspackDevServer: createSpaDevServer,
   createSpaProdServer
 };
 export {
-  createSpaDevServer,
+  createSpaDevServer$1 as createSpaDevServer,
   createSpaProdServer,
+  createSpaDevServer as createSpaRspackDevServer,
   createSsrDevServer$1 as createSsrDevServer,
   createSsrProdServer,
   createSsrDevServer as createSsrRspackDevServer,