@canopy-iiif/app 1.6.13 → 1.6.15

package/lib/build/iiif.js

@@ -38,6 +38,19 @@ const IIIF_CACHE_DIR = path.resolve(".cache/iiif");
 const IIIF_CACHE_MANIFESTS_DIR = path.join(IIIF_CACHE_DIR, "manifests");
 const IIIF_CACHE_COLLECTIONS_DIR = path.join(IIIF_CACHE_DIR, "collections");
 const IIIF_CACHE_COLLECTION = path.join(IIIF_CACHE_DIR, "collection.json");
+
+function relativeRuntimeScript(outPath, filename, versioned = false) {
+  if (!outPath || !filename) return null;
+  const abs = path.join(OUT_DIR, "scripts", filename);
+  let rel = path.relative(path.dirname(outPath), abs).split(path.sep).join("/");
+  if (!versioned) return rel;
+  try {
+    const st = fs.statSync(abs);
+    const version = Math.floor(st.mtimeMs || Date.now());
+    if (version) rel += `?v=${version}`;
+  } catch (_) {}
+  return rel;
+}
 // Primary global index location
 const IIIF_CACHE_INDEX = path.join(IIIF_CACHE_DIR, "index.json");
 // Additional legacy locations kept for backward compatibility (read + optional write)
@@ -2003,40 +2016,16 @@ async function buildIiifCollectionPages(CONFIG) {
             needsSearchForm;
 
           const viewerRel = needsHydrateViewer
-            ? path
-                .relative(
-                  path.dirname(outPath),
-                  path.join(OUT_DIR, "scripts", "canopy-viewer.js"),
-                )
-                .split(path.sep)
-                .join("/")
+            ? relativeRuntimeScript(outPath, "canopy-viewer.js", true)
             : null;
           const sliderRel = needsRelated
-            ? path
-                .relative(
-                  path.dirname(outPath),
-                  path.join(OUT_DIR, "scripts", "canopy-slider.js"),
-                )
-                .split(path.sep)
-                .join("/")
+            ? relativeRuntimeScript(outPath, "canopy-slider.js", true)
             : null;
           const timelineRel = needsTimeline
-            ? path
-                .relative(
-                  path.dirname(outPath),
-                  path.join(OUT_DIR, "scripts", "canopy-timeline.js"),
-                )
-                .split(path.sep)
-                .join("/")
+            ? relativeRuntimeScript(outPath, "canopy-timeline.js", true)
             : null;
           const mapRel = needsMap
-            ? path
-                .relative(
-                  path.dirname(outPath),
-                  path.join(OUT_DIR, "scripts", "canopy-map.js"),
-                )
-                .split(path.sep)
-                .join("/")
+            ? relativeRuntimeScript(outPath, "canopy-map.js", true)
             : null;
           const mapCssRel = needsMap
             ? path
@@ -2048,31 +2037,13 @@ async function buildIiifCollectionPages(CONFIG) {
                 .join("/")
             : null;
           const heroRel = needsHeroSlider
-            ? path
-                .relative(
-                  path.dirname(outPath),
-                  path.join(OUT_DIR, "scripts", "canopy-hero-slider.js"),
-                )
-                .split(path.sep)
-                .join("/")
+            ? relativeRuntimeScript(outPath, "canopy-hero-slider.js", true)
             : null;
           const relatedRel = needsRelated
-            ? path
-                .relative(
-                  path.dirname(outPath),
-                  path.join(OUT_DIR, "scripts", "canopy-related-items.js"),
-                )
-                .split(path.sep)
-                .join("/")
+            ? relativeRuntimeScript(outPath, "canopy-related-items.js", true)
             : null;
           const searchFormRel = needsSearchForm
-            ? path
-                .relative(
-                  path.dirname(outPath),
-                  path.join(OUT_DIR, "scripts", "canopy-search-form.js"),
-                )
-                .split(path.sep)
-                .join("/")
+            ? relativeRuntimeScript(outPath, "canopy-search-form.js", true)
             : null;
 
           const moduleScriptRels = [];

package/lib/build/mdx.js

@@ -1283,14 +1283,20 @@ async function buildCloverHydrationRuntimes() {
   renameAnonymousChunks(scriptsDir);
   try {
     const { logLine } = require("./log");
-    ["canopy-viewer.js", "canopy-slider.js"].forEach((file) => {
+    const runtimeLabels = {
+      viewer: "Viewer, Scroll, and Image runtime",
+      slider: "Slider runtime",
+    };
+    Object.keys(entryPoints).forEach((key) => {
+      const file = `canopy-${key}.js`;
       try {
         const abs = path.join(scriptsDir, file);
         const st = fs.statSync(abs);
         const size = st && st.size ? st.size : 0;
         const kb = size ? ` (${(size / 1024).toFixed(1)} KB)` : "";
         const rel = path.relative(process.cwd(), abs).split(path.sep).join("/");
-        logLine(`✓ Wrote ${rel}${kb}`, "cyan");
+        const label = runtimeLabels[key] ? ` – ${runtimeLabels[key]}` : "";
+        logLine(`✓ Wrote ${rel}${kb}${label}`, "cyan");
       } catch (_) {}
     });
   } catch (_) {}

package/lib/build/pages.js

@@ -14,6 +14,19 @@ const mdx = require('./mdx');
 const navigation = require('../components/navigation');
 const referenced = require('../components/referenced');
 
+function relativeRuntimeScript(outPath, filename, versioned = false) {
+  if (!outPath || !filename) return null;
+  const abs = path.join(OUT_DIR, 'scripts', filename);
+  let rel = path.relative(path.dirname(outPath), abs).split(path.sep).join('/');
+  if (!versioned) return rel;
+  try {
+    const st = fs.statSync(abs);
+    const version = Math.floor(st.mtimeMs || Date.now());
+    if (version) rel += `?v=${version}`;
+  } catch (_) {}
+  return rel;
+}
+
 function normalizeWhitespace(value) {
   if (!value) return '';
   return String(value).replace(/\s+/g, ' ').trim();
@@ -213,35 +226,32 @@ async function renderContentMdxToHtml(filePath, outPath, extraProps = {}, source
   const needsFacets = body.includes('data-canopy-related-items');
   const needsCustomClients = body.includes('data-canopy-client-component');
   const viewerRel = needsHydrateViewer
-    ? path.relative(path.dirname(outPath), path.join(OUT_DIR, 'scripts', 'canopy-viewer.js')).split(path.sep).join('/')
+    ? relativeRuntimeScript(outPath, 'canopy-viewer.js', true)
     : null;
   const sliderRel = (needsHydrateSlider || needsFacets)
-    ? path.relative(path.dirname(outPath), path.join(OUT_DIR, 'scripts', 'canopy-slider.js')).split(path.sep).join('/')
+    ? relativeRuntimeScript(outPath, 'canopy-slider.js', true)
     : null;
   const heroRel = needsHeroSlider
-    ? path.relative(path.dirname(outPath), path.join(OUT_DIR, 'scripts', 'canopy-hero-slider.js')).split(path.sep).join('/')
+    ? relativeRuntimeScript(outPath, 'canopy-hero-slider.js', true)
     : null;
   const heroCssRel = needsHeroSlider
     ? path.relative(path.dirname(outPath), path.join(OUT_DIR, 'scripts', 'canopy-hero-slider.css')).split(path.sep).join('/')
     : null;
   const timelineRel = needsTimeline
-    ? path.relative(path.dirname(outPath), path.join(OUT_DIR, 'scripts', 'canopy-timeline.js')).split(path.sep).join('/')
+    ? relativeRuntimeScript(outPath, 'canopy-timeline.js', true)
     : null;
   const mapRel = needsMap
-    ? path.relative(path.dirname(outPath), path.join(OUT_DIR, 'scripts', 'canopy-map.js')).split(path.sep).join('/')
+    ? relativeRuntimeScript(outPath, 'canopy-map.js', true)
     : null;
   const mapCssRel = needsMap
     ? path.relative(path.dirname(outPath), path.join(OUT_DIR, 'scripts', 'canopy-map.css')).split(path.sep).join('/')
     : null;
   const facetsRel = needsFacets
-    ? path.relative(path.dirname(outPath), path.join(OUT_DIR, 'scripts', 'canopy-related-items.js')).split(path.sep).join('/')
+    ? relativeRuntimeScript(outPath, 'canopy-related-items.js', true)
     : null;
   let searchFormRel = null;
   if (needsSearchForm) {
-    const runtimeAbs = path.join(OUT_DIR, 'scripts', 'canopy-search-form.js');
-    let rel = path.relative(path.dirname(outPath), runtimeAbs).split(path.sep).join('/');
-    try { const st = fs.statSync(runtimeAbs); rel += `?v=${Math.floor(st.mtimeMs || Date.now())}`; } catch (_) {}
-    searchFormRel = rel;
+    searchFormRel = relativeRuntimeScript(outPath, 'canopy-search-form.js', true);
   }
   let customClientRel = null;
   if (needsCustomClients) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopy-iiif/app",
-  "version": "1.6.13",
+  "version": "1.6.15",
   "private": false,
   "license": "MIT",
   "author": "Mat Jordan <mat@northwestern.edu>",