@amplifyup/sdk 0.1.74 → 0.1.76

package/dist/{query-NcrxJQvI.d.ts → query-B23UsNIv.d.ts}

@@ -1,4 +1,4 @@
-import { i as AmplifyUpTarget, y as ListRow } from './types-BGZYaFxP.js';
+import { j as AmplifyUpTarget, z as ListRow } from './types-D4TSd2Yt.js';
 
 /**
  * On-request variant selection (tier 3).

package/dist/{query-_SMo6VRf.d.mts → query-CV8x3oQT.d.mts}

@@ -1,4 +1,4 @@
-import { i as AmplifyUpTarget, y as ListRow } from './types-BGZYaFxP.mjs';
+import { j as AmplifyUpTarget, z as ListRow } from './types-D4TSd2Yt.mjs';
 
 /**
  * On-request variant selection (tier 3).

package/dist/react.d.mts

@@ -1,9 +1,9 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { L as LayoutComponentProps, P as PageConfig, F as Field$1, l as FIELDS_BRAND, c as AmplifyUpConfig, e as AmplifyPageContextInput, C as ContentSource, A as AmplifyContentMeta } from './types-BGZYaFxP.mjs';
-export { w as FieldRef, x as Fields, z as ImageValue, y as ListRow, B as PortableRef, Z as ZoneConfig, m as attachFieldEnvelopes, p as composerStoreKey, o as envelopeListRows, v as isBrandedFields, s as isFieldEnvelope, u as isReadOnlyRowField, q as listOwnerFromSpec, t as toFieldEnvelopes } from './types-BGZYaFxP.mjs';
+import { L as LayoutComponentProps, P as PageConfig, F as Field$1, m as FIELDS_BRAND, d as AmplifyUpConfig, f as AmplifyPageContextInput, C as ContentSource, A as AmplifyContentMeta } from './types-D4TSd2Yt.mjs';
+export { x as FieldRef, y as Fields, B as ImageValue, z as ListRow, D as PortableRef, Z as ZoneConfig, o as attachFieldEnvelopes, q as composerStoreKey, p as envelopeListRows, w as isBrandedFields, u as isFieldEnvelope, v as isReadOnlyRowField, s as listOwnerFromSpec, t as toFieldEnvelopes } from './types-D4TSd2Yt.mjs';
 import react__default, { ReactNode } from 'react';
 export { AmplifyRenderer } from './AmplifyRenderer.mjs';
-export { Q as QueryContentError, e as QueryContentOptions, k as QueryFilter, l as QueryFilterOp, i as QueryPagination, h as QueryResult, m as QuerySort, j as QuerySpec, S as SelectVariantsError, a as SelectVariantsOptions, b as SelectVariantsResult, n as nextPageSpec, q as queryContent, d as searchSpec, s as selectVariants } from './query-_SMo6VRf.mjs';
+export { Q as QueryContentError, e as QueryContentOptions, k as QueryFilter, l as QueryFilterOp, i as QueryPagination, h as QueryResult, m as QuerySort, j as QuerySpec, S as SelectVariantsError, a as SelectVariantsOptions, b as SelectVariantsResult, n as nextPageSpec, q as queryContent, d as searchSpec, s as selectVariants } from './query-CV8x3oQT.mjs';
 export { i as isComposerPreview, a as isPreviewRequest, b as isWorkingContentRequest } from './preview-_vHmzRen.mjs';
 
 type RenderComponentContext = {

package/dist/react.d.ts

@@ -1,9 +1,9 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { L as LayoutComponentProps, P as PageConfig, F as Field$1, l as FIELDS_BRAND, c as AmplifyUpConfig, e as AmplifyPageContextInput, C as ContentSource, A as AmplifyContentMeta } from './types-BGZYaFxP.js';
-export { w as FieldRef, x as Fields, z as ImageValue, y as ListRow, B as PortableRef, Z as ZoneConfig, m as attachFieldEnvelopes, p as composerStoreKey, o as envelopeListRows, v as isBrandedFields, s as isFieldEnvelope, u as isReadOnlyRowField, q as listOwnerFromSpec, t as toFieldEnvelopes } from './types-BGZYaFxP.js';
+import { L as LayoutComponentProps, P as PageConfig, F as Field$1, m as FIELDS_BRAND, d as AmplifyUpConfig, f as AmplifyPageContextInput, C as ContentSource, A as AmplifyContentMeta } from './types-D4TSd2Yt.js';
+export { x as FieldRef, y as Fields, B as ImageValue, z as ListRow, D as PortableRef, Z as ZoneConfig, o as attachFieldEnvelopes, q as composerStoreKey, p as envelopeListRows, w as isBrandedFields, u as isFieldEnvelope, v as isReadOnlyRowField, s as listOwnerFromSpec, t as toFieldEnvelopes } from './types-D4TSd2Yt.js';
 import react__default, { ReactNode } from 'react';
 export { AmplifyRenderer } from './AmplifyRenderer.js';
-export { Q as QueryContentError, e as QueryContentOptions, k as QueryFilter, l as QueryFilterOp, i as QueryPagination, h as QueryResult, m as QuerySort, j as QuerySpec, S as SelectVariantsError, a as SelectVariantsOptions, b as SelectVariantsResult, n as nextPageSpec, q as queryContent, d as searchSpec, s as selectVariants } from './query-NcrxJQvI.js';
+export { Q as QueryContentError, e as QueryContentOptions, k as QueryFilter, l as QueryFilterOp, i as QueryPagination, h as QueryResult, m as QuerySort, j as QuerySpec, S as SelectVariantsError, a as SelectVariantsOptions, b as SelectVariantsResult, n as nextPageSpec, q as queryContent, d as searchSpec, s as selectVariants } from './query-B23UsNIv.js';
 export { i as isComposerPreview, a as isPreviewRequest, b as isWorkingContentRequest } from './preview-_vHmzRen.js';
 
 type RenderComponentContext = {

package/dist/react.js

@@ -17,7 +17,121 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
+// src/storage.ts
+var INSTANCE_ID_KEY = "amplifyup_instance_id";
+var USER_ID_KEY = "amplifyup_user_id";
+var SESSION_ID_KEY = "amplifyup_session_id";
+var SESSION_ACTIVITY_KEY = "amplifyup_session_activity";
+var VISITOR_FIRST_SEEN_KEY = "amplifyup_visitor_first_seen";
+var ANON_COOKIE_NAME = "amplifyup_anon_id";
+var SESSION_COOKIE_NAME = "amplifyup_session_id";
+var SESSION_IDLE_GAP_MS = 30 * 60 * 1e3;
+function generateGuid() {
+  if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+    return crypto.randomUUID();
+  }
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
+    const r = Math.random() * 16 | 0;
+    const v = c === "x" ? r : r & 3 | 8;
+    return v.toString(16);
+  });
+}
+function readCookie(name) {
+  if (typeof document === "undefined") return null;
+  const parts = document.cookie.split(";");
+  for (const part of parts) {
+    const idx = part.indexOf("=");
+    if (idx === -1) continue;
+    if (part.slice(0, idx).trim() !== name) continue;
+    const value = part.slice(idx + 1).trim();
+    try {
+      return value ? decodeURIComponent(value) : null;
+    } catch {
+      return value || null;
+    }
+  }
+  return null;
+}
+function writeCookie(name, value, maxAgeSeconds = 31536e3) {
+  if (typeof document === "undefined") return;
+  document.cookie = `${name}=${encodeURIComponent(value)}; Path=/; Max-Age=${maxAgeSeconds}; SameSite=Lax`;
+}
+function getInstanceId() {
+  if (typeof window === "undefined") {
+    return "";
+  }
+  const fromCookie = readCookie(ANON_COOKIE_NAME);
+  const fromLs = localStorage.getItem(INSTANCE_ID_KEY);
+  const instanceId = fromLs || fromCookie || `browser_${generateGuid()}`;
+  if (fromLs !== instanceId) {
+    localStorage.setItem(INSTANCE_ID_KEY, instanceId);
+  }
+  if (fromCookie !== instanceId) {
+    writeCookie(ANON_COOKIE_NAME, instanceId);
+  }
+  return instanceId;
+}
+function getUserId() {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  return localStorage.getItem(USER_ID_KEY);
+}
+function getSessionId() {
+  if (typeof window === "undefined") {
+    return "";
+  }
+  const now = Date.now();
+  const lastActivity = Number(localStorage.getItem(SESSION_ACTIVITY_KEY) || 0);
+  const fromCookie = readCookie(SESSION_COOKIE_NAME);
+  const fromLs = localStorage.getItem(SESSION_ID_KEY);
+  let sessionId = fromLs || fromCookie || "";
+  if (!sessionId || lastActivity > 0 && now - lastActivity >= SESSION_IDLE_GAP_MS) {
+    sessionId = generateGuid();
+  }
+  localStorage.setItem(SESSION_ID_KEY, sessionId);
+  localStorage.setItem(SESSION_ACTIVITY_KEY, String(now));
+  writeCookie(SESSION_COOKIE_NAME, sessionId, Math.floor(SESSION_IDLE_GAP_MS / 1e3));
+  return sessionId;
+}
+function getVisitorFirstSeenAt() {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  try {
+    const existing = localStorage.getItem(VISITOR_FIRST_SEEN_KEY);
+    if (existing) return existing;
+    const firstSeenAt = (/* @__PURE__ */ new Date()).toISOString();
+    localStorage.setItem(VISITOR_FIRST_SEEN_KEY, firstSeenAt);
+    return firstSeenAt;
+  } catch {
+    return null;
+  }
+}
+function setUserId(userId) {
+  if (typeof window === "undefined") {
+    return;
+  }
+  localStorage.setItem(USER_ID_KEY, userId);
+}
+function clearIds() {
+  if (typeof window === "undefined") {
+    return;
+  }
+  localStorage.removeItem(INSTANCE_ID_KEY);
+  localStorage.removeItem(USER_ID_KEY);
+  localStorage.removeItem(SESSION_ID_KEY);
+  localStorage.removeItem(SESSION_ACTIVITY_KEY);
+  localStorage.removeItem(VISITOR_FIRST_SEEN_KEY);
+  document.cookie = `${ANON_COOKIE_NAME}=; Path=/; Max-Age=0; SameSite=Lax`;
+  document.cookie = `${SESSION_COOKIE_NAME}=; Path=/; Max-Age=0; SameSite=Lax`;
+}
+
 // src/adapters/aws.ts
+function visitorContext() {
+  const firstSeenAt = getVisitorFirstSeenAt();
+  return firstSeenAt ? { firstSeenAt } : void 0;
+}
 var AWSAdapter = class {
   constructor() {
     this.initialized = false;
@@ -57,7 +171,9 @@ var AWSAdapter = class {
       console.warn("AmplifyUp SDK: AWS configuration missing");
       return;
     }
-    const url = `${this.apiGatewayUrl}${endpoint}`;
+    const trackingId = eventData?.trackingId || this.config?.trackingId;
+    const query = trackingId ? `?tid=${encodeURIComponent(trackingId)}` : "";
+    const url = `${this.apiGatewayUrl}${endpoint}${query}`;
     try {
       const response = await fetch(url, {
         method: "POST",
@@ -119,7 +235,8 @@ var AWSAdapter = class {
         page: {
           path: properties.path || properties.url,
           referrer: properties.referrer
-        }
+        },
+        visitor: visitorContext()
       },
       timestamp: properties.timestamp || (/* @__PURE__ */ new Date()).toISOString()
     };
@@ -157,7 +274,8 @@ var AWSAdapter = class {
         ...properties
       },
       context: {
-        url: properties.url || (typeof window !== "undefined" ? window.location.href : "")
+        url: properties.url || (typeof window !== "undefined" ? window.location.href : ""),
+        visitor: visitorContext()
       },
       timestamp: properties.timestamp || (/* @__PURE__ */ new Date()).toISOString()
     };
@@ -213,100 +331,6 @@ var AWSAdapter = class {
   }
 };
 
-// src/storage.ts
-var INSTANCE_ID_KEY = "amplifyup_instance_id";
-var USER_ID_KEY = "amplifyup_user_id";
-var SESSION_ID_KEY = "amplifyup_session_id";
-var SESSION_ACTIVITY_KEY = "amplifyup_session_activity";
-var ANON_COOKIE_NAME = "amplifyup_anon_id";
-var SESSION_COOKIE_NAME = "amplifyup_session_id";
-var SESSION_IDLE_GAP_MS = 30 * 60 * 1e3;
-function generateGuid() {
-  if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
-    return crypto.randomUUID();
-  }
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
-    const r = Math.random() * 16 | 0;
-    const v = c === "x" ? r : r & 3 | 8;
-    return v.toString(16);
-  });
-}
-function readCookie(name) {
-  if (typeof document === "undefined") return null;
-  const parts = document.cookie.split(";");
-  for (const part of parts) {
-    const idx = part.indexOf("=");
-    if (idx === -1) continue;
-    if (part.slice(0, idx).trim() !== name) continue;
-    const value = part.slice(idx + 1).trim();
-    try {
-      return value ? decodeURIComponent(value) : null;
-    } catch {
-      return value || null;
-    }
-  }
-  return null;
-}
-function writeCookie(name, value, maxAgeSeconds = 31536e3) {
-  if (typeof document === "undefined") return;
-  document.cookie = `${name}=${encodeURIComponent(value)}; Path=/; Max-Age=${maxAgeSeconds}; SameSite=Lax`;
-}
-function getInstanceId() {
-  if (typeof window === "undefined") {
-    return "";
-  }
-  const fromCookie = readCookie(ANON_COOKIE_NAME);
-  const fromLs = localStorage.getItem(INSTANCE_ID_KEY);
-  const instanceId = fromLs || fromCookie || `browser_${generateGuid()}`;
-  if (fromLs !== instanceId) {
-    localStorage.setItem(INSTANCE_ID_KEY, instanceId);
-  }
-  if (fromCookie !== instanceId) {
-    writeCookie(ANON_COOKIE_NAME, instanceId);
-  }
-  return instanceId;
-}
-function getUserId() {
-  if (typeof window === "undefined") {
-    return null;
-  }
-  return localStorage.getItem(USER_ID_KEY);
-}
-function getSessionId() {
-  if (typeof window === "undefined") {
-    return "";
-  }
-  const now = Date.now();
-  const lastActivity = Number(localStorage.getItem(SESSION_ACTIVITY_KEY) || 0);
-  const fromCookie = readCookie(SESSION_COOKIE_NAME);
-  const fromLs = localStorage.getItem(SESSION_ID_KEY);
-  let sessionId = fromLs || fromCookie || "";
-  if (!sessionId || lastActivity > 0 && now - lastActivity >= SESSION_IDLE_GAP_MS) {
-    sessionId = generateGuid();
-  }
-  localStorage.setItem(SESSION_ID_KEY, sessionId);
-  localStorage.setItem(SESSION_ACTIVITY_KEY, String(now));
-  writeCookie(SESSION_COOKIE_NAME, sessionId, Math.floor(SESSION_IDLE_GAP_MS / 1e3));
-  return sessionId;
-}
-function setUserId(userId) {
-  if (typeof window === "undefined") {
-    return;
-  }
-  localStorage.setItem(USER_ID_KEY, userId);
-}
-function clearIds() {
-  if (typeof window === "undefined") {
-    return;
-  }
-  localStorage.removeItem(INSTANCE_ID_KEY);
-  localStorage.removeItem(USER_ID_KEY);
-  localStorage.removeItem(SESSION_ID_KEY);
-  localStorage.removeItem(SESSION_ACTIVITY_KEY);
-  document.cookie = `${ANON_COOKIE_NAME}=; Path=/; Max-Age=0; SameSite=Lax`;
-  document.cookie = `${SESSION_COOKIE_NAME}=; Path=/; Max-Age=0; SameSite=Lax`;
-}
-
 // src/targets.ts
 var AWS_DEV_API = "https://api-dev.amplifyup.ai";
 var AWS_PROD_API = "https://api.amplifyup.ai";
@@ -843,6 +867,7 @@ function applyPageContext(input, opts) {
   }
   const pageFields = {};
   for (const pf of opts.pageData?.pageFields || []) {
+    if (pf.dataType === "taxonomy") continue;
     if (pf.source === "static") {
       if (pf.value !== void 0) pageFields[pf.key] = pf.value;
       continue;
@@ -865,6 +890,7 @@ function applyPageContext(input, opts) {
 function staticPageFieldsFromSnapshot(pageData) {
   const pageFields = {};
   for (const pf of pageData?.pageFields || []) {
+    if (pf.dataType === "taxonomy") continue;
     if (pf.source === "static" && pf.value !== void 0) {
       pageFields[pf.key] = pf.value;
     }
@@ -882,6 +908,11 @@ function attachStaticPageContext(pageData, pageRoute) {
     pageRoute: pageRoute || ""
   };
 }
+function withPageTaxonomies(properties, taxonomies) {
+  if (!taxonomies || Object.keys(taxonomies).length === 0) return properties;
+  const page = properties.page && typeof properties.page === "object" && !Array.isArray(properties.page) ? properties.page : { fields: {} };
+  return { ...properties, page: { ...page, taxonomies } };
+}
 function mergeEventContext(properties, attached) {
   if (!attached) return properties;
   return {
@@ -951,6 +982,27 @@ function hydratePageResourceProps(props, fields) {
   return out;
 }
 
+// src/edge/normalizeRoute.ts
+function normalizeRoute(route) {
+  let path = String(route || "").trim();
+  if (!path) return "/";
+  try {
+    if (/^https?:\/\//i.test(path)) {
+      path = new URL(path).pathname;
+    }
+  } catch {
+  }
+  const q = path.indexOf("?");
+  if (q >= 0) path = path.slice(0, q);
+  const h = path.indexOf("#");
+  if (h >= 0) path = path.slice(0, h);
+  if (!path.startsWith("/")) path = `/${path}`;
+  if (path.length > 1 && path.endsWith("/")) {
+    path = path.replace(/\/+$/, "");
+  }
+  return path || "/";
+}
+
 // src/page-resource-runtime.ts
 var pageResourceFields = null;
 function setPageResourceFields(fields) {
@@ -1048,27 +1100,6 @@ function previewLayoutReady(opts) {
   return true;
 }
 
-// src/edge/normalizeRoute.ts
-function normalizeRoute(route) {
-  let path = String(route || "").trim();
-  if (!path) return "/";
-  try {
-    if (/^https?:\/\//i.test(path)) {
-      path = new URL(path).pathname;
-    }
-  } catch {
-  }
-  const q = path.indexOf("?");
-  if (q >= 0) path = path.slice(0, q);
-  const h = path.indexOf("#");
-  if (h >= 0) path = path.slice(0, h);
-  if (!path.startsWith("/")) path = `/${path}`;
-  if (path.length > 1 && path.endsWith("/")) {
-    path = path.replace(/\/+$/, "");
-  }
-  return path || "/";
-}
-
 // src/edge/variantKeys.ts
 function serializeVariantKeys(keys) {
   if (!keys) return "";
@@ -1190,7 +1221,8 @@ function mapResolvedToPageConfig(payload) {
     },
     ...payload.eventTracking && payload.eventTracking.length > 0 ? { eventTracking: payload.eventTracking } : {},
     ...payload.pageData ? { pageData: payload.pageData } : {},
-    ...payload.pageResources ? { pageResources: payload.pageResources } : {}
+    ...payload.pageResources ? { pageResources: payload.pageResources } : {},
+    ...payload.pageTaxonomies ? { pageTaxonomies: payload.pageTaxonomies } : {}
   };
 }
 function collectDegraded(payload) {
@@ -1422,6 +1454,7 @@ function searchSpec(pagination, field, term) {
 }
 
 // src/index.ts
+var PAGE_VIEW_HOLD_MS = 1500;
 var DWELL_ACTIVITY_IDLE_MS = 2 * 60 * 1e3;
 var DWELL_POLL_MS = 5e3;
 function readPreviewQueryOverrides() {
@@ -1495,6 +1528,12 @@ var AmplifyUpSDK = class {
     this.resolvedPageResource = null;
     this.resolvedPageRoute = "";
     this.resolvedRouteParams = {};
+    /** Path whose delivery response is in flight; page_view for it is held. */
+    this.pendingResolvePath = null;
+    this.heldPageView = null;
+    this.resolvedPageTaxonomies = null;
+    /** Path the taxonomies above were resolved for. */
+    this.resolvedTaxonomiesPath = null;
     this.historyHooksInstalled = false;
     this.pageEngagementState = {
       reached: /* @__PURE__ */ new Set(),
@@ -2025,8 +2064,10 @@ var AmplifyUpSDK = class {
    * Apply published pageData (from /v1/resolve) so field validation and
    * mapped page fields can run.
    */
-  applyResolvedPageData(pageData, pageRoute, routeParams, pageResources) {
+  applyResolvedPageData(pageData, pageRoute, routeParams, pageResources, pageTaxonomies) {
     this.resolvedPageData = pageData || null;
+    this.resolvedPageTaxonomies = pageTaxonomies || null;
+    this.resolvedTaxonomiesPath = this.pendingResolvePath;
     if (pageRoute) this.resolvedPageRoute = pageRoute;
     if (routeParams) this.resolvedRouteParams = routeParams;
     const firstResourceName = pageData?.resources?.[0]?.name;
@@ -2060,6 +2101,28 @@ var AmplifyUpSDK = class {
   getAttachedPageContext() {
     return this.attachedPageContext;
   }
+  /**
+   * The page's delivery response for `path` is on its way. A page_view for the
+   * same path waits for it (up to PAGE_VIEW_HOLD_MS) so it carries the page's
+   * taxonomies.
+   */
+  beginPageResolve(path) {
+    this.pendingResolvePath = normalizeRoute(path);
+    this.resolvedPageTaxonomies = null;
+    this.resolvedTaxonomiesPath = null;
+  }
+  endPageResolve(path) {
+    if (this.pendingResolvePath !== normalizeRoute(path)) return;
+    this.pendingResolvePath = null;
+    this.flushHeldPageView();
+  }
+  flushHeldPageView() {
+    const held = this.heldPageView;
+    if (!held) return;
+    clearTimeout(held.timer);
+    this.heldPageView = null;
+    this.sendPageView(held.url, held.properties);
+  }
   /**
    * Track a page view
    */
@@ -2070,6 +2133,21 @@ var AmplifyUpSDK = class {
     if (!this.isInitialized()) {
       return;
     }
+    this.lastTrackedPath = url;
+    if (this.pendingResolvePath && this.pendingResolvePath === normalizeRoute(url)) {
+      this.flushHeldPageView();
+      this.heldPageView = {
+        url,
+        properties,
+        timer: setTimeout(() => this.flushHeldPageView(), PAGE_VIEW_HOLD_MS)
+      };
+      return;
+    }
+    this.flushHeldPageView();
+    this.sendPageView(url, properties);
+  }
+  sendPageView(url, properties) {
+    const taxonomies = this.resolvedTaxonomiesPath && this.resolvedTaxonomiesPath === normalizeRoute(url) ? this.resolvedPageTaxonomies : null;
     const instanceId = getInstanceId();
     const sessionId = getSessionId();
     const pageProperties = {
@@ -2081,10 +2159,9 @@ var AmplifyUpSDK = class {
       sessionId,
       trackingId: this.config?.trackingId,
       // Timestamp is included in event payload
-      ...mergeEventContext(properties || {}, this.attachedPageContext)
+      ...withPageTaxonomies(mergeEventContext(properties || {}, this.attachedPageContext), taxonomies)
     };
     this.adapter.page(pageProperties);
-    this.lastTrackedPath = url;
   }
   /**
    * Track an event
@@ -5531,6 +5608,8 @@ function AmplifyUpProvider({
   React3.useEffect(() => {
     let cancelled = false;
     const sdk = getSDK();
+    const heldRoute = isComposerPreview() || config.clientPersonalization !== false ? getActualRoute() : null;
+    if (heldRoute) sdk.beginPageResolve(heldRoute);
     const run = async () => {
       try {
         await sdk.init({
@@ -5610,7 +5689,8 @@ function AmplifyUpProvider({
             result.pageConfig.pageData || null,
             result.pageConfig.route,
             extractRouteParams(result.pageConfig.route, actualRoute),
-            result.pageConfig.pageResources || null
+            result.pageConfig.pageResources || null,
+            result.pageConfig.pageTaxonomies || null
           );
         }
         setInitialized(true);
@@ -5634,6 +5714,7 @@ function AmplifyUpProvider({
         setSource(null);
         setMeta(null);
       } finally {
+        if (heldRoute) sdk.endPageResolve(heldRoute);
         if (!cancelled) setLoading(false);
       }
     };