@adobe/helix-rum-enhancer 2.26.0-beta.1 → 2.26.1

package/.releaserc.cjs

@@ -29,5 +29,5 @@ module.exports = {
       slackChannel: "rum-explorers",
     }],
   ],
-  branches: ['main', { name: 'beta', prerelease: true }],
+  branches: ['main'],
 };

package/CHANGELOG.md

@@ -1,9 +1,16 @@
-# [2.26.0-beta.1](https://github.com/adobe/helix-rum-enhancer/compare/v2.25.0...v2.26.0-beta.1) (2024-10-09)
+## [2.26.1](https://github.com/adobe/helix-rum-enhancer/compare/v2.26.0...v2.26.1) (2024-12-10)
+
+
+### Bug Fixes
+
+* **redirects:** use underscore in param ([bada92e](https://github.com/adobe/helix-rum-enhancer/commit/bada92e69aaa8f560d61d6264f578eb2958934ec))
+
+# [2.26.0](https://github.com/adobe/helix-rum-enhancer/compare/v2.25.0...v2.26.0) (2024-10-16)
 
 
 ### Features
 
-* handle pre-rendering ([bb11187](https://github.com/adobe/helix-rum-enhancer/commit/bb11187058b8cb521a270c316323b66414a8d817))
+* handle pre-speculation rules and rendering ([#301](https://github.com/adobe/helix-rum-enhancer/issues/301)) ([196d404](https://github.com/adobe/helix-rum-enhancer/commit/196d404f3f90a247a223e8ddc7c667592a87319f))
 
 # [2.25.0](https://github.com/adobe/helix-rum-enhancer/compare/v2.24.0...v2.25.0) (2024-10-03)
 

package/modules/dom.js

@@ -9,99 +9,100 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export const getTargetValue = (element) => element.getAttribute('data-rum-target') || element.getAttribute('href')
-    || element.currentSrc || element.getAttribute('src') || element.dataset.action || element.action;
+export const getTargetValue = (el) => el.getAttribute('data-rum-target') || el.getAttribute('href')
+    || el.currentSrc || el.getAttribute('src') || el.dataset.action || el.action;
 
-export const targetSelector = (element) => {
+export const targetSelector = (el) => {
   try {
-    if (!element) return undefined;
-    let value = getTargetValue(element);
-    if (!value && element.tagName !== 'A' && element.closest('a')) {
-      value = getTargetValue(element.closest('a'));
+    if (!el) return undefined;
+    let v = getTargetValue(el);
+    if (!v && el.tagName !== 'A' && el.closest('a')) {
+      v = getTargetValue(el.closest('a'));
     }
-    if (value && !value.startsWith('https://')) {
+    if (v && !v.startsWith('https://')) {
     // resolve relative links
-      value = new URL(value, window.location).href;
+      v = new URL(v, window.location).href;
     }
-    return value;
+    return v;
     /* c8 ignore next 3 */
   } catch (error) {
     return null;
   }
 };
 
-function walk(element, checkFn) {
-  if (!element || element === document.body || element === document.documentElement) {
+function walk(el, checkFn) {
+  if (!el || el === document.body || el === document.documentElement) {
     return undefined;
   }
-  const checkValue = checkFn(element);
-  return checkValue || walk(element.parentElement, checkFn);
+  return checkFn(el) || walk(el.parentElement, checkFn);
 }
 
-function isDialog(element) {
+function isDialog(el) {
   // doing it well
-  if (element.tagName === 'DIALOG') return true;
+  if (el.tagName === 'DIALOG') return true;
   // making the best of it
-  if (element.getAttribute('role') === 'dialog') return true;
-  if (element.getAttribute('role') === 'alertdialog') return true;
-  if (element.getAttribute('aria-modal') === 'true') return true;
+  if (el.getAttribute('role') === 'dialog') return true;
+  if (el.getAttribute('role') === 'alertdialog') return true;
+  if (el.getAttribute('aria-modal') === 'true') return true;
   // doing it wrong
-  const computedStyle = window.getComputedStyle(element);
-  return (computedStyle && computedStyle.position === 'fixed' && computedStyle.zIndex > 100);
+  const cs = window.getComputedStyle(el);
+  return (cs && cs.position === 'fixed' && cs.zIndex > 100);
 }
 
-function isButton(element) {
-  if (element.tagName === 'BUTTON') return true;
-  if (element.tagName === 'INPUT' && element.getAttribute('type') === 'button') return true;
-  if (element.tagName === 'A') {
-    const classes = Array.from(element.classList);
+function isButton(el) {
+  if (el.tagName === 'BUTTON') return true;
+  if (el.tagName === 'INPUT' && el.getAttribute('type') === 'button') return true;
+  if (el.tagName === 'A') {
+    const classes = Array.from(el.classList);
     return classes.some((className) => className.match(/button|cta/));
   }
-  return element.getAttribute('role') === 'button';
+  return el.getAttribute('role') === 'button';
 }
 
-function getSourceContext(element) {
-  if (element.closest('form')) {
-    return `form${element.id ? `#${element.id}` : ''}`;
+function getSourceContext(el) {
+  const formEl = el.closest('form');
+  if (formEl) {
+    return `form${formEl.id ? `#${formEl.id}` : ''}`;
   }
-  const block = element.closest('.block[data-block-name]');
+  const block = el.closest('.block[data-block-name]');
   if (block) return `.${block.getAttribute('data-block-name')}`;
-  if (walk(element, isDialog)) return 'dialog';
-  if (element.closest('nav')) return 'nav';
-  if (element.closest('header')) return 'header';
-  if (element.closest('footer')) return 'footer';
-  if (element.closest('aside')) return 'aside';
-  return (walk(element, (e) => e.id && `#${e.id}`));
+  if (walk(el, isDialog)) return 'dialog';
+  if (el.closest('nav')) return 'nav';
+  if (el.closest('header')) return 'header';
+  if (el.closest('footer')) return 'footer';
+  if (el.closest('aside')) return 'aside';
+  return (walk(el, (e) => e.id && `#${e.id}`));
 }
 
-function getSourceElement(element) {
-  if (element.closest('form') && Array.from(element.closest('form').elements).includes(element)) {
-    return (element.tagName.toLowerCase()
-        + (['INPUT', 'BUTTON'].includes(element.tagName)
-          ? `[type='${element.getAttribute('type') || ''}']`
+function getSourceElement(el) {
+  const f = el.closest('form');
+  if (f && Array.from(f.elements).includes(el)) {
+    return (el.tagName.toLowerCase()
+        + (['INPUT', 'BUTTON'].includes(el.tagName)
+          ? `[type='${el.getAttribute('type') || ''}']`
           : ''));
   }
-  if (walk(element, isButton)) return 'button';
-  return element.tagName.toLowerCase().match(/^(a|img|video)$/) && element.tagName.toLowerCase();
+  if (walk(el, isButton)) return 'button';
+  return el.tagName.toLowerCase().match(/^(a|img|video)$/) && el.tagName.toLowerCase();
 }
 
-function getSourceIdentifier(element) {
-  if (element.id) return `#${element.id}`;
-  if (element.getAttribute('data-block-name')) return `.${element.getAttribute('data-block-name')}`;
-  return (element.classList.length > 0 && `.${element.classList[0]}`);
+function getSourceIdentifier(el) {
+  if (el.id) return `#${el.id}`;
+  if (el.getAttribute('data-block-name')) return `.${el.getAttribute('data-block-name')}`;
+  return (el.classList.length > 0 && `.${el.classList[0]}`);
 }
-export const sourceSelector = (element) => {
+export const sourceSelector = (el) => {
   try {
-    if (!element || element === document.body || element === document.documentElement) {
+    if (!el || el === document.body || el === document.documentElement) {
       return undefined;
     }
-    if (element.getAttribute('data-rum-source')) {
-      return element.getAttribute('data-rum-source');
+    if (el.getAttribute('data-rum-source')) {
+      return el.getAttribute('data-rum-source');
     }
-    const context = getSourceContext(element.parentElement) || '';
-    const elementName = getSourceElement(element) || '';
-    const identifier = getSourceIdentifier(element) || '';
-    return `${context} ${elementName}${identifier}`.trim() || `"${element.textContent.substring(0, 10)}"`;
+    const ctx = getSourceContext(el.parentElement) || '';
+    const name = getSourceElement(el) || '';
+    const id = getSourceIdentifier(el) || '';
+    return `${ctx} ${name}${id}`.trim() || `"${el.textContent.substring(0, 10)}"`;
     /* c8 ignore next 3 */
   } catch (error) {
     return null;

package/modules/index.js

@@ -25,14 +25,14 @@ import { fflags } from './fflags.js';
 const { sampleRUM, queue, isSelected } = (window.hlx && window.hlx.rum) ? window.hlx.rum
   /* c8 ignore next */ : {};
 
-const formSubmitListener = (e) => sampleRUM('formsubmit', { target: targetSelector(e.target), source: sourceSelector(e.target) });
-
+// blocks mutation observer
 // eslint-disable-next-line no-use-before-define, max-len
-const blocksMutationObserver = window.MutationObserver ? new MutationObserver(blocksMutationsCallback)
+const blocksMO = window.MutationObserver ? new MutationObserver(blocksMCB)
   /* c8 ignore next */ : {};
 
+// media mutation observer
 // eslint-disable-next-line no-use-before-define, max-len
-const mediaMutationObserver = window.MutationObserver ? new MutationObserver(mediaMutationsCallback)
+const mediaMO = window.MutationObserver ? new MutationObserver(mediaMCB)
   /* c8 ignore next */ : {};
 
 function trackCheckpoint(checkpoint, data, t) {
@@ -114,6 +114,8 @@ function addNavigationTracking() {
   const navigate = (source, type, redirectCount) => {
     // target can be 'visible', 'hidden' (background tab) or 'prerendered' (speculation rules)
     const payload = { source, target: document.visibilityState };
+    /* c8 ignore next 13 */
+    // prerendering cannot be tested yet with headless browsers
     if (document.prerendering) {
       // listen for "activation" of the current pre-rendered page
       document.addEventListener('prerenderingchange', () => {
@@ -136,7 +138,7 @@ function addNavigationTracking() {
       sampleRUM('enter', payload); // enter site
     }
     fflags.enabled('redirect', () => {
-      const from = new URLSearchParams(window.location.search).get('redirect-from');
+      const from = new URLSearchParams(window.location.search).get('redirect_from');
       if (redirectCount || from) {
         sampleRUM('redirect', { source: from, target: redirectCount || 1 });
       }
@@ -144,10 +146,10 @@ function addNavigationTracking() {
   };
 
   new PerformanceObserver((list) => list
-    .getEntries().map((entry) => navigate(
+    .getEntries().map((e) => navigate(
       window.hlx.referrer || document.referrer,
-      entry.type,
-      entry.redirectCount,
+      e.type,
+      e.redirectCount,
     )))
     .observe({ type: 'navigation', buffered: true });
 }
@@ -156,16 +158,16 @@ function addLoadResourceTracking() {
   const observer = new PerformanceObserver((list) => {
     try {
       list.getEntries()
-        .filter((entry) => !entry.responseStatus || entry.responseStatus < 400)
-        .filter((entry) => window.location.hostname === new URL(entry.name).hostname)
-        .filter((entry) => new URL(entry.name).pathname.match('.*(\\.plain\\.html$|\\.json|graphql|api)'))
-        .forEach((entry) => {
-          sampleRUM('loadresource', { source: entry.name, target: Math.round(entry.duration) });
+        .filter((e) => !e.responseStatus || e.responseStatus < 400)
+        .filter((e) => window.location.hostname === new URL(e.name).hostname)
+        .filter((e) => new URL(e.name).pathname.match('.*(\\.plain\\.html$|\\.json|graphql|api)'))
+        .forEach((e) => {
+          sampleRUM('loadresource', { source: e.name, target: Math.round(e.duration) });
         });
       list.getEntries()
-        .filter((entry) => entry.responseStatus === 404)
-        .forEach((entry) => {
-          sampleRUM('missingresource', { source: entry.name, target: entry.hostname });
+        .filter((e) => e.responseStatus === 404)
+        .forEach((e) => {
+          sampleRUM('missingresource', { source: e.name, target: e.hostname });
         });
       /* c8 ignore next 3 */
     } catch (error) {
@@ -175,24 +177,26 @@ function addLoadResourceTracking() {
   observer.observe({ type: 'resource', buffered: true });
 }
 
-function activateBlocksMutationObserver() {
-  if (!blocksMutationObserver || blocksMutationObserver.active) {
+// activate blocks mutation observer
+function activateBlocksMO() {
+  if (!blocksMO || blocksMO.active) {
     return;
   }
-  blocksMutationObserver.active = true;
-  blocksMutationObserver.observe(
+  blocksMO.active = true;
+  blocksMO.observe(
     document.body,
     // eslint-disable-next-line object-curly-newline
     { subtree: true, attributes: true, attributeFilter: ['data-block-status'] },
   );
 }
 
-function activateMediaMutationObserver() {
-  if (!mediaMutationObserver || mediaMutationObserver.active) {
+// activate media mutation observer
+function activateMediaMO() {
+  if (!mediaMO || mediaMO.active) {
     return;
   }
-  mediaMutationObserver.active = true;
-  mediaMutationObserver.observe(
+  mediaMO.active = true;
+  mediaMO.observe(
     document.body,
     // eslint-disable-next-line object-curly-newline
     { subtree: true, attributes: false, childList: true },
@@ -204,16 +208,16 @@ function getIntersectionObsever(checkpoint) {
   if (!window.IntersectionObserver) {
     return null;
   }
-  activateBlocksMutationObserver();
-  activateMediaMutationObserver();
+  activateBlocksMO();
+  activateMediaMO();
   const observer = new IntersectionObserver((entries) => {
     try {
       entries
-        .filter((entry) => entry.isIntersecting)
-        .forEach((entry) => {
-          observer.unobserve(entry.target); // observe only once
-          const target = targetSelector(entry.target);
-          const source = sourceSelector(entry.target);
+        .filter((e) => e.isIntersecting)
+        .forEach((e) => {
+          observer.unobserve(e.target); // observe only once
+          const target = targetSelector(e.target);
+          const source = sourceSelector(e.target);
           sampleRUM(checkpoint, { target, source });
         });
       /* c8 ignore next 3 */
@@ -245,11 +249,10 @@ function addViewMediaTracking(parent) {
 }
 
 function addFormTracking(parent) {
-  activateBlocksMutationObserver();
-  activateMediaMutationObserver();
+  activateBlocksMO();
+  activateMediaMO();
   parent.querySelectorAll('form').forEach((form) => {
-    form.removeEventListener('submit', formSubmitListener); // listen only once
-    form.addEventListener('submit', formSubmitListener);
+    form.addEventListener('submit', (e) => sampleRUM('formsubmit', { target: targetSelector(e.target), source: sourceSelector(e.target) }), { once: true });
   });
 }
 
@@ -257,7 +260,8 @@ function addObserver(ck, fn, block) {
   return DEFAULT_TRACKING_EVENTS.includes(ck) && fn(block);
 }
 
-function blocksMutationsCallback(mutations) {
+// blocks mutation observer callback
+function blocksMCB(mutations) {
   // block specific mutations
   mutations
     .filter((m) => m.type === 'attributes' && m.attributeName === 'data-block-status')
@@ -268,7 +272,8 @@ function blocksMutationsCallback(mutations) {
     });
 }
 
-function mediaMutationsCallback(mutations) {
+// media mutation observer callback
+function mediaMCB(mutations) {
   // media mutations
   mutations
     .forEach((m) => {

package/modules/martech.js

@@ -19,7 +19,7 @@ export function addCookieConsentTracking(sampleRUM) {
     return;
   }
 
-  let consentMutationObserver;
+  let consentMO; // consent mutation observer
   const trackShowConsent = () => {
     const otsdk = document.querySelector('body > div#onetrust-consent-sdk');
     if (otsdk) {
@@ -28,8 +28,8 @@ export function addCookieConsentTracking(sampleRUM) {
       } else {
         sampleRUM('consent', { source: 'onetrust', target: 'show' });
       }
-      if (consentMutationObserver) {
-        consentMutationObserver.disconnect();
+      if (consentMO) {
+        consentMO.disconnect();
       }
       return true;
     }
@@ -38,11 +38,11 @@ export function addCookieConsentTracking(sampleRUM) {
 
   if (!trackShowConsent()) {
     // eslint-disable-next-line max-len
-    consentMutationObserver = window.MutationObserver
+    consentMO = window.MutationObserver
       ? new MutationObserver(trackShowConsent)
       : /* c8 ignore next */ null;
-    if (consentMutationObserver) {
-      consentMutationObserver.observe(
+    if (consentMO) {
+      consentMO.observe(
         document.body,
         // eslint-disable-next-line object-curly-newline
         { attributes: false, childList: true, subtree: false },

package/modules/utils.js

@@ -10,6 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
+const { href } = window.location;
+
 export const urlSanitizers = {
   /**
    * Returns the full url.
@@ -17,21 +19,21 @@ export const urlSanitizers = {
    * @param {string} url (default: window.location.href) The url to sanitize
    * @returns {string} The sanitized url
    */
-  full: (url = window.location.href) => new URL(url).toString(),
+  full: (url = href) => new URL(url).toString(),
   /**
    * Returns the origin of the provided url.
    * If no url is provided, it defaults to window.location.href.
    * @param {string} url (default: window.location.href) The url to sanitize
    * @returns {string} The sanitized url
    */
-  origin: (url = window.location.href) => new URL(url).origin,
+  origin: (url = href) => new URL(url).origin,
   /**
    * Returns the sanitized url: the origin and the path (no query params or hash)
    * If no url is provided, it defaults to window.location.href.
    * @param {string} url (default: window.location.href) The url to sanitize
    * @returns {string} The sanitized url
    */
-  path: (url = window.location.href) => {
+  path: (url = href) => {
     const u = new URL(url);
     return `${u.origin}${u.pathname}`;
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-rum-enhancer",
-  "version": "2.26.0-beta.1",
+  "version": "2.26.1",
   "description": "Helix RUM Enhancer",
   "main": "src/index.js",
   "type": "module",
@@ -14,7 +14,7 @@
     "build-bundle": "rollup --config",
     "prepack": "npm run build-bundle",
     "semantic-release": "semantic-release",
-    "semantic-release-dry": "semantic-release --dry-run --branches $CI_BRANCH 1.x main beta",
+    "semantic-release-dry": "semantic-release --dry-run --branches $CI_BRANCH 1.x main",
     "prepare": "husky"
   },
   "repository": {
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "2.0.8",
-    "@adobe/helix-rum-js": "2.6.0",
+    "@adobe/helix-rum-js": "2.10.0",
     "@esm-bundle/chai": "4.3.4-fix.0",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
@@ -48,19 +48,19 @@
     "eslint": "8.57.1",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.31.0",
-    "husky": "9.1.6",
-    "jsdoc-to-markdown": "9.0.2",
+    "husky": "9.1.7",
+    "jsdoc-to-markdown": "9.1.1",
     "junit-report-builder": "5.1.1",
     "lint-staged": "15.2.10",
-    "mocha": "10.7.3",
+    "mocha": "11.0.1",
     "mocha-multi-reporters": "1.5.1",
-    "rollup": "4.24.0",
+    "rollup": "4.28.1",
     "rollup-plugin-checksum": "1.0.1",
     "rollup-plugin-cleanup": "3.2.1",
     "rollup-plugin-eslint-bundle": "9.0.0",
-    "semantic-release": "24.1.2",
+    "semantic-release": "24.2.0",
     "semantic-release-slack-bot": "^4.0.2",
-    "web-vitals": "4.2.3"
+    "web-vitals": "4.2.4"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/index.js

@@ -29,96 +29,98 @@
   const DEFAULT_TRACKING_EVENTS = ['click', 'cwv', 'form', 'viewblock', 'viewmedia', 'loadresource', 'utm', 'paid', 'email', 'consent'];
   fflags.enabled('example', () => DEFAULT_TRACKING_EVENTS.push('example'));
 
+  const { href } = window.location;
   const urlSanitizers = {
-    full: (url = window.location.href) => new URL(url).toString(),
-    origin: (url = window.location.href) => new URL(url).origin,
-    path: (url = window.location.href) => {
+    full: (url = href) => new URL(url).toString(),
+    origin: (url = href) => new URL(url).origin,
+    path: (url = href) => {
       const u = new URL(url);
       return `${u.origin}${u.pathname}`;
     },
   };
 
-  const getTargetValue = (element) => element.getAttribute('data-rum-target') || element.getAttribute('href')
-      || element.currentSrc || element.getAttribute('src') || element.dataset.action || element.action;
-  const targetSelector = (element) => {
+  const getTargetValue = (el) => el.getAttribute('data-rum-target') || el.getAttribute('href')
+      || el.currentSrc || el.getAttribute('src') || el.dataset.action || el.action;
+  const targetSelector = (el) => {
     try {
-      if (!element) return undefined;
-      let value = getTargetValue(element);
-      if (!value && element.tagName !== 'A' && element.closest('a')) {
-        value = getTargetValue(element.closest('a'));
+      if (!el) return undefined;
+      let v = getTargetValue(el);
+      if (!v && el.tagName !== 'A' && el.closest('a')) {
+        v = getTargetValue(el.closest('a'));
       }
-      if (value && !value.startsWith('https://')) {
-        value = new URL(value, window.location).href;
+      if (v && !v.startsWith('https://')) {
+        v = new URL(v, window.location).href;
       }
-      return value;
+      return v;
     } catch (error) {
       return null;
     }
   };
-  function walk(element, checkFn) {
-    if (!element || element === document.body || element === document.documentElement) {
+  function walk(el, checkFn) {
+    if (!el || el === document.body || el === document.documentElement) {
       return undefined;
     }
-    const checkValue = checkFn(element);
-    return checkValue || walk(element.parentElement, checkFn);
+    return checkFn(el) || walk(el.parentElement, checkFn);
   }
-  function isDialog(element) {
-    if (element.tagName === 'DIALOG') return true;
-    if (element.getAttribute('role') === 'dialog') return true;
-    if (element.getAttribute('role') === 'alertdialog') return true;
-    if (element.getAttribute('aria-modal') === 'true') return true;
-    const computedStyle = window.getComputedStyle(element);
-    return (computedStyle && computedStyle.position === 'fixed' && computedStyle.zIndex > 100);
+  function isDialog(el) {
+    if (el.tagName === 'DIALOG') return true;
+    if (el.getAttribute('role') === 'dialog') return true;
+    if (el.getAttribute('role') === 'alertdialog') return true;
+    if (el.getAttribute('aria-modal') === 'true') return true;
+    const cs = window.getComputedStyle(el);
+    return (cs && cs.position === 'fixed' && cs.zIndex > 100);
   }
-  function isButton(element) {
-    if (element.tagName === 'BUTTON') return true;
-    if (element.tagName === 'INPUT' && element.getAttribute('type') === 'button') return true;
-    if (element.tagName === 'A') {
-      const classes = Array.from(element.classList);
+  function isButton(el) {
+    if (el.tagName === 'BUTTON') return true;
+    if (el.tagName === 'INPUT' && el.getAttribute('type') === 'button') return true;
+    if (el.tagName === 'A') {
+      const classes = Array.from(el.classList);
       return classes.some((className) => className.match(/button|cta/));
     }
-    return element.getAttribute('role') === 'button';
+    return el.getAttribute('role') === 'button';
   }
-  function getSourceContext(element) {
-    if (element.closest('form')) {
-      return `form${element.id ? `#${element.id}` : ''}`;
+  function getSourceContext(el) {
+    const formEl = el.closest('form');
+    if (formEl) {
+      return `form${formEl.id ? `#${formEl.id}` : ''}`;
     }
-    const block = element.closest('.block[data-block-name]');
+    const block = el.closest('.block[data-block-name]');
     if (block) return `.${block.getAttribute('data-block-name')}`;
-    if (walk(element, isDialog)) return 'dialog';
-    if (element.closest('nav')) return 'nav';
-    if (element.closest('header')) return 'header';
-    if (element.closest('footer')) return 'footer';
-    if (element.closest('aside')) return 'aside';
-    return (walk(element, (e) => e.id && `#${e.id}`));
+    if (walk(el, isDialog)) return 'dialog';
+    if (el.closest('nav')) return 'nav';
+    if (el.closest('header')) return 'header';
+    if (el.closest('footer')) return 'footer';
+    if (el.closest('aside')) return 'aside';
+    return (walk(el, (e) => e.id && `#${e.id}`));
   }
-  function getSourceElement(element) {
-    if (element.closest('form') && Array.from(element.closest('form').elements).includes(element)) {
-      return (element.tagName.toLowerCase()
-          + (['INPUT', 'BUTTON'].includes(element.tagName)
-            ? `[type='${element.getAttribute('type') || ''}']`
+  function getSourceElement(el) {
+    const f = el.closest('form');
+    if (f && Array.from(f.elements).includes(el)) {
+      return (el.tagName.toLowerCase()
+          + (['INPUT', 'BUTTON'].includes(el.tagName)
+            ? `[type='${el.getAttribute('type') || ''}']`
             : ''));
     }
-    if (walk(element, isButton)) return 'button';
-    return element.tagName.toLowerCase().match(/^(a|img|video)$/) && element.tagName.toLowerCase();
+    if (walk(el, isButton)) return 'button';
+    return el.tagName.toLowerCase().match(/^(a|img|video)$/) && el.tagName.toLowerCase();
   }
-  function getSourceIdentifier(element) {
-    if (element.id) return `#${element.id}`;
-    if (element.getAttribute('data-block-name')) return `.${element.getAttribute('data-block-name')}`;
-    return (element.classList.length > 0 && `.${element.classList[0]}`);
+  function getSourceIdentifier(el) {
+    if (el.id) return `#${el.id}`;
+    if (el.getAttribute('data-block-name')) return `.${el.getAttribute('data-block-name')}`;
+    return (el.classList.length > 0 && `.${el.classList[0]}`);
   }
-  const sourceSelector = (element) => {
+  const sourceSelector = (el) => {
     try {
-      if (!element || element === document.body || element === document.documentElement) {
+      if (!el || el === document.body || el === document.documentElement) {
         return undefined;
       }
-      if (element.getAttribute('data-rum-source')) {
-        return element.getAttribute('data-rum-source');
+      if (el.getAttribute('data-rum-source')) {
+        return el.getAttribute('data-rum-source');
       }
-      const context = getSourceContext(element.parentElement) || '';
-      const elementName = getSourceElement(element) || '';
-      const identifier = getSourceIdentifier(element) || '';
-      return `${context} ${elementName}${identifier}`.trim() || `"${element.textContent.substring(0, 10)}"`;
+      const ctx = getSourceContext(el.parentElement) || '';
+      const name = getSourceElement(el) || '';
+      const id = getSourceIdentifier(el) || '';
+      return `${ctx} ${name}${id}`.trim() || `"${el.textContent.substring(0, 10)}"`;
     } catch (error) {
       return null;
     }
@@ -132,7 +134,7 @@
       sampleRUM('consent', { source: 'onetrust', target: 'hidden' });
       return;
     }
-    let consentMutationObserver;
+    let consentMO;
     const trackShowConsent = () => {
       const otsdk = document.querySelector('body > div#onetrust-consent-sdk');
       if (otsdk) {
@@ -141,19 +143,19 @@
         } else {
           sampleRUM('consent', { source: 'onetrust', target: 'show' });
         }
-        if (consentMutationObserver) {
-          consentMutationObserver.disconnect();
+        if (consentMO) {
+          consentMO.disconnect();
         }
         return true;
       }
       return false;
     };
     if (!trackShowConsent()) {
-      consentMutationObserver = window.MutationObserver
+      consentMO = window.MutationObserver
         ? new MutationObserver(trackShowConsent)
         :  null;
-      if (consentMutationObserver) {
-        consentMutationObserver.observe(
+      if (consentMO) {
+        consentMO.observe(
           document.body,
           { attributes: false, childList: true, subtree: false },
         );
@@ -197,10 +199,9 @@
 
   const { sampleRUM, queue, isSelected } = (window.hlx && window.hlx.rum) ? window.hlx.rum
      : {};
-  const formSubmitListener = (e) => sampleRUM('formsubmit', { target: targetSelector(e.target), source: sourceSelector(e.target) });
-  const blocksMutationObserver = window.MutationObserver ? new MutationObserver(blocksMutationsCallback)
+  const blocksMO = window.MutationObserver ? new MutationObserver(blocksMCB)
      : {};
-  const mediaMutationObserver = window.MutationObserver ? new MutationObserver(mediaMutationsCallback)
+  const mediaMO = window.MutationObserver ? new MutationObserver(mediaMCB)
      : {};
   function trackCheckpoint(checkpoint, data, t) {
     const { weight, id } = window.hlx.rum;
@@ -286,17 +287,17 @@
         sampleRUM('enter', payload);
       }
       fflags.enabled('redirect', () => {
-        const from = new URLSearchParams(window.location.search).get('redirect-from');
+        const from = new URLSearchParams(window.location.search).get('redirect_from');
         if (redirectCount || from) {
           sampleRUM('redirect', { source: from, target: redirectCount || 1 });
         }
       });
     };
     new PerformanceObserver((list) => list
-      .getEntries().map((entry) => navigate(
+      .getEntries().map((e) => navigate(
         window.hlx.referrer || document.referrer,
-        entry.type,
-        entry.redirectCount,
+        e.type,
+        e.redirectCount,
       )))
       .observe({ type: 'navigation', buffered: true });
   }
@@ -304,38 +305,38 @@
     const observer = new PerformanceObserver((list) => {
       try {
         list.getEntries()
-          .filter((entry) => !entry.responseStatus || entry.responseStatus < 400)
-          .filter((entry) => window.location.hostname === new URL(entry.name).hostname)
-          .filter((entry) => new URL(entry.name).pathname.match('.*(\\.plain\\.html$|\\.json|graphql|api)'))
-          .forEach((entry) => {
-            sampleRUM('loadresource', { source: entry.name, target: Math.round(entry.duration) });
+          .filter((e) => !e.responseStatus || e.responseStatus < 400)
+          .filter((e) => window.location.hostname === new URL(e.name).hostname)
+          .filter((e) => new URL(e.name).pathname.match('.*(\\.plain\\.html$|\\.json|graphql|api)'))
+          .forEach((e) => {
+            sampleRUM('loadresource', { source: e.name, target: Math.round(e.duration) });
           });
         list.getEntries()
-          .filter((entry) => entry.responseStatus === 404)
-          .forEach((entry) => {
-            sampleRUM('missingresource', { source: entry.name, target: entry.hostname });
+          .filter((e) => e.responseStatus === 404)
+          .forEach((e) => {
+            sampleRUM('missingresource', { source: e.name, target: e.hostname });
           });
       } catch (error) {
       }
     });
     observer.observe({ type: 'resource', buffered: true });
   }
-  function activateBlocksMutationObserver() {
-    if (!blocksMutationObserver || blocksMutationObserver.active) {
+  function activateBlocksMO() {
+    if (!blocksMO || blocksMO.active) {
       return;
     }
-    blocksMutationObserver.active = true;
-    blocksMutationObserver.observe(
+    blocksMO.active = true;
+    blocksMO.observe(
       document.body,
       { subtree: true, attributes: true, attributeFilter: ['data-block-status'] },
     );
   }
-  function activateMediaMutationObserver() {
-    if (!mediaMutationObserver || mediaMutationObserver.active) {
+  function activateMediaMO() {
+    if (!mediaMO || mediaMO.active) {
       return;
     }
-    mediaMutationObserver.active = true;
-    mediaMutationObserver.observe(
+    mediaMO.active = true;
+    mediaMO.observe(
       document.body,
       { subtree: true, attributes: false, childList: true },
     );
@@ -344,16 +345,16 @@
     if (!window.IntersectionObserver) {
       return null;
     }
-    activateBlocksMutationObserver();
-    activateMediaMutationObserver();
+    activateBlocksMO();
+    activateMediaMO();
     const observer = new IntersectionObserver((entries) => {
       try {
         entries
-          .filter((entry) => entry.isIntersecting)
-          .forEach((entry) => {
-            observer.unobserve(entry.target);
-            const target = targetSelector(entry.target);
-            const source = sourceSelector(entry.target);
+          .filter((e) => e.isIntersecting)
+          .forEach((e) => {
+            observer.unobserve(e.target);
+            const target = targetSelector(e.target);
+            const source = sourceSelector(e.target);
             sampleRUM(checkpoint, { target, source });
           });
       } catch (error) {
@@ -381,17 +382,16 @@
     }
   }
   function addFormTracking(parent) {
-    activateBlocksMutationObserver();
-    activateMediaMutationObserver();
+    activateBlocksMO();
+    activateMediaMO();
     parent.querySelectorAll('form').forEach((form) => {
-      form.removeEventListener('submit', formSubmitListener);
-      form.addEventListener('submit', formSubmitListener);
+      form.addEventListener('submit', (e) => sampleRUM('formsubmit', { target: targetSelector(e.target), source: sourceSelector(e.target) }), { once: true });
     });
   }
   function addObserver(ck, fn, block) {
     return DEFAULT_TRACKING_EVENTS.includes(ck) && fn(block);
   }
-  function blocksMutationsCallback(mutations) {
+  function blocksMCB(mutations) {
     mutations
       .filter((m) => m.type === 'attributes' && m.attributeName === 'data-block-status')
       .filter((m) => m.target.dataset.blockStatus === 'loaded')
@@ -400,7 +400,7 @@
         addObserver('viewblock', addViewBlockTracking, m.target);
       });
   }
-  function mediaMutationsCallback(mutations) {
+  function mediaMCB(mutations) {
     mutations
       .forEach((m) => {
         addObserver('viewmedia', addViewMediaTracking, m.target);

package/src/index.md5

@@ -1 +1 @@
-81557c0399da9e24aeac8f384303248a
+9516743215eadcd19f5b5cf311883d16

package/web-test-runner.config.js

@@ -23,6 +23,7 @@ export default {
       'test/fixtures/**',
       'node_modules/**',
       '.rum/**',
+      'src/**',
     ],
   },
   files: [
@@ -43,9 +44,10 @@ export default {
           context.url = '/node_modules/@adobe/helix-rum-js/dist/rum-standalone.js';
           await next();
           context.body = context.body
-            .replace(/const weight.*/, 'const weight = 1')
+            .replace(/const weight =/, 'const weight = 1 ||')
             .replace(/navigator\.sendBeacon/g, 'fakeSendBeacon')
-            .replace('.rum/@adobe/helix-rum-enhancer@^2/src/index.js', 'src/index.map.js');
+            // eslint-disable-next-line no-template-curly-in-string
+            .replace('.rum/@adobe/helix-rum-enhancer@${enhancerVersion || \'^2\'}/src/index.js', 'src/index.map.js');
           return true;
         } else if (context.url.startsWith('/.rum/web-vitals')) {
           context.url = '/node_modules/web-vitals/dist/web-vitals.iife.js';