ultimate-jekyll-manager 0.0.110 → 0.0.112

package/CLAUDE.md

@@ -17,15 +17,55 @@ The "consuming" project has the following structure:
 ## Local Development
 When working with a consuming project, the local development server URL can be found in the `.temp/_config_browsersync.yml` file in the consuming project's root directory. You should read this file to determine the correct local URL for browsing and testing the site.
 
-Other Ultimate Jekyll Components:
+## Other Ultimate Jekyll Components:
 src/assets/css/ultimate-jekyll-manager.scss = Main stylesheet used by Ultimate Jekyll to style the site
 src/assets/css/global = Global styles that are used by Ultimate Jekyll
 src/assets/css/pages = Page-specific styles that are used by Ultimate Jekyll
 * If you are making a page, put the styles in this directory like so: `src/assets/css/pages/[page-name]/index.scss`
 
+src/assets/css/main.scss
+* This file runs on EVERY page and should be edited to contain site-wide CSS styles.
+
+
 src/assets/js/ultimate-jekyll-manager.js = Main JavaScript file used by Ultimate Jekyll to manage the site
 src/assets/js/pages = Page-specific JavaScript files that are used by Ultimate Jekyll
 * If you are making a page, put the JavaScript in this directory like so: `src/assets/js/pages/[page-name]/index.js`
+* The page-specific JS and CSS files are automatically included in the page based on the page's canonical path.
+* You need to use our standardized structure:
+  * Notice how how the helpers are outside the main export function.
+```js
+/**
+ * XXX Page JavaScript
+ */
+
+// Libraries
+let webManager = null;
+
+// Module
+export default (Manager) => {
+  return new Promise(async function (resolve) {
+    // Shortcuts
+    webManager = Manager.webManager;
+
+    // Initialize when DOM is ready
+    await webManager.dom().ready();
+
+    // We just need to pause videos when switching tabs for better UX
+    helper1();
+
+    // Resolve after initialization
+    return resolve();
+  });
+};
+
+// Helper functions
+function helper1() {
+  // ...
+}
+```
+
+/src/assets/js/main.js
+* This file runs on EVERY page and should be edited to contain site-wide JavaScript functionality.
 
 src/assets/themes = Theme scss and js files that are can be picked and used by the consuming project.
 

package/dist/commands/migrate.js

@@ -41,47 +41,47 @@ async function migratePosts() {
     return;
   }
 
-  // Check if target already exists
-  const targetExists = jetpack.exists(targetPath);
+  logger.log(`Migrating _posts from root to src/...`);
 
-  if (targetExists) {
-    logger.warn(`Target directory ${targetPath} already exists!`);
-    logger.log('Checking for conflicts...');
+  // Get all files recursively from source (not directories)
+  const sourceFiles = jetpack.find(sourcePath, { matching: '**/*', directories: false }) || [];
 
-    // Get list of files in both directories
-    const sourceFiles = jetpack.list(sourcePath) || [];
-    const targetFiles = jetpack.list(targetPath) || [];
+  if (sourceFiles.length === 0) {
+    logger.log('No files found in _posts directory');
+    jetpack.remove(sourcePath);
+    return;
+  }
 
-    // Find conflicts
-    const conflicts = sourceFiles.filter((file) => targetFiles.includes(file));
+  let movedCount = 0;
+  let overwrittenCount = 0;
 
-    if (conflicts.length > 0) {
-      logger.warn(`Found ${conflicts.length} conflicting file(s):`);
-      conflicts.forEach((file) => logger.warn(`  - ${file}`));
-      throw new Error('Cannot migrate _posts: conflicts detected. Please resolve manually.');
-    }
-  }
+  // Just move everything, overwrite if needed
+  sourceFiles.forEach((sourceFile) => {
+    const relativePath = path.relative(sourcePath, sourceFile);
+    const targetFile = path.join(targetPath, relativePath);
 
-  // Log the migration
-  logger.log(`Migrating _posts from root to src/...`);
-  logger.log(`  Source: ${sourcePath}`);
-  logger.log(`  Target: ${targetPath}`);
+    // Check if target exists
+    const targetExists = jetpack.exists(targetFile);
 
-  // Ensure target directory exists
-  jetpack.dir(path.dirname(targetPath));
+    // Ensure parent directory exists
+    jetpack.dir(path.dirname(targetFile));
 
-  // Move the directory
-  jetpack.move(sourcePath, targetPath);
+    // Move the file (this overwrites if target exists)
+    jetpack.move(sourceFile, targetFile, { overwrite: true });
 
-  // Verify the move
-  const moveSuccessful = jetpack.exists(targetPath)
-    && !jetpack.exists(sourcePath);
+    if (targetExists) {
+      overwrittenCount++;
+      logger.log(`  ✓ Overwrote: ${relativePath}`);
+    } else {
+      movedCount++;
+      logger.log(`  ✓ Moved: ${relativePath}`);
+    }
+  });
 
-  if (moveSuccessful) {
-    logger.log(logger.format.green('✓ Successfully migrated _posts to src/_posts'));
-  } else {
-    throw new Error('Failed to migrate _posts directory');
-  }
+  // Remove the source directory
+  jetpack.remove(sourcePath);
+
+  logger.log(logger.format.green(`✓ Successfully migrated _posts: ${movedCount} moved, ${overwrittenCount} overwritten`));
 }
 
 async function migrateAssets() {
@@ -100,47 +100,101 @@ async function migrateAssets() {
   const targetExists = jetpack.exists(targetPath);
 
   if (targetExists) {
-    logger.warn(`Target directory ${targetPath} already exists!`);
-    logger.log('Merging assets directories...');
-
-    // Get list of files in both directories (recursively)
-    const sourceFiles = jetpack.find(sourcePath, { matching: '**/*' }) || [];
-    const targetFiles = jetpack.find(targetPath, { matching: '**/*' }) || [];
-
-    // Convert to relative paths for comparison
-    const sourceRelative = sourceFiles.map((f) => path.relative(sourcePath, f));
-    const targetRelative = targetFiles.map((f) => path.relative(targetPath, f));
-
-    // Find conflicts
-    const conflicts = sourceRelative.filter((file) => targetRelative.includes(file));
+    logger.log(`Target directory ${targetPath} already exists - will merge contents...`);
+
+    // Get all files recursively from source (not directories)
+    const sourceFiles = jetpack.find(sourcePath, { matching: '**/*', directories: false }) || [];
+
+    let movedCount = 0;
+    let identicalCount = 0;
+    const conflicts = [];
+
+    // First pass: check for conflicts
+    sourceFiles.forEach((sourceFile) => {
+      const relativePath = path.relative(sourcePath, sourceFile);
+      const targetFile = path.join(targetPath, relativePath);
+
+      // Only care about file conflicts, not directory existence
+      if (jetpack.exists(targetFile) === 'file') {
+        // Check if files are identical
+        const sourceStats = jetpack.inspect(sourceFile);
+        const targetStats = jetpack.inspect(targetFile);
+
+        // Compare file sizes first (faster than reading content)
+        if (sourceStats.size !== targetStats.size) {
+          // Different sizes, definitely a conflict
+          conflicts.push(relativePath);
+        } else {
+          // Same size, need to compare content for small files
+          if (sourceStats.size < 1024 * 1024) { // Less than 1MB
+            const sourceContent = jetpack.read(sourceFile, 'buffer');
+            const targetContent = jetpack.read(targetFile, 'buffer');
+
+            if (Buffer.compare(sourceContent, targetContent) !== 0) {
+              // Files differ - this is a real conflict
+              conflicts.push(relativePath);
+            }
+          }
+          // For large files with same size, we assume they're identical
+        }
+      }
+    });
 
+    // If we have actual file conflicts, throw error
     if (conflicts.length > 0) {
-      logger.warn(`Found ${conflicts.length} conflicting file(s):`);
-      conflicts.slice(0, 10).forEach((file) => logger.warn(`  - ${file}`));
+      logger.error(`Found ${conflicts.length} conflicting file(s) with different content:`);
+      conflicts.slice(0, 10).forEach((file) => logger.error(`  - ${file}`));
       if (conflicts.length > 10) {
-        logger.warn(`  ... and ${conflicts.length - 10} more`);
+        logger.error(`  ... and ${conflicts.length - 10} more`);
       }
-      throw new Error('Cannot migrate assets: conflicts detected. Please resolve manually.');
+      throw new Error('Cannot migrate assets: duplicate files with different content detected. Please resolve manually.');
     }
 
-    // Move all files from source to target
-    logger.log('Moving files...');
-    sourceRelative.forEach((file) => {
-      const src = path.join(sourcePath, file);
-      const dest = path.join(targetPath, file);
-
-      // Only move files, not directories
-      if (jetpack.exists(src) === 'file') {
-        jetpack.move(src, dest);
+    // No conflicts, proceed with migration
+    sourceFiles.forEach((sourceFile) => {
+      const relativePath = path.relative(sourcePath, sourceFile);
+      const targetFile = path.join(targetPath, relativePath);
+
+      if (jetpack.exists(targetFile) === 'file') {
+        // Files are identical (we checked above), just remove source
+        jetpack.remove(sourceFile);
+        identicalCount++;
+        logger.log(`  ✓ Skipped identical file: ${relativePath}`);
+      } else {
+        // No file conflict, move it (directory will be created if needed)
+        jetpack.dir(path.dirname(targetFile));
+        jetpack.move(sourceFile, targetFile);
+        movedCount++;
+        logger.log(`  ✓ Moved: ${relativePath}`);
       }
     });
 
-    // Remove the old assets directory
-    jetpack.remove(sourcePath);
+    // Clean up empty directories in source
+    const remainingItems = jetpack.list(sourcePath) || [];
+    if (remainingItems.length === 0) {
+      jetpack.remove(sourcePath);
+      logger.log(`  ✓ Removed empty source directory`);
+    } else {
+      // Try to clean up empty subdirectories
+      const remainingDirs = jetpack.find(sourcePath, { matching: '*/', directories: true, files: false }) || [];
+      remainingDirs.reverse().forEach((dir) => {
+        const contents = jetpack.list(dir) || [];
+        if (contents.length === 0) {
+          jetpack.remove(dir);
+        }
+      });
+
+      // Check again if root is empty
+      const finalCheck = jetpack.list(sourcePath) || [];
+      if (finalCheck.length === 0) {
+        jetpack.remove(sourcePath);
+        logger.log(`  ✓ Removed empty source directory after cleanup`);
+      }
+    }
 
-    logger.log(logger.format.green('✓ Successfully merged assets into src/assets'));
+    logger.log(logger.format.green(`✓ Successfully merged assets: ${movedCount} moved, ${identicalCount} identical files skipped`));
   } else {
-    // Log the migration
+    // Simple move when target doesn't exist
     logger.log(`Migrating assets from root to src/...`);
     logger.log(`  Source: ${sourcePath}`);
     logger.log(`  Target: ${targetPath}`);
@@ -152,8 +206,7 @@ async function migrateAssets() {
     jetpack.move(sourcePath, targetPath);
 
     // Verify the move
-    const moveSuccessful = jetpack.exists(targetPath)
-      && !jetpack.exists(sourcePath);
+    const moveSuccessful = jetpack.exists(targetPath) && !jetpack.exists(sourcePath);
 
     if (moveSuccessful) {
       logger.log(logger.format.green('✓ Successfully migrated assets to src/assets'));
@@ -349,16 +402,16 @@ async function cleanupOldDirectories() {
       return;
     }
 
-    // Check if directory is empty
-    const contents = jetpack.list(dirPath) || [];
+    // Check if directory has any FILES (not just subdirectories)
+    const files = jetpack.find(dirPath, { matching: '**/*', directories: false }) || [];
 
-    if (contents.length === 0) {
-      // Directory is empty, delete it
+    if (files.length === 0) {
+      // Directory has no files (might have empty subdirectories), delete it
       jetpack.remove(dirPath);
       logger.log(`  ✓ Deleted empty ${name} directory`);
       deletedCount++;
     } else {
-      logger.warn(`  ⚠ ${name} directory still exists and is not empty (${contents.length} item(s))`);
+      logger.warn(`  ⚠ ${name} directory still exists with ${files.length} file(s)`);
       logger.warn(`    Please manually review: ${dirPath}`);
     }
   });

package/dist/commands/setup.js

@@ -412,6 +412,9 @@ async function fetchFirebaseAuth() {
           r = file.replace(r);
         }
 
+        // Log success for this file
+        logger.log(`Fetched: ${file.remote}`);
+
         // Write to file
         jetpack.write(finalPath,
           '---\n'
@@ -421,14 +424,43 @@ async function fetchFirebaseAuth() {
           + r
         )
       })
+      .catch((error) => {
+        // Only log the filename that failed, not the error content
+        logger.error(`❌ Failed to fetch: ${file.remote}`);
+        logger.error(`   URL: ${url}`);
+
+        // Check if it's a specific type of error (not HTML response)
+        // Use regex to check case-insensitive for HTML content
+        const htmlPattern = /<!doctype|<html|<head|<body/i;
+        if (error.message && !htmlPattern.test(error.message)) {
+          logger.error(`   Error: ${error.message}`);
+        }
+
+        // Re-throw to make Promise.all fail
+        throw new Error(`Failed to fetch Firebase auth file: ${file.remote}`);
+      })
     );
   });
 
-  // Await all promises
-  await Promise.all(promises);
-
   // Log
-  logger.log('Fetched firebase-auth files');
+  logger.log('Fetching firebase-auth files...');
+
+  try {
+    // Await all promises
+    await Promise.all(promises);
+
+    // Log success
+    logger.log('✅ Fetched firebase-auth files');
+  } catch (error) {
+    // Check if we should skip Firebase auth errors
+    if (process.env.UJ_SKIP_FIREBASE_AUTH_ERRORS === 'true') {
+      logger.warn('⚠️  Failed to fetch some Firebase auth files, but continuing due to UJ_SKIP_FIREBASE_AUTH_ERRORS=true');
+      return;
+    }
+
+    // Error already logged above, just throw to stop execution
+    throw new Error('Failed to fetch one or more Firebase auth files. Please check your Firebase project configuration.');
+  }
 }
 
 function logVersionCheck(name, installedVersion, latestVersion, isUpToDate) {

package/dist/defaults/src/_config.yml

@@ -86,11 +86,11 @@ web_manager:
     config:
       palette:
         popup:
-          background: "#fd5631"
+          background: "#237afc"
           text: "#fff"
         button:
           background: "#fff"
-          text: "#fd5631"
+          text: "#237afc"
   chatsy:
     enabled: true
     config:
@@ -98,7 +98,7 @@ web_manager:
       chatId: ""
       settings:
         openChatButton:
-          background: "#fd5631"
+          background: "#237afc"
           text: "#fff"
   sentry:
     enabled: true

package/dist/defaults/src/_includes/frontend/sections/footer.json

@@ -2,7 +2,7 @@
   logo: {
     href: '/',
     class: 'filter-adaptive',
-    description: '{{ site.brand.description }}',
+    description: '{{ site.meta.description }}',
   },
   links: [
     {

package/dist/index.js

@@ -62,7 +62,10 @@ class Manager {
       );
 
       /* @dev-only:start */
-      console.log(`Page module loading (${pageModulePathFull})`);
+      {
+        console.log(`Page-specific module loading: #main/${pageModulePathFull}`);
+        console.log(`Page-specific module loading: #project/${pageModulePathFull}`);
+      }
       /* @dev-only:end */
 
       // Load page-specific scripts
@@ -74,9 +77,9 @@ class Manager {
           })
           .catch(e => {
             if (this.isNotFound(e, pageModulePath)) {
-              console.warn(`Page module #main not found (${pageModulePathFull})`);
+              console.warn(`Page-specific module missing: #main/${pageModulePathFull}`);
             } else {
-              console.error(`Page module #main error (${pageModulePathFull})`, e);
+              console.error(`Page-specific module error: #main/${pageModulePathFull}`, e);
             }
           })
       );
@@ -89,9 +92,9 @@ class Manager {
           })
           .catch(e => {
             if (this.isNotFound(e, pageModulePath)) {
-              console.warn(`Project module #project not found (${pageModulePathFull})`);
+              console.warn(`Page-specific module missing: #project/${pageModulePathFull}`);
             } else {
-              console.error(`Project module #project error (${pageModulePathFull})`, e);
+              console.error(`Page-specific module error: #project/${pageModulePathFull}`, e);
             }
           })
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-jekyll-manager",
-  "version": "0.0.110",
+  "version": "0.0.112",
   "description": "Ultimate Jekyll dependency manager",
   "main": "dist/index.js",
   "exports": {

package/dist/defaults/src/pages/about.md

@@ -1,7 +0,0 @@
----
-### ALL PAGES ###
-layout: blueprint/about
-permalink: /about
-
-### REGULAR PAGES ###
----

package/dist/defaults/src/pages/pricing.md

@@ -1,7 +0,0 @@
----
-### ALL PAGES ###
-layout: blueprint/pricing
-permalink: /pricing
-
-### REGULAR PAGES ###
----