Merge branch 'main' into rum-js-v2

.github/workflows/main.yaml

@@ -19,7 +19,7 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     needs: test
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/next'
+    if: github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -29,10 +29,6 @@ jobs:
         with:
           node-version: 20
       - run: npm ci
-      - name: Sync next branch
-        run: sh sync.sh
-        env:
-          GITHUB_TOKEN: ${{ secrets.ADOBE_BOT_GITHUB_TOKEN }}
       - run: npm run semantic-release
         env:
           GITHUB_TOKEN: ${{ secrets.ADOBE_BOT_GITHUB_TOKEN }}

.releaserc.cjs

@@ -18,5 +18,5 @@ module.exports = {
       "publishCmd": "./publish.sh ${nextRelease.version} ${nextRelease.type}"
     }],
   ],
-  branches: ["main", "next"],
+  branches: ["main"],
 };

.renovaterc.json

@@ -3,8 +3,7 @@
     "github>adobe/helix-shared"
   ],
   "baseBranches": [
-    "main",
-    "2.x"
+    "main"
   ],
   "packageRules": [
     {

CHANGELOG.md

@@ -1,3 +1,22 @@
+# [2.3.0](https://github.com/adobe/aem-lib/compare/v2.2.0...v2.3.0) (2024-07-01)
+
+
+### Bug Fixes
+
+* adjust coverage ([d2ee48c](https://github.com/adobe/aem-lib/commit/d2ee48c51cb962e77004bb98c7d5431989f426ee))
+
+
+### Features
+
+* improve sampleRUM error handling ([5c32dbb](https://github.com/adobe/aem-lib/commit/5c32dbba5fc62b82f2efd4aa2c2f0bab2f9110af))
+
+# [2.2.0](https://github.com/adobe/aem-lib/compare/v2.1.2...v2.2.0) (2024-07-01)
+
+
+### Features
+
+* remove the next logic ([f009296](https://github.com/adobe/aem-lib/commit/f00929696e58cc7da8445fc404a022d345f7d0fc))
+
 ## [2.1.2](https://github.com/adobe/aem-lib/compare/v2.1.1...v2.1.2) (2024-06-12)
 
 

dist/aem.js

@@ -162,13 +162,19 @@ function init() {
 
   ['error', 'unhandledrejection'].forEach((event) => {
     window.addEventListener(event, ({ reason, error }) => {
-      const source = (reason || error).stack
-        .split('\n')
-        .filter((line) => line.match(/https?:\/\//))
-        .shift()
-        .replace(/at ([^ ]+) \((.+)\)/, '$1@$2');
-      const target = (reason || error).toString();
-      sampleRUM('error', { source, target });
+      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);
     });
   });
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/aem-lib",
-  "version": "2.1.2",
+  "version": "2.3.0",
   "description": "AEM Library",
   "type": "module",
   "scripts": {
@@ -47,7 +47,7 @@
     "semantic-release": "24.0.0",
     "sinon": "18.0.0",
     "stylelint": "16.6.1",
-    "stylelint-config-standard": "36.0.0"
+    "stylelint-config-standard": "36.0.1"
   },
   "dependencies": {
     "@adobe/helix-rum-js": "1.9.0"

publish.sh

@@ -8,12 +8,6 @@ TYPE=$2 # can be major, minor, patch
 VERSION_DASH=${VERSION//./-}
 BRANCH=update-lib-aem-$TYPE-$VERSION_DASH
 
-# if the version is 2.0.0 or greater, exit gracefully now
-if [[ $VERSION == 2.* ]]; then
-  echo "Version $VERSION is 2.0.0 or greater, exiting gracefully"
-  exit 0
-fi
-
 cd ..
 echo "Using gh version: $(gh --version)"
 gh repo clone $ORG/$REPO

src/setup.js

@@ -37,9 +37,8 @@ export function setup() {
 /**
  * Auto initializiation.
  */
-/* c8 ignore next 14 */
+/* c8 ignore next 18 */
 export function init() {
   setup();
   sampleRUM();
-  window.addEventListener('hlx:section:loaded', sampleRUM.enhance, { once: true });
 }