core-maugli 1.2.49 → 1.2.51

package/bin/init.js

@@ -93,6 +93,16 @@ function updateConfig(targetDir, lang, repoUrl) {
   if (repoUrl) {
     console.log(`Configured repository URL to ${repoUrl}`);
   }
+  
+  // Create netlify.toml for new blog
+  try {
+    execSync('npm run init-netlify', { 
+      cwd: targetDir, 
+      stdio: 'pipe' 
+    });
+  } catch (error) {
+    console.log('Note: netlify.toml will be created on npm install');
+  }
 }
 
 export default async function init(targetName, langOption, repoOption) {

package/netlify.toml

@@ -31,14 +31,18 @@
 [[plugins]]
   package = "netlify-plugin-submit-sitemap"
 
+# Пользовательский плагин
+[[plugins]]
+  package = "netlify-plugin-my-custom-analytics"
+
 # Плагины для интеграций (требуют ручной настройки)
 # Раскомментируйте после настройки в Netlify UI:
 # ⚠️  После раскомментирования этот файл не будет автоматически обновляться
 
 # Bluesky Custom Domain
 # Инструкция: https://app.netlify.com/extensions/bluesky-custom-domain
-# [[plugins]]
-#   package = "netlify-plugin-bluesky"
+[[plugins]]
+  package = "netlify-plugin-bluesky"
 
 # Supabase Integration  
 # Инструкция: https://app.netlify.com/extensions/supabase

package/package.json

@@ -2,7 +2,7 @@
     "name": "core-maugli",
     "description": "Astro & Tailwind CSS blog theme for Maugli.",
     "type": "module",
-    "version": "1.2.49",
+    "version": "1.2.51",
     "license": "GPL-3.0-or-later OR Commercial",
     "repository": {
         "type": "git",
@@ -27,6 +27,7 @@
         "build:no-check": "node scripts/flatten-images.cjs && node scripts/optimize-images.cjs && node typograf-batch.js && node scripts/verify-assets.js && node scripts/generate-previews.js && astro build",
         "optimize": "node scripts/optimize-images.cjs",
         "optimize:squoosh": "node scripts/squoosh-optimize.js",
+        "clean:resized": "node scripts/clean-resized-images.js",
         "test": "node tests/examplesFilter.test.ts",
         "astro": "astro",
         "featured:add": "node scripts/featured.js add",
@@ -39,9 +40,9 @@
         "check-version": "node scripts/check-version.js",
         "auto-update": "node scripts/auto-update.js",
         "build:ci": "SKIP_VERSION_CHECK=true npm run build",
-        "generate-netlify": "node scripts/copy-netlify-config.js",
+        "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 && node scripts/copy-netlify-config.js",
+        "postinstall": "node scripts/upgrade-config.js && node scripts/setup-user-images.js",
         "generate-previews": "node scripts/generate-previews.js"
     },
     "dependencies": {

package/scripts/clean-resized-images.js

@@ -0,0 +1,51 @@
+#!/usr/bin/env node
+
+/**
+ * Очищает ресайзеные изображения из git
+ * Удаляет уже закоммиченные файлы с суффиксами -400, -800, -1200
+ */
+
+import { execSync } from 'child_process';
+
+function main() {
+    try {
+        console.log('🧹 Cleaning resized images from git...');
+        
+        // Ищем все ресайзеные изображения в git
+        let resizedFiles;
+        try {
+            resizedFiles = execSync('git ls-files | grep -E ".*-(400|800|1200)\\.webp$"', { encoding: 'utf8' });
+        } catch (error) {
+            console.log('✅ No resized images found in git - nothing to clean');
+            return;
+        }
+        
+        if (!resizedFiles.trim()) {
+            console.log('✅ No resized images found in git - nothing to clean');
+            return;
+        }
+        
+        const files = resizedFiles.trim().split('\n');
+        console.log(`📋 Found ${files.length} resized images in git:`);
+        files.forEach(file => console.log(`   🗑️  ${file}`));
+        
+        // Удаляем файлы из git индекса (но оставляем на диске)
+        const filesString = files.join(' ');
+        execSync(`git rm --cached ${filesString}`, { encoding: 'utf8' });
+        
+        console.log(`✅ Removed ${files.length} resized images from git`);
+        console.log('💡 Files remain on disk but will be ignored by git');
+        console.log('');
+        console.log('📝 Next steps:');
+        console.log('   1. git add .gitignore');
+        console.log('   2. git commit -m "chore: remove resized images from git"');
+        console.log('');
+        console.log('🔄 Resized images will be regenerated automatically during build');
+        
+    } catch (error) {
+        console.error('❌ Error cleaning resized images:', error.message);
+        console.log('💡 You can manually run: git rm --cached public/**/*-{400,800,1200}.webp');
+    }
+}
+
+main();

package/scripts/copy-netlify-config-simple.js

@@ -0,0 +1,58 @@
+#!/usr/bin/env node
+
+/**
+ * Простое копирование netlify.toml из пакета core-maugli
+ */
+
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+function main() {
+    try {
+        const targetPath = path.join(process.cwd(), 'netlify.toml');
+        
+        // Проверяем, есть ли уже netlify.toml с маркером "CUSTOMIZED"
+        if (fs.existsSync(targetPath)) {
+            const existingContent = fs.readFileSync(targetPath, 'utf8');
+            
+            if (existingContent.includes('# CUSTOMIZED')) {
+                console.log('📋 Found "# CUSTOMIZED" marker - preserving entire file');
+                return;
+            }
+            
+            // Создаем бэкап
+            fs.copyFileSync(targetPath, targetPath + '.backup');
+            console.log('📦 Created backup: netlify.toml.backup');
+        }
+        
+        // Ищем исходный файл в пакете
+        let sourcePath;
+        const nodeModulesPath = path.join(process.cwd(), 'node_modules', 'core-maugli', 'netlify.toml');
+        if (fs.existsSync(nodeModulesPath)) {
+            sourcePath = nodeModulesPath;
+        } else {
+            sourcePath = path.join(__dirname, '..', 'netlify.toml');
+        }
+        
+        if (!fs.existsSync(sourcePath)) {
+            console.log('⚠️  netlify.toml template not found');
+            return;
+        }
+        
+        // Просто копируем файл
+        fs.copyFileSync(sourcePath, targetPath);
+        console.log('✅ netlify.toml copied successfully');
+        
+        console.log('');
+        console.log('💡 Add "# CUSTOMIZED" comment to prevent auto-updates');
+        
+    } catch (error) {
+        console.error('❌ Error copying netlify.toml:', error.message);
+    }
+}
+
+main();

package/scripts/copy-netlify-config.js

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
 
 /**
- * Копирует netlify.toml из пакета core-maugli в проект
+ * Копирует netlify.toml только при инициализации нового блога
+ * НЕ ТРОГАЕТ существующие netlify.toml файлы!
  */
 
 import fs from 'fs';
@@ -15,45 +16,19 @@ function main() {
     try {
         const targetPath = path.join(process.cwd(), 'netlify.toml');
         
-        // Проверяем, есть ли уже netlify.toml
+        // Если netlify.toml уже существует - НЕ ТРОГАЕМ!
         if (fs.existsSync(targetPath)) {
-            const existingContent = fs.readFileSync(targetPath, 'utf8');
-            
-            // Проверяем, кастомизирован ли файл пользователем
-            const hasBlueskyActive = existingContent.includes('bluesky-custom-domain') && 
-                                    !existingContent.includes('# [[plugins]]');
-            const hasSupabaseActive = existingContent.includes('@supabase/netlify-integration') && 
-                                     !existingContent.includes('# [[plugins]]');
-            const hasCustomComment = existingContent.includes('# CUSTOMIZED');
-            const hasUserModifications = !existingContent.includes('# Auto-copied from core-maugli package');
-            
-            const hasCustomizations = hasBlueskyActive || hasSupabaseActive || hasCustomComment || hasUserModifications;
-            
-            if (hasCustomizations) {
-                console.log('📋 netlify.toml exists with active integrations - preserving user settings');
-                if (hasBlueskyActive) console.log('   🔵 Bluesky integration detected');
-                if (hasSupabaseActive) console.log('   🟢 Supabase integration detected');
-                if (hasCustomComment) console.log('   ✏️  Custom modifications marked');
-                console.log('💡 To force update: delete netlify.toml and reinstall');
-                return;
-            } else {
-                console.log('📋 netlify.toml exists but no active integrations - updating to latest template');
-                // Создадим бэкап на всякий случай
-                fs.copyFileSync(targetPath, targetPath + '.backup');
-                console.log('📦 Created backup: netlify.toml.backup');
-            }
+            console.log('📋 netlify.toml already exists - leaving unchanged');
+            console.log('� Configure Netlify plugins manually via Netlify UI');
+            return;
         }
         
         // Ищем исходный файл в пакете
         let sourcePath;
-        
-        // Если запускаем из node_modules
         const nodeModulesPath = path.join(process.cwd(), 'node_modules', 'core-maugli', 'netlify.toml');
         if (fs.existsSync(nodeModulesPath)) {
             sourcePath = nodeModulesPath;
-        } 
-        // Если запускаем из самого пакета (для разработки)
-        else {
+        } else {
             sourcePath = path.join(__dirname, '..', 'netlify.toml');
         }
         
@@ -62,15 +37,14 @@ function main() {
             return;
         }
         
-        // Копируем файл
+        // Копируем файл только для нового блога
         fs.copyFileSync(sourcePath, targetPath);
-        console.log('✅ netlify.toml copied successfully');
-        console.log('');
-        console.log('📝 Manual setup required for:');
-        console.log('   • Bluesky: https://app.netlify.com/extensions/bluesky-custom-domain');
-        console.log('   • Supabase: https://app.netlify.com/extensions/supabase');
+        console.log('✅ netlify.toml created for new blog');
         console.log('');
-        console.log('💡 Uncomment plugins in netlify.toml after setup');
+        console.log('📝 Next steps:');
+        console.log('   1. Deploy to Netlify');
+        console.log('   2. Configure plugins via Netlify UI');
+        console.log('   3. Add "# CUSTOMIZED" comment to prevent overwrites');
         
     } catch (error) {
         console.error('❌ Error copying netlify.toml:', error.message);

package/scripts/update-all-blogs.js

@@ -56,10 +56,8 @@ const REQUIRED_SCRIPTS = [
     'scripts/update-with-backup.js',
     'scripts/check-version.js',
     'scripts/auto-update.js',
-    'scripts/copy-netlify-config.js',
     'scripts/set-force-update.js',
-    '.gitignore',
-    'netlify.toml'
+    '.gitignore'
 ];
 
 function log(message, type = 'info') {
@@ -155,23 +153,7 @@ function updateBlogProject(projectPath) {
         process.chdir(absolutePath);
         execSync('npm update core-maugli', { stdio: 'pipe' });
         
-        // 8. Копируем netlify.toml
-        log('Copying netlify.toml configuration...', 'info');
-        const copyNetlifyScript = path.join(process.cwd(), 'scripts/copy-netlify-config.js');
-        if (fs.existsSync(copyNetlifyScript)) {
-            try {
-                const { execSync } = require('child_process');
-                execSync(`node "${copyNetlifyScript}"`, { 
-                    stdio: 'pipe',
-                    cwd: absolutePath 
-                });
-                log('   ✅ netlify.toml copied', 'success');
-            } catch (error) {
-                log(`   ⚠️ netlify.toml copy failed: ${error.message}`, 'warn');
-            }
-        }
-
-        // 9. Результат
+        // 8. Результат
         log(`Project updated successfully!`, 'success');
         log(`  Version: ${oldVersion} → ${CURRENT_VERSION}`, 'info');
         log(`  Scripts updated: ${scriptsUpdated ? 'Yes' : 'No'}`, 'info');