core-maugli 1.2.22 → 1.2.24

package/package.json

@@ -2,7 +2,7 @@
     "name": "core-maugli",
     "description": "Astro & Tailwind CSS blog theme for Maugli.",
     "type": "module",
-    "version": "1.2.22",
+    "version": "1.2.24",
     "license": "GPL-3.0-or-later OR Commercial",
     "repository": {
         "type": "git",

package/src/components/BaseHead.astro

@@ -137,17 +137,17 @@ let defaultAuthorName = defaultAuthor.data.name;
 <meta http-equiv="x-ua-compatible" content="ie=edge" />
 
 <!-- Font Loading Strategy - Non-blocking -->
-<link 
-    rel="preload" 
-    href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap" 
-    as="style" 
-    onload="this.onload=null;this.rel='stylesheet'" 
+<link
+    rel="preload"
+    href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap"
+    as="style"
+    onload="this.onload=null;this.rel='stylesheet'"
 />
-<link 
-    rel="preload" 
-    href="https://fonts.googleapis.com/css2?family=Geologica:wght@400;500;600&display=swap" 
-    as="style" 
-    onload="this.onload=null;this.rel='stylesheet'" 
+<link
+    rel="preload"
+    href="https://fonts.googleapis.com/css2?family=Geologica:wght@400;500;600&display=swap"
+    as="style"
+    onload="this.onload=null;this.rel='stylesheet'"
 />
 <noscript>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap" />

package/src/components/Card.astro

@@ -1,7 +1,4 @@
 ---
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
 import { maugliConfig } from '../config/maugli.config';
 import FormattedDate from './FormattedDate.astro';
 
@@ -16,7 +13,7 @@ type Props = {
     headingLevel?: 'h2' | 'h3';
     isFeatured?: boolean;
     class?: string;
-    type?: string; // добавлен тип
+    type?: string;
 };
 
 const { href, title, image, seo, publishDate, excerpt, description, headingLevel = 'h2', isFeatured = false, class: className, type } = Astro.props;
@@ -35,62 +32,8 @@ const baseImage =
             ? maugliConfig.defaultProductImage
             : maugliConfig.seo.defaultImage);
 
-// Генерируем адаптивные версии изображений
-function getResponsiveImages(imagePath: string) {
-    const basePath = imagePath.replace(/\.(webp|jpg|jpeg|png)$/i, '');
-    const extension = imagePath.match(/\.(webp|jpg|jpeg|png)$/i)?.[0] || '.webp';
-
-    // Проверяем существование адаптивных версий
-    const __filename = fileURLToPath(import.meta.url);
-    const projectRoot = path.resolve(path.dirname(__filename), '../..');
-
-    const variants = [
-        { suffix: '-400', width: '400w' },
-        { suffix: '-800', width: '800w' },
-        { suffix: '-1200', width: '1200w' }
-    ];
-
-    const srcsetItems = [];
-
-    // Добавляем адаптивные версии, если они существуют
-    for (const variant of variants) {
-        const variantPath = `${basePath}${variant.suffix}${extension}`;
-        const filePath = path.join(projectRoot, 'public', variantPath.replace(/^\//, ''));
-
-        if (fs.existsSync(filePath)) {
-            srcsetItems.push(`${variantPath} ${variant.width}`);
-        }
-    }
-
-    // Всегда добавляем оригинальное изображение
-    srcsetItems.push(`${imagePath} 1200w`);
-
-    return {
-        src: imagePath,
-        srcset: srcsetItems.join(', '),
-        sizes: '(max-width: 768px) 100vw, (max-width: 1024px) 50vw, 400px'
-    };
-}
-
-const cardImage = getResponsiveImages(baseImage);
 const cardImageAlt = seo?.image?.alt || image?.alt || title || 'Изображение';
 
-// Используем уменьшенное превью, если оно существует
-let previewImage;
-if (cardImage.src) {
-    previewImage = cardImage.src.replace(/\/([^\/]+)$/, '/previews/$1');
-
-    const __filename = fileURLToPath(import.meta.url);
-    const projectRoot = path.resolve(path.dirname(__filename), '../..');
-    const previewFilePath = path.join(projectRoot, 'public', previewImage.replace(/^\//, ''));
-
-    if (!fs.existsSync(previewFilePath)) {
-        previewImage = undefined;
-    }
-}
-
-const finalImage = previewImage || cardImage.src;
-
 // Определяем контент для отображения
 const content = excerpt || description;
 ---
@@ -106,9 +49,7 @@ const content = excerpt || description;
         <!-- Изображение -->
         <div class="w-full aspect-[1200/630] bg-[var(--bg-muted)] overflow-hidden relative">
             <img
-                src={finalImage}
-                srcset={cardImage.srcset}
-                sizes={cardImage.sizes}
+                src={baseImage}
                 alt={cardImageAlt}
                 loading="lazy"
                 width="1200"

package/src/components/Footer.astro

@@ -2,7 +2,6 @@
 import { maugliConfig } from '../config/maugli.config';
 import { LANGUAGES } from '../i18n/languages';
 import AuthorLinksGroup from './AuthorLinksGroup.astro';
-import OptimizedImage from './OptimizedImage.astro';
 // Универсальный импорт словарей по доступным языкам
 const dicts: Record<string, any> = {};
 for (const lang of LANGUAGES) {

package/src/components/OptimizedImage.astro

@@ -12,34 +12,20 @@ export interface Props {
     quality?: number;
 }
 
-const {
-    src,
-    alt,
-    width,
-    height,
-    class: className = '',
-    loading = 'lazy',
-    decoding = 'async',
-    sizes,
-    priority = false,
-    quality = 75,
-    ...rest
-} = Astro.props;
+const { src, alt, width, height, class: className = '', loading = 'lazy', decoding = 'async', sizes, priority = false, quality = 75, ...rest } = Astro.props;
 
 // Generate responsive image variations with quality optimization
 const generateSrcSet = (baseSrc: string) => {
     const baseUrl = baseSrc.replace(/\.[^.]+$/, '');
     const ext = 'webp'; // Always use WebP for better compression
-    
+
     const variations = [
         { width: 400, suffix: '-400' },
         { width: 800, suffix: '-800' },
         { width: 1200, suffix: '-1200' }
     ];
-    
-    return variations
-        .map(({ width, suffix }) => `${baseUrl}${suffix}.${ext} ${width}w`)
-        .join(', ');
+
+    return variations.map(({ width, suffix }) => `${baseUrl}${suffix}.${ext} ${width}w`).join(', ');
 };
 
 const srcSet = generateSrcSet(src);
@@ -62,6 +48,4 @@ const shouldPreload = priority && loading === 'eager';
     {...rest}
 />
 
-{priority && (
-    <link rel="preload" as="image" href={src} type="image/webp" />
-)}
+{priority && <link rel="preload" as="image" href={src} type="image/webp" />}

package/src/components/ResponsiveImage.astro

@@ -0,0 +1,46 @@
+---
+export interface Props {
+    src: string;
+    alt: string;
+    width?: number;
+    height?: number;
+    class?: string;
+    loading?: 'lazy' | 'eager';
+    decoding?: 'async' | 'sync' | 'auto';
+    sizes?: string;
+    quality?: number;
+    format?: 'webp' | 'avif' | 'jpeg' | 'png';
+}
+
+const {
+    src,
+    alt,
+    width = 1200,
+    height = 630,
+    class: className = '',
+    loading = 'lazy',
+    decoding = 'async',
+    sizes = '(max-width: 768px) 100vw, (max-width: 1024px) 50vw, 400px',
+    quality = 75,
+    format = 'webp',
+    ...rest
+} = Astro.props;
+
+// Простая стратегия - используем базовое изображение и не генерируем srcset для несуществующих файлов
+const optimizedSrc = src;
+
+// Генерируем srcset только если есть базовое изображение
+const generateSrcSet = (baseSrc: string) => {
+    if (baseSrc.startsWith('http')) {
+        return baseSrc;
+    }
+
+    // Возвращаем только базовое изображение без попыток создания srcset
+    // Responsive варианты будут обработаны build процессом
+    return baseSrc;
+};
+
+const srcSet = generateSrcSet(src);
+---
+
+<img src={optimizedSrc} alt={alt} width={width} height={height} class={className} loading={loading} decoding={decoding} sizes={sizes} {...rest} />