ultimate-jekyll-manager 0.0.217 → 0.0.219

package/dist/defaults/config/ultimate-jekyll-manager.json

@@ -2,6 +2,9 @@
   webpack: {
     target: 'default',
   },
+  imagemin: {
+    enabled: true,
+  },
   github: {
     workflows: {
       build: {

package/dist/gulp/tasks/imagemin.js

@@ -10,6 +10,7 @@ const GitHubCache = require('./utils/github-cache');
 
 // Load package
 const rootPathProject = Manager.getRootPath('project');
+const ujmConfig = Manager.getUJMConfig();
 
 // Settings
 const CACHE_DIR = '.temp/cache/imagemin';
@@ -52,6 +53,18 @@ async function imagemin(complete) {
   logger.log('Starting...');
   Manager.logMemory(logger, 'Start');
 
+  // Skip in dev mode - only run during builds
+  if (!Manager.isBuildMode()) {
+    logger.log('⏭️ Skipping imagemin in dev mode');
+    return complete();
+  }
+
+  // Skip if disabled in config
+  if (ujmConfig?.imagemin?.enabled === false) {
+    logger.log('⏭️ Skipping imagemin - disabled in ultimate-jekyll-manager.json');
+    return complete();
+  }
+
   // Track timing
   const startTime = Date.now();
 

package/dist/gulp/tasks/utils/github-cache.js

@@ -164,13 +164,12 @@ class GitHubCache {
     if (options.validFiles) {
       const orphanCheck = await this.checkForOrphans(options.validFiles);
       if (orphanCheck.hasOrphans) {
-        this.logger.log(`🗑️ Found ${orphanCheck.orphanedCount} orphaned files in cache`);
-        forceRecreate = true;
-        files = orphanCheck.validFiles;
-        // Re-add metadata after orphan check
-        if (jetpack.exists(metaPath) && !files.includes(metaPath)) {
-          files.push(metaPath);
+        this.logger.log(`🗑️ Found ${orphanCheck.orphanedCount} orphaned files in cache, removing...`);
+        // Delete orphaned files locally — git add -A will pick up the deletions
+        for (const orphan of orphanCheck.orphanedFiles) {
+          jetpack.remove(path.join(this.cacheDir, orphan));
         }
+        this.logger.log(`✅ Removed ${orphanCheck.orphanedCount} orphaned files`);
       }
     }
 
@@ -415,25 +414,21 @@ class GitHubCache {
         execSync(`git remote add origin https://${process.env.GH_TOKEN}@github.com/${this.owner}/${this.repo}.git`, { cwd: this.cacheDir, stdio: 'ignore' });
         execSync(`git checkout -b ${this.branchName}`, { cwd: this.cacheDir, stdio: 'ignore' });
       } else if (!jetpack.exists(gitDir)) {
-        // If no git dir exists, clone the branch
+        // No .git dir — init locally and fetch the branch ref so we can push incrementally
+        // (files are already here from the ZIP fetch, no need to clone)
         this.logger.log(`📥 Initializing git in cache directory...`);
+        execSync('git init', { cwd: this.cacheDir, stdio: 'ignore' });
+        execSync(`git remote add origin https://${process.env.GH_TOKEN}@github.com/${this.owner}/${this.repo}.git`, { cwd: this.cacheDir, stdio: 'ignore' });
 
-        // Save current files temporarily
-        const tempBackup = path.join(path.dirname(this.cacheDir), `${path.basename(this.cacheDir)}-backup-${Date.now()}`);
-        if (jetpack.exists(this.cacheDir)) {
-          jetpack.move(this.cacheDir, tempBackup);
-        }
-
-        // Clone the branch
-        execSync(
-          `git clone --depth 1 --branch ${this.branchName} https://${process.env.GH_TOKEN}@github.com/${this.owner}/${this.repo}.git "${this.cacheDir}"`,
-          { stdio: 'ignore' }
-        );
-
-        // Restore backed up files (overwriting cloned files)
-        if (jetpack.exists(tempBackup)) {
-          jetpack.copy(tempBackup, this.cacheDir, { overwrite: true });
-          jetpack.remove(tempBackup);
+        // Fetch just the branch ref so git knows the remote history
+        try {
+          execSync(`git fetch --depth 1 origin ${this.branchName}`, { cwd: this.cacheDir, stdio: 'ignore' });
+          execSync(`git checkout -b ${this.branchName}`, { cwd: this.cacheDir, stdio: 'ignore' });
+          // Reset to the fetched ref to establish history, then overlay our files
+          execSync(`git reset origin/${this.branchName}`, { cwd: this.cacheDir, stdio: 'ignore' });
+        } catch (e) {
+          // Branch might not exist yet remotely — just create it locally
+          execSync(`git checkout -b ${this.branchName}`, { cwd: this.cacheDir, stdio: 'ignore' });
         }
       } else {
         // Git dir exists, just pull latest
@@ -519,7 +514,7 @@ class GitHubCache {
   async checkForOrphans(validFiles) {
     const validSet = new Set(validFiles);
     const cacheFiles = jetpack.find(this.cacheDir, {
-      matching: '**/*',
+      matching: ['**/*', '!.git/**'],
       files: true,
       directories: false
     });
@@ -529,7 +524,7 @@ class GitHubCache {
 
     cacheFiles.forEach(file => {
       const relativePath = path.relative(this.cacheDir, file);
-      if (validSet.has(relativePath) || relativePath === 'meta.json') {
+      if (validSet.has(relativePath) || relativePath === 'meta.json' || relativePath === 'README.md') {
         validCacheFiles.push(file);
       } else {
         orphanedFiles.push(relativePath);

package/package.json

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