core-maugli 1.2.81 → 1.2.82

package/package.json

@@ -2,7 +2,7 @@
   "name": "core-maugli",
   "description": "Astro & Tailwind CSS blog theme for Maugli.",
   "type": "module",
-  "version": "1.2.81",
+  "version": "1.2.82",
   "license": "GPL-3.0-or-later OR Commercial",
   "repository": {
     "type": "git",
@@ -42,12 +42,13 @@
     "build:ci": "SKIP_VERSION_CHECK=true npm run build",
     "init-netlify": "node scripts/copy-netlify-config.js",
     "set-force-update": "node scripts/set-force-update.js",
-    "postinstall": "node scripts/upgrade-config.js && node scripts/setup-user-images.js",
+    "postinstall": "node scripts/postinstall.js",
     "generate-previews": "node scripts/generate-previews.js",
     "generate-netlify": "node scripts/generate-netlify-config.js",
-    "verify-pack": "node scripts/verify-pack.js"
+    "verify-pack": "node scripts/verify-pack.js",
+    "clean:duplicates": "node scripts/cleanup-duplicates.js"
   },
-  "prepublishOnly": "npm run verify-pack",
+  "prepublishOnly": "npm run clean:duplicates && npm run verify-pack",
   "dependencies": {
     "@astrojs/mdx": "^4.3.0",
     "@astrojs/rss": "^4.0.11",

package/scripts/auto-update.js

@@ -46,20 +46,20 @@ async function getLatestVersion() {
 
 function compareVersions(current, latest) {
     if (!current || !latest) return false;
-    
+
     current = current.replace(/^[\^~]/, '');
-    
+
     const currentParts = current.split('.').map(Number);
     const latestParts = latest.split('.').map(Number);
-    
+
     for (let i = 0; i < Math.max(currentParts.length, latestParts.length); i++) {
         const currentPart = currentParts[i] || 0;
         const latestPart = latestParts[i] || 0;
-        
+
         if (latestPart > currentPart) return true;
         if (latestPart < currentPart) return false;
     }
-    
+
     return false;
 }
 
@@ -80,7 +80,7 @@ async function syncHelperFiles() {
         'scripts/check-version.js',
         'scripts/auto-update.js',
         'scripts/set-force-update.js',
-        '.gitignore',
+        '.gitignore'
     ];
 
     async function sha256(p) {
@@ -117,28 +117,31 @@ async function syncHelperFiles() {
     }
 
     async function cleanupDuplicates() {
+        let removed = 0;
         async function walk(dir) {
             const ents = await fs.promises.readdir(dir, { withFileTypes: true });
             for (const e of ents) {
                 const p = path.join(dir, e.name);
                 if (e.isDirectory()) await walk(p);
-                else if (/\s2(\.[^.]+)?$/i.test(e.name)) {
+                else if (/\s\d+(\.[^.]+)?$/i.test(e.name) || /\s?\(\d+\)(\.[^.]+)?$/i.test(e.name)) {
                     await fs.promises.unlink(p).catch(() => {});
+                    removed++;
                     console.log(`✖ removed duplicate: ${path.relative(root, p)}`);
                 }
             }
         }
         await walk(root);
+        console.log(`✖ total duplicates removed: ${removed}`);
     }
 
     await copyItems();
-    await cleanupDuplicates().catch(e => console.warn('cleanup warning:', e.message));
+    await cleanupDuplicates().catch((e) => console.warn('cleanup warning:', e.message));
 }
 
 async function performAutoUpdate() {
     console.log(colorize('🤖 CI/CD Auto-update mode activated', 'cyan'));
     console.log(colorize('🔄 Updating core-maugli automatically...', 'blue'));
-    
+
     try {
         // Check if update script exists
         const updateScriptPath = path.join(process.cwd(), 'scripts', 'update-all-blogs.js');
@@ -151,7 +154,7 @@ async function performAutoUpdate() {
             execSync('npm update core-maugli', { stdio: 'inherit' });
             await syncHelperFiles();
         }
-        
+
         console.log(colorize('✅ Auto-update completed successfully!', 'green'));
         return true;
     } catch (error) {
@@ -162,36 +165,36 @@ async function performAutoUpdate() {
 
 async function main() {
     console.log(colorize('🔍 Checking for core-maugli updates...', 'cyan'));
-    
+
     const currentVersion = await getCurrentVersion();
     const latestVersion = await getLatestVersion();
-    
+
     if (!currentVersion || !latestVersion) {
         console.log(colorize('⚠️  Could not check version. Proceeding...', 'yellow'));
         return;
     }
-    
+
     console.log(colorize(`📦 Current version: ${currentVersion}`, 'white'));
     console.log(colorize(`📦 Latest version: ${latestVersion}`, 'white'));
-    
+
     if (!compareVersions(currentVersion, latestVersion)) {
         console.log(colorize('✅ Already using the latest version!', 'green'));
         return;
     }
-    
+
     // Auto-update without prompts
     console.log(colorize(`🚀 New version ${latestVersion} available! Auto-updating...`, 'magenta'));
-    
+
     const success = await performAutoUpdate();
     if (!success) {
         console.error(colorize('❌ Auto-update failed. Build may fail or produce unexpected results.', 'red'));
         process.exit(1);
     }
-    
+
     console.log(colorize('✅ Ready to proceed with updated version!', 'green'));
 }
 
-main().catch(error => {
+main().catch((error) => {
     console.error(colorize('❌ Auto-update check failed:', 'red'), error.message);
     process.exit(1);
 });

package/scripts/cleanup-duplicates.js

@@ -0,0 +1,31 @@
+#!/usr/bin/env node
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
+
+const dirs = ['src/components', 'src/utils', 'public/flags'];
+const patterns = [/\(\d+\)$/i, /\s\d+$/i, /- copy$/i, /_copy$/i];
+
+async function scan(dir) {
+  let entries;
+  try {
+    entries = await fs.readdir(dir, { withFileTypes: true });
+  } catch {
+    return;
+  }
+  for (const entry of entries) {
+    const fullPath = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      await scan(fullPath);
+      continue;
+    }
+    const base = path.basename(entry.name, path.extname(entry.name));
+    if (patterns.some((p) => p.test(base))) {
+      await fs.unlink(fullPath);
+      console.log(`Removed duplicate: ${fullPath}`);
+    }
+  }
+}
+
+for (const dir of dirs) {
+  await scan(dir);
+}

package/scripts/postinstall.js

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+
+import fs from 'fs/promises';
+import path from 'path';
+import { fileURLToPath, pathToFileURL } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+async function runUpgrade() {
+    const upgradePath = path.join(__dirname, 'upgrade-config.js');
+    await import(pathToFileURL(upgradePath).href);
+}
+
+async function runSetupImages() {
+    const { setupUserImages } = await import('./setup-user-images.js');
+    await setupUserImages();
+}
+
+async function main() {
+    const pkgPath = path.join(__dirname, '..', 'package.json');
+    const pkg = JSON.parse(await fs.readFile(pkgPath, 'utf8'));
+    const currentVersion = pkg.version;
+
+    const userRoot = process.env.INIT_CWD || process.cwd();
+    const versionFile = path.join(userRoot, '.core-maugli-version');
+
+    let previousVersion = null;
+    try {
+        previousVersion = (await fs.readFile(versionFile, 'utf8')).trim();
+    } catch {}
+
+    if (previousVersion !== currentVersion) {
+        console.log(`Detected core-maugli version change (${previousVersion || 'none'} -> ${currentVersion}).`);
+        await runUpgrade();
+        await fs.writeFile(versionFile, currentVersion, 'utf8');
+    } else {
+        console.log(`core-maugli version ${currentVersion} unchanged, skipping upgrade.`);
+    }
+
+    await runSetupImages();
+}
+
+main().catch((err) => {
+    console.error('Postinstall failed:', err);
+    process.exit(1);
+});

package/scripts/update-components.js

@@ -63,7 +63,12 @@ const PRESERVE_PATHS = [
 ];
 
 // Дополнительные паттерны для мусорных файлов
-const EXTRA_STALE_PATTERNS = [/\s[0-9]+\.(astro|jsx?|tsx?|mjs|cjs|css|json)$/i, /~$/i];
+const EXTRA_STALE_PATTERNS = [
+    /\s[0-9]+\.(astro|jsx?|tsx?|mjs|cjs|css|json)$/i, // "file 1.js"
+    /\(\d+\)\.(astro|tsx?|jsx?|mjs|cjs|css|json)$/i, // "file(1).js"
+    /(?:[\s_-](?:копия|copy))\.(astro|tsx?|jsx?|mjs|cjs|css|json)$/i, // "file - копия.js" или "file_copy.js"
+    /~$/i
+];
 
 // Рекурсивный обход проекта
 async function walk(dir, visitor) {
@@ -103,12 +108,16 @@ async function cleanup() {
 
     // Удаляем дубликаты и временные файлы внутри FORCE_UPDATE_PATHS
     await walk(userRoot, async (p, dir) => {
+        const base = path.basename(p);
         if (dir) {
-            if (isInsideForcePaths(p) && /\s[0-9]+$/.test(path.basename(p))) {
+            if (
+                isInsideForcePaths(p) &&
+                (/\s[0-9]+$/.test(base) || /\(\d+\)$/.test(base) || /(?:[\s_-](?:копия|copy))$/i.test(base))
+            ) {
                 await fs.rm(p, { recursive: true, force: true });
                 removed.push(path.relative(userRoot, p));
             }
-        } else if (isInsideForcePaths(p) && EXTRA_STALE_PATTERNS.some((rx) => rx.test(path.basename(p)))) {
+        } else if (isInsideForcePaths(p) && EXTRA_STALE_PATTERNS.some((rx) => rx.test(base))) {
             await fs.rm(p, { force: true });
             removed.push(path.relative(userRoot, p));
         }

package/scripts/upgrade-config.js

@@ -9,17 +9,6 @@ import { fileURLToPath, pathToFileURL } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-// Импортируем функцию обновления компонентов
-async function importUpdateComponents() {
-  try {
-    const { updateComponents } = await import('./update-components.js');
-    return updateComponents;
-  } catch (error) {
-    console.warn('Could not load update-components.js:', error.message);
-    return null;
-  }
-}
-
 const defaultConfigPath = path.join(__dirname, '../src/config/maugli.config.ts');
 const userRoot = process.env.INIT_CWD || process.cwd();
 const userConfigPath = path.join(userRoot, 'src/config/maugli.config.ts');
@@ -55,14 +44,6 @@ function mergeMissing(target, source) {
 
 async function main() {
     console.log('🔄 Starting Maugli upgrade process...');
-    
-    // Сначала обновляем компоненты
-    const updateComponents = await importUpdateComponents();
-    if (updateComponents) {
-        await updateComponents();
-    }
-    
-    // Затем обновляем конфиг
     const pkg = await loadTsModule(defaultConfigPath);
     const defCfg = pkg.maugliConfig;
     const newVersion = pkg.MAUGLI_CONFIG_VERSION || defCfg.configVersion;

package/scripts/verify-pack.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { execSync } from 'node:child_process';
-import { readFileSync, statSync } from 'node:fs';
+import { readFileSync, statSync, readdirSync } from 'node:fs';
+import path from 'node:path';
 
 // Run `npm pack --dry-run` and capture JSON output describing package contents
 const env = { ...process.env, npm_config_loglevel: 'error' };
@@ -44,4 +45,31 @@ if (missing.length > 0) {
   process.exit(1);
 }
 
+const duplicatePatterns = [/\(\d+\)$/i, /\s\d+$/i, /- copy$/i, /_copy$/i];
+const duplicateDirs = ['src/components', 'src/utils', 'public/flags'];
+
+function findDuplicates(dir, results = []) {
+  let entries;
+  try {
+    entries = readdirSync(dir, { withFileTypes: true });
+  } catch {
+    return results;
+  }
+  for (const entry of entries) {
+    const full = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      findDuplicates(full, results);
+    } else {
+      const base = path.basename(entry.name, path.extname(entry.name));
+      if (duplicatePatterns.some((p) => p.test(base))) results.push(full);
+    }
+  }
+  return results;
+}
+
+const duplicates = duplicateDirs.flatMap((d) => findDuplicates(d));
+if (duplicates.length > 0) {
+  console.warn('Warning: duplicate files detected:', duplicates.join(', '));
+}
+
 console.log('All required package files are present.');

package/src/components/BaseHead.astro

@@ -175,7 +175,7 @@ let defaultAuthorName = defaultAuthor.data.name;
     if ('serviceWorker' in navigator) {
         window.addEventListener('load', async () => {
             try {
-                const registration = await navigator.serviceWorker.register('/sw.js');
+                const registration = await navigator.serviceWorker.register(`${import.meta.env.BASE_URL}sw.js`);
                 console.log('SW registered: ', registration);
             } catch (registrationError) {
                 console.log('SW registration failed: ', registrationError);

package/src/content/products/maugli-freeblog.md

@@ -56,7 +56,7 @@ jsonld:
     '@type': 'Offer'
     'priceCurrency': 'USD'
     'price': '0'
-    'url': 'https://freeblog.maugli.ru'
+    'url': 'https://www.npmjs.com/package/core-maugli'
 
 isExample: true
 ---
@@ -157,6 +157,6 @@ Maugli Free Blog спроектирован для лёгкой развертк
 
 ## **Где взять?**
 
-- **GitHub:** [ссылка].
+- **NPM:** [core-maugli](https://www.npmjs.com/package/core-maugli)
 
 **Maugli Free Blog — это платформа, созданная для автоматизации, SEO и AI-интеграций.**

package/src/pages/sw.js.ts

@@ -0,0 +1,6 @@
+import { buildSW } from 'virtual:pwa-register';
+
+export const GET = async () =>
+  new Response(await buildSW(), {
+    headers: { 'Content-Type': 'application/javascript' }
+  });

package/src/styles/global.css

@@ -157,7 +157,13 @@
         --tw-prose-captions: var(--text-muted);
     }
 
-    .prose p,
+    .prose p {
+        font-size: 1em;
+        margin: 0 0 0.9em;
+        color: var(--text-main) 85%;
+        line-height: 1.65 !important;
+    }
+
     .prose li {
         line-height: 1.65 !important;
     }
@@ -188,6 +194,44 @@
     }
 
     /* Ссылки — читаемые и неядрёные */
+
+    /* Таблицы — перегородки (границы) в цвет мутед-бэкграунда */
+    .prose table {
+        border-collapse: collapse;
+        margin-top: 16px;
+    }
+    .prose th,
+    .prose td {
+        border-top: 1px solid var(--bg-muted);
+        border-bottom: 1px solid var(--bg-muted);
+        border-left: none;
+        border-right: none;
+    }
+    .prose thead th {
+        background: none !important;
+        font-size: 1em;
+        color: var(--text-heading);
+        border-top: none !important;
+        font-weight: 700;
+    }
+    .prose th,
+    .prose td {
+        font-size: 1em;
+        color: color-mix(in srgb, var(--text-main) 80%, transparent);
+    }
+    html.dark .prose thead th {
+        background: none;
+    }
+    html.dark .prose th,
+    html.dark .prose td {
+        border-top-color: none;
+        border-bottom-color: var(--bg-muted);
+        border-left: none;
+        border-right: none;
+    }
+    html.dark .prose thead th {
+        background: none !important;
+    }
     .prose a {
         color: color-mix(in srgb, var(--color-brand) 80%, var(--text-main));
         text-decoration: underline;