ultimate-jekyll-manager 0.0.118 → 0.0.120

package/dist/gulp/tasks/defaults.js

@@ -60,8 +60,14 @@ const FILE_MAP = {
   // 'dist/pages/**/*': {
   //   path: (file) => file.source.replace('dist/pages', 'dist'),
   // },
+  // Files to rename and merge
   '_.gitignore': {
     name: (file) => file.name.replace('_.gitignore', '.gitignore'),
+    mergeLines: true, // Merge line-by-line instead of overwriting
+  },
+  '_.env': {
+    name: (file) => file.name.replace('_.env', '.env'),
+    mergeLines: true, // Merge line-by-line instead of overwriting
   },
 
   // Config file with smart merging
@@ -110,6 +116,188 @@ const delay = 250;
 // Index
 let index = -1;
 
+// Helper function to merge line-based files (.gitignore, .env)
+function mergeLineBasedFiles(existingContent, newContent, fileName) {
+  // Parse existing content into lines
+  const existingLines = existingContent.split('\n');
+  const newLines = newContent.split('\n');
+
+  // For .env files, we track keys; for .gitignore, we track the full line
+  const isEnvFile = fileName === '.env';
+
+  // Markers for separating default values from user custom values
+  const DEFAULT_SECTION_MARKER = '# ========== Default Values ==========';
+  const CUSTOM_SECTION_MARKER = '# ========== Custom Values ==========';
+
+  // Parse existing file into default section and custom section
+  let defaultSection = [];
+  let customSection = [];
+  let inCustomSection = false;
+  let inDefaultSection = false;
+
+  const existingDefaultKeys = new Set();
+  const existingCustomKeys = new Set();
+
+  for (const line of existingLines) {
+    const trimmed = line.trim();
+
+    // Check for section markers
+    if (trimmed === DEFAULT_SECTION_MARKER) {
+      inDefaultSection = true;
+      inCustomSection = false;
+      continue;
+    }
+    if (trimmed === CUSTOM_SECTION_MARKER) {
+      inCustomSection = true;
+      inDefaultSection = false;
+      continue;
+    }
+
+    // Add to appropriate section
+    if (inCustomSection) {
+      customSection.push(line);
+      // Track custom keys
+      if (isEnvFile && trimmed && !trimmed.startsWith('#')) {
+        const key = trimmed.split('=')[0].trim();
+        if (key) {
+          existingCustomKeys.add(key);
+        }
+      }
+    } else if (inDefaultSection) {
+      defaultSection.push(line);
+      // Track default keys
+      if (isEnvFile && trimmed && !trimmed.startsWith('#')) {
+        const key = trimmed.split('=')[0].trim();
+        if (key) {
+          existingDefaultKeys.add(key);
+        }
+      }
+    }
+  }
+
+  // Parse new content to build complete default section in order
+  const newDefaultSection = [];
+  const newDefaultKeys = new Set();
+
+  let inNewDefaultSection = false;
+  let inNewCustomSection = false;
+
+  for (const line of newLines) {
+    const trimmed = line.trim();
+
+    // Check for section markers
+    if (trimmed === DEFAULT_SECTION_MARKER) {
+      inNewDefaultSection = true;
+      inNewCustomSection = false;
+      continue;
+    }
+    if (trimmed === CUSTOM_SECTION_MARKER) {
+      inNewCustomSection = true;
+      inNewDefaultSection = false;
+      continue;
+    }
+
+    // Only process default section from new file
+    if (inNewDefaultSection) {
+      // For env files, check if key exists
+      if (isEnvFile && trimmed && !trimmed.startsWith('#')) {
+        const key = trimmed.split('=')[0].trim();
+        if (key) {
+          newDefaultKeys.add(key);
+          // If key exists in user's file (either section), skip the default value
+          if (!existingDefaultKeys.has(key) && !existingCustomKeys.has(key)) {
+            // New key - add it
+            newDefaultSection.push(line);
+          } else {
+            // Key exists - we'll add user's value later in order
+            newDefaultSection.push(null); // Placeholder to maintain order
+          }
+        } else {
+          newDefaultSection.push(line);
+        }
+      } else {
+        // Comments and empty lines
+        newDefaultSection.push(line);
+      }
+    }
+  }
+
+  // Now merge user's existing default values in the correct order
+  const mergedDefaultSection = [];
+  let defaultSectionIndex = 0;
+
+  for (const line of newDefaultSection) {
+    if (line === null) {
+      // Placeholder - insert corresponding user value
+      // Find the next user value
+      while (defaultSectionIndex < defaultSection.length) {
+        const userLine = defaultSection[defaultSectionIndex++];
+        const trimmed = userLine.trim();
+        if (trimmed && !trimmed.startsWith('#')) {
+          mergedDefaultSection.push(userLine);
+          break;
+        }
+      }
+    } else {
+      mergedDefaultSection.push(line);
+    }
+  }
+
+  // Find any user-added lines in default section that aren't in new defaults
+  // These should be moved to custom section
+  const userAddedToDefaults = [];
+
+  for (const line of defaultSection) {
+    const trimmed = line.trim();
+
+    // Skip empty lines and comments
+    if (!trimmed || trimmed.startsWith('#')) {
+      continue;
+    }
+
+    if (isEnvFile) {
+      // For .env, check if key exists in new defaults
+      const key = trimmed.split('=')[0].trim();
+      if (key && !newDefaultKeys.has(key) && !existingCustomKeys.has(key)) {
+        // User added this key to defaults section - move to custom
+        userAddedToDefaults.push(line);
+      }
+    } else {
+      // For .gitignore, check if line exists in new defaults
+      // We need to check if this exact line appears in the new default section
+      const lineExistsInNewDefaults = newLines.some(newLine => {
+        return newLine.trim() === trimmed;
+      });
+
+      if (!lineExistsInNewDefaults) {
+        // User added this line to defaults section - move to custom
+        userAddedToDefaults.push(line);
+      }
+    }
+  }
+
+  // Build final result
+  const result = [];
+
+  // Add default section
+  result.push(DEFAULT_SECTION_MARKER);
+  result.push(...mergedDefaultSection);
+
+  // Add custom section
+  result.push('');
+  result.push(CUSTOM_SECTION_MARKER);
+
+  // First add any user lines that were in default section (moved to custom)
+  if (userAddedToDefaults.length > 0) {
+    result.push(...userAddedToDefaults);
+  }
+
+  // Then add existing custom section
+  result.push(...customSection);
+
+  return result.join('\n');
+}
+
 // Helper function to merge configs intelligently
 function mergeConfigs(existingConfig, newConfig) {
   const merged = { ...newConfig };
@@ -256,8 +444,27 @@ function customTransform() {
       }
     }
 
+    // Handle line-based merging (.gitignore, .env)
+    if (options.mergeLines && exists && !isBinaryFile) {
+      try {
+        const existingContent = jetpack.read(fullOutputPath);
+        const newContent = file.contents.toString();
+
+        // Merge line-by-line, passing the filename to handle .env differently
+        const mergedContent = mergeLineBasedFiles(existingContent, newContent, item.name);
+
+        // Update file contents
+        file.contents = Buffer.from(mergedContent);
+
+        logger.log(`Merged line-based file: ${relativePath}`);
+      } catch (error) {
+        logger.error(`Error merging line-based file ${relativePath}:`, error);
+        // Fall through to normal processing if merge fails
+      }
+    }
+
     // Skip if instructed
-    if (options.skip || (!options.overwrite && exists && !options.merge)) {
+    if (options.skip || (!options.overwrite && exists && !options.merge && !options.mergeLines)) {
       logger.log(`Skipping file: ${relativePath}`);
       return callback();
     }
@@ -325,6 +532,8 @@ function getFileOptions(filePath) {
     path: null,
     template: null,
     skip: false,
+    merge: false,
+    mergeLines: false,
     rule: null,
   };
 

package/dist/gulp/tasks/serve.js

@@ -63,6 +63,24 @@ module.exports = async function serve(complete) {
 
     // Write the config file
     jetpack.write('.temp/_config_browsersync.yml', `url: ${externalUrl}`);
+//     jetpack.write('.temp/_config_browsersync.yml', `
+// url: ${externalUrl}
+
+// web_manager:
+//   firebase:
+//     app:
+//       config:
+//         authDomain: "${new URL(externalUrl).host}"
+// `);
+//     jetpack.write('.temp/_config_browsersync.yml', `
+// url: ${externalUrl}
+
+// web_manager:
+//   firebase:
+//     app:
+//       config:
+//         authDomain: "${new URL(localUrl).host}"
+// `);
 
     // Set global variable to access browserSync in other files
     global.browserSync = browserSync;

package/dist/lib/logger.js

@@ -1,5 +1,5 @@
 // Libraries
-const chalk = require('chalk');
+const chalk = require('chalk').default;
 
 // Logger class
 function Logger(name) {