chore(release): pull hotfix-release/3.25.0 into main (#1801)

rudderlabs · Jul 23, 2024 · 5747055 · 5747055
2 parents 3e43a00 + 6e6c4b9
commit 5747055
Show file tree

Hide file tree

Showing 21 changed files with 82 additions and 62 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rudderstack/analytics-js-monorepo",
-  "version": "3.24.0",
+  "version": "3.25.0",
   "private": true,
   "description": "Monorepo for RudderStack Analytics JS SDK",
   "workspaces": [

diff --git a/packages/analytics-js-plugins/CHANGELOG.md b/packages/analytics-js-plugins/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [3.4.4](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-23)
+
+### Dependency Updates
+
+* `@rudderstack/analytics-js` updated to version `3.4.3`
 ## [3.4.3](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-23)
 
 ### Dependency Updates

diff --git a/packages/analytics-js-plugins/CHANGELOG_LATEST.md b/packages/analytics-js-plugins/CHANGELOG_LATEST.md
@@ -1,5 +1,5 @@
-## [3.4.3](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected].2...@rudderstack/[email protected].3) (2024-07-23)
+## [3.4.4](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected].3...@rudderstack/[email protected].4) (2024-07-23)
 
 ### Dependency Updates
 
-* `@rudderstack/analytics-js` updated to version `3.4.2`
+* `@rudderstack/analytics-js` updated to version `3.4.3`
diff --git a/packages/analytics-js-plugins/package.json b/packages/analytics-js-plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rudderstack/analytics-js-plugins",
-  "version": "3.4.3",
+  "version": "3.4.4",
   "private": true,
   "description": "RudderStack JavaScript SDK plugins",
   "main": "dist/npm/modern/cjs/index.cjs",

diff --git a/packages/analytics-js-plugins/project.json b/packages/analytics-js-plugins/project.json
@@ -52,9 +52,9 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
-        "tag": "@rudderstack/[email protected].3",
-        "title": "@rudderstack/[email protected].3",
-        "discussion-category": "@rudderstack/[email protected].3",
+        "tag": "@rudderstack/[email protected].4",
+        "title": "@rudderstack/[email protected].4",
+        "discussion-category": "@rudderstack/[email protected].4",
         "notesFile": "./packages/analytics-js-plugins/CHANGELOG_LATEST.md"
       }
     }

diff --git a/packages/analytics-js/CHANGELOG.md b/packages/analytics-js/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [3.7.4](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-23)
+
+### Dependency Updates
+
+* `@rudderstack/analytics-js-plugins` updated to version `3.7.3`
+
+### Bug Fixes
+
+* filter non errors ([#1800](https://github.com/rudderlabs/rudder-sdk-js/issues/1800)) ([73de1cc](https://github.com/rudderlabs/rudder-sdk-js/commit/73de1ccc264e9afcbae3e6d7f66e120aca81e49a))
+
 ## [3.7.3](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-23)
 
 ### Dependency Updates

diff --git a/packages/analytics-js/CHANGELOG_LATEST.md b/packages/analytics-js/CHANGELOG_LATEST.md
@@ -1,10 +1,10 @@
-## [3.7.3](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected].2...@rudderstack/[email protected].3) (2024-07-23)
+## [3.7.4](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected].3...@rudderstack/[email protected].4) (2024-07-23)
 
 ### Dependency Updates
 
-* `@rudderstack/analytics-js-plugins` updated to version `3.7.2`
+* `@rudderstack/analytics-js-plugins` updated to version `3.7.3`
 
 ### Bug Fixes
 
-* filter unhandled errors by message ([#1797](https://github.com/rudderlabs/rudder-sdk-js/issues/1797)) ([2f45d00](https://github.com/rudderlabs/rudder-sdk-js/commit/2f45d001e7d9dbb70b12b017fc73bc740135e870))
+* filter non errors ([#1800](https://github.com/rudderlabs/rudder-sdk-js/issues/1800)) ([73de1cc](https://github.com/rudderlabs/rudder-sdk-js/commit/73de1ccc264e9afcbae3e6d7f66e120aca81e49a))
 
diff --git a/packages/analytics-js/__tests__/services/ErrorHandler/ErrorHandler.test.ts b/packages/analytics-js/__tests__/services/ErrorHandler/ErrorHandler.test.ts
@@ -267,12 +267,12 @@ describe('ErrorHandler', () => {
   it('should attach error listeners', () => {
     const unhandledRejectionListener = jest.spyOn(window, 'addEventListener');
     errorHandlerInstance.attachErrorListeners();
-    expect(unhandledRejectionListener).toHaveBeenCalledTimes(1);
+    expect(unhandledRejectionListener).toHaveBeenCalledTimes(2);
     expect(unhandledRejectionListener).toHaveBeenCalledWith('error', expect.any(Function));
-    // expect(unhandledRejectionListener).toHaveBeenCalledWith(
-    //   'unhandledrejection',
-    //   expect.any(Function),
-    // );
+    expect(unhandledRejectionListener).toHaveBeenCalledWith(
+      'unhandledrejection',
+      expect.any(Function),
+    );
   });
 
   it('should notify buffered errors once Error reporting plugin is loaded', () => {

diff --git a/packages/analytics-js/__tests__/services/ErrorHandler/processError.test.ts b/packages/analytics-js/__tests__/services/ErrorHandler/processError.test.ts
@@ -95,7 +95,7 @@ describe('ErrorHandler - getNormalizedErrorForUnhandledError', () => {
     expect(normalizedError).toBeUndefined();
   });
 
-  it('should return error instance for Event argument value with SDK script target', () => {
+  it.skip('should return error instance for Event argument value with SDK script target', () => {
     const event = new Event('dummyError');
     const targetElement = document.createElement('script');
     targetElement.dataset.loader = 'RS_JS_SDK';

diff --git a/packages/analytics-js/package.json b/packages/analytics-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rudderstack/analytics-js",
-  "version": "3.7.3",
+  "version": "3.7.4",
   "description": "RudderStack JavaScript SDK",
   "main": "dist/npm/modern/cjs/index.cjs",
   "module": "dist/npm/modern/esm/index.mjs",

diff --git a/packages/analytics-js/project.json b/packages/analytics-js/project.json
@@ -60,9 +60,9 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
-        "tag": "@rudderstack/[email protected].3",
-        "title": "@rudderstack/[email protected].3",
-        "discussion-category": "@rudderstack/[email protected].3",
+        "tag": "@rudderstack/[email protected].4",
+        "title": "@rudderstack/[email protected].4",
+        "discussion-category": "@rudderstack/[email protected].4",
         "notesFile": "./packages/analytics-js/CHANGELOG_LATEST.md"
       }
     }

diff --git a/packages/analytics-js/src/services/ErrorHandler/ErrorHandler.ts b/packages/analytics-js/src/services/ErrorHandler/ErrorHandler.ts
@@ -64,17 +64,12 @@ class ErrorHandler implements IErrorHandler {
         this.onError(event, undefined, undefined, undefined, ErrorType.UNHANDLEDEXCEPTION);
       });
 
-      // TODO: uncomment this when we have a way to handle unhandledrejection for non-Error objects
-      // (globalThis as typeof window).addEventListener(
-      //   'unhandledrejection',
-      //   (event: PromiseRejectionEvent) => {
-      //     if (!(event.reason instanceof Error)) {
-      //       // Prevent the default handling by the browser
-      //       event.preventDefault();
-      //     }
-      //     this.onError(event, undefined, undefined, undefined, ErrorType.UNHANDLEDREJECTION);
-      //   },
-      // );
+      (globalThis as typeof window).addEventListener(
+        'unhandledrejection',
+        (event: PromiseRejectionEvent) => {
+          this.onError(event, undefined, undefined, undefined, ErrorType.UNHANDLEDREJECTION);
+        },
+      );
     } else {
       this.logger?.debug(`Failed to attach global error listeners.`);
     }
@@ -159,7 +154,7 @@ class ErrorHandler implements IErrorHandler {
             error: normalizedError,
             errorState,
           });
-        } else {
+        } else if (normalizedError) {
           this.notifyError(normalizedError, errorState);
         }
       }

diff --git a/packages/analytics-js/src/services/ErrorHandler/processError.ts b/packages/analytics-js/src/services/ErrorHandler/processError.ts
@@ -39,26 +39,26 @@ const getNormalizedErrorForUnhandledError = (error: SDKError): SDKError | undefi
       return error;
     }
     // TODO: remove this block once all device mode integrations start using the v3 script loader module (TS)
-    if (error instanceof Event) {
-      const eventTarget = error.target as ErrorTarget;
-      // Discard all the non-script loading errors
-      if (eventTarget && eventTarget.localName !== 'script') {
-        return undefined;
-      }
-      // Discard script errors that are not originated at SDK or from native SDKs
-      if (
-        eventTarget?.dataset &&
-        (eventTarget.dataset.loader !== LOAD_ORIGIN ||
-          eventTarget.dataset.isnonnativesdk !== 'true')
-      ) {
-        return undefined;
-      }
-      const errorMessage = `Error in loading a third-party script from URL ${eventTarget?.src} with ID ${eventTarget?.id}.`;
-      return Object.create(error, {
-        message: { value: errorMessage },
-      });
-    }
-    return error;
+    // if (error instanceof Event) {
+    //   const eventTarget = error.target as ErrorTarget;
+    //   // Discard all the non-script loading errors
+    //   if (eventTarget && eventTarget.localName !== 'script') {
+    //     return undefined;
+    //   }
+    //   // Discard script errors that are not originated at SDK or from native SDKs
+    //   if (
+    //     eventTarget?.dataset &&
+    //     (eventTarget.dataset.loader !== LOAD_ORIGIN ||
+    //       eventTarget.dataset.isnonnativesdk !== 'true')
+    //   ) {
+    //     return undefined;
+    //   }
+    //   const errorMessage = `Error in loading a third-party script from URL ${eventTarget?.src} with ID ${eventTarget?.id}.`;
+    //   return Object.create(error, {
+    //     message: { value: errorMessage },
+    //   });
+    // }
+    return undefined;
   } catch (e) {
     return e;
   }

diff --git a/packages/loading-scripts/CHANGELOG.md b/packages/loading-scripts/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [3.0.21](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-23)
+
+### Dependency Updates
+
+* `@rudderstack/analytics-js` updated to version `3.0.20`
 ## [3.0.20](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-23)
 
 ### Dependency Updates

diff --git a/packages/loading-scripts/CHANGELOG_LATEST.md b/packages/loading-scripts/CHANGELOG_LATEST.md
@@ -1,5 +1,5 @@
-## [3.0.20](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected].19...@rudderstack/[email protected].20) (2024-07-23)
+## [3.0.21](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected].20...@rudderstack/[email protected].21) (2024-07-23)
 
 ### Dependency Updates
 
-* `@rudderstack/analytics-js` updated to version `3.0.19`
+* `@rudderstack/analytics-js` updated to version `3.0.20`
diff --git a/packages/loading-scripts/package.json b/packages/loading-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rudderstack/analytics-js-loading-scripts",
-  "version": "3.0.20",
+  "version": "3.0.21",
   "private": true,
   "description": "Loading script for RudderStack JavaScript SDK",
   "main": "./src/index.js",

diff --git a/packages/loading-scripts/project.json b/packages/loading-scripts/project.json
@@ -52,9 +52,9 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
-        "tag": "@rudderstack/[email protected].20",
-        "title": "@rudderstack/[email protected].20",
-        "discussion-category": "@rudderstack/[email protected].20",
+        "tag": "@rudderstack/[email protected].21",
+        "title": "@rudderstack/[email protected].21",
+        "discussion-category": "@rudderstack/[email protected].21",
         "notesFile": "./packages/loading-scripts/CHANGELOG_LATEST.md"
       }
     }

diff --git a/packages/sanity-suite/CHANGELOG.md b/packages/sanity-suite/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [3.1.11](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-23)
+
+### Dependency Updates
+
+* `@rudderstack/analytics-js` updated to version `3.1.10`
 ## [3.1.10](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-07-23)
 
 ### Dependency Updates

diff --git a/packages/sanity-suite/package.json b/packages/sanity-suite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rudderstack/analytics-js-sanity-suite",
-  "version": "3.1.10",
+  "version": "3.1.11",
   "private": true,
   "description": "Sanity suite for testing JS SDK package",
   "main": "./dist/v3/cdn/testBook.js",

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -6,7 +6,7 @@ sonar.qualitygate.wait=false
 sonar.projectKey=rudderlabs_rudder-sdk-js
 sonar.organization=rudderlabs
 sonar.projectName=rudder-sdk-js
-sonar.projectVersion=3.24.0
+sonar.projectVersion=3.25.0
 
 # Meta-data for the project
 sonar.links.scm=https://github.com/rudderlabs/rudder-sdk-js