ultimate-jekyll-manager 1.1.8 → 1.1.10

package/CHANGELOG.md

@@ -14,6 +14,37 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - `Fixed` for any bug fixes.
 - `Security` in case of vulnerabilities.
 
+---
+## [1.1.10] - 2026-05-10
+### Removed
+- `through2` dependency. Replaced with native `node:stream` `Transform` across 6 gulp task files (`defaults.js`, `distribute.js`, `jsonToHtml.js`, `minifyHtml.js`, `sass.js`, `utils/template-transform.js`). through2@5 became ESM-only with no `require` condition in its exports, breaking CJS require; the built-in `Transform` is a drop-in replacement
+
+### Changed
+- Bumped `@babel/preset-env` from ^7.29.2 to ^7.29.5
+- Bumped `dompurify` from ^3.3.3 to ^3.4.2
+- Bumped `dotenv` from ^17.4.1 to ^17.4.2
+- Bumped `fast-xml-parser` from ^5.5.11 to ^5.7.3
+- Bumped `gulp-filter` from ^9.0.1 to ^10.0.0 (Node 22 ESM-CJS interop keeps `require('gulp-filter').default` working)
+- Bumped `html-validate` from ^10.11.3 to ^10.16.0
+- Bumped `libsodium-wrappers` from ^0.8.3 to ^0.8.4
+- Bumped `postcss` from ^8.5.9 to ^8.5.14
+- Bumped `prettier` from ^3.8.2 to ^3.8.3
+- Bumped `web-manager` from ^4.1.40 to ^4.1.41
+- Bumped `webpack` from ^5.106.1 to ^5.106.2
+
+---
+## [1.1.9] - 2026-04-23
+### Added
+- Admin users page: "Sign in as user" dropdown option that calls BEM `POST /backend-manager/user/token` to generate a custom auth token, then shows a modal with the sign-in URL (copy button + open-in-new-tab button)
+- Modal opens immediately in a loading state while the token is generated, then swaps to ready/error state
+- Auth signin page: handle `authCustomToken` URL param via Firebase `signInWithCustomToken`, redirecting to `authReturnUrl` (validated) or `/dashboard`
+
+### Fixed
+- Billing section: cancel subscription button now appears for suspended paid subscriptions (previously hidden). Logic updated to `isPaid && rawStatus !== 'cancelled' && !resolved.cancelling` so it correctly shows for active, trialing, and suspended paid subs, while hiding for free users, already-cancelled subs, and subs with pending cancellation
+
+### Changed
+- Admin users table: dropdown trigger button restyled using `btn-outline-adaptive rounded-circle` for a cleaner look
+
 ---
 ## [1.1.8] - 2026-04-22
 ### Changed

package/dist/assets/js/core/auth.js

@@ -152,7 +152,15 @@ function updateAuthLinks() {
 
       $link.addEventListener('click', (e) => {
         const url = new URL($link.href, window.location.origin);
-        url.searchParams.set('authReturnUrl', window.location.href);
+        const currentUrl = new URL(window.location.href);
+        const existingReturnUrl = currentUrl.searchParams.get('authReturnUrl');
+
+        if (existingReturnUrl) {
+          url.searchParams.set('authReturnUrl', existingReturnUrl);
+        } else if (!authPaths.includes(currentUrl.pathname)) {
+          url.searchParams.set('authReturnUrl', window.location.href);
+        }
+
         $link.href = url.toString();
       });
     } catch (e) {}

package/dist/assets/js/libs/auth.js

@@ -22,6 +22,12 @@ export default function () {
     // Check for authSignout parameter first
     await handleAuthSignout();
 
+    // Check for authCustomToken parameter (admin impersonation / custom token sign-in)
+    const customTokenHandled = await handleCustomTokenSignin();
+    if (customTokenHandled) {
+      return;
+    }
+
     // Initialize the appropriate form based on the page (with autoReady: false)
     initializePageForm();
 
@@ -209,6 +215,48 @@ export default function () {
     }
   }
 
+  async function handleCustomTokenSignin() {
+    const url = new URL(window.location.href);
+    const customToken = url.searchParams.get('authCustomToken');
+
+    if (!customToken) {
+      return false;
+    }
+
+    try {
+      console.log('[Auth] Signing in with custom token');
+
+      const { getAuth, signInWithCustomToken } = await import('@firebase/auth');
+      const auth = getAuth();
+
+      const userCredential = await signInWithCustomToken(auth, customToken);
+      console.log('[Auth] Custom token sign-in successful:', userCredential.user.email || userCredential.user.uid);
+
+      trackLogin('custom-token', userCredential.user);
+
+      const authReturnUrl = url.searchParams.get('authReturnUrl');
+      const redirectTo = authReturnUrl && webManager.isValidRedirectUrl(authReturnUrl)
+        ? authReturnUrl
+        : '/dashboard';
+
+      window.location.href = redirectTo;
+      return true;
+    } catch (error) {
+      webManager.sentry().captureException(new Error('Custom token sign-in error', { cause: error }));
+      console.error('[Auth] Custom token sign-in failed:', error);
+
+      const url = new URL(window.location.href);
+      url.searchParams.delete('authCustomToken');
+      window.history.replaceState({}, document.title, url.toString());
+
+      webManager.utilities().showNotification(
+        `Custom token sign-in failed: ${error.message || 'Invalid or expired token'}`,
+        { type: 'danger', timeout: 8000 }
+      );
+      return false;
+    }
+  }
+
   async function handleAuthSignout() {
     const url = new URL(window.location.href);
     const authSignout = url.searchParams.get('authSignout');

package/dist/assets/js/pages/account/sections/billing.js

@@ -140,7 +140,7 @@ function buildBillingState(account) {
         upgrade: !isPaid || rawStatus === 'cancelled',
         change: resolved.active,
         manage: isPaid && rawStatus !== 'cancelled',
-        cancel: resolved.active,
+        cancel: isPaid && rawStatus !== 'cancelled' && !resolved.cancelling,
       },
     },
   };

package/dist/assets/js/pages/admin/users/index.js

@@ -172,7 +172,7 @@ function renderUsers() {
       <td class="text-muted small">${updatedText}</td>
       <td>
         <div class="dropdown">
-          <button class="btn btn-sm btn-link p-0" type="button" data-bs-toggle="dropdown">
+          <button class="btn btn-sm btn-adaptive rounded-circle" type="button" data-bs-toggle="dropdown">
             ${getPrerenderedIcon('ellipsis-vertical', 'fa-sm')}
           </button>
           <ul class="dropdown-menu dropdown-menu-end">
@@ -192,6 +192,10 @@ function renderUsers() {
               ${getPrerenderedIcon('fire', 'fa-sm me-2')}
               View in Explorer
             </a></li>
+            <li><a class="dropdown-item small btn-signin-as" href="#">
+              ${getPrerenderedIcon('right-to-bracket', 'fa-sm me-2')}
+              Sign in as user
+            </a></li>
             <li><hr class="dropdown-divider"></li>
             <li><a class="dropdown-item small text-danger btn-delete-user" href="#">
               ${getPrerenderedIcon('trash', 'fa-sm me-2')}
@@ -223,6 +227,11 @@ function renderUsers() {
       window.location.href = `/admin/firebase?collection=users&doc=${uid}`;
     });
 
+    $row.querySelector('.btn-signin-as').addEventListener('click', (e) => {
+      e.preventDefault();
+      signInAsUser(uid, email);
+    });
+
     $row.querySelector('.btn-delete-user').addEventListener('click', (e) => {
       e.preventDefault();
       deleteUser(uid, email);
@@ -269,6 +278,105 @@ function viewUser(uid, userData) {
   modal.show();
 }
 
+async function signInAsUser(uid, email) {
+  openSignInAsModalLoading(email);
+
+  try {
+    const response = await authorizedFetch(`${webManager.getApiUrl()}/backend-manager/user/token`, {
+      method: 'POST',
+      timeout: 30000,
+      response: 'json',
+      tries: 1,
+      log: true,
+      body: { uid: uid },
+    });
+
+    const token = response?.token;
+    if (!token) {
+      throw new Error('No token returned from server');
+    }
+
+    const signinUrl = new URL('/signin', window.location.origin);
+    signinUrl.searchParams.set('authSignout', 'true');
+    signinUrl.searchParams.set('authCustomToken', token);
+    signinUrl.searchParams.set('authReturnUrl', '/dashboard');
+
+    showSignInAsModalReady(email, signinUrl.toString());
+  } catch (error) {
+    console.error('Failed to create sign-in link:', error);
+    showSignInAsModalError(error.message || 'Unknown error');
+  }
+}
+
+function openSignInAsModalLoading(email) {
+  const $loading = document.getElementById('signin-as-loading');
+  const $ready = document.getElementById('signin-as-ready');
+  const $error = document.getElementById('signin-as-error');
+  const $loadingEmail = document.getElementById('signin-as-loading-email');
+  const $navigateBtn = document.getElementById('btn-signin-as-navigate');
+
+  if ($loading) $loading.classList.remove('d-none');
+  if ($ready) $ready.classList.add('d-none');
+  if ($error) $error.classList.add('d-none');
+  if ($navigateBtn) $navigateBtn.classList.add('d-none');
+  if ($loadingEmail) $loadingEmail.textContent = email;
+
+  const modal = bootstrap.Modal.getOrCreateInstance(document.getElementById('signin-as-modal'));
+  modal.show();
+}
+
+function showSignInAsModalReady(email, urlString) {
+  const $loading = document.getElementById('signin-as-loading');
+  const $ready = document.getElementById('signin-as-ready');
+  const $error = document.getElementById('signin-as-error');
+  const $email = document.getElementById('signin-as-email');
+  const $url = document.getElementById('signin-as-url');
+  const $copyBtn = document.getElementById('btn-signin-as-copy');
+  const $navigateBtn = document.getElementById('btn-signin-as-navigate');
+
+  if ($loading) $loading.classList.add('d-none');
+  if ($error) $error.classList.add('d-none');
+  if ($ready) $ready.classList.remove('d-none');
+  if ($navigateBtn) $navigateBtn.classList.remove('d-none');
+  if ($email) $email.textContent = email;
+  if ($url) $url.value = urlString;
+
+  if ($copyBtn) {
+    $copyBtn.onclick = async () => {
+      await navigator.clipboard.writeText(urlString).catch(() => {});
+      const originalHTML = $copyBtn.innerHTML;
+      $copyBtn.innerHTML = `${getPrerenderedIcon('circle-check', 'fa-sm')}`;
+      $copyBtn.classList.add('btn-success');
+      $copyBtn.classList.remove('btn-outline-adaptive');
+      setTimeout(() => {
+        $copyBtn.innerHTML = originalHTML;
+        $copyBtn.classList.remove('btn-success');
+        $copyBtn.classList.add('btn-outline-adaptive');
+      }, 1500);
+    };
+  }
+
+  if ($navigateBtn) {
+    $navigateBtn.onclick = () => {
+      window.open(urlString, '_blank', 'noopener');
+    };
+  }
+}
+
+function showSignInAsModalError(message) {
+  const $loading = document.getElementById('signin-as-loading');
+  const $ready = document.getElementById('signin-as-ready');
+  const $error = document.getElementById('signin-as-error');
+  const $errorMessage = document.getElementById('signin-as-error-message');
+  const $navigateBtn = document.getElementById('btn-signin-as-navigate');
+
+  if ($loading) $loading.classList.add('d-none');
+  if ($ready) $ready.classList.add('d-none');
+  if ($error) $error.classList.remove('d-none');
+  if ($navigateBtn) $navigateBtn.classList.add('d-none');
+  if ($errorMessage) $errorMessage.textContent = message;
+}
+
 async function deleteUser(uid, email) {
   if (!confirm(`Delete user ${email} (${uid})?\n\nThis will permanently delete their account and cannot be undone.`)) {
     return;

package/dist/defaults/dist/_layouts/blueprint/admin/users/index.html

@@ -28,6 +28,10 @@ prerender_icons:
   - name: "trash"
   - name: "ellipsis-vertical"
   - name: "copy"
+  - name: "right-to-bracket"
+  - name: "circle-check"
+  - name: "arrow-up-right-from-square"
+  - name: "circle-xmark"
 ---
 
 <!-- Page Header Actions -->
@@ -181,6 +185,64 @@ prerender_icons:
   </div>
 </div>
 
+<!-- Sign In As User Modal -->
+<div class="modal fade" id="signin-as-modal" tabindex="-1" aria-labelledby="signin-as-modal-label" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h6 class="modal-title" id="signin-as-modal-label">Sign in as user</h6>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+
+      <!-- Loading State -->
+      <div class="modal-body text-center py-5" id="signin-as-loading">
+        <div class="spinner-border text-primary mb-3" role="status">
+          <span class="visually-hidden">Loading...</span>
+        </div>
+        <h5 class="mb-2">Generating sign-in link</h5>
+        <p class="text-muted mb-0">
+          Creating a one-time token for <strong id="signin-as-loading-email" class="text-body"></strong>...
+        </p>
+      </div>
+
+      <!-- Ready State -->
+      <div class="modal-body text-center d-none" id="signin-as-ready">
+        <div class="rounded-circle d-inline-flex align-items-center justify-content-center p-3 bg-success bg-opacity-10 mx-auto mb-3">
+          {% uj_icon "circle-check", "fa-2xl text-success" %}
+        </div>
+        <h5 class="mb-2">Sign-in link ready</h5>
+        <p class="text-muted mb-3">
+          A one-time sign-in link for <strong id="signin-as-email" class="text-body"></strong> has been generated. Open it in an incognito window to avoid signing out of your admin session.
+        </p>
+        <div class="input-group mb-2">
+          <input type="text" class="form-control form-control-sm font-monospace" id="signin-as-url" readonly>
+          <button type="button" class="btn btn-sm btn-outline-adaptive" id="btn-signin-as-copy">
+            {% uj_icon "copy", "fa-sm" %}
+          </button>
+        </div>
+        <small class="text-muted d-block">The link contains a short-lived custom token</small>
+      </div>
+
+      <!-- Error State -->
+      <div class="modal-body text-center py-5 d-none" id="signin-as-error">
+        <div class="rounded-circle d-inline-flex align-items-center justify-content-center p-3 bg-danger bg-opacity-10 mx-auto mb-3">
+          {% uj_icon "circle-xmark", "fa-2xl text-danger" %}
+        </div>
+        <h5 class="mb-2">Failed to generate link</h5>
+        <p class="text-muted mb-0" id="signin-as-error-message"></p>
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" class="btn btn-sm btn-outline-adaptive" data-bs-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-sm btn-adaptive d-none" id="btn-signin-as-navigate">
+          {% uj_icon "arrow-up-right-from-square", "fa-sm me-1" %}
+          Open in new tab
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- User Edit Modal -->
 <div class="modal fade" id="user-edit-modal" tabindex="-1" aria-labelledby="user-edit-modal-label" aria-hidden="true">
   <div class="modal-dialog">

package/dist/gulp/tasks/defaults.js

@@ -2,7 +2,7 @@
 const Manager = new (require('../../build.js'));
 const logger = Manager.logger('defaults');
 const { src, dest, watch, series } = require('gulp');
-const through2 = require('through2');
+const { Transform } = require('node:stream');
 const jetpack = require('fs-jetpack');
 const path = require('path');
 const { minimatch } = require('minimatch');
@@ -406,7 +406,9 @@ function defaults(complete, changedFile) {
 }
 
 function customTransform() {
-  return through2.obj(function (file, _, callback) {
+  return new Transform({
+    objectMode: true,
+    transform(file, _, callback) {
     // Skip if it's a directory
     if (file.isDirectory()) {
       return callback(null, file);
@@ -539,6 +541,7 @@ function customTransform() {
 
     // Complete
     return callback();
+    },
   });
 }
 function defaultsWatcher(complete) {

package/dist/gulp/tasks/distribute.js

@@ -2,7 +2,7 @@
 const Manager = new (require('../../build.js'));
 const logger = Manager.logger('distribute');
 const { src, dest, watch, series } = require('gulp');
-const through2 = require('through2');
+const { Transform } = require('node:stream');
 const path = require('path');
 const jetpack = require('fs-jetpack');
 const { template } = require('node-powertools');
@@ -180,38 +180,41 @@ function getFilesRecursive(dir) {
 }
 
 function customTransform() {
-  return through2.obj(function (file, _, callback) {
-    // Skip if it's a directory
-    if (file.isDirectory()) {
-      return callback(null, file);
-    }
+  return new Transform({
+    objectMode: true,
+    transform(file, _, callback) {
+      // Skip if it's a directory
+      if (file.isDirectory()) {
+        return callback(null, file);
+      }
 
-    // Get relative path from src base
-    const relativePath = path.relative(file.base, file.path).replace(/\\/g, '/');
+      // Get relative path from src base
+      const relativePath = path.relative(file.base, file.path).replace(/\\/g, '/');
 
-    // Log
-    if (LOUD) {
-      logger.log(`Processing file: ${relativePath}`);
-    }
+      // Log
+      if (LOUD) {
+        logger.log(`Processing file: ${relativePath}`);
+      }
 
-    // Change path if it starts with 'pages/'
-    // if (relativePath.startsWith('pages/')) {
-    //   // Remove 'pages/' prefix
-    //   const newRelativePath = relativePath.replace(/^pages\//, '');
+      // Change path if it starts with 'pages/'
+      // if (relativePath.startsWith('pages/')) {
+      //   // Remove 'pages/' prefix
+      //   const newRelativePath = relativePath.replace(/^pages\//, '');
 
-    //   // Update file path to remove pages directory
-    //   // This will make src/pages/index.html -> dist/index.html
-    //   file.path = path.join(file.base, newRelativePath);
+      //   // Update file path to remove pages directory
+      //   // This will make src/pages/index.html -> dist/index.html
+      //   file.path = path.join(file.base, newRelativePath);
 
-    //   // Log
-    //   logger.log(`  -> Moving from pages/ to root: ${newRelativePath}`);
-    // }
+      //   // Log
+      //   logger.log(`  -> Moving from pages/ to root: ${newRelativePath}`);
+      // }
 
-    // Push the file
-    this.push(file);
+      // Push the file
+      this.push(file);
 
-    // Continue
-    callback();
+      // Continue
+      callback();
+    },
   });
 }
 

package/dist/gulp/tasks/jsonToHtml.js

@@ -2,7 +2,7 @@
 const Manager = new (require('../../build.js'));
 const logger = Manager.logger('json-to-html');
 const { src, dest, watch, series } = require('gulp');
-const through2 = require('through2');
+const { Transform } = require('node:stream');
 const path = require('path');
 const jetpack = require('fs-jetpack');
 const { template } = require('node-powertools');
@@ -42,90 +42,96 @@ function jsonToHtml(complete) {
 
   // First, copy JSON files to _data directory
   const jsonCopy = src(input)
-    .pipe(through2.obj(function (file, _, callback) {
-      if (file.isDirectory()) {
-        return callback(null, file);
-      }
-
-      try {
-        // Parse JSON5 content
-        const json5Content = file.contents.toString();
-        const parsedData = JSON5.parse(json5Content);
-
-        // Convert to regular JSON (pretty printed for readability)
-        const regularJson = JSON.stringify(parsedData, null, 2);
-
-        // Also write to _data directory for Jekyll to pick up
-        const relativePath = path.relative(file.base, file.path);
-        const dataPath = path.join(dataOutput, relativePath);
-        const dataDir = path.dirname(dataPath);
-
-        // Ensure directory exists
-        jetpack.dir(dataDir);
-
-        // Write regular JSON file to _data
-        jetpack.write(dataPath, regularJson);
-
-        // Track compiled files
-        compiled[dataPath] = true;
-
-        // Update file contents with regular JSON
-        file.contents = Buffer.from(regularJson);
-
-        callback(null, file);
-      } catch (err) {
-        logger.error(`Error parsing JSON5 file ${file.path}: ${err.message}`);
-        callback(err);
-      }
+    .pipe(new Transform({
+      objectMode: true,
+      transform(file, _, callback) {
+        if (file.isDirectory()) {
+          return callback(null, file);
+        }
+
+        try {
+          // Parse JSON5 content
+          const json5Content = file.contents.toString();
+          const parsedData = JSON5.parse(json5Content);
+
+          // Convert to regular JSON (pretty printed for readability)
+          const regularJson = JSON.stringify(parsedData, null, 2);
+
+          // Also write to _data directory for Jekyll to pick up
+          const relativePath = path.relative(file.base, file.path);
+          const dataPath = path.join(dataOutput, relativePath);
+          const dataDir = path.dirname(dataPath);
+
+          // Ensure directory exists
+          jetpack.dir(dataDir);
+
+          // Write regular JSON file to _data
+          jetpack.write(dataPath, regularJson);
+
+          // Track compiled files
+          compiled[dataPath] = true;
+
+          // Update file contents with regular JSON
+          file.contents = Buffer.from(regularJson);
+
+          callback(null, file);
+        } catch (err) {
+          logger.error(`Error parsing JSON5 file ${file.path}: ${err.message}`);
+          callback(err);
+        }
+      },
     }))
     .pipe(dest(dataOutput));
 
   // Then create HTML wrapper files
   const htmlGeneration = src(input)
-    .pipe(through2.obj(function (file, _, callback) {
-      // Skip if it's a directory
-      if (file.isDirectory()) {
-        return callback(null, file);
-      }
-
-      // Get relative path from src/_includes
-      const relativePath = path.relative(file.base, file.path);
-      const relativeDir = path.dirname(relativePath);
-      const basename = path.basename(file.path, '.json');
-
-      // Convert path for Jekyll data reference
-      // _includes/frontend/sections/nav.json -> _includes.frontend.sections.nav
-      const dataPath = '_includes.' + relativePath
-        .replace(/\\/g, '/')
-        .replace('.json', '')
-        .split('/')
-        .join('.');
-
-      // Determine the template path
-      // Look for corresponding template in themes/{theme}/{target}/...
-      const templatePath = `themes/${config.theme.id}/${relativeDir}/${basename}.html`;
-
-      // Create the HTML content
-      const htmlContent = template(INCLUDE_TEMPLATE, {
-        dataPath: dataPath,
-        templatePath: templatePath
-      });
-
-      // Update file contents and extension
-      file.contents = Buffer.from(htmlContent);
-      file.path = file.path.replace('.json', '.html');
-
-      // Log transformation
-      logger.log(`Converting: ${relativePath} -> ${path.basename(file.path)}`);
-      logger.log(`  Data path: site.data.${dataPath}`);
-      logger.log(`  Template: ${templatePath}`);
-
-      // Track the full output path
-      const fullPath = path.resolve(output, path.relative(file.base, file.path));
-      compiled[fullPath] = true;
-
-      // Continue
-      callback(null, file);
+    .pipe(new Transform({
+      objectMode: true,
+      transform(file, _, callback) {
+        // Skip if it's a directory
+        if (file.isDirectory()) {
+          return callback(null, file);
+        }
+
+        // Get relative path from src/_includes
+        const relativePath = path.relative(file.base, file.path);
+        const relativeDir = path.dirname(relativePath);
+        const basename = path.basename(file.path, '.json');
+
+        // Convert path for Jekyll data reference
+        // _includes/frontend/sections/nav.json -> _includes.frontend.sections.nav
+        const dataPath = '_includes.' + relativePath
+          .replace(/\\/g, '/')
+          .replace('.json', '')
+          .split('/')
+          .join('.');
+
+        // Determine the template path
+        // Look for corresponding template in themes/{theme}/{target}/...
+        const templatePath = `themes/${config.theme.id}/${relativeDir}/${basename}.html`;
+
+        // Create the HTML content
+        const htmlContent = template(INCLUDE_TEMPLATE, {
+          dataPath: dataPath,
+          templatePath: templatePath
+        });
+
+        // Update file contents and extension
+        file.contents = Buffer.from(htmlContent);
+        file.path = file.path.replace('.json', '.html');
+
+        // Log transformation
+        logger.log(`Converting: ${relativePath} -> ${path.basename(file.path)}`);
+        logger.log(`  Data path: site.data.${dataPath}`);
+        logger.log(`  Template: ${templatePath}`);
+
+        // Track the full output path
+        const fullPath = path.resolve(output, path.relative(file.base, file.path));
+        compiled[fullPath] = true;
+
+        // Continue
+        callback(null, file);
+      },
     }))
     .pipe(dest(output));
 

package/dist/gulp/tasks/minifyHtml.js

@@ -4,7 +4,7 @@ const logger = Manager.logger('minifyHtml');
 const { src, dest, series } = require('gulp');
 const { minify: minifyRust } = require('@minify-html/node');
 const { minify: minifyJs } = require('terser');
-const through2 = require('through2');
+const { Transform } = require('node:stream');
 
 // Load package
 const package = Manager.getPackage('main');
@@ -85,61 +85,65 @@ function minifyHtmlTask(complete) {
 
   // Process HTML files
   return src(input)
-    .pipe(through2.obj(function(file, _enc, callback) {
-      if (file.isBuffer()) {
-        fileQueue.push({ file });
-        callback();
-      } else {
-        callback(null, file);
-      }
-    }, async function(callback) {
-      // This function is called when all files have been queued
-      if (fileQueue.length === 0) {
-        logger.log('No HTML files to minify');
-        return callback();
-      }
+    .pipe(new Transform({
+      objectMode: true,
+      transform(file, _enc, callback) {
+        if (file.isBuffer()) {
+          fileQueue.push({ file });
+          callback();
+        } else {
+          callback(null, file);
+        }
+      },
+      async flush(callback) {
+        // This function is called when all files have been queued
+        if (fileQueue.length === 0) {
+          logger.log('No HTML files to minify');
+          return callback();
+        }
 
-      const totalFiles = fileQueue.length;
-      logger.log(`Minifying ${totalFiles} HTML files...`);
-
-      try {
-        // Process files in batches
-        for (let i = 0; i < fileQueue.length; i += CONCURRENCY_LIMIT) {
-          const batch = fileQueue.slice(i, i + CONCURRENCY_LIMIT);
-
-          // Process batch in parallel
-          const processedFiles = await Promise.all(
-            batch.map(async ({ file }) => {
-              try {
-                const htmlContent = file.contents.toString();
-                const finalHtml = await minifyFileContent(htmlContent, options, file.path);
-                file.contents = Buffer.from(finalHtml);
-                processed.count++;
-
-                // Log progress every 50 files or on last file
-                if (processed.count % 50 === 0 || processed.count === totalFiles) {
-                  const percentage = ((processed.count / totalFiles) * 100).toFixed(1);
-                  logger.log(`Progress: ${processed.count}/${totalFiles} files (${percentage}%)`);
-                  Manager.logMemory(logger, `After ${processed.count} files`);
+        const totalFiles = fileQueue.length;
+        logger.log(`Minifying ${totalFiles} HTML files...`);
+
+        try {
+          // Process files in batches
+          for (let i = 0; i < fileQueue.length; i += CONCURRENCY_LIMIT) {
+            const batch = fileQueue.slice(i, i + CONCURRENCY_LIMIT);
+
+            // Process batch in parallel
+            const processedFiles = await Promise.all(
+              batch.map(async ({ file }) => {
+                try {
+                  const htmlContent = file.contents.toString();
+                  const finalHtml = await minifyFileContent(htmlContent, options, file.path);
+                  file.contents = Buffer.from(finalHtml);
+                  processed.count++;
+
+                  // Log progress every 50 files or on last file
+                  if (processed.count % 50 === 0 || processed.count === totalFiles) {
+                    const percentage = ((processed.count / totalFiles) * 100).toFixed(1);
+                    logger.log(`Progress: ${processed.count}/${totalFiles} files (${percentage}%)`);
+                    Manager.logMemory(logger, `After ${processed.count} files`);
+                  }
+
+                  return file;
+                } catch (err) {
+                  logger.error(`Error minifying ${file.path}: ${err.message}`);
+                  return file;
                 }
+              })
+            );
 
-                return file;
-              } catch (err) {
-                logger.error(`Error minifying ${file.path}: ${err.message}`);
-                return file;
-              }
-            })
-          );
+            // Push processed files to the stream
+            processedFiles.forEach(file => this.push(file));
+          }
 
-          // Push processed files to the stream
-          processedFiles.forEach(file => this.push(file));
+          callback();
+        } catch (err) {
+          logger.error(`Batch processing error: ${err.message}`);
+          callback(err);
         }
-
-        callback();
-      } catch (err) {
-        logger.error(`Batch processing error: ${err.message}`);
-        callback(err);
-      }
+      },
     }))
     .pipe(dest(output))
     .on('finish', () => {

package/dist/gulp/tasks/sass.js

@@ -13,7 +13,7 @@ const { template } = require('node-powertools');
 const yaml = require('js-yaml');
 const postcss = require('gulp-postcss');
 const purgeCss = require('@fullhuman/postcss-purgecss');
-const through2 = require('through2');
+const { Transform } = require('node:stream');
 
 // Load package
 const package = Manager.getPackage('main');
@@ -324,19 +324,20 @@ function sass(complete) {
     let purgeCssLogged = false;
     stream = stream
       .pipe(postcss([purgeCssPlugin]))
-      .pipe(through2.obj(
-        function (file, enc, cb) {
+      .pipe(new Transform({
+        objectMode: true,
+        transform(file, enc, cb) {
           cb(null, file);
         },
-        function (cb) {
+        flush(cb) {
           if (!purgeCssLogged) {
             purgeCssLogged = true;
             const purgeCssTime = ((performance.now() - purgeCssStartTime) / 1000).toFixed(2);
             logger.log(`PurgeCSS completed in ${purgeCssTime}s`);
           }
           cb();
-        }
-      ));
+        },
+      }));
   }
 
   // Process

package/dist/gulp/tasks/utils/template-transform.js

@@ -1,49 +1,49 @@
 // Libraries
-const through2 = require('through2');
+const { Transform } = require('node:stream');
 const { template } = require('node-powertools');
 const path = require('path');
 
 /**
- * Creates a through2 transform stream that processes template variables in files
+ * Creates a transform stream that processes template variables in files
  **/
 function createTemplateTransform(data) {
   const extensions = ['html', 'md', 'liquid', 'json']
 
-  return through2.obj(function(file, encoding, callback) {
-    // Skip directories
-    if (file.isDirectory()) {
-      return callback(null, file);
-    }
-
-    // Check if file extension matches
-    const ext = path.extname(file.path).toLowerCase().slice(1);
-    if (!extensions.includes(ext)) {
-      return callback(null, file);
-    }
-
-    // Log
-    // console.log(`Processing file: ${file.path}`);
-
-    // Process the file contents
-    try {
-      const contents = file.contents.toString();
-
-      // Process templates
-      const templated = template(contents, data, {
-        brackets: ['[', ']'],
-      });
-
-      // Update file contents if changed
-      if (contents !== templated) {
-        file.contents = Buffer.from(templated);
-        const relativePath = file.relative || file.path;
+  return new Transform({
+    objectMode: true,
+    transform(file, encoding, callback) {
+      // Skip directories
+      if (file.isDirectory()) {
+        return callback(null, file);
       }
-    } catch (error) {
-      console.error(`Error processing templates in ${file.path}:`, error);
-    }
 
-    // Pass the file through
-    callback(null, file);
+      // Check if file extension matches
+      const ext = path.extname(file.path).toLowerCase().slice(1);
+      if (!extensions.includes(ext)) {
+        return callback(null, file);
+      }
+
+      // Process the file contents
+      try {
+        const contents = file.contents.toString();
+
+        // Process templates
+        const templated = template(contents, data, {
+          brackets: ['[', ']'],
+        });
+
+        // Update file contents if changed
+        if (contents !== templated) {
+          file.contents = Buffer.from(templated);
+          const relativePath = file.relative || file.path;
+        }
+      } catch (error) {
+        console.error(`Error processing templates in ${file.path}:`, error);
+      }
+
+      // Pass the file through
+      callback(null, file);
+    },
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-jekyll-manager",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "description": "Ultimate Jekyll dependency manager",
   "main": "dist/index.js",
   "exports": {
@@ -66,7 +66,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.29.0",
-    "@babel/preset-env": "^7.29.2",
+    "@babel/preset-env": "^7.29.5",
     "@fullhuman/postcss-purgecss": "^8.0.0",
     "@minify-html/node": "^0.18.1",
     "@octokit/rest": "^22.0.1",
@@ -79,35 +79,34 @@
     "chart.js": "^4.5.1",
     "cheerio": "^1.2.0",
     "chrome-launcher": "^1.2.1",
-    "dompurify": "^3.3.3",
-    "dotenv": "^17.4.1",
-    "fast-xml-parser": "^5.5.11",
+    "dompurify": "^3.4.2",
+    "dotenv": "^17.4.2",
+    "fast-xml-parser": "^5.7.3",
     "fs-jetpack": "^5.1.0",
     "glob": "^13.0.6",
     "gulp-clean-css": "^4.3.0",
-    "gulp-filter": "^9.0.1",
+    "gulp-filter": "^10.0.0",
     "gulp-postcss": "^10.0.0",
     "gulp-rename": "^2.1.0",
     "gulp-responsive-modern": "^1.0.0",
     "gulp-sass": "^6.0.1",
     "html-minifier-terser": "^7.2.0",
-    "html-validate": "^10.11.3",
+    "html-validate": "^10.16.0",
     "itwcw-package-analytics": "^1.0.8",
     "js-yaml": "^4.1.1",
     "json5": "^2.2.3",
-    "libsodium-wrappers": "^0.8.3",
+    "libsodium-wrappers": "^0.8.4",
     "lodash": "^4.18.1",
     "markdown-it": "^14.1.1",
     "minimatch": "^10.2.5",
     "node-powertools": "^3.0.0",
     "npm-api": "^1.0.1",
-    "postcss": "^8.5.9",
-    "prettier": "^3.8.2",
+    "postcss": "^8.5.14",
+    "prettier": "^3.8.3",
     "sass": "^1.99.0",
     "spellchecker": "^3.7.1",
-    "through2": "^4.0.2",
-    "web-manager": "^4.1.39",
-    "webpack": "^5.106.1",
+    "web-manager": "^4.1.41",
+    "webpack": "^5.106.2",
     "wonderful-fetch": "^2.0.5",
     "wonderful-version": "^1.3.2",
     "yargs": "^18.0.0"