@canopy-iiif/app 1.11.2 → 1.12.0

package/lib/build/search.js

@@ -138,7 +138,7 @@ async function writeFacetCollections(labelWhitelist, combined) {
       }
       const selfId = absoluteUrl(`/api/facet/${labelSlug}/${valueSlug}.json`);
       const parentId = absoluteUrl(`/api/facet/${labelSlug}.json`);
-      const homepage = absoluteUrl(`/search?${encodeURIComponent(labelSlug)}=${encodeURIComponent(valueSlug)}`);
+      const homepage = absoluteUrl(`/search/index.html?${encodeURIComponent(labelSlug)}=${encodeURIComponent(valueSlug)}`);
       const col = {
         '@context': 'https://iiif.io/api/presentation/3/context.json',
         id: selfId,

package/lib/build/sitemap.js

@@ -42,7 +42,7 @@ function collectAbsoluteUrls(iiifRecords, pageRecords) {
     push(record.href);
   });
   // Ensure the search page is always present even though it is generated separately
-  push('/search.html');
+  push('/search/index.html');
   return Array.from(urls.values()).sort((a, b) => a.localeCompare(b));
 }
 

package/lib/search/search-form-runtime.js

@@ -105,7 +105,7 @@ function isOnSearchPage() {
     let path = String(location.pathname || '');
     if (base && path.startsWith(base)) path = path.slice(base.length);
     if (path.endsWith('/')) path = path.slice(0, -1);
-    return path === '/search';
+    return path === '/search' || path === '/search/index.html';
   } catch (_) {
     return false;
   }

package/lib/search/search.js

@@ -114,10 +114,7 @@ function getSearchRouteEntries() {
 function resolveSearchOutputRelative(routeValue) {
   const defaultRoute = getDefaultRoute('search') || 'search';
   const trimmed = typeof routeValue === 'string' ? routeValue.trim().replace(/^\/+|\/+$/g, '') : '';
-  if (!trimmed || trimmed === defaultRoute) {
-    return `${trimmed || defaultRoute}.html`;
-  }
-  return path.join(trimmed, 'index.html');
+  return path.join(trimmed || defaultRoute, 'index.html');
 }
 
 async function ensureSearchRuntime() {

package/package.json

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

package/ui/dist/index.mjs

@@ -43458,7 +43458,7 @@ function isAbsoluteUrl(href) {
 }
 function resolveSearchPath(pathValue) {
   let raw = typeof pathValue === "string" ? pathValue.trim() : "";
-  if (!raw) raw = "/search";
+  if (!raw) raw = "/search/index.html";
   if (isAbsoluteUrl(raw)) return raw;
   const normalizedPath = raw.startsWith("/") ? raw : `/${raw}`;
   const base = readBasePath();
@@ -43477,7 +43477,7 @@ function SearchPanelForm(props = {}) {
     placeholder,
     buttonLabel,
     label,
-    searchPath = "/search",
+    searchPath = "/search/index.html",
     inputId: inputIdProp,
     clearLabel
   } = props || {};
@@ -43633,7 +43633,7 @@ function SearchPanel(props = {}) {
     // eslint-disable-line no-unused-vars
     buttonLabel: buttonLabelProp,
     label,
-    searchPath = "/search"
+    searchPath = "/search/index.html"
   } = props || {};
   const { getString } = useLocale();
   const placeholder = placeholderProp != null ? placeholderProp : getString("common.phrases.placeholder_search", "Search\u2026");
@@ -44627,7 +44627,7 @@ function CanopyHeader(props = {}) {
   const defaultSearchRoute = siteDefaultRoutes && typeof siteDefaultRoutes.search === "string" ? siteDefaultRoutes.search : "search";
   const trimmedSearchRoute = searchRouteValue ? searchRouteValue.replace(/^\/+|\/+$/g, "") : "";
   const usesDirectorySearchRoute = trimmedSearchRoute && trimmedSearchRoute !== (defaultSearchRoute || "search");
-  const normalizedSearchRoute = usesDirectorySearchRoute ? `/${trimmedSearchRoute}/` : `/${(trimmedSearchRoute || defaultSearchRoute || "search").replace(/^\/+/, "")}`;
+  const normalizedSearchRoute = usesDirectorySearchRoute ? `/${trimmedSearchRoute}/` : `/${(trimmedSearchRoute || defaultSearchRoute || "search").replace(/^\/+/, "")}/index.html`;
   const resolvedLanguageToggle = languageToggleProp === false ? null : languageToggleProp === true || typeof languageToggleProp === "undefined" ? siteLanguageToggle : languageToggleProp;
   const resolvedSearchLabel = searchLabelProp != null ? searchLabelProp : getString("common.nouns.search", "Search");
   const resolvedSearchPlaceholder = searchPlaceholderProp != null ? searchPlaceholderProp : getString("common.phrases.placeholder_search", "Search\u2026");
@@ -46316,7 +46316,7 @@ function MdxSearchFormModal(props = {}) {
     // kept for backward compat; ignored by teaser form
     buttonLabel: buttonLabelProp,
     label,
-    searchPath = "/search"
+    searchPath = "/search/index.html"
   } = props || {};
   const { getString } = useLocale();
   const placeholder = placeholderProp != null ? placeholderProp : getString("common.phrases.placeholder_search", "Search\u2026");