Merge branch 'main' of github.com:adobe/aem-boilerplate

404.html

@@ -11,8 +11,6 @@
   <meta property="og:title" content="Page not found">
   <script src="/scripts/scripts.js" type="module" crossorigin="use-credentials"></script>
   <script type="module">
-    import { sampleRUM } from '/scripts/aem.js';
-
     window.addEventListener('load', () => {
       if (document.referrer) {
         const { origin, pathname } = new URL(document.referrer);
@@ -26,9 +24,12 @@
           btnContainer.append(backBtn);
         }
       }
-      sampleRUM('404', { source: document.referrer });
     });
   </script>
+  <script type="module">
+    import { sampleRUM } from '/scripts/aem.js';
+    sampleRUM('404', { source: document.referrer });
+  </script>
   <link rel="stylesheet" href="/styles/styles.css">
   <style>
     main.error {

scripts/aem.js

@@ -128,12 +128,18 @@ function init() {
 
   window.addEventListener('load', () => sampleRUM('load'));
 
-  window.addEventListener('unhandledrejection', (event) => {
-    sampleRUM('error', { source: event.reason.sourceURL, target: event.reason.line });
-  });
-
-  window.addEventListener('error', (event) => {
-    sampleRUM('error', { source: event.filename, target: event.lineno });
+  ['error', 'unhandledrejection'].forEach((event) => {
+    window.addEventListener(event, ({ reason, error }) => {
+      const errData = { source: 'undefined error' };
+      try {
+        errData.target = (reason || error).toString();
+        errData.source = (reason || error).stack.split('\n')
+          .filter((line) => line.match(/https?:\/\//)).shift()
+          .replace(/at ([^ ]+) \((.+)\)/, '$1@$2')
+          .trim();
+      } catch (err) { /* error structure was not as expected */ }
+      sampleRUM('error', errData);
+    });
   });
 }