@adobe/helix-rum-enhancer 2.14.2 → 2.16.0

package/.releaserc.cjs

@@ -12,5 +12,5 @@ module.exports = {
     }],
     ["@semantic-release/github", {}]
   ],
-  branches: ['main', '1.x'],
+  branches: ['main'],
 };

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+# [2.16.0](https://github.com/adobe/helix-rum-enhancer/compare/v2.15.0...v2.16.0) (2024-07-02)
+
+
+### Features
+
+* enable paid checkpoint for all ([#219](https://github.com/adobe/helix-rum-enhancer/issues/219)) ([5348744](https://github.com/adobe/helix-rum-enhancer/commit/5348744de770c024b2c9fe17962307e39293bf36))
+
+# [2.15.0](https://github.com/adobe/helix-rum-enhancer/compare/v2.14.2...v2.15.0) (2024-07-01)
+
+
+### Bug Fixes
+
+* use correct token for release ([094f37e](https://github.com/adobe/helix-rum-enhancer/commit/094f37ef2de8ddf5d64ea38c9071c9b1bec6119a))
+
+
+### Features
+
+* add more logic to button selector ([#205](https://github.com/adobe/helix-rum-enhancer/issues/205)) ([c9a5629](https://github.com/adobe/helix-rum-enhancer/commit/c9a5629e7e690397a5f46cbf8db08570f0c4d250))
+* clean up and trigger release ([bfc8d24](https://github.com/adobe/helix-rum-enhancer/commit/bfc8d241cd19b33975ac37be5167783b99fbe54c))
+* switch release token ([0e5b3b0](https://github.com/adobe/helix-rum-enhancer/commit/0e5b3b03d0b96a32118340e7b6f004da8660f0aa))
+* trigger release ([bf26949](https://github.com/adobe/helix-rum-enhancer/commit/bf269492cb330c55d22fd0eeed4aad4cfdac57a3))
+
 ## [2.14.2](https://github.com/adobe/helix-rum-enhancer/compare/v2.14.1...v2.14.2) (2024-06-12)
 
 

package/modules/defaults.js

@@ -10,4 +10,4 @@
  * governing permissions and limitations under the License.
  */
 export const KNOWN_PROPERTIES = ['weight', 'id', 'referer', 'checkpoint', 't', 'source', 'target', 'cwv', 'CLS', 'FID', 'LCP', 'INP', 'TTFB'];
-export const DEFAULT_TRACKING_EVENTS = ['click', 'cwv', 'form', 'enterleave', 'viewblock', 'viewmedia', 'loadresource', 'utm'];
+export const DEFAULT_TRACKING_EVENTS = ['click', 'cwv', 'form', 'enterleave', 'viewblock', 'viewmedia', 'loadresource', 'utm', 'paid'];

package/modules/dom.js

@@ -54,11 +54,25 @@ export const sourceSelector = (element) => {
       return `.${element.getAttribute('data-block-name')}`;
     }
 
-    if (Array.from(element.classList).some((className) => className.match(/button|cta/))) {
-      return blockName ? `.${blockName} .button` : '.button';
+    const classes = Array.from(element.classList);
+    const label = element.tagName.toLowerCase();
+    const firstClass = classes.length > 0 ? `.${classes[0]}` : '';
+    const labelWithClass = `${element.tagName.toLowerCase()}${firstClass}`;
+    if (element.tagName.toLowerCase() === 'button'
+      || element.type === 'button'
+      || classes.some((className) => className.match(/button|cta/))) {
+      let parent = element.parentElement;
+      if (!parent) return labelWithClass;
+      if (parent.id) return `#${parent.id} ${label}`;
+      while (parent.tagName !== 'BODY' && !parent.id) parent = parent.parentElement;
+      if (parent.id) return `#${parent.id} ${labelWithClass}`;
+      return blockName ? `.${blockName} ${labelWithClass}` : labelWithClass;
     }
 
-    return sourceSelector(element.parentElement);
+    const parent = sourceSelector(element.parentElement);
+    if (parent) return parent;
+
+    return labelWithClass;
     /* c8 ignore next 3 */
   } catch (error) {
     return null;

package/modules/fflags.js

@@ -16,6 +16,5 @@ export const fflags = {
   enabled: (flag, callback) => fflags.has(flag) && callback(),
   disabled: (flag, callback) => !fflags.has(flag) && callback(),
   onetrust: [543, 770, 1136],
-  ads: [1139, 543],
   email: [1139, 543],
 };

package/modules/index.js

@@ -31,7 +31,6 @@ function optedIn(checkpoint, data) {
 function getCollectionConfig() {
   // eslint-disable-next-line max-len
   fflags.enabled('onetrust', () => DEFAULT_TRACKING_EVENTS.push('consent'));
-  fflags.enabled('ads', () => DEFAULT_TRACKING_EVENTS.push('paid'));
   fflags.enabled('email', () => DEFAULT_TRACKING_EVENTS.push('email'));
   return DEFAULT_TRACKING_EVENTS;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-rum-enhancer",
-  "version": "2.14.2",
+  "version": "2.16.0",
   "description": "Helix RUM Enhancer",
   "main": "src/index.js",
   "type": "module",
@@ -42,7 +42,7 @@
     "@web/test-runner-commands": "0.9.0",
     "@web/test-runner-mocha": "0.9.0",
     "@web/test-runner-playwright": "0.11.0",
-    "c8": "10.0.0",
+    "c8": "10.1.2",
     "codecov": "3.8.3",
     "eslint": "8.57.0",
     "eslint-plugin-header": "3.1.1",
@@ -50,8 +50,8 @@
     "husky": "9.0.11",
     "jsdoc-to-markdown": "8.0.1",
     "junit-report-builder": "3.2.1",
-    "lint-staged": "15.2.5",
-    "mocha": "10.4.0",
+    "lint-staged": "15.2.7",
+    "mocha": "10.5.2",
     "mocha-multi-reporters": "1.5.1",
     "rollup": "4.18.0",
     "rollup-plugin-cleanup": "3.2.1",

package/src/index.js

@@ -16,7 +16,7 @@
   'use strict';
 
   const KNOWN_PROPERTIES = ['weight', 'id', 'referer', 'checkpoint', 't', 'source', 'target', 'cwv', 'CLS', 'FID', 'LCP', 'INP', 'TTFB'];
-  const DEFAULT_TRACKING_EVENTS = ['click', 'cwv', 'form', 'enterleave', 'viewblock', 'viewmedia', 'loadresource', 'utm'];
+  const DEFAULT_TRACKING_EVENTS = ['click', 'cwv', 'form', 'enterleave', 'viewblock', 'viewmedia', 'loadresource', 'utm', 'paid'];
 
   const fflags = {
     has: (flag) => fflags[flag].indexOf(Array.from(window.origin)
@@ -25,7 +25,6 @@
     enabled: (flag, callback) => fflags.has(flag) && callback(),
     disabled: (flag, callback) => !fflags.has(flag) && callback(),
     onetrust: [543, 770, 1136],
-    ads: [1139, 543],
     email: [1139, 543],
   };
 
@@ -100,11 +99,25 @@
         return `.${element.getAttribute('data-block-name')}`;
       }
 
-      if (Array.from(element.classList).some((className) => className.match(/button|cta/))) {
-        return blockName ? `.${blockName} .button` : '.button';
+      const classes = Array.from(element.classList);
+      const label = element.tagName.toLowerCase();
+      const firstClass = classes.length > 0 ? `.${classes[0]}` : '';
+      const labelWithClass = `${element.tagName.toLowerCase()}${firstClass}`;
+      if (element.tagName.toLowerCase() === 'button'
+        || element.type === 'button'
+        || classes.some((className) => className.match(/button|cta/))) {
+        let parent = element.parentElement;
+        if (!parent) return labelWithClass;
+        if (parent.id) return `#${parent.id} ${label}`;
+        while (parent.tagName !== 'BODY' && !parent.id) parent = parent.parentElement;
+        if (parent.id) return `#${parent.id} ${labelWithClass}`;
+        return blockName ? `.${blockName} ${labelWithClass}` : labelWithClass;
       }
 
-      return sourceSelector(element.parentElement);
+      const parent = sourceSelector(element.parentElement);
+      if (parent) return parent;
+
+      return labelWithClass;
     } catch (error) {
       return null;
     }
@@ -119,7 +132,6 @@
   function getCollectionConfig() {
     // eslint-disable-next-line max-len
     fflags.enabled('onetrust', () => DEFAULT_TRACKING_EVENTS.push('consent'));
-    fflags.enabled('ads', () => DEFAULT_TRACKING_EVENTS.push('paid'));
     fflags.enabled('email', () => DEFAULT_TRACKING_EVENTS.push('email'));
     return DEFAULT_TRACKING_EVENTS;
   }