jekyll-hover-popup 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdae0cb64015858986ffe6c6dc11d44947b4e172dee08bccd68d191230416b26
-  data.tar.gz: af148150f8a1890b082adbccc2c4665a56dacbad3eea581608dd02c0cbee8f36
+  metadata.gz: bb537e34ef0aa3bb1f5396179b65f549533f3c670cd4dffcd581f3b727c355c2
+  data.tar.gz: 552f8704d5da719123714a6f9bb22c8921ec38131a16f3c8d5d36bf5fcbbb8fb
 SHA512:
-  metadata.gz: a3192b0edd3563b6b267740ca86eff70b040b269d30aff9005366902be46d6f11026644757ea3f010296aa610f91f4969426e82c0bb1860ed473b7ed0cd07f44
-  data.tar.gz: 203ad982a1a4dd62680ee9798179a224835fca23322b2744e1239d09dfcce0ac8a63e63e574f90a58acf893a43cd69204015160ba37d229b2d5d1a9f40076d30
+  metadata.gz: 03eb03b79e05fa4b829562d5f11ebbf270e2b6e35fb8f61f0f4f45474fd580556795d4eceee5f8e53f5cf62d4f3e496aae0fd5a13b09d6726e1d0602f158bd43
+  data.tar.gz: 02e9f34463fdbaf23c1c3b2c231096d3e09d2853ce6b7aeaa27c780a65dd2cb75977b2cb3431cb95d773f2f73ad1b8deb6bbfa5d4a7bb20248de5f8083fd07c5

data/assets/jekyll-hover-popup/hover_popup.js

@@ -128,10 +128,16 @@
     });
   }
 
+  function stripHtmlExtension(pathname) {
+    return pathname.replace(/\.html?$/i, "");
+  }
+
   function normalizePath(pathname) {
     if (!pathname) return "/";
-    const normalized = pathname.endsWith("/") ? pathname : `${pathname}/`;
-    return normalized;
+    // Treat /page.html and /page/ as the same document for cache/same-page checks.
+    let path = stripHtmlExtension(pathname);
+    if (!path.endsWith("/")) path = `${path}/`;
+    return path || "/";
   }
 
   function normalizeLinkKey(url) {
@@ -145,6 +151,30 @@
     );
   }
 
+  // Prefer paths that static hosts (esp. Cloudflare Pages) resolve correctly.
+  // Never request `page.html/` — that often SPA-fallbacks to the site index.
+  function fetchPathCandidates(pathname) {
+    const paths = [];
+    const push = (p) => {
+      if (p && !paths.includes(p)) paths.push(p);
+    };
+
+    if (/\.html?$/i.test(pathname)) {
+      push(pathname);
+      const withoutExt = stripHtmlExtension(pathname) || "/";
+      push(withoutExt);
+      if (!withoutExt.endsWith("/")) push(`${withoutExt}/`);
+      return paths;
+    }
+
+    const withSlash = pathname.endsWith("/") ? pathname : `${pathname}/`;
+    const withoutSlash = pathname.endsWith("/") ? pathname.replace(/\/+$/, "") || "/" : pathname;
+    push(withSlash);
+    push(withoutSlash);
+    if (withoutSlash !== "/") push(`${withoutSlash}.html`);
+    return paths;
+  }
+
   function isImagePath(pathname) {
     return /\.(avif|bmp|gif|ico|jpe?g|png|svg|webp)$/i.test(pathname);
   }
@@ -281,30 +311,25 @@
   }
 
   async function fetchPageDocument(pathname) {
-    const cacheKey = pathname.endsWith("/") ? pathname : `${pathname}/`;
+    const cacheKey = normalizePath(pathname);
     if (pageCache.has(cacheKey)) return pageCache.get(cacheKey);
 
-    const fetchPath = cacheKey;
-    const response = await fetch(fetchPath, { credentials: "same-origin" });
-    if (!response.ok) {
-      const fallback = pathname.endsWith("/") ? pathname.slice(0, -1) : `${pathname}/`;
-      if (fallback !== fetchPath) {
-        const retry = await fetch(fallback, { credentials: "same-origin" });
-        if (retry.ok) {
-          const html = await retry.text();
-          const doc = new DOMParser().parseFromString(html, "text/html");
-          pageCache.set(cacheKey, doc);
-          pageCache.set(fallback, doc);
-          return doc;
-        }
+    let lastError;
+    for (const fetchPath of fetchPathCandidates(pathname)) {
+      try {
+        const response = await fetch(fetchPath, { credentials: "same-origin" });
+        if (!response.ok) continue;
+
+        const html = await response.text();
+        const doc = new DOMParser().parseFromString(html, "text/html");
+        pageCache.set(cacheKey, doc);
+        return doc;
+      } catch (err) {
+        lastError = err;
       }
-      throw new Error(`Failed to load ${fetchPath}`);
     }
 
-    const html = await response.text();
-    const doc = new DOMParser().parseFromString(html, "text/html");
-    pageCache.set(cacheKey, doc);
-    return doc;
+    throw lastError || new Error(`Failed to load ${pathname}`);
   }
 
   async function loadLinkContent(anchor) {
@@ -312,7 +337,7 @@
     const hash = url.hash;
 
     let doc;
-    if (url.pathname === window.location.pathname && url.search === window.location.search) {
+    if (isSamePage(url)) {
       doc = document;
     } else {
       doc = await fetchPageDocument(url.pathname);

data/lib/jekyll/hover_popup/hooks.rb

@@ -8,8 +8,7 @@ module Jekyll
           next if cfg["enabled"] == false
           next unless doc.respond_to?(:output_ext) && doc.output_ext == ".html"
 
-          assets_path = cfg["assets_path"] || "/assets/jekyll-hover-popup"
-          assets_path = "/#{assets_path}" unless assets_path.start_with?("/")
+          assets_path = resolve_assets_path(site, cfg)
           hover_delay_ms = cfg["hover_delay_ms"] || 0
           nav_hover_preview = cfg.fetch("nav_hover_preview", false)
 
@@ -21,6 +20,21 @@ module Jekyll
         end
       end
 
+      # Site-root path (e.g. "/assets/jekyll-hover-popup"), with site.baseurl prepended.
+      def self.resolve_assets_path(site, cfg)
+        assets_path = cfg["assets_path"] || "/assets/jekyll-hover-popup"
+        assets_path = "/#{assets_path}" unless assets_path.start_with?("/")
+
+        baseurl = site.config["baseurl"].to_s
+        baseurl = "" if baseurl == "/"
+        baseurl = baseurl.chomp("/")
+
+        return assets_path if baseurl.empty?
+        return assets_path if assets_path == baseurl || assets_path.start_with?("#{baseurl}/")
+
+        "#{baseurl}#{assets_path}"
+      end
+
       def self.inject_assets(html, assets_path:, hover_delay_ms:, nav_hover_preview: false)
         return html if html.include?('data-hover-popup-root="true"')
 

data/lib/jekyll/hover_popup/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module HoverPopup
-    VERSION = "0.3.0"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-hover-popup
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - directsun