@ozdao/martyrs 0.2.564 → 0.2.565

package/dist/martyrs.es.js

@@ -1,4 +1,4 @@
-import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, p as h, L as b, q as k, M as x, r as B, I, s as T, t as U, u as f, v as w, S as D, w as E, x as L, y as P, z as q, A as y, B as A, D as G, E as j, U as v, G as z, H, m as R } from "./main-CmjWiDVF.js";
+import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, p as h, L as b, q as k, M as x, r as B, I, s as T, t as U, u as f, v as w, S as D, w as E, x as L, y as P, z as q, A as y, B as A, D as G, E as j, U as v, G as z, H, m as R } from "./main-B9o1iBAZ.js";
 export {
   e as Address,
   o as Breadcrumbs,

package/dist/music.server.js

@@ -1,12 +1,10 @@
-import { c as coreabac } from "./core.abac-DUPBnlk6.js";
+import { c as coreabac, L as LoggerNamespaced } from "./abac-BPl9Bmf9.js";
 import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
-import { L as LoggerNamespaced } from "./core.logger-C3q8A9dl.js";
-import { C as CRUD } from "./crud-C7FSTUes.js";
-import { A as ABAC } from "./abac-DYoheWuc.js";
+import { C as CRUD } from "./crud-q1ye5IhV.js";
 import { V as Verifier, a as Validator } from "./core.verifier-gPPX_jhf.js";
 import fs$1 from "fs";
 import path$1 from "path";
-import { a as applyCommonSchema } from "./common.schema-GFSlNJo7.js";
+import { a as applyCommonSchema } from "./common.schema-DswiUXKB.js";
 import { a as applyEngagementSchema } from "./engagement.schema-fh6W1fb_.js";
 import { a as applyMetadataSchema, c as createFriendlyURL } from "./metadata.schema-CIRR_WQ-.js";
 import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
@@ -187,7 +185,7 @@ function tracksVerifierFactory(db) {
     deleteVerifier
   };
 }
-const { getInstance: getInstance$4 } = ABAC;
+const { getInstance: getInstance$4 } = coreabac;
 function setupTracksRoutes(app, db) {
   const abac = getInstance$4(db);
   const verifier = tracksVerifierFactory();
@@ -449,7 +447,7 @@ function artistsVerifierFactory(db) {
     deleteVerifier
   };
 }
-const { getInstance: getInstance$3 } = ABAC;
+const { getInstance: getInstance$3 } = coreabac;
 function setupArtistsRoutes(app, db) {
   const abac = getInstance$3(db);
   const verifier = artistsVerifierFactory();
@@ -732,7 +730,7 @@ function albumsVerifierFactory(db) {
     deleteVerifier
   };
 }
-const { getInstance: getInstance$2 } = ABAC;
+const { getInstance: getInstance$2 } = coreabac;
 function setupAlbumsRoutes(app, db) {
   const abac = getInstance$2(db);
   const verifier = albumsVerifierFactory();
@@ -989,7 +987,7 @@ function playlistsVerifierFactory(db) {
     deleteVerifier
   };
 }
-const { getInstance: getInstance$1 } = ABAC;
+const { getInstance: getInstance$1 } = coreabac;
 function setupPlaylistsRoutes(app, db) {
   const abac = getInstance$1(db);
   const verifier = playlistsVerifierFactory();
@@ -1289,7 +1287,7 @@ function genresVerifierFactory(db) {
     deleteVerifier
   };
 }
-const { getInstance } = ABAC;
+const { getInstance } = coreabac;
 function setupGenresRoutes(app, db) {
   const abac = getInstance(db);
   const verifier = genresVerifierFactory();
@@ -1869,8 +1867,9 @@ const musicPolicies = (function initializeMusicPolicies(abacAccessControl) {
       return true;
     }
     if (action === "create") {
-      if (context.data.creator && context.data.creator.target) {
-        return context.data.creator.target.toString() === user.toString();
+      const creator = context.data.body?.creator;
+      if (creator?.target) {
+        return creator.target.toString() === user.toString();
       }
       return false;
     }

package/dist/notifications.server.js

@@ -1,4 +1,3 @@
-import { c as coreabac } from "./core.abac-DUPBnlk6.js";
 import { Types } from "mongoose";
 import apn from "apn";
 import { m as mailing } from "./mailing-DuEFRsa3.js";
@@ -761,13 +760,11 @@ const NotificationService = (function(db, wss) {
     sendToAnonymousDevices
   };
 });
-const { getInstance } = coreabac;
 function initializeNotifications(app, db, wss, origins, publicPath) {
   db.notification = NotificationModel(db);
   db.userDevice = UserDeviceModel(db);
   db.notificationPreference = NotificationPreferenceModel(db);
   db.notificationLog = NotificationLogModel(db);
-  getInstance(db);
   if (wss) {
     const notificationService = NotificationService(db, wss);
     if (app) {

package/dist/orders.server.js

@@ -1,11 +1,10 @@
-import "node-cache";
-import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
 import "./mailing-DuEFRsa3.js";
+import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
 import { m as modelsFactory, a as applyProfileSchema } from "./profile.schema-CjLOfG7b.js";
 import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { a as applyCredentialsSchema } from "./credentials.schema--2vvcu8c.js";
-import { C as CRUD } from "./crud-C7FSTUes.js";
-import { A as ABAC } from "./abac-DYoheWuc.js";
+import { C as CRUD } from "./crud-q1ye5IhV.js";
+import { c as coreabac } from "./abac-BPl9Bmf9.js";
 import axios from "axios";
 import { V as Verifier, a as Validator } from "./core.verifier-gPPX_jhf.js";
 import { m as middlewareIndexFactory } from "./index-_Edcmck_.js";
@@ -882,7 +881,7 @@ const verifierFactory$1 = (function(db) {
     deleteVerifier
   };
 });
-const { getInstance: getInstance$1 } = ABAC;
+const { getInstance: getInstance$1 } = coreabac;
 function setupApplicationsRoutes(app, db) {
   const abac = getInstance$1(db);
   const verifier = verifierFactory$1();
@@ -1217,7 +1216,7 @@ const verifierFactory = (function(db) {
     deleteVerifier
   };
 });
-const { getInstance } = ABAC;
+const { getInstance } = coreabac;
 function setupCustomersRoutes(app, db) {
   const abac = getInstance(db);
   const verifier = verifierFactory();

package/dist/organizations.server.js

@@ -1,13 +1,12 @@
-import { A as ABAC } from "./abac-DYoheWuc.js";
+import { c as coreabac } from "./abac-BPl9Bmf9.js";
 import { a as applyCredentialsSchema } from "./credentials.schema--2vvcu8c.js";
 import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { a as applyEngagementSchema } from "./engagement.schema-fh6W1fb_.js";
 import { m as middlewareIndexFactory } from "./index-_Edcmck_.js";
 import { m as mailing } from "./mailing-DuEFRsa3.js";
 import { uuid } from "uuidv4";
-import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
+import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
 import { Types } from "mongoose";
-import { c as coreabac } from "./core.abac-DUPBnlk6.js";
 import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
 import { a as addUserStatusFields, b as addMembersQuantity } from "./addUserStatusFields-Cc-JpmPo.js";
 import jwt from "jsonwebtoken";
@@ -1068,11 +1067,9 @@ const controllerFactory = (db) => {
     checkAccesses
   };
 };
-const { getInstance: getInstance$1 } = coreabac;
 const organizationsRoutes = (function(app, db) {
   const controller = controllerFactory(db);
   const { authJwt } = middlewareIndexFactory(db);
-  getInstance$1(db);
   app.get(
     "/api/organizations",
     [
@@ -1170,11 +1167,13 @@ const initOrganizationPolicies = (function initializeOrganizationPolicies(abacAc
       if (currentResource?.owner?.type === "organization") {
         return String(currentResource.owner.target);
       }
-      if (data?.owner?.type === "organization") {
-        return String(data.owner.target);
+      const ownerData = data?.body?.owner || data?.params?.owner;
+      if (ownerData?.type === "organization") {
+        return String(ownerData.target);
       }
-      if (data?.organization) {
-        return String(data.organization);
+      const orgId = data?.body?.organization || data?.params?.organization;
+      if (orgId) {
+        return String(orgId);
       }
       if (currentResource?.organization) {
         return String(currentResource.organization);
@@ -1320,7 +1319,7 @@ const initOrganizationPolicies = (function initializeOrganizationPolicies(abacAc
   abacAccessControl.organizationHelpers = organizationHelpers;
   return abacAccessControl;
 });
-const { getInstance } = ABAC;
+const { getInstance } = coreabac;
 function initializeOrganization(app, db, origins, publicPath) {
   db.department = DepartmentModel(db);
   db.organization = OrganizationModel(db);

package/dist/products.server.js

@@ -1,21 +1,20 @@
 import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
-import { L as LoggerNamespaced } from "./core.logger-C3q8A9dl.js";
-import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
+import { L as LoggerNamespaced, c as coreabac } from "./abac-BPl9Bmf9.js";
+import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
 import OpenAI from "openai";
 import { Types } from "mongoose";
-import { a as applyCommonSchema } from "./common.schema-GFSlNJo7.js";
+import { a as applyCommonSchema } from "./common.schema-DswiUXKB.js";
 import { a as applyEngagementSchema } from "./engagement.schema-fh6W1fb_.js";
 import { a as applyMetadataSchema } from "./metadata.schema-CIRR_WQ-.js";
 import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { m as middlewareFactory } from "./authJwt-J1csaMWA.js";
-import { c as coreabac } from "./core.abac-DUPBnlk6.js";
 import { a as Validator, V as Verifier } from "./core.verifier-gPPX_jhf.js";
-import { C as CRUD } from "./crud-C7FSTUes.js";
-import { A as ABAC } from "./abac-DYoheWuc.js";
+import { C as CRUD } from "./crud-q1ye5IhV.js";
 const controllerFactory$1 = (db) => {
   const Category = db.category;
   const logger = new LoggerNamespaced(db);
   const cache = new CacheNamespaced();
+  const abac = coreabac.getInstance(db);
   const generateSlug = async (name, parentId = null) => {
     const baseSlug = name.toLowerCase().replace(/[^a-z0-9\s-]/g, "").replace(/\s+/g, "-").replace(/-+/g, "-").trim("-");
     let slug = baseSlug;
@@ -137,13 +136,24 @@ const controllerFactory$1 = (db) => {
         const depthNum = parseInt(depth, 10);
         const isTree = tree === "true" || tree === true;
         const isRoot = root === "true" || root === true;
-        console.log("🚀 Read categories params:", { url, depth: depthNum, tree: isTree, root });
-        const cacheKey = JSON.stringify(req.query);
+        const cacheKey = JSON.stringify({ query: req.query, userId: req.userId });
         const cached = await cache.get(cacheKey);
         if (cached) return res.json(cached);
+        let canViewAllStatuses = false;
+        if (req.userId) {
+          const accessCheck = await abac.checkAccess({
+            user: req.userId,
+            resource: "category",
+            action: "read",
+            data: {
+              body: owner ? { owner: { type: "organization", target: owner } } : {}
+            }
+          });
+          canViewAllStatuses = accessCheck.allow;
+        }
         const match = {
           ..._id && { _id: new db.mongoose.Types.ObjectId(_id) },
-          ...status && { status },
+          ...status !== void 0 ? { status } : canViewAllStatuses ? {} : { status: "published" },
           ...search && { name: { $regex: search, $options: "i" } },
           ...type && { "owner.type": type },
           ...owner && { "owner.target": new db.mongoose.Types.ObjectId(owner) },
@@ -167,48 +177,39 @@ const controllerFactory$1 = (db) => {
         } else if (isRoot && !_id) {
           match.url = { $regex: "^/[^/]+$" };
         }
-        console.log("🔎 Match object:", JSON.stringify(match, null, 2));
         const pipeline = [
           { $match: match },
-          ...queryProcessorCore.getSortingOptions(sortParam, sortOrder)
-          // ...(skip || limit ? globalsQuery.getPaginationOptions(skip, limit) : []),
+          ...queryProcessorCore.getSortingOptions(sortParam, sortOrder),
+          ...!isTree && (skip || limit) ? queryProcessorCore.getPaginationOptions(skip, limit) : []
         ];
-        console.log("🔧 Pipeline:", JSON.stringify(pipeline, null, 2));
         let results = await Category.aggregate(pipeline);
-        console.log("🔍 Aggregate results:", results.length, "categories found");
-        console.log("🔍 Results URLs:", results.map((r) => r.url));
         if (url && depthNum > 1) {
           const maxLevel = url.split("/").filter(Boolean).length + depthNum - 1;
           results = results.filter((cat) => {
             const catLevel = cat.url.split("/").filter(Boolean).length;
             return cat.url === url || catLevel <= maxLevel;
           });
-          console.log("🔍 After depth filter:", results.length, "categories");
         }
         if (isTree && results.length > 0) {
-          console.log("🌳 Building tree from results");
           results = buildTreeFromUrl(results, sortParam, sortOrder);
+          const skipNum = parseInt(skip, 10) || 0;
+          const limitNum = parseInt(limit, 10) || 0;
+          if (limitNum > 0) {
+            results = results.slice(skipNum, skipNum + limitNum);
+          }
         } else if (!isTree && depthNum === 1 && url && results.length > 0) {
-          console.log("📋 Processing tree=false, depth=1");
-          console.log("📋 Looking for main category with url:", url);
           const mainCategory = results.find((c) => c.url === url);
-          console.log("📋 Main category found:", !!mainCategory, mainCategory?.url);
           if (mainCategory) {
             const children = results.filter(
               (c) => c.url !== url && c.url.startsWith(url + "/")
             );
-            console.log("📋 Children found:", children.length, children.map((c) => c.url));
             mainCategory.children = children;
             results = [mainCategory];
-            console.log("📋 Final result with children:", results[0].url, "children:", results[0].children.length);
-          } else {
-            console.log("❌ Main category not found in results!");
           }
         }
         const tags = ["categories"];
         if (owner) tags.push(`organization_${owner}`);
         await cache.setWithTags(cacheKey, results, tags);
-        console.log("✅ Final results count:", results.length);
         res.json(results);
       } catch (err) {
         logger.error(`Error reading categories: ${err.message}`);
@@ -1611,7 +1612,7 @@ const verifierFactory = (function(db) {
     deleteVerifier
   };
 });
-const { getInstance } = ABAC;
+const { getInstance } = coreabac;
 function setupVariantsRoutes(app, db) {
   const abac = getInstance(db);
   const verifier = verifierFactory();

package/dist/{queryProcessor-CBQgZycY.js → queryProcessor-C_5Iipam.js}

@@ -2,7 +2,7 @@ import { Types } from "mongoose";
 const ObjectId = { Types }.Types.ObjectId;
 function getBasicOptions(query) {
   console.log(query);
-  const { _id, url, status, notstatus, type, organization, owner, customer, creator, product } = query;
+  const { _id, url, status, notstatus, type, organization, owner, customer, creator, product, listing } = query;
   const stages = [];
   const conditions = [];
   if (_id) {
@@ -43,6 +43,9 @@ function getBasicOptions(query) {
   if (product) {
     conditions.push({ "product": new ObjectId(product) });
   }
+  if (listing) {
+    conditions.push({ listing });
+  }
   if (conditions.length > 0) {
     stages.push({ $match: { $and: conditions } });
   }

package/dist/rents.server.js

@@ -1,9 +1,8 @@
 import { m as middlewareIndexFactory } from "./index-_Edcmck_.js";
-import { c as coreabac } from "./core.abac-DUPBnlk6.js";
+import { L as LoggerNamespaced, c as coreabac } from "./abac-BPl9Bmf9.js";
 import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
-import { L as LoggerNamespaced } from "./core.logger-C3q8A9dl.js";
 import { V as Verifier, a as Validator } from "./core.verifier-gPPX_jhf.js";
-import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
+import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
 const queryValidatorConfig = {
   // status: { rule: 'optional', validator: Validator.schema().string().oneOf(['published', 'pending']), default: 'pending' },
   owner: { rule: "optional", validator: Validator.schema().string(), default: null },

package/dist/spots.server.js

@@ -1,4 +1,4 @@
-import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
+import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
 const getIsOpenNowStage = (function getIsOpenNowStage2() {
   const now = /* @__PURE__ */ new Date();
   const currentDay = now.getDay();

package/dist/style.css

@@ -167,6 +167,7 @@ a.button {
   text-box: trim-both cap alphabetic;
 }
 .button {
+  position: relative;
   display: flex;
   padding: var(--small);
   border-radius: var(--small);
@@ -211,29 +212,43 @@ a.button {
   align-items: center;
   justify-content: center;
   gap: 8px;
+  transition: opacity 0.3s ease;
 }
-.icon {
-  width: 1rem;
-  height: 1rem;
-}
-
-/* Vue Transitions */
-.content-enter-active,
-.content-leave-active {
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+.button-loader {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  pointer-events: none;
 }
-.content-enter-from {
+.button-success {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   opacity: 0;
-  transform: translateY(8px) scale(0.95);
+  transition: opacity 0.3s ease;
+  pointer-events: none;
 }
-.content-leave-to {
+.button-error {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   opacity: 0;
-  transform: translateY(-8px) scale(0.95);
+  transition: opacity 0.3s ease;
+  pointer-events: none;
 }
-.content-enter-to,
-.content-leave-from {
+.active {
   opacity: 1;
-  transform: translateY(0) scale(1);
+}
+.hidden {
+  opacity: 0;
 }.slide-fade-enter-active {
   transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
 }
@@ -1417,21 +1432,21 @@ to {
   margin-left: 0.5rem;
 }
 
-.notification-badge-container[data-v-7812247a] {
+.notification-badge-container[data-v-1dbe1152] {
   position: relative;
   display: inline-block;
 }
-.notification-button[data-v-7812247a] {
+.notification-button[data-v-1dbe1152] {
   background: none;
   border: none;
   cursor: pointer;
   position: relative;
   font-size: 1.2rem;
 }
-.notification-icon[data-v-7812247a] {
+.notification-icon[data-v-1dbe1152] {
   font-size: 1.4rem;
 }
-.button-counter[data-v-7812247a] {
+.button-counter[data-v-1dbe1152] {
   position: absolute;
   right: -8px;
   bottom: -8px;
@@ -1445,8 +1460,8 @@ to {
   line-height: 16px;
   font-size: 10px;
 }
-.notifications-loading[data-v-7812247a],
-.notifications-empty[data-v-7812247a] {
+.notifications-loading[data-v-1dbe1152],
+.notifications-empty[data-v-1dbe1152] {
   padding: 24px;
   text-align: center;
   color: rgb(var(--text-light));
@@ -2900,7 +2915,7 @@ to { opacity: 1; transform: translateY(0);
 .bg-danger[data-v-58dea369] {
   background-color: #ef4444;
 }
-#map[data-v-31c24ebe]:focus {
+#map[data-v-e9370e2c]:focus {
   outline: none;
 }
   /* Add styles for the user card component here */

package/dist/{web-cNKIl_cL.js → web-BF3ijvEr.js}

@@ -1,4 +1,4 @@
-import { W as p } from "./main-CmjWiDVF.js";
+import { W as p } from "./main-B9o1iBAZ.js";
 class f extends p {
   constructor() {
     super(...arguments), this.group = "CapacitorStorage";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.564",
+  "version": "0.2.565",
   "description": "Fullstack framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

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

@@ -196,9 +196,10 @@ export default function createSsrDevServer(projectRoot, configs, createServer) {
       console.log('[LOADING 6] Loading server module...');
 
       // Получаем путь к скомпилированному файлу
-      const { outputPath } = stats.toJson();
-      const entryName = Object.keys(stats.toJson().entrypoints)[0];
-      const assetName = stats.toJson().entrypoints[entryName].assets[0].name;
+      const jsonStats = stats.toJson();
+      const { outputPath } = jsonStats;
+      const entryName = Object.keys(jsonStats.entrypoints)[0];
+      const assetName = jsonStats.entrypoints[entryName].assets[0].name;
 
       // Импортируем с уникальным параметром для сброса кэша
       serverModule = await import(`file://${path.resolve(outputPath, assetName)}?t=${Date.now()}`);

package/src/builder/rspack/rspack.config.api.js

@@ -7,18 +7,25 @@ export default projectRoot => {
   return {
     target: 'node',
     mode: 'development',
-    entry: [path.resolve(projectRoot, 'src/server.js')],
+    entry: {
+      server: path.resolve(projectRoot, 'src/server.js')
+    },
     output: {
       filename: 'server.js',
+      chunkFilename: '[name].server.js',
       path: path.resolve(projectRoot, 'builds/web/server'),
       libraryTarget: 'module',
-      chunkFormat: 'module', 
+      chunkFormat: 'module',
+      chunkLoading: 'import',
       module: true,
       clean: true,
     },
     experiments: {
       outputModule: true,
     },
+    optimization: {
+      minimize: false,
+    },
     resolve: {
       alias: {
         '@martyrs': path.resolve(projectRoot, 'martyrs'),
@@ -37,13 +44,17 @@ export default projectRoot => {
       }),
       // Для .node файлов тоже используем module
       function({ context, request }, callback) {
-        if (/\.node$/.test(request)) {
+        if (request.endsWith('.node')) {
           return callback(null, `module ${request}`);
         }
         callback();
       }
     ],
-    plugins: [],
+    plugins: [
+      new rspack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1
+      })
+    ],
     module: {
       rules: [
         {

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

@@ -48,7 +48,7 @@ export default (projectRoot) => {
                   const rewritten = content
                     // Обработка существующего синтаксиса v-slot
                     .replace(
-                      /<(\w+)\s+v-slot(:[\w\-]+)?=("|'){([^"'}]+)}("|')\s*>/g,
+                      /<(\w+)\s+v-slot(:[\w-]+)?=("|'){([^"'}]+)}("|')\s*>/g,
                       (_match, tag, slotName, _q1, slotProps, _q2) => {
                         const slotAttr = slotName || '';
                         return `<template v-slot${slotAttr}="{${slotProps}}"><${tag}>`;
@@ -60,13 +60,13 @@ export default (projectRoot) => {
                     )
                     // Новая обработка для сокращенного синтаксиса #slotname
                     .replace(
-                      /<(\w+)(\s+#[\w\-]+)([^>]*)\/>/g,
+                      /<(\w+)(\s+#[\w-]+)([^>]*)\/>/g,
                       (_match, tag, slotDirective, attrs) => {
                         return `<template${slotDirective}><${tag}${attrs}/></template>`;
                       }
                     )
                     .replace(
-                      /<(\w+)(\s+#[\w\-]+)([^>]*)>(.*?)<\/\1>/gs,
+                      /<(\w+)(\s+#[\w-]+)([^>]*)>(.*?)<\/\1>/gs,
                       (_match, tag, slotDirective, attrs, content) => {
                         return `<template${slotDirective}><${tag}${attrs}>${content}</${tag}></template>`;
                       }

package/src/builder/rspack/rspack.config.ssr.client.js

@@ -77,7 +77,7 @@ export default (projectRoot) => {
           {
             extractor: (content) => {
               // Ищем классы и селекторы с префиксами Tailwind
-              const normalClasses = content.match(/[A-Za-z0-9-_:\/]+/g) || [];
+              const normalClasses = content.match(/[A-Za-z0-9-_:/]+/g) || [];
               
               // Дополнительно ищем Vue атрибуты data-v-*
               // Это важно для правильного распознавания scoped стилей
@@ -96,6 +96,33 @@ export default (projectRoot) => {
         fileName: 'manifest.json',
         publicPath: '/'
       }),
+      new RspackManifestPlugin({
+        fileName: 'pwa-manifest.json',
+        seed: {
+          name: process.env.APP_NAME || 'App by Martyrs Framework',
+          short_name: process.env.APP_SHORT_NAME || 'App',
+          description: process.env.APP_DESCRIPTION || 'Progressive Web App by Martyrs Framework',
+          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
+      }),
       ...(isProd ? [
         new InjectManifest({
           swSrc: path.resolve(projectRoot, '../public/sw.js'),
@@ -119,33 +146,6 @@ export default (projectRoot) => {
               return { manifest };
             }
           ]
-        }),
-        new RspackManifestPlugin({
-          fileName: 'pwa-manifest.json',
-          seed: {
-            name: process.env.APP_NAME || 'App by Martyrs Framework',
-            short_name: process.env.APP_SHORT_NAME || 'App',
-            description: process.env.APP_DESCRIPTION || 'Progressive Web App by Martyrs Framework',
-            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
         })
       ] : []),
     ],

package/src/builder/templates/page.js

@@ -38,14 +38,14 @@ export default `
           requestIdleCallback(() => {
             const link = document.createElement('link');
             link.rel = 'manifest';
-            link.href = '/manifest.json';
+            link.href = '/pwa-manifest.json';
             document.head.appendChild(link);
           });
         } else {
           setTimeout(() => {
             const link = document.createElement('link');
             link.rel = 'manifest';
-            link.href = '/manifest.json';
+            link.href = '/pwa-manifest.json';
             document.head.appendChild(link);
           }, 0);
         }