ultimate-jekyll-manager 0.0.228 → 0.0.230

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

@@ -75,6 +75,9 @@ export default function (Manager, options) {
         if (policy === 'authenticated') {
           redirect(unauthenticated, window.location.href);
         }
+
+        // Append authReturnUrl to all signup/signin links so users return here after auth
+        updateAuthLinks();
       }
     });
   } catch (e) {
@@ -108,6 +111,23 @@ function redirect(url, returnUrl) {
   window.location.href = newURL;
 }
 
+// Add authReturnUrl to all signup/signin links so users return to the current page after auth
+function updateAuthLinks() {
+  const currentUrl = window.location.href;
+  const authPaths = ['/signin', '/signup'];
+
+  document.querySelectorAll('a[href]').forEach(($link) => {
+    try {
+      const href = new URL($link.href, window.location.origin);
+
+      if (!authPaths.includes(href.pathname)) { return; }
+
+      href.searchParams.set('authReturnUrl', currentUrl);
+      $link.href = href.toString();
+    } catch (e) {}
+  });
+}
+
 function setAnalyticsUserId(user, webManager) {
   const userId = user?.uid;
   const email = user?.email;

package/dist/assets/js/modules/vert.js

@@ -11,6 +11,33 @@ const searchParams = new URLSearchParams(window.location.search);
 const qsDebug = searchParams.get('debug') === 'true';
 const qsLoud = searchParams.get('loud') === 'true';
 
+// Reveal a vert-unit by removing the initial hide styles
+const revealVertUnit = ($vertUnit) => {
+  if ($vertUnit) {
+    $vertUnit.style.removeProperty('overflow');
+    $vertUnit.style.removeProperty('max-height');
+  }
+};
+
+// Protect height-constrained ancestors from AdSense's height: auto !important override.
+// Walks up from the ad's script element and observes any ancestor with a fixed-height class.
+const HEIGHT_CLASSES = ['vh-100', 'h-100', 'min-vh-100'];
+const protectAncestorHeights = ($el) => {
+  let $current = $el?.parentElement;
+  while ($current && $current !== document.body) {
+    if (HEIGHT_CLASSES.some((cls) => $current.classList.contains(cls))) {
+      const $protected = $current;
+      console.log('[Vert] Protecting ancestor height:', $protected.className);
+      new MutationObserver(() => {
+        if ($protected.style.height) {
+          $protected.style.removeProperty('height');
+        }
+      }).observe($protected, { attributes: true, attributeFilter: ['style'] });
+    }
+    $current = $current.parentElement;
+  }
+};
+
 // Main initialization
 webManager.dom().ready().then(() => {
   // Get the current script element to extract configuration
@@ -87,6 +114,7 @@ const setupMessageHandler = () => {
       const $iframe = document.getElementById(payload.id);
       if ($iframe) {
         $iframe.style.height = payload.height + 'px';
+        revealVertUnit($iframe.closest('vert-unit'));
       }
     } else if (command === 'uj-vert-unit:click') {
       // Navigate to the URL when ad is clicked
@@ -121,6 +149,7 @@ const monitorAdFillStatus = ($vertUnit, config) => {
     // Handle filled status
     if (status === 'filled') {
       console.log('[Vert] Adsense is filled, no fallback needed');
+      revealVertUnit($vertUnit);
       return;
     }
 
@@ -173,7 +202,7 @@ const createCustomAd = ($vertUnit, config) => {
   $iframe.style.cssText = config.style;
   $iframe.setAttribute('sandbox', 'allow-forms allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts allow-top-navigation-by-user-activation');
   $iframe.width = '100%';
-  $iframe.height = '100%';
+  $iframe.height = '0';
   $iframe.setAttribute('frameborder', '0');
   $iframe.setAttribute('marginwidth', '0');
   $iframe.setAttribute('marginheight', '0');
@@ -187,6 +216,9 @@ const createCustomAd = ($vertUnit, config) => {
   $vertUnit.innerHTML = '';
   $vertUnit.appendChild($iframe);
 
+  // Reveal the vert unit now that custom ad is loaded
+  revealVertUnit($vertUnit);
+
   // Retrigger bindings to apply plan visibility
   webManager.auth().listen({ once: true }, async () => {
     webManager.bindings().update();
@@ -198,6 +230,9 @@ const createCustomAd = ($vertUnit, config) => {
 
 // Function to create and insert the ad unit
 const createAdUnit = (config, $currentScript) => {
+  // Protect height-constrained ancestors before ads modify them
+  protectAncestorHeights($currentScript);
+
   // Create ad unit elements
   const $vertUnit = document.createElement('vert-unit');
 
@@ -205,6 +240,9 @@ const createAdUnit = (config, $currentScript) => {
   $vertUnit.className = 'uj-vert-unit';
   $vertUnit.setAttribute('data-wm-bind', '@hide auth.account.subscription.product !== basic');
 
+  // Hide until ad is ready to prevent layout flash
+  $vertUnit.style.cssText = 'overflow:hidden; max-height:0;';
+
   // Create the ins element for AdSense
   const $ins = document.createElement('ins');
   $ins.className = 'adsbygoogle';

package/dist/defaults/dist/_includes/core/foot.html

@@ -100,6 +100,7 @@
     {% for item in page.resolved.web_manager %}
       {{ item[0] | jsonify }}: {{ item[1] | jsonify }},
     {% endfor %}
+    env: {{ page.resolved.web_manager.env | jsonify }},
   };
 </script>
 

package/dist/gulp/tasks/serve.js

@@ -69,7 +69,13 @@ module.exports = async function serve(complete) {
     externalUrl = instance.options.get('urls').get('external');
 
     // Write the config file
-    jetpack.write('.temp/_config_browsersync.yml', `url: ${externalUrl}`);
+    jetpack.write('.temp/_config_browsersync.yml', [
+      `url: ${externalUrl}`,
+      '',
+      'web_manager:',
+      '  env:',
+      `    FIREBASE_EMULATOR_CONNECT: ${process.env.FIREBASE_EMULATOR_CONNECT === 'true'}`,
+    ].join('\n'));
 //     jetpack.write('.temp/_config_browsersync.yml', `
 // url: ${externalUrl}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-jekyll-manager",
-  "version": "0.0.228",
+  "version": "0.0.230",
   "description": "Ultimate Jekyll dependency manager",
   "main": "dist/index.js",
   "exports": {
@@ -99,7 +99,7 @@
     "sass": "^1.97.3",
     "spellchecker": "^3.7.1",
     "through2": "^4.0.2",
-    "web-manager": "^4.1.6",
+    "web-manager": "^4.1.7",
     "webpack": "^5.104.1",
     "wonderful-fetch": "^1.3.4",
     "wonderful-version": "^1.3.2",