npm - @ozdao/martyrs - Versions diffs - 0.2.492 → 0.2.494 - Mend

@ozdao/martyrs 0.2.492 → 0.2.494

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (341) hide show

package/dist/_virtual/index.cjs CHANGED Viewed

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const _commonjsHelpers = require("./_commonjsHelpers.cjs");
-const index = require("../node_modules/lodash.merge/index.cjs");
-var lodash_mergeExports = index.__require();
-const merge = /* @__PURE__ */ _commonjsHelpers.getDefaultExportFromCjs(lodash_mergeExports);
-exports.default = merge;
+const index = require("../node_modules/fast-deep-equal/index.cjs");
+var fastDeepEqualExports = index.__require();
+const equal = /* @__PURE__ */ _commonjsHelpers.getDefaultExportFromCjs(fastDeepEqualExports);
+exports.default = equal;
 //# sourceMappingURL=index.cjs.map

package/dist/_virtual/index.js CHANGED Viewed

@@ -1,8 +1,8 @@
 import { getDefaultExportFromCjs } from "./_commonjsHelpers.js";
-import { __require as requireLodash_merge } from "../node_modules/lodash.merge/index.js";
-var lodash_mergeExports = requireLodash_merge();
-const merge = /* @__PURE__ */ getDefaultExportFromCjs(lodash_mergeExports);
+import { __require as requireFastDeepEqual } from "../node_modules/fast-deep-equal/index.js";
+var fastDeepEqualExports = requireFastDeepEqual();
+const equal = /* @__PURE__ */ getDefaultExportFromCjs(fastDeepEqualExports);
 export {
-  merge as default
+  equal as default
 };
 //# sourceMappingURL=index.js.map

package/dist/_virtual/index2.cjs CHANGED Viewed

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const _commonjsHelpers = require("./_commonjsHelpers.cjs");
-const index = require("../node_modules/fast-deep-equal/index.cjs");
-var fastDeepEqualExports = index.__require();
-const equal = /* @__PURE__ */ _commonjsHelpers.getDefaultExportFromCjs(fastDeepEqualExports);
-exports.default = equal;
+const index = require("../node_modules/lodash.merge/index.cjs");
+var lodash_mergeExports = index.__require();
+const merge = /* @__PURE__ */ _commonjsHelpers.getDefaultExportFromCjs(lodash_mergeExports);
+exports.default = merge;
 //# sourceMappingURL=index2.cjs.map

package/dist/_virtual/index2.js CHANGED Viewed

@@ -1,8 +1,8 @@
 import { getDefaultExportFromCjs } from "./_commonjsHelpers.js";
-import { __require as requireFastDeepEqual } from "../node_modules/fast-deep-equal/index.js";
-var fastDeepEqualExports = requireFastDeepEqual();
-const equal = /* @__PURE__ */ getDefaultExportFromCjs(fastDeepEqualExports);
+import { __require as requireLodash_merge } from "../node_modules/lodash.merge/index.js";
+var lodash_mergeExports = requireLodash_merge();
+const merge = /* @__PURE__ */ getDefaultExportFromCjs(lodash_mergeExports);
 export {
-  equal as default
+  merge as default
 };
 //# sourceMappingURL=index2.js.map

package/dist/builder.cjs CHANGED Viewed

@@ -41,10 +41,10 @@ const Dotenv = require("dotenv-webpack");
 const glob = require("glob-all");
 const webpackMerge = require("webpack-merge");
 const webpackStatsPlugin = require("webpack-stats-plugin");
+const workboxRspackPlugin = require("@aaroon/workbox-rspack-plugin");
 const purgecssWebpackPlugin = require("purgecss-webpack-plugin");
 const rspackManifestPlugin = require("rspack-manifest-plugin");
 const nodeExternals = require("webpack-node-externals");
-const workboxRspackPlugin = require("@aaroon/workbox-rspack-plugin");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 const TerserPlugin = require("terser-webpack-plugin");
@@ -435,9 +435,12 @@ function createSsrDevServer$1(projectRoot, { clientConfig: clientConfig2, apiCon
   };
   return startServer;
 }
-const createSsrProdServer = function createSsrProdServer2(projectRoot, { clientConfig: clientConfig2, apiConfig: apiConfig2, createServer }) {
+function createSsrProdServer(projectRoot, { clientConfig: clientConfig2, apiConfig: apiConfig2 }, createServerPath) {
+  const clientStats = JSON.parse(fs.readFileSync(path.join(projectRoot, "builds/web/client/stats.json"), "utf-8"));
+  const serverManifest = JSON.parse(fs.readFileSync(path.join(projectRoot, "builds/web/server/manifest.json"), "utf-8"));
+  const { createServer } = createServerPath;
   const startServer = async () => {
-    const { app, server, env } = await createServer.createServer();
+    const { app, server, env } = await createServer();
     app.use(
       clientConfig2.output.publicPath,
       express.static(path.resolve(projectRoot, "builds/web/client"), {
@@ -445,6 +448,10 @@ const createSsrProdServer = function createSsrProdServer2(projectRoot, { clientC
         // Кэширование на 1 день
       })
     );
+    const { render } = await import(path.join(
+      apiConfig2.output.path,
+      serverManifest["main.js"]
+    ));
     const { head, body } = transformProdStats({
       stats: clientStats,
       publicPath: clientConfig2.output.publicPath
@@ -481,7 +488,7 @@ const createSsrProdServer = function createSsrProdServer2(projectRoot, { clientC
     }
   };
   return start;
-};
+}
 function createSsrDevServer(projectRoot, { clientConfig: clientConfig2, apiConfig: apiConfig2, ssrConfig: ssrConfig2 }) {
   const clientCompiler = core.rspack(clientConfig2);
   const ssrCompiler = core.rspack(ssrConfig2);
@@ -1003,50 +1010,50 @@ const clientConfig = (projectRoot) => {
             extensions: ["vue", "js", "css", "scss"]
           }
         ]
-      })
+      }),
       // PWA PWA PWA PWA PWA
       // PWA: инжектим манифест в существующий sw.js
-      // new InjectManifest({
-      //   swSrc: path.resolve(projectRoot, '../public/sw.js'),
-      //   swDest: 'sw.js',
-      //   exclude: [/\.html$/, /\.map$/],
-      //   manifestTransforms: [
-      //     (manifestEntries) => {
-      //       const manifest = manifestEntries.filter(entry => {
-      //         return !entry.url.match(/\.(html|map)$/) && entry.size < 5 * 1024 * 1024;
-      //       });
-      //       return { manifest };
-      //     }
-      //   ]
-      // }),
+      new workboxRspackPlugin.InjectManifest({
+        swSrc: path.resolve(projectRoot, "../public/sw.js"),
+        swDest: "sw.js",
+        exclude: [/\.html$/, /\.map$/],
+        manifestTransforms: [
+          (manifestEntries) => {
+            const manifest = manifestEntries.filter((entry) => {
+              return !entry.url.match(/\.(html|map)$/) && entry.size < 5 * 1024 * 1024;
+            });
+            return { manifest };
+          }
+        ]
+      }),
       // // PWA Manifest
-      // new RspackManifestPlugin({
-      //   fileName: 'manifest.json',
-      //   seed: {
-      //     name: process.env.APP_NAME || 'OZDAO App',
-      //     short_name: process.env.APP_SHORT_NAME || 'OZDAO',
-      //     description: process.env.APP_DESCRIPTION || 'OZDAO Progressive Web App',
-      //     theme_color: '#000000',
-      //     background_color: '#ffffff',
-      //     display: 'standalone',
-      //     orientation: 'portrait',
-      //     scope: '/',
-      //     start_url: '/',
-      //     icons: [
-      //       {
-      //         src: '/favicon/android-chrome-192x192.png',
-      //         sizes: '192x192',
-      //         type: 'image/png'
-      //       },
-      //       {
-      //         src: '/favicon/android-chrome-512x512.png',
-      //         sizes: '512x512',
-      //         type: 'image/png'
-      //       }
-      //     ]
-      //   },
-      //   generate: (seed) => seed
-      // }),
+      new rspackManifestPlugin.RspackManifestPlugin({
+        fileName: "manifest.json",
+        seed: {
+          name: process.env.APP_NAME || "OZDAO App",
+          short_name: process.env.APP_SHORT_NAME || "OZDAO",
+          description: process.env.APP_DESCRIPTION || "OZDAO Progressive Web App",
+          theme_color: "#000000",
+          background_color: "#ffffff",
+          display: "standalone",
+          orientation: "portrait",
+          scope: "/",
+          start_url: "/",
+          icons: [
+            {
+              src: "/favicon/android-chrome-192x192.png",
+              sizes: "192x192",
+              type: "image/png"
+            },
+            {
+              src: "/favicon/android-chrome-512x512.png",
+              sizes: "512x512",
+              type: "image/png"
+            }
+          ]
+        },
+        generate: (seed) => seed
+      })
     ],
     optimization: {
       usedExports: true,
@@ -1166,7 +1173,7 @@ const spaConfig = (projectRoot) => {
         },
         filename: "index.html",
         inject: "body"
-      }),
+      })
       // new rspack.CopyRspackPlugin({
       //   patterns: [
       //     { from: path.resolve(projectRoot, "../public/logo"), to: 'logo' },
@@ -1174,50 +1181,6 @@ const spaConfig = (projectRoot) => {
       //     { from: path.resolve(projectRoot, "../public/icons"), to: 'icons' }
       //   ]
       // })
-      // PWA: инжектим манифест в существующий sw.js (унифицированно с SSR)
-      new workboxRspackPlugin.InjectManifest({
-        swSrc: path.resolve(projectRoot, "../public/sw.js"),
-        swDest: "sw.js",
-        exclude: [/\.html$/, /\.map$/],
-        manifestTransforms: [
-          (manifestEntries) => {
-            const manifest = manifestEntries.filter((entry) => {
-              return !entry.url.match(/\.(html|map)$/) && entry.size < 5 * 1024 * 1024;
-            });
-            return { manifest };
-          }
-        ]
-      }),
-      // PWA Manifest
-      new rspackManifestPlugin.RspackManifestPlugin({
-        fileName: "manifest.json",
-        seed: {
-          name: process.env.APP_NAME || "OZDAO App",
-          short_name: process.env.APP_SHORT_NAME || "OZDAO",
-          description: process.env.APP_DESCRIPTION || "OZDAO Progressive Web App",
-          theme_color: "#000000",
-          background_color: "#ffffff",
-          display: "standalone",
-          orientation: "portrait",
-          scope: "/",
-          start_url: "/",
-          icons: [
-            {
-              src: "/favicon/android-chrome-192x192.png",
-              sizes: "192x192",
-              type: "image/png"
-            },
-            {
-              src: "/favicon/android-chrome-512x512.png",
-              sizes: "512x512",
-              type: "image/png"
-            }
-          ]
-        },
-        generate: (seed, files, entrypoints) => {
-          return seed;
-        }
-      })
     ],
     optimization: {
       minimizer: [new rspack$1.SwcJsMinimizerRspackPlugin(), , new rspack$1.LightningCssMinimizerRspackPlugin()]

package/dist/builder.js CHANGED Viewed

@@ -4,7 +4,7 @@ import webpack from "webpack";
 import devMiddleware from "webpack-dev-middleware";
 import * as express from "express";
 import express__default from "express";
-import fs from "fs";
+import fs, { readFileSync } from "fs";
 import chalk from "chalk";
 import core, { rspack as rspack$2, ProgressPlugin } from "@rspack/core";
 import Mustache from "mustache";
@@ -18,10 +18,10 @@ import Dotenv from "dotenv-webpack";
 import glob from "glob-all";
 import { merge as merge$3 } from "webpack-merge";
 import { StatsWriterPlugin } from "webpack-stats-plugin";
+import { InjectManifest } from "@aaroon/workbox-rspack-plugin";
 import { PurgeCSSPlugin } from "purgecss-webpack-plugin";
 import { RspackManifestPlugin } from "rspack-manifest-plugin";
 import nodeExternals from "webpack-node-externals";
-import { InjectManifest } from "@aaroon/workbox-rspack-plugin";
 import MiniCssExtractPlugin from "mini-css-extract-plugin";
 import CssMinimizerPlugin from "css-minimizer-webpack-plugin";
 import TerserPlugin from "terser-webpack-plugin";
@@ -393,9 +393,12 @@ function createSsrDevServer$1(projectRoot, { clientConfig: clientConfig2, apiCon
   };
   return startServer;
 }
-const createSsrProdServer = function createSsrProdServer2(projectRoot, { clientConfig: clientConfig2, apiConfig: apiConfig2, createServer: createServer2 }) {
+function createSsrProdServer(projectRoot, { clientConfig: clientConfig2, apiConfig: apiConfig2 }, createServerPath) {
+  const clientStats = JSON.parse(readFileSync(path.join(projectRoot, "builds/web/client/stats.json"), "utf-8"));
+  const serverManifest = JSON.parse(readFileSync(path.join(projectRoot, "builds/web/server/manifest.json"), "utf-8"));
+  const { createServer: createServer2 } = createServerPath;
   const startServer = async () => {
-    const { app, server, env } = await createServer2.createServer();
+    const { app, server, env } = await createServer2();
     app.use(
       clientConfig2.output.publicPath,
       express__default.static(path.resolve(projectRoot, "builds/web/client"), {
@@ -403,6 +406,10 @@ const createSsrProdServer = function createSsrProdServer2(projectRoot, { clientC
         // Кэширование на 1 день
       })
     );
+    const { render } = await import(path.join(
+      apiConfig2.output.path,
+      serverManifest["main.js"]
+    ));
     const { head, body } = transformProdStats({
       stats: clientStats,
       publicPath: clientConfig2.output.publicPath
@@ -439,7 +446,7 @@ const createSsrProdServer = function createSsrProdServer2(projectRoot, { clientC
     }
   };
   return start;
-};
+}
 function createSsrDevServer(projectRoot, { clientConfig: clientConfig2, apiConfig: apiConfig2, ssrConfig: ssrConfig2 }) {
   const clientCompiler = rspack$2(clientConfig2);
   const ssrCompiler = rspack$2(ssrConfig2);
@@ -961,50 +968,50 @@ const clientConfig = (projectRoot) => {
             extensions: ["vue", "js", "css", "scss"]
           }
         ]
-      })
+      }),
       // PWA PWA PWA PWA PWA
       // PWA: инжектим манифест в существующий sw.js
-      // new InjectManifest({
-      //   swSrc: path.resolve(projectRoot, '../public/sw.js'),
-      //   swDest: 'sw.js',
-      //   exclude: [/\.html$/, /\.map$/],
-      //   manifestTransforms: [
-      //     (manifestEntries) => {
-      //       const manifest = manifestEntries.filter(entry => {
-      //         return !entry.url.match(/\.(html|map)$/) && entry.size < 5 * 1024 * 1024;
-      //       });
-      //       return { manifest };
-      //     }
-      //   ]
-      // }),
+      new InjectManifest({
+        swSrc: path.resolve(projectRoot, "../public/sw.js"),
+        swDest: "sw.js",
+        exclude: [/\.html$/, /\.map$/],
+        manifestTransforms: [
+          (manifestEntries) => {
+            const manifest = manifestEntries.filter((entry) => {
+              return !entry.url.match(/\.(html|map)$/) && entry.size < 5 * 1024 * 1024;
+            });
+            return { manifest };
+          }
+        ]
+      }),
       // // PWA Manifest
-      // new RspackManifestPlugin({
-      //   fileName: 'manifest.json',
-      //   seed: {
-      //     name: process.env.APP_NAME || 'OZDAO App',
-      //     short_name: process.env.APP_SHORT_NAME || 'OZDAO',
-      //     description: process.env.APP_DESCRIPTION || 'OZDAO Progressive Web App',
-      //     theme_color: '#000000',
-      //     background_color: '#ffffff',
-      //     display: 'standalone',
-      //     orientation: 'portrait',
-      //     scope: '/',
-      //     start_url: '/',
-      //     icons: [
-      //       {
-      //         src: '/favicon/android-chrome-192x192.png',
-      //         sizes: '192x192',
-      //         type: 'image/png'
-      //       },
-      //       {
-      //         src: '/favicon/android-chrome-512x512.png',
-      //         sizes: '512x512',
-      //         type: 'image/png'
-      //       }
-      //     ]
-      //   },
-      //   generate: (seed) => seed
-      // }),
+      new RspackManifestPlugin({
+        fileName: "manifest.json",
+        seed: {
+          name: process.env.APP_NAME || "OZDAO App",
+          short_name: process.env.APP_SHORT_NAME || "OZDAO",
+          description: process.env.APP_DESCRIPTION || "OZDAO Progressive Web App",
+          theme_color: "#000000",
+          background_color: "#ffffff",
+          display: "standalone",
+          orientation: "portrait",
+          scope: "/",
+          start_url: "/",
+          icons: [
+            {
+              src: "/favicon/android-chrome-192x192.png",
+              sizes: "192x192",
+              type: "image/png"
+            },
+            {
+              src: "/favicon/android-chrome-512x512.png",
+              sizes: "512x512",
+              type: "image/png"
+            }
+          ]
+        },
+        generate: (seed) => seed
+      })
     ],
     optimization: {
       usedExports: true,
@@ -1124,7 +1131,7 @@ const spaConfig = (projectRoot) => {
         },
         filename: "index.html",
         inject: "body"
-      }),
+      })
       // new rspack.CopyRspackPlugin({
       //   patterns: [
       //     { from: path.resolve(projectRoot, "../public/logo"), to: 'logo' },
@@ -1132,50 +1139,6 @@ const spaConfig = (projectRoot) => {
       //     { from: path.resolve(projectRoot, "../public/icons"), to: 'icons' }
       //   ]
       // })
-      // PWA: инжектим манифест в существующий sw.js (унифицированно с SSR)
-      new InjectManifest({
-        swSrc: path.resolve(projectRoot, "../public/sw.js"),
-        swDest: "sw.js",
-        exclude: [/\.html$/, /\.map$/],
-        manifestTransforms: [
-          (manifestEntries) => {
-            const manifest = manifestEntries.filter((entry) => {
-              return !entry.url.match(/\.(html|map)$/) && entry.size < 5 * 1024 * 1024;
-            });
-            return { manifest };
-          }
-        ]
-      }),
-      // PWA Manifest
-      new RspackManifestPlugin({
-        fileName: "manifest.json",
-        seed: {
-          name: process.env.APP_NAME || "OZDAO App",
-          short_name: process.env.APP_SHORT_NAME || "OZDAO",
-          description: process.env.APP_DESCRIPTION || "OZDAO Progressive Web App",
-          theme_color: "#000000",
-          background_color: "#ffffff",
-          display: "standalone",
-          orientation: "portrait",
-          scope: "/",
-          start_url: "/",
-          icons: [
-            {
-              src: "/favicon/android-chrome-192x192.png",
-              sizes: "192x192",
-              type: "image/png"
-            },
-            {
-              src: "/favicon/android-chrome-512x512.png",
-              sizes: "512x512",
-              type: "image/png"
-            }
-          ]
-        },
-        generate: (seed, files, entrypoints) => {
-          return seed;
-        }
-      })
     ],
     optimization: {
       minimizer: [new rspack$1.SwcJsMinimizerRspackPlugin(), , new rspack$1.LightningCssMinimizerRspackPlugin()]

package/dist/{crud-B-kQw3Z5.cjs → crud-JN_LFj01.cjs} RENAMED Viewed

@@ -662,6 +662,9 @@ class CRUDPolicies {
         }
       );
     }
+    if (options.enabled === false) {
+      return null;
+    }
     return this.abac.middleware(this.crud.modelName, action, options);
   }
   // Получение middleware для проверки доступа к полям

package/dist/{crud-Cwx5VlSm.js → crud-sE7GLPbj.js} RENAMED Viewed

@@ -661,6 +661,9 @@ class CRUDPolicies {
         }
       );
     }
+    if (options.enabled === false) {
+      return null;
+    }
     return this.abac.middleware(this.crud.modelName, action, options);
   }
   // Получение middleware для проверки доступа к полям