@ozdao/martyrs 0.2.564 → 0.2.566

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);
         }

package/src/components/BottomSheet/BottomSheet.vue

@@ -1,11 +1,11 @@
 <template>
   <transition name="slideY"  mode="out-in">
-    <section 
+    <section
       v-if="show"
-      ref="wrapper" 
-      class="w-100 bs-black rows-1 h-100"
+      ref="wrapper"
+      class="w-100 bs-black rows-1 h-100 pos-absolute pos-t-0 pos-l-0 z-index-9999"
       :class="{
-        'pd-t-extra': MOBILE_APP === 'ios',  
+        'pd-t-extra': MOBILE_APP === 'ios',
       }"
       >
       <!-- Toggle To Close -->

package/src/components/Button/Button.vue

@@ -89,6 +89,7 @@ async function Submit() {
     if (props.callback) setTimeout(() => props.callback(), props.callbackDelay)
 
   } catch (err) {
+    console.error('=== BUTTON ERROR ===', err)
     emits('error', err)
     // Если возникла ошибка, мы изменяем стили и устанавливаем сообщение об ошибке
     button.value.classList.replace('bg-main', 'bg-fourth-nano')
@@ -113,28 +114,23 @@ async function Submit() {
 		class="button"
     :class="{ 'button--disabled': loading || validation }"
   >
-    <Transition name="content" mode="out-in">
-      <!-- Default slot content -->
-      <span v-if="!loading && !error && !finished || !showLoader" class="button-content">
-        <slot></slot>
-      </span>
-      <!-- Loading state -->
-      <Loader v-else-if="loading && !error && showLoader"   class="icon button-content pos-relative pos-t-0 pos-l-0 loading"/>
-      <!-- Success state -->
-      <span v-else-if="finished && showSucces" class="button-content t-semi t-center w-100 loading t-black">
-        <template v-if="text.success">
-          {{ text.success }}
-        </template>
-        <IconCheckmark v-else class="icon" />
-      </span>
-      <!-- Error state -->
-      <span v-else-if="error" class="button-content t-center w-100 error">
-        <template v-if="text.error">
-          {{ text.error }}
-        </template>
-        <IconCross v-else class="icon" />
-      </span>
-    </Transition>
+    <span class="button-content" :class="{ 'hidden': loading || error || finished }">
+      <slot></slot>
+    </span>
+
+    <span class="button-loader" :class="{ 'active': loading && showLoader }">
+      <Loader class=""/>
+    </span>
+
+    <span class="button-success" :class="{ 'active': finished && showSucces }">
+      <template v-if="text.success">{{ text.success }}</template>
+      <IconCheckmark v-else class="i-regular" />
+    </span>
+
+    <span class="button-error" :class="{ 'active': error }">
+      <template v-if="text.error">{{ text.error }}</template>
+      <IconCross v-else class="i-regular" />
+    </span>
     
     <!-- Counter -->
     <div v-if="counter" class="button-counter font-second flex flex-center">
@@ -157,6 +153,7 @@ a.button {
 }
 
 .button {
+  position: relative;
   display: flex;
   padding: var(--small);
   border-radius: var(--small);
@@ -206,32 +203,48 @@ 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;
 }
 </style>

package/src/components/FieldPhone/FieldPhone.vue

@@ -404,7 +404,7 @@
     }
     
     // Разрешаем только + и цифры
-    dialCodeInput.value = dialCodeInput.value.replace(/[^\+\d]/g, '');
+    dialCodeInput.value = dialCodeInput.value.replace(/[^+\d]/g, '');
     
     // Убеждаемся что + только в начале
     const plusCount = (dialCodeInput.value.match(/\+/g) || []).length;

package/src/components/Loader/Loader.vue

@@ -22,7 +22,7 @@ export default {
     },
     centered: {
       type: Boolean,
-      default: true, // По умолчанию лоадер центрирован (для обратной совместимости)
+      default: false
     },
   },
 };

package/src/components/Tree/Tree.vue

@@ -1,6 +1,7 @@
 <template>
   <VueDraggableNext
-    v-bind="dragOptions" 
+    v-bind="dragOptions"
+    :disabled="!dragndrop"
     class="dragArea list-group w-full"
     :list="items"
     :handle="'.my-handle'"
@@ -11,10 +12,11 @@
         :item="item"
       >
       </slot>
-      <Tree 
+      <Tree
         :items="item.children"
         :state="state"
         :parent-id="item._id"
+        :dragndrop="dragndrop"
         @update="emitChange"
         class="pd-l-medium"
         v-slot="{ item }"
@@ -36,7 +38,8 @@ import Tree from './Tree.vue';
 const props = defineProps({
   items: Array,
   state: Array,
-  parentId: { type: String, default: null }
+  parentId: { type: String, default: null },
+  dragndrop: { type: Boolean, default: true }
 });
 
 const emits = defineEmits(['update']);