From 83eef031152cc954ae4bb692bf6ddb73b5b170c8 Mon Sep 17 00:00:00 2001 From: Sai Kumar Battinoju <88789928+saikumarrs@users.noreply.github.com> Date: Fri, 22 Mar 2024 13:58:16 +0530 Subject: [PATCH 1/6] fix(analytics-js-plugins): add backward compatibility for storage api (#1669) fix: add backward compatibility for storage api --- .../src/utilities/retryQueue/RetryQueue.ts | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/packages/analytics-js-plugins/src/utilities/retryQueue/RetryQueue.ts b/packages/analytics-js-plugins/src/utilities/retryQueue/RetryQueue.ts index e9b227c4cd..0bf2bf17c0 100644 --- a/packages/analytics-js-plugins/src/utilities/retryQueue/RetryQueue.ts +++ b/packages/analytics-js-plugins/src/utilities/retryQueue/RetryQueue.ts @@ -5,7 +5,7 @@ import type { StorageType } from '@rudderstack/analytics-js-common/types/Storage import type { Nullable } from '@rudderstack/analytics-js-common/types/Nullable'; import type { ILogger } from '@rudderstack/analytics-js-common/types/Logger'; import type { BatchOpts, QueueOpts } from '@rudderstack/analytics-js-common/types/LoadOptions'; -import { isDefined, isNullOrUndefined } from '@rudderstack/analytics-js-common/utilities/checks'; +import { isDefined, isFunction, isNullOrUndefined } from '@rudderstack/analytics-js-common/utilities/checks'; import { LOCAL_STORAGE } from '@rudderstack/analytics-js-common/constants/storages'; import { generateUUID } from '@rudderstack/analytics-js-common/utilities/uuId'; import type { @@ -705,7 +705,21 @@ class RetryQueue implements IQueue { }; const findOtherQueues = (name: string): IStore[] => { const res: IStore[] = []; - const storageKeys = this.store.getOriginalEngine().keys(); + const storageEngine = this.store.getOriginalEngine(); + let storageKeys = []; + // 'keys' API is not supported by all the core SDK versions + // Hence, we need this backward compatibility check + if (isFunction(storageEngine.keys)) { + storageKeys = storageEngine.keys(); + } else { + for (let i = 0; i < storageEngine.length; i++) { + const key = storageEngine.key(i); + if (key) { + storageKeys.push(key); + } + } + } + storageKeys.forEach((k: string) => { const keyParts: string[] = k ? k.split('.') : []; From a01aadfff624bdaedaa5edeaed667616f22230ae Mon Sep 17 00:00:00 2001 From: GitHub actions Date: Fri, 22 Mar 2024 08:32:37 +0000 Subject: [PATCH 2/6] chore(@rudderstack/analytics-js-plugins): release version 3.0.3 --- packages/analytics-js-plugins/CHANGELOG.md | 7 +++++++ packages/analytics-js-plugins/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/analytics-js-plugins/CHANGELOG.md b/packages/analytics-js-plugins/CHANGELOG.md index 9184205c1b..c6f453d603 100644 --- a/packages/analytics-js-plugins/CHANGELOG.md +++ b/packages/analytics-js-plugins/CHANGELOG.md @@ -2,6 +2,13 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver). +## [3.0.3](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/analytics-js-plugins@3.0.2...@rudderstack/analytics-js-plugins@3.0.3) (2024-03-22) + + +### Bug Fixes + +* **analytics-js-plugins:** add backward compatibility for storage api ([#1669](https://github.com/rudderlabs/rudder-sdk-js/issues/1669)) ([83eef03](https://github.com/rudderlabs/rudder-sdk-js/commit/83eef031152cc954ae4bb692bf6ddb73b5b170c8)) + ## [3.0.2](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/analytics-js-plugins@3.0.1...@rudderstack/analytics-js-plugins@3.0.2) (2024-03-22) ### Dependency Updates diff --git a/packages/analytics-js-plugins/package.json b/packages/analytics-js-plugins/package.json index 4a440110d6..ad21dcd086 100644 --- 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.0.2", + "version": "3.0.3", "private": true, "description": "RudderStack JavaScript SDK plugins", "main": "dist/npm/modern/cjs/index.js", From 3561351c113c12dc187ce6c568aef3428547900a Mon Sep 17 00:00:00 2001 From: GitHub actions Date: Fri, 22 Mar 2024 08:32:37 +0000 Subject: [PATCH 3/6] chore(@rudderstack/analytics-js): release version 3.0.3 --- packages/analytics-js/CHANGELOG.md | 5 +++++ packages/analytics-js/package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/analytics-js/CHANGELOG.md b/packages/analytics-js/CHANGELOG.md index 45c6e2bfc9..f7ae9dfe26 100644 --- a/packages/analytics-js/CHANGELOG.md +++ b/packages/analytics-js/CHANGELOG.md @@ -2,6 +2,11 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver). +## [3.0.3](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/analytics-js@3.0.2...@rudderstack/analytics-js@3.0.3) (2024-03-22) + +### Dependency Updates + +* `@rudderstack/analytics-js-plugins` updated to version `3.0.2` ## [3.0.2](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/analytics-js@3.0.1...@rudderstack/analytics-js@3.0.2) (2024-03-22) ### Dependency Updates diff --git a/packages/analytics-js/package.json b/packages/analytics-js/package.json index 8ba37d5148..e6dbfa561a 100644 --- a/packages/analytics-js/package.json +++ b/packages/analytics-js/package.json @@ -1,6 +1,6 @@ { "name": "@rudderstack/analytics-js", - "version": "3.0.2", + "version": "3.0.3", "description": "RudderStack JavaScript SDK", "main": "dist/npm/modern/cjs/index.js", "module": "dist/npm/modern/esm/index.js", From 57e4d7b0cb906db59d432ced76ef30bc5de75a08 Mon Sep 17 00:00:00 2001 From: GitHub actions Date: Fri, 22 Mar 2024 08:32:38 +0000 Subject: [PATCH 4/6] chore(@rudderstack/analytics-js-loading-scripts): release version 3.0.3 --- packages/loading-scripts/CHANGELOG.md | 5 +++++ packages/loading-scripts/package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/loading-scripts/CHANGELOG.md b/packages/loading-scripts/CHANGELOG.md index 0db41d39b8..86ce05b976 100644 --- 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.3](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/analytics-js-loading-scripts@3.0.2...@rudderstack/analytics-js-loading-scripts@3.0.3) (2024-03-22) + +### Dependency Updates + +* `@rudderstack/analytics-js` updated to version `3.0.2` ## [3.0.2](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/analytics-js-loading-scripts@3.0.1...@rudderstack/analytics-js-loading-scripts@3.0.2) (2024-03-22) ### Dependency Updates diff --git a/packages/loading-scripts/package.json b/packages/loading-scripts/package.json index 724b5526b7..147e700a3b 100644 --- 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.2", + "version": "3.0.3", "private": true, "description": "Loading script for RudderStack JavaScript SDK", "main": "./src/index.js", From ee53d31d22d13943e500af1929a01a2ac1d893e6 Mon Sep 17 00:00:00 2001 From: GitHub actions Date: Fri, 22 Mar 2024 08:32:39 +0000 Subject: [PATCH 5/6] chore(@rudderstack/analytics-js-sanity-suite): release version 3.0.3 --- packages/sanity-suite/CHANGELOG.md | 5 +++++ packages/sanity-suite/package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/sanity-suite/CHANGELOG.md b/packages/sanity-suite/CHANGELOG.md index 5d5138b053..661c116e6a 100644 --- 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.0.3](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/analytics-js-sanity-suite@3.0.2...@rudderstack/analytics-js-sanity-suite@3.0.3) (2024-03-22) + +### Dependency Updates + +* `@rudderstack/analytics-js` updated to version `3.0.2` ## [3.0.2](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/analytics-js-sanity-suite@3.0.1...@rudderstack/analytics-js-sanity-suite@3.0.2) (2024-03-22) ### Dependency Updates diff --git a/packages/sanity-suite/package.json b/packages/sanity-suite/package.json index f3e813859b..e71aa2ebae 100644 --- a/packages/sanity-suite/package.json +++ b/packages/sanity-suite/package.json @@ -1,6 +1,6 @@ { "name": "@rudderstack/analytics-js-sanity-suite", - "version": "3.0.2", + "version": "3.0.3", "private": true, "description": "Sanity suite for testing JS SDK package", "main": "./dist/cdn/v3/testBook.js", From 64653fef67bd3d9f4652d85c3326123fb0c79a4b Mon Sep 17 00:00:00 2001 From: GitHub actions Date: Fri, 22 Mar 2024 08:35:24 +0000 Subject: [PATCH 6/6] chore(monorepo): sync versions and generate release logs --- package-lock.json | 12 ++++++------ package.json | 2 +- packages/analytics-js-plugins/CHANGELOG_LATEST.md | 7 ++----- packages/analytics-js-plugins/project.json | 6 +++--- packages/analytics-js/CHANGELOG_LATEST.md | 12 ++---------- packages/analytics-js/project.json | 6 +++--- packages/loading-scripts/CHANGELOG_LATEST.md | 10 ++-------- packages/loading-scripts/project.json | 6 +++--- sonar-project.properties | 2 +- 9 files changed, 23 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index c52b76a834..427a9231c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@rudderstack/analytics-js-monorepo", - "version": "3.2.0", + "version": "3.3.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@rudderstack/analytics-js-monorepo", - "version": "3.2.0", + "version": "3.3.0", "hasInstallScript": true, "license": "MIT", "workspaces": [ @@ -23785,7 +23785,7 @@ }, "packages/analytics-js": { "name": "@rudderstack/analytics-js", - "version": "3.0.2", + "version": "3.0.3", "license": "MIT", "devDependencies": { "@rudderstack/analytics-js-common": "*", @@ -23831,7 +23831,7 @@ }, "packages/analytics-js-plugins": { "name": "@rudderstack/analytics-js-plugins", - "version": "3.0.2", + "version": "3.0.3", "license": "MIT", "dependencies": { "@rudderstack/analytics-js-common": "*", @@ -23898,7 +23898,7 @@ }, "packages/loading-scripts": { "name": "@rudderstack/analytics-js-loading-scripts", - "version": "3.0.2", + "version": "3.0.3", "license": "MIT", "dependencies": { "@rudderstack/analytics-js": "*" @@ -23907,7 +23907,7 @@ }, "packages/sanity-suite": { "name": "@rudderstack/analytics-js-sanity-suite", - "version": "3.0.2", + "version": "3.0.3", "license": "MIT", "dependencies": { "@rudderstack/analytics-js": "*", diff --git a/package.json b/package.json index f81e66d109..2e8c10f74e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@rudderstack/analytics-js-monorepo", - "version": "3.2.0", + "version": "3.3.0", "private": true, "description": "Monorepo for RudderStack Analytics JS SDK", "workspaces": [ diff --git a/packages/analytics-js-plugins/CHANGELOG_LATEST.md b/packages/analytics-js-plugins/CHANGELOG_LATEST.md index 31d39acdb0..28de66919f 100644 --- a/packages/analytics-js-plugins/CHANGELOG_LATEST.md +++ b/packages/analytics-js-plugins/CHANGELOG_LATEST.md @@ -1,10 +1,7 @@ -## [3.0.2](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/analytics-js-plugins@3.0.1...@rudderstack/analytics-js-plugins@3.0.2) (2024-03-22) +## [3.0.3](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/analytics-js-plugins@3.0.2...@rudderstack/analytics-js-plugins@3.0.3) (2024-03-22) -### Dependency Updates - -* `@rudderstack/analytics-js-common` updated to version `3.0.1` ### Bug Fixes -* optimize localstorage transactions ([#1651](https://github.com/rudderlabs/rudder-sdk-js/issues/1651)) ([1289217](https://github.com/rudderlabs/rudder-sdk-js/commit/12892176578dd3628fded2311ea2548e3ff5802c)) +* **analytics-js-plugins:** add backward compatibility for storage api ([#1669](https://github.com/rudderlabs/rudder-sdk-js/issues/1669)) ([83eef03](https://github.com/rudderlabs/rudder-sdk-js/commit/83eef031152cc954ae4bb692bf6ddb73b5b170c8)) diff --git a/packages/analytics-js-plugins/project.json b/packages/analytics-js-plugins/project.json index 9dd93875e1..3c8f8d4237 100644 --- a/packages/analytics-js-plugins/project.json +++ b/packages/analytics-js-plugins/project.json @@ -119,9 +119,9 @@ "github": { "executor": "@jscutlery/semver:github", "options": { - "tag": "@rudderstack/analytics-js-plugins@3.0.2", - "title": "@rudderstack/analytics-js-plugins@3.0.2", - "discussion-category": "@rudderstack/analytics-js-plugins@3.0.2", + "tag": "@rudderstack/analytics-js-plugins@3.0.3", + "title": "@rudderstack/analytics-js-plugins@3.0.3", + "discussion-category": "@rudderstack/analytics-js-plugins@3.0.3", "notesFile": "./packages/analytics-js-plugins/CHANGELOG_LATEST.md" } } diff --git a/packages/analytics-js/CHANGELOG_LATEST.md b/packages/analytics-js/CHANGELOG_LATEST.md index 8992e4f609..f2e0d6e0ac 100644 --- a/packages/analytics-js/CHANGELOG_LATEST.md +++ b/packages/analytics-js/CHANGELOG_LATEST.md @@ -1,13 +1,5 @@ -## [3.0.2](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/analytics-js@3.0.1...@rudderstack/analytics-js@3.0.2) (2024-03-22) +## [3.0.3](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/analytics-js@3.0.2...@rudderstack/analytics-js@3.0.3) (2024-03-22) ### Dependency Updates -* `@rudderstack/analytics-js-common` updated to version `3.0.1` -* `@rudderstack/analytics-js-plugins` updated to version `3.0.1` - -### Bug Fixes - -* optimize localstorage transactions ([#1651](https://github.com/rudderlabs/rudder-sdk-js/issues/1651)) ([1289217](https://github.com/rudderlabs/rudder-sdk-js/commit/12892176578dd3628fded2311ea2548e3ff5802c)) -* replace polyfillio with fastly ([#1664](https://github.com/rudderlabs/rudder-sdk-js/issues/1664)) ([24d3a0b](https://github.com/rudderlabs/rudder-sdk-js/commit/24d3a0b383f58b79fc1970d0c74761de30bb3f4a)) -* type issues ([#1663](https://github.com/rudderlabs/rudder-sdk-js/issues/1663)) ([1f114a1](https://github.com/rudderlabs/rudder-sdk-js/commit/1f114a19ac14ffd9af6ae876a54d4d19afd80d65)) - +* `@rudderstack/analytics-js-plugins` updated to version `3.0.2` diff --git a/packages/analytics-js/project.json b/packages/analytics-js/project.json index 6fdda128b9..9886be1b2f 100644 --- a/packages/analytics-js/project.json +++ b/packages/analytics-js/project.json @@ -126,9 +126,9 @@ "github": { "executor": "@jscutlery/semver:github", "options": { - "tag": "@rudderstack/analytics-js@3.0.2", - "title": "@rudderstack/analytics-js@3.0.2", - "discussion-category": "@rudderstack/analytics-js@3.0.2", + "tag": "@rudderstack/analytics-js@3.0.3", + "title": "@rudderstack/analytics-js@3.0.3", + "discussion-category": "@rudderstack/analytics-js@3.0.3", "notesFile": "./packages/analytics-js/CHANGELOG_LATEST.md" } } diff --git a/packages/loading-scripts/CHANGELOG_LATEST.md b/packages/loading-scripts/CHANGELOG_LATEST.md index deacc7505a..e8cc012072 100644 --- a/packages/loading-scripts/CHANGELOG_LATEST.md +++ b/packages/loading-scripts/CHANGELOG_LATEST.md @@ -1,11 +1,5 @@ -## [3.0.2](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/analytics-js-loading-scripts@3.0.1...@rudderstack/analytics-js-loading-scripts@3.0.2) (2024-03-22) +## [3.0.3](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/analytics-js-loading-scripts@3.0.2...@rudderstack/analytics-js-loading-scripts@3.0.3) (2024-03-22) ### Dependency Updates -* `@rudderstack/analytics-js` updated to version `3.0.1` - -### Bug Fixes - -* replace polyfillio with fastly ([#1664](https://github.com/rudderlabs/rudder-sdk-js/issues/1664)) ([24d3a0b](https://github.com/rudderlabs/rudder-sdk-js/commit/24d3a0b383f58b79fc1970d0c74761de30bb3f4a)) -* type issues ([#1663](https://github.com/rudderlabs/rudder-sdk-js/issues/1663)) ([1f114a1](https://github.com/rudderlabs/rudder-sdk-js/commit/1f114a19ac14ffd9af6ae876a54d4d19afd80d65)) - +* `@rudderstack/analytics-js` updated to version `3.0.2` diff --git a/packages/loading-scripts/project.json b/packages/loading-scripts/project.json index 0458b27071..c6e488551c 100644 --- a/packages/loading-scripts/project.json +++ b/packages/loading-scripts/project.json @@ -89,9 +89,9 @@ "github": { "executor": "@jscutlery/semver:github", "options": { - "tag": "@rudderstack/analytics-js-loading-scripts@3.0.2", - "title": "@rudderstack/analytics-js-loading-scripts@3.0.2", - "discussion-category": "@rudderstack/analytics-js-loading-scripts@3.0.2", + "tag": "@rudderstack/analytics-js-loading-scripts@3.0.3", + "title": "@rudderstack/analytics-js-loading-scripts@3.0.3", + "discussion-category": "@rudderstack/analytics-js-loading-scripts@3.0.3", "notesFile": "./packages/loading-scripts/CHANGELOG_LATEST.md" } } diff --git a/sonar-project.properties b/sonar-project.properties index 5835c5cc3b..8acb4bd968 100644 --- 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.2.0 +sonar.projectVersion=3.3.0 # Meta-data for the project sonar.links.scm=https://github.com/rudderlabs/rudder-sdk-js