core-maugli 1.1.7 → 1.1.9

package/README.md

@@ -8,14 +8,19 @@ Maugli is a lightweight, agent-friendly blog that can integrate into an existing
 
 The theme includes a `product` entity for showcasing offerings. Rename it (for example, to "services") and hide or customize related menu items by editing the `navLinks` array in the same configuration file.
 
-[![Deploy to Netlify Button](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/dashapps/maugli-astro-theme)
+[![Deploy to Netlify Button](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/dashapps/core-maugli-blog)
 
-Before deploying, push this project to your own Git repository. Update the
-`repository=` parameter in the link above so it points to your repository or
-connect the repo through the Netlify UI.
+The Netlify deployment button automatically uses your repository URL configured in [`src/config/maugli.config.ts`](src/config/maugli.config.ts). When you run `npx core-maugli init`, it will ask for your repository URL and configure the deployment button accordingly.
 
-Example link:
-`https://app.netlify.com/start/deploy?repository=https://github.com/your-user/your-repo`
+You can also use the dynamic `<NetlifyButton />` component in your Astro pages:
+
+```astro
+---
+import NetlifyButton from '../components/NetlifyButton.astro';
+---
+
+<NetlifyButton />
+```
 
 Using Netlify CLI instead:
 
@@ -239,3 +244,4 @@ commercial license.
 
 Contact <licensing@maugli.cfd> or visit
 <https://maugli.cfd/licensing> for more information.
+

package/bin/init.js

@@ -31,7 +31,47 @@ function promptLang(codes) {
   });
 }
 
-function updateConfig(targetDir, lang) {
+function promptRepo() {
+  return new Promise(resolve => {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.question('Repository URL: ', answer => {
+      rl.close();
+      resolve(answer.trim());
+    });
+  });
+}
+
+async function getRepoUrl(targetDir, repoOption) {
+  if (repoOption) return repoOption;
+  try {
+    const url = execSync('git remote get-url origin', {
+      cwd: targetDir,
+      stdio: ['ignore', 'pipe', 'ignore']
+    })
+      .toString()
+      .trim();
+    if (url) return url;
+  } catch {
+    // ignore
+  }
+  return await promptRepo();
+}
+
+function updateReadme(targetDir, repoUrl) {
+  if (!repoUrl) return;
+  const readmePath = path.join(targetDir, 'README.md');
+  if (!existsSync(readmePath)) return;
+  let content = readFileSync(readmePath, 'utf8');
+  const pattern = /https:\/\/app\.netlify\.com\/start\/deploy\?repository=[^\)\s]+/;
+  content = content.replace(
+    pattern,
+    `https://app.netlify.com/start/deploy?repository=${repoUrl}`
+  );
+  writeFileSync(readmePath, content);
+  console.log('Updated Netlify link in README.md');
+}
+
+function updateConfig(targetDir, lang, repoUrl) {
   const configPath = path.join(targetDir, 'src', 'config', 'maugli.config.ts');
   if (!existsSync(configPath)) return;
   let content = readFileSync(configPath, 'utf8');
@@ -39,11 +79,23 @@ function updateConfig(targetDir, lang) {
   const multiMatch = content.match(/enableMultiLang:\s*(true|false)/);
   const multi = multiMatch ? multiMatch[1] === 'true' : false;
   content = content.replace(/showLangSwitcher:\s*(true|false)/, `showLangSwitcher: ${multi}`);
+  
+  // Update repository URL if provided
+  if (repoUrl) {
+    content = content.replace(
+      /repository:\s*{[^}]*url:\s*'[^']*'/,
+      `repository: {\n    url: '${repoUrl}'`
+    );
+  }
+  
   writeFileSync(configPath, content);
   console.log(`Configured default language to ${lang}`);
+  if (repoUrl) {
+    console.log(`Configured repository URL to ${repoUrl}`);
+  }
 }
 
-export default async function init(targetName, langOption) {
+export default async function init(targetName, langOption, repoOption) {
   const targetDir = targetName ? path.resolve(targetName) : process.cwd();
   const codes = getLanguageCodes();
   const lang = langOption && codes.includes(langOption) ? langOption : await promptLang(codes);
@@ -82,6 +134,9 @@ export default async function init(targetName, langOption) {
   ];
   items.forEach(copyItem);
 
+  const repoUrl = await getRepoUrl(targetDir, repoOption);
+  updateReadme(targetDir, repoUrl);
+
   // Create essential config files
   const gitignoreContent = `
 # Dependencies
@@ -122,7 +177,7 @@ dist/
   console.log('Created .prettierrc');
 
   execSync('npm install', { cwd: targetDir, stdio: 'inherit' });
-  updateConfig(targetDir, lang);
+  updateConfig(targetDir, lang, repoUrl);
 }
 
 // Если скрипт запускается напрямую
@@ -130,13 +185,17 @@ if (import.meta.url === `file://${process.argv[1]}`) {
   const args = process.argv.slice(2);
   let targetName;
   let lang;
+  let repo;
   for (let i = 0; i < args.length; i++) {
     if (args[i] === '--lang' && i + 1 < args.length) {
       lang = args[i + 1];
       i++;
+    } else if (args[i] === '--repo' && i + 1 < args.length) {
+      repo = args[i + 1];
+      i++;
     } else {
       targetName = args[i];
     }
   }
-  await init(targetName, lang);
-}
+  await init(targetName, lang, repo);
+}

package/package.json

@@ -2,11 +2,11 @@
     "name": "core-maugli",
     "description": "Astro & Tailwind CSS blog theme for Maugli.",
     "type": "module",
-    "version": "1.1.7",
+    "version": "1.1.9",
     "license": "GPL-3.0-or-later OR Commercial",
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/dashapps/maugli-astro-theme.git"
+        "url": "git+https://github.com/dashapps/core-maugli-blog.git"
     },
     "author": "Maugli Content Farm",
     "keywords": [

package/scripts/upgrade-config.js

@@ -10,81 +10,89 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 const defaultConfigPath = path.join(__dirname, '../src/config/maugli.config.ts');
-const userConfigPath = path.join(process.cwd(), 'src/config/maugli.config.ts');
+const userRoot = process.env.INIT_CWD || process.cwd();
+const userConfigPath = path.join(userRoot, 'src/config/maugli.config.ts');
 
 async function loadTsModule(filePath) {
-  const code = await fs.readFile(filePath, 'utf8');
-  const js = ts.transpileModule(code, {
-    compilerOptions: { module: ts.ModuleKind.ESNext, target: ts.ScriptTarget.ES2020 }
-  }).outputText;
-  const tmp = path.join(os.tmpdir(), `maugli-${Date.now()}.mjs`);
-  await fs.writeFile(tmp, js, 'utf8');
-  const mod = await import(pathToFileURL(tmp).href);
-  await fs.unlink(tmp);
-  return mod;
+    const code = await fs.readFile(filePath, 'utf8');
+    const js = ts.transpileModule(code, {
+        compilerOptions: { module: ts.ModuleKind.ESNext, target: ts.ScriptTarget.ES2020 }
+    }).outputText;
+    const tmp = path.join(os.tmpdir(), `maugli-${Date.now()}.mjs`);
+    await fs.writeFile(tmp, js, 'utf8');
+    const mod = await import(pathToFileURL(tmp).href);
+    await fs.unlink(tmp);
+    return mod;
 }
 
 function mergeMissing(target, source) {
-  for (const key of Object.keys(source)) {
-    if (key === 'configVersion') continue;
-    const sv = source[key];
-    const tv = target[key];
-    if (sv && typeof sv === 'object' && !Array.isArray(sv)) {
-      if (!tv || typeof tv !== 'object' || Array.isArray(tv)) {
-        if (!(key in target)) target[key] = sv;
-      } else {
-        mergeMissing(tv, sv);
-      }
-    } else {
-      if (!(key in target)) target[key] = sv;
+    for (const key of Object.keys(source)) {
+        if (key === 'configVersion') continue;
+        const sv = source[key];
+        const tv = target[key];
+        if (sv && typeof sv === 'object' && !Array.isArray(sv)) {
+            if (!tv || typeof tv !== 'object' || Array.isArray(tv)) {
+                if (!(key in target)) target[key] = sv;
+            } else {
+                mergeMissing(tv, sv);
+            }
+        } else {
+            if (!(key in target)) target[key] = sv;
+        }
     }
-  }
 }
 
 async function main() {
-  const pkg = await loadTsModule(defaultConfigPath);
-  const defCfg = pkg.maugliConfig;
-  const newVersion = pkg.MAUGLI_CONFIG_VERSION || defCfg.configVersion;
+    const pkg = await loadTsModule(defaultConfigPath);
+    const defCfg = pkg.maugliConfig;
+    const newVersion = pkg.MAUGLI_CONFIG_VERSION || defCfg.configVersion;
 
-  let user;
-  try {
-    user = await loadTsModule(userConfigPath);
-  } catch (err) {
-    console.error(`Cannot find user config at ${userConfigPath}`);
-    process.exit(1);
-  }
-  const userCfg = user.maugliConfig;
-  if (userCfg.configVersion === newVersion) {
-    console.log('maugli.config.ts is already up to date');
-    return;
-  }
+    try {
+        await fs.access(userConfigPath);
+    } catch {
+        console.warn(`User config not found at ${userConfigPath}, skipping upgrade`);
+        return;
+    }
+
+    let user;
+    try {
+        user = await loadTsModule(userConfigPath);
+    } catch (err) {
+        console.warn(`Cannot load user config at ${userConfigPath}:`, err.message);
+        return;
+    }
+    const userCfg = user.maugliConfig;
+    if (userCfg.configVersion === newVersion) {
+        console.log('maugli.config.ts is already up to date');
+        return;
+    }
 
-  mergeMissing(userCfg, defCfg);
-  userCfg.configVersion = newVersion;
+    mergeMissing(userCfg, defCfg);
+    userCfg.configVersion = newVersion;
 
-  const defText = await fs.readFile(defaultConfigPath, 'utf8');
-  const headerEnd = defText.indexOf('export const maugliConfig');
-  let header = defText.slice(0, headerEnd);
-  header = header.replace(/MAUGLI_CONFIG_VERSION\s*=\s*['\"][^'\"]*['\"]/, `MAUGLI_CONFIG_VERSION = '${newVersion}'`);
-  let bracePos = defText.indexOf('{', headerEnd);
-  let count = 0, i = bracePos;
-  for (; i < defText.length; i++) {
-    if (defText[i] === '{') count++;
-    else if (defText[i] === '}') count--;
-    if (count === 0) break;
-  }
-  let j = i;
-  while (j < defText.length && defText[j] !== ';') j++;
-  const tail = defText.slice(j + 1);
+    const defText = await fs.readFile(defaultConfigPath, 'utf8');
+    const headerEnd = defText.indexOf('export const maugliConfig');
+    let header = defText.slice(0, headerEnd);
+    header = header.replace(/MAUGLI_CONFIG_VERSION\s*=\s*['\"][^'\"]*['\"]/, `MAUGLI_CONFIG_VERSION = '${newVersion}'`);
+    let bracePos = defText.indexOf('{', headerEnd);
+    let count = 0,
+        i = bracePos;
+    for (; i < defText.length; i++) {
+        if (defText[i] === '{') count++;
+        else if (defText[i] === '}') count--;
+        if (count === 0) break;
+    }
+    let j = i;
+    while (j < defText.length && defText[j] !== ';') j++;
+    const tail = defText.slice(j + 1);
 
-  const newObject = JSON.stringify(userCfg, null, 2);
-  const result = `${header}export const maugliConfig: MaugliConfig = ${newObject};${tail}`;
-  await fs.writeFile(userConfigPath, result, 'utf8');
-  console.log(`Upgraded maugli.config.ts to version ${newVersion}`);
+    const newObject = JSON.stringify(userCfg, null, 2);
+    const result = `${header}export const maugliConfig: MaugliConfig = ${newObject};${tail}`;
+    await fs.writeFile(userConfigPath, result, 'utf8');
+    console.log(`Upgraded maugli.config.ts to version ${newVersion}`);
 }
 
-main().catch(err => {
-  console.error('Upgrade failed:', err);
-  process.exit(1);
+main().catch((err) => {
+    console.error('Upgrade failed:', err);
+    process.exit(1);
 });
-

package/src/components/NetlifyButton.astro

@@ -0,0 +1,22 @@
+---
+import { maugliConfig } from '../config/maugli.config.ts';
+
+interface Props {
+    class?: string;
+}
+
+const { class: className } = Astro.props;
+
+// Use repository URL from config, fallback to default
+const repositoryUrl = maugliConfig.repository?.url || 'https://github.com/dashapps/core-maugli-blog';
+const netlifyEnabled = maugliConfig.repository?.netlifyEnabled !== false;
+const netlifyUrl = `https://app.netlify.com/start/deploy?repository=${repositoryUrl}`;
+---
+
+{
+    netlifyEnabled && (
+        <a href={netlifyUrl} target="_blank" rel="noopener noreferrer" class={className}>
+            <img src="https://www.netlify.com/img/deploy/button.svg" alt="Deploy to Netlify" />
+        </a>
+    )
+}

package/src/config/maugli.config.ts

@@ -1,5 +1,5 @@
 // MAUGLI_CONFIG_VERSION — config version for CLI/automation compatibility
-export const MAUGLI_CONFIG_VERSION = '0.2';
+export const MAUGLI_CONFIG_VERSION = '0.3';
 // Main configuration interface for the Maugli project
 export interface MaugliConfig {
   // Show example/demo content (for CLI/empty blog setup)
@@ -19,6 +19,11 @@ export interface MaugliConfig {
     farmProductIds?: string[];   // Array of farm product IDs for API
     farmProjectIds?: string[];   // Array of farm project/case IDs for API
   };
+  // Repository settings for deployment
+  repository?: {
+    url?: string; // User's repository URL for Netlify deployment button
+    netlifyEnabled?: boolean; // Enable Netlify deployment button (default: true)
+  };
   // Brand and logo settings
   brand: {
     name: string; // Brand name
@@ -111,6 +116,11 @@ export const maugliConfig: MaugliConfig = {
     farmProductIds: [],   // Array of farm product IDs for API
     farmProjectIds: [],   // Array of farm project/case IDs for API
   },
+  // Repository settings for deployment
+  repository: {
+    url: 'https://github.com/dashapps/core-maugli-blog', // User's repository URL for Netlify deployment button
+    netlifyEnabled: true, // Enable Netlify deployment button (default: true)
+  },
   enableThemeSwitcher: true, // Enable theme switcher (true by default)
   seo: {
     titleSuffix: ' — Maugli', // Suffix for page titles