core-maugli 1.2.44 → 1.2.45

package/netlify.toml

@@ -1,22 +1,20 @@
-# Netlify configuration generated from maugli.config.ts
+# Netlify configuration for Maugli Blog
+# Auto-copied from core-maugli package
 
 [build]
-  command = "npm run build"
   publish = "dist"
+  command = "npm run build"
 
 [build.environment]
-  NODE_VERSION = "18"
-  NPM_FLAGS = "--legacy-peer-deps"
+  NODE_VERSION = "20"
 
-# Netlify plugins
+# Обязательные плагины для Astro
 [[plugins]]
-  package = "@netlify/plugin-lighthouse"
+  package = "netlify-plugin-astro"
 
+# Рекомендуемые плагины для оптимизации
 [[plugins]]
-  package = "netlify-plugin-submit-sitemap"
-
-[[plugins]]
-  package = "netlify-plugin-checklinks"
+  package = "@netlify/plugin-lighthouse"
 
 [[plugins]]
   package = "netlify-plugin-image-optim"
@@ -25,10 +23,20 @@
   package = "netlify-plugin-minify-html"
 
 [[plugins]]
-  package = "netlify-plugin-inline-critical-css"
+  package = "netlify-plugin-submit-sitemap"
 
-[[plugins]]
-  package = "netlify-plugin-hashfiles"
+# Плагины для интеграций (требуют ручной настройки)
+# Раскомментируйте после настройки в Netlify UI:
+
+# Bluesky Custom Domain
+# Инструкция: https://app.netlify.com/extensions/bluesky-custom-domain
+# [[plugins]]
+#   package = "netlify-plugin-bluesky"
+
+# Supabase Integration  
+# Инструкция: https://app.netlify.com/extensions/supabase
+# [[plugins]]
+#   package = "@supabase/netlify-integration"
 
 # Redirects
 [[redirects]]
@@ -36,23 +44,23 @@
   to = "/rss.xml"
   status = 301
 
-# Headers
+# Headers для безопасности
 [[headers]]
   for = "/*"
   [headers.values]
-    "X-Frame-Options" = "DENY"
-  [headers.values]
-    "X-Content-Type-Options" = "nosniff"
-  [headers.values]
-    "Referrer-Policy" = "strict-origin-when-cross-origin"
+    X-Frame-Options = "DENY"
+    X-XSS-Protection = "1; mode=block"
+    X-Content-Type-Options = "nosniff"
+    Referrer-Policy = "strict-origin-when-cross-origin"
 
+# Кэширование изображений
 [[headers]]
   for = "/img/*"
   [headers.values]
-    "Cache-Control" = "public, max-age=31536000, immutable"
+    Cache-Control = "public, max-age=31536000, immutable"
 
 [[headers]]
   for = "/*.webp"
   [headers.values]
-    "Cache-Control" = "public, max-age=31536000, immutable"
+    Cache-Control = "public, max-age=31536000, immutable"
 

package/package.json

@@ -2,7 +2,7 @@
     "name": "core-maugli",
     "description": "Astro & Tailwind CSS blog theme for Maugli.",
     "type": "module",
-    "version": "1.2.44",
+    "version": "1.2.45",
     "license": "GPL-3.0-or-later OR Commercial",
     "repository": {
         "type": "git",
@@ -39,8 +39,8 @@
         "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/generate-netlify-config.js",
-        "postinstall": "node scripts/upgrade-config.js && node scripts/setup-user-images.js && node scripts/generate-netlify-config.js",
+        "generate-netlify": "node scripts/copy-netlify-config.js",
+        "postinstall": "node scripts/upgrade-config.js && node scripts/setup-user-images.js && node scripts/copy-netlify-config.js",
         "generate-previews": "node scripts/generate-previews.js"
     },
     "dependencies": {

package/scripts/check-version.js

@@ -8,6 +8,15 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+// Handle CLI arguments and environment variables first
+const args = process.argv.slice(2);
+if (args.includes('--skip-check') || 
+    process.env.SKIP_VERSION_CHECK === 'true' ||
+    process.env.DISABLE_AUTO_UPDATE === 'true') {
+    console.log(colorize('⏭️  Version check skipped', 'yellow'));
+    process.exit(0);
+}
+
 // Colors for console output
 const colors = {
     red: '\x1b[31m',
@@ -228,13 +237,8 @@ async function main() {
     console.log(colorize('\n✅ Proceeding with build...\n', 'green'));
 }
 
-// Handle CLI arguments
-const args = process.argv.slice(2);
-if (args.includes('--skip-check') || 
-    process.env.SKIP_VERSION_CHECK === 'true' ||
-    process.env.DISABLE_AUTO_UPDATE === 'true') {
-    console.log(colorize('⏭️  Version check skipped', 'yellow'));
-    process.exit(0);
+function colorize(text, color) {
+    return `${colors[color]}${text}${colors.reset}`;
 }
 
 main().catch(error => {

package/scripts/copy-netlify-config.js

@@ -0,0 +1,57 @@
+#!/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
+        if (fs.existsSync(targetPath)) {
+            console.log('📋 netlify.toml already exists - skipping copy');
+            return;
+        }
+        
+        // Ищем исходный файл в пакете
+        let sourcePath;
+        
+        // Если запускаем из node_modules
+        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('📝 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('');
+        console.log('💡 Uncomment plugins in netlify.toml after setup');
+        
+    } catch (error) {
+        console.error('❌ Error copying netlify.toml:', error.message);
+    }
+}
+
+main();

package/scripts/update-all-blogs.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env nconst CURRENT_VERSION = '1.2.45';de
 
 /**
  * Скрипт для централизованного обновления всех блогов до последней версии core-maugli
@@ -57,7 +57,7 @@ const REQUIRED_SCRIPTS = [
     'scripts/update-with-backup.js',
     'scripts/check-version.js',
     'scripts/auto-update.js',
-    'scripts/generate-netlify-config.js',
+        'scripts/copy-netlify-config.js',
     '.gitignore',
     'netlify.toml'
 ];
@@ -155,19 +155,19 @@ function updateBlogProject(projectPath) {
         process.chdir(absolutePath);
         execSync('npm update core-maugli', { stdio: 'pipe' });
         
-        // 8. Генерируем netlify.toml
-        log('Generating netlify.toml configuration...', 'info');
-        const generateNetlifyScript = path.join(process.cwd(), 'scripts/generate-netlify-config.js');
-        if (fs.existsSync(generateNetlifyScript)) {
+        // 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 "${generateNetlifyScript}"`, { 
+                execSync(`node "${copyNetlifyScript}"`, { 
                     stdio: 'pipe',
                     cwd: absolutePath 
                 });
-                log('   ✅ netlify.toml generated', 'success');
+                log('   ✅ netlify.toml copied', 'success');
             } catch (error) {
-                log(`   ⚠️ netlify.toml generation failed: ${error.message}`, 'warn');
+                log(`   ⚠️ netlify.toml copy failed: ${error.message}`, 'warn');
             }
         }
 
@@ -211,7 +211,7 @@ function main() {
         log('  ✅ Correct core-maugli version', 'success');
         log('  ✅ Up-to-date build scripts', 'success');
         log('  ✅ Working image optimization', 'success');
-        log('  ✅ Auto-generated netlify.toml', 'success');
+        log('  ✅ Auto-copied netlify.toml', 'success');
     }
 }
 

package/scripts/generate-netlify-config.js

@@ -1,176 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Generate netlify.toml from maugli.config.ts
- * This script creates a Netlify configuration file based on the Maugli configuration
- */
-
-import fs from 'fs';
-import os from 'os';
-import path from 'path';
-import ts from 'typescript';
-import { fileURLToPath, pathToFileURL } from 'url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-async function loadTsModule(filePath) {
-    const code = await fs.promises.readFile(filePath, 'utf8');
-    const js = ts.transpileModule(code, {
-        compilerOptions: { module: ts.ModuleKind.ESNext, target: ts.ScriptTarget.ES2020 }
-    }).outputText;
-    const tmp = path.join(os.tmpdir(), `netlify-gen-${Date.now()}.mjs`);
-    await fs.promises.writeFile(tmp, js, 'utf8');
-    const mod = await import(pathToFileURL(tmp).href);
-    await fs.promises.unlink(tmp);
-    return mod;
-}
-
-async function loadMaugliConfig() {
-    try {
-        // Try to load from user project first
-        const userConfigPath = path.join(process.cwd(), 'src/config/maugli.config.ts');
-        if (fs.existsSync(userConfigPath)) {
-            const mod = await loadTsModule(userConfigPath);
-            return mod.maugliConfig;
-        }
-        
-        // Fallback to default config
-        const defaultConfigPath = path.join(__dirname, '../src/config/maugli.config.ts');
-        const mod = await loadTsModule(defaultConfigPath);
-        return mod.maugliConfig;
-    } catch (error) {
-        console.warn('Could not load maugli.config.ts:', error.message);
-        return null;
-    }
-}
-
-function generateNetlifyToml(config) {
-    const netlifyConfig = config.netlify || {};
-    
-    let toml = `# Netlify configuration generated from maugli.config.ts\n\n`;
-    
-    // Build settings
-    toml += `[build]\n`;
-    toml += `  command = "${netlifyConfig.buildCommand || 'npm run build'}"\n`;
-    toml += `  publish = "${netlifyConfig.publishDir || 'dist'}"\n\n`;
-    
-    // Environment variables
-    if (netlifyConfig.environment) {
-        toml += `[build.environment]\n`;
-        
-        // Add auto-update control
-        if (netlifyConfig.autoUpdate === false) {
-            toml += `  DISABLE_AUTO_UPDATE = "true"\n`;
-        }
-        
-        for (const [key, value] of Object.entries(netlifyConfig.environment)) {
-            toml += `  ${key} = "${value}"\n`;
-        }
-        toml += `\n`;
-    } else if (netlifyConfig.autoUpdate === false) {
-        toml += `[build.environment]\n`;
-        toml += `  DISABLE_AUTO_UPDATE = "true"\n\n`;
-    }
-    
-    // Plugins
-    if (netlifyConfig.plugins && netlifyConfig.plugins.length > 0) {
-        toml += `# Netlify plugins\n`;
-        netlifyConfig.plugins.forEach(plugin => {
-            toml += `[[plugins]]\n`;
-            toml += `  package = "${plugin}"\n\n`;
-        });
-    }
-    
-    // Redirects
-    if (netlifyConfig.redirects && netlifyConfig.redirects.length > 0) {
-        toml += `# Redirects\n`;
-        netlifyConfig.redirects.forEach(redirect => {
-            toml += `[[redirects]]\n`;
-            toml += `  from = "${redirect.from}"\n`;
-            toml += `  to = "${redirect.to}"\n`;
-            toml += `  status = ${redirect.status || 301}\n`;
-            if (redirect.force) {
-                toml += `  force = true\n`;
-            }
-            toml += `\n`;
-        });
-    }
-    
-    // Headers
-    if (netlifyConfig.headers && netlifyConfig.headers.length > 0) {
-        toml += `# Headers\n`;
-        netlifyConfig.headers.forEach(header => {
-            toml += `[[headers]]\n`;
-            toml += `  for = "${header.for}"\n`;
-            for (const [key, value] of Object.entries(header.values)) {
-                toml += `  [headers.values]\n`;
-                toml += `    "${key}" = "${value}"\n`;
-            }
-            toml += `\n`;
-        });
-    }
-    
-    return toml;
-}
-
-async function main() {
-    console.log('🔧 Generating netlify.toml from maugli.config.ts...');
-    
-    const config = await loadMaugliConfig();
-    if (!config) {
-        console.warn('⚠️  Could not load maugli configuration, skipping netlify.toml generation');
-        return;
-    }
-    
-    const tomlContent = generateNetlifyToml(config);
-    const outputPath = path.join(process.cwd(), 'netlify.toml');
-    
-    // Check if netlify.toml already exists
-    if (fs.existsSync(outputPath)) {
-        // Read existing content to check if it's auto-generated
-        const existingContent = fs.readFileSync(outputPath, 'utf8');
-        if (existingContent.includes('# Netlify configuration generated from maugli.config.ts')) {
-            console.log('🔄 Updating auto-generated netlify.toml...');
-        } else {
-            console.log('⚠️  Custom netlify.toml detected. Creating backup...');
-            fs.copyFileSync(outputPath, `${outputPath}.backup`);
-        }
-    }
-    
-    fs.writeFileSync(outputPath, tomlContent, 'utf8');
-    console.log('✅ netlify.toml generated successfully!');
-    
-    if (config.netlify?.autoUpdate === false) {
-        console.log('🚫 Auto-update disabled in Netlify configuration');
-    } else {
-        console.log('🔄 Auto-update enabled for Netlify builds');
-    }
-    
-    // List installed plugins
-    if (config.netlify?.plugins && config.netlify.plugins.length > 0) {
-        console.log('🔌 Netlify plugins configured:');
-        
-        const manualSetupPlugins = [
-            'netlify-plugin-bluesky-custom-domain',
-            'netlify-plugin-supabase'
-        ];
-        
-        config.netlify.plugins.forEach(plugin => {
-            const needsManualSetup = manualSetupPlugins.includes(plugin);
-            const indicator = needsManualSetup ? '⚙️ ' : '✅ ';
-            console.log(`   ${indicator}${plugin}`);
-        });
-        
-        console.log('\n📋 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('📁 File location:', outputPath);
-}
-
-main().catch(error => {
-    console.error('❌ Failed to generate netlify.toml:', error.message);
-    process.exit(1);
-});