From c731fe5c9480f7622e47efe10346fe3f1854b975 Mon Sep 17 00:00:00 2001 From: Emiliano Sanchez Date: Mon, 18 Apr 2022 13:38:31 -0300 Subject: [PATCH 1/4] polishing of imports and comments --- .github/workflows/ci-cd.yml | 2 +- package-lock.json | 8 ++++---- package.json | 4 ++-- src/settings/browser.js | 7 ++++--- src/settings/defaults/version.js | 2 +- src/settings/node.js | 7 ++++--- types/splitio.d.ts | 8 ++++---- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 6ba5a3b3f..10ca4d209 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -46,7 +46,7 @@ jobs: run: BUILD_BRANCH=$(echo "${GITHUB_REF#refs/heads/}") BUILD_COMMIT=${{ github.sha }} npm run build - name: Deploy S3 Development - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/development' }} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/update_dependencies' }} uses: jakejarvis/s3-sync-action@v0.5.1 with: args: --acl public-read --follow-symlinks --cache-control max-age=31536000,public diff --git a/package-lock.json b/package-lock.json index 33a9332ae..a474cfd22 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@splitsoftware/splitio", - "version": "10.18.0", + "version": "10.18.1-rc.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -437,9 +437,9 @@ "dev": true }, "@splitsoftware/splitio-commons": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@splitsoftware/splitio-commons/-/splitio-commons-1.3.0.tgz", - "integrity": "sha512-jwthiLCgN4DOiLjxn7RIGoEArTonpLUMcHgKMhka1rIzu9R8z+4qkvYPC+Eb5zLK/EIBViyf+sZJFUmBny3Ckw==", + "version": "1.3.1-rc.0", + "resolved": "https://registry.npmjs.org/@splitsoftware/splitio-commons/-/splitio-commons-1.3.1-rc.0.tgz", + "integrity": "sha512-cwjisRkzjq+1xtibKyy6tIPEojMgdNUpi8IC63LPo4HufMOHF591UDL00K97j/gSGBzAm3FxdlbBbdjmNd+gcw==", "requires": { "tslib": "^2.3.1" } diff --git a/package.json b/package.json index 677d784ee..e22df53e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@splitsoftware/splitio", - "version": "10.18.0", + "version": "10.18.1-rc.0", "description": "Split SDK", "files": [ "README.md", @@ -32,7 +32,7 @@ "node": ">=6" }, "dependencies": { - "@splitsoftware/splitio-commons": "1.3.0", + "@splitsoftware/splitio-commons": "1.3.1-rc.0", "@types/google.analytics": "0.0.40", "@types/ioredis": "^4.28.0", "ioredis": "^4.28.0", diff --git a/src/settings/browser.js b/src/settings/browser.js index ae2302eff..d3f04443e 100644 --- a/src/settings/browser.js +++ b/src/settings/browser.js @@ -1,12 +1,13 @@ import { settingsValidation } from '@splitsoftware/splitio-commons/src/utils/settingsValidation'; -import { defaults } from './defaults/browser'; import { validateRuntime } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/runtime'; -import { validateStorage } from './storage/browser'; -import { validateIntegrations } from './integrations/browser'; import { validateLogger } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/logger/builtinLogger'; import { LocalhostFromObject } from '@splitsoftware/splitio-commons/src/sync/offline/LocalhostFromObject'; import { validateConsent } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/consent'; +import { defaults } from './defaults/browser'; +import { validateStorage } from './storage/browser'; +import { validateIntegrations } from './integrations/browser'; + const params = { defaults, acceptKey: true, acceptTT: true, // Client with bound key and optional TT diff --git a/src/settings/defaults/version.js b/src/settings/defaults/version.js index edef8859e..2f86c0145 100644 --- a/src/settings/defaults/version.js +++ b/src/settings/defaults/version.js @@ -1 +1 @@ -export const packageVersion = '10.18.0'; +export const packageVersion = '10.18.1-rc.0'; diff --git a/src/settings/node.js b/src/settings/node.js index c336fa124..00a9a6d45 100644 --- a/src/settings/node.js +++ b/src/settings/node.js @@ -1,10 +1,11 @@ import { settingsValidation } from '@splitsoftware/splitio-commons/src/utils/settingsValidation'; -import { defaults } from './defaults/node'; -import { validateRuntime } from './runtime/node'; -import { validateStorage } from './storage/node'; import { validateLogger } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/logger/builtinLogger'; import { LocalhostFromFile } from '@splitsoftware/splitio-commons/src/sync/offline/LocalhostFromFile'; +import { defaults } from './defaults/node'; +import { validateStorage } from './storage/node'; +import { validateRuntime } from './runtime/node'; + const params = { defaults, runtime: validateRuntime, diff --git a/types/splitio.d.ts b/types/splitio.d.ts index be7fe47c2..53503861a 100644 --- a/types/splitio.d.ts +++ b/types/splitio.d.ts @@ -1048,10 +1048,10 @@ declare namespace SplitIO { integrations?: BrowserIntegration[], /** * User consent status. Possible values are `'GRANTED'`, which is the default, `'DECLINED'` or `'UNKNOWN'`. - * - `'GRANTED'`: the user has granted consent for tracking events and impressions. The SDK will send them to Split cloud. - * - `'DECLINED'`: the user has declined consent for tracking events and impressions. The SDK will not send them to Split cloud. - * - `'UNKNOWN'`: the user has neither granted nor declined consent for tracking events and impressions. The SDK will track them in its internal storage, and eventually send - * them or not if the consent status is updated to 'GRANTED' or 'DECLINED' respectively. The status can be updated at any time with the `setUserConsent` factory method. + * - `'GRANTED'`: the user grants consent for tracking events and impressions. The SDK sends them to Split cloud. + * - `'DECLINED'`: the user declines consent for tracking events and impressions. The SDK does not send them to Split cloud. + * - `'UNKNOWN'`: the user neither grants nor declines consent for tracking events and impressions. The SDK tracks them in its internal storage, and eventually either sends + * them or not if the consent status is updated to 'GRANTED' or 'DECLINED' respectively. The status can be updated at any time with the `UserConsent.setStatus` factory method. * * @typedef {string} userConsent * @default 'GRANTED' From 9b2314a25eccf634e34192134a0cbae8c0717bd2 Mon Sep 17 00:00:00 2001 From: Emiliano Sanchez Date: Tue, 19 Apr 2022 11:24:06 -0300 Subject: [PATCH 2/4] put back ci-cd config --- .github/workflows/ci-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 10ca4d209..6ba5a3b3f 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -46,7 +46,7 @@ jobs: run: BUILD_BRANCH=$(echo "${GITHUB_REF#refs/heads/}") BUILD_COMMIT=${{ github.sha }} npm run build - name: Deploy S3 Development - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/update_dependencies' }} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/development' }} uses: jakejarvis/s3-sync-action@v0.5.1 with: args: --acl public-read --follow-symlinks --cache-control max-age=31536000,public From 55cf4196569aa77ddf77dc8ce6957ad8a84b46ad Mon Sep 17 00:00:00 2001 From: Emiliano Sanchez Date: Tue, 19 Apr 2022 19:20:34 -0300 Subject: [PATCH 3/4] prepare stable release --- CHANGES.txt | 5 +++++ package-lock.json | 22 +++++++++++----------- package.json | 6 +++--- src/settings/defaults/version.js | 2 +- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index fd16d077b..a43f307b7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +10.18.1 (April 20, 2022) + - Updated some dependencies for vulnerability fixes. + - Bugfixing - Added peer dependencies to avoid issues when requiring some third-party dependencies used by modules of the package (Related to issue https://github.com/splitio/javascript-client/issues/662). + - Bugfixing - Updated `ready` method to rejects the promise with an Error object instead of a string value (Related to issue https://github.com/splitio/javascript-client/issues/654). + 10.18.0 (April 7, 2022) - Added user consent feature to allow delaying or disabling the data tracking from SDK until user consent is explicitly granted or declined. Read more in our docs. - Added `scheduler.impressionsQueueSize` property to SDK configuration to limit the amount of impressions tracked in memory. Read more in our docs. diff --git a/package-lock.json b/package-lock.json index a474cfd22..8a390b5ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@splitsoftware/splitio", - "version": "10.18.1-rc.0", + "version": "10.18.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -437,9 +437,9 @@ "dev": true }, "@splitsoftware/splitio-commons": { - "version": "1.3.1-rc.0", - "resolved": "https://registry.npmjs.org/@splitsoftware/splitio-commons/-/splitio-commons-1.3.1-rc.0.tgz", - "integrity": "sha512-cwjisRkzjq+1xtibKyy6tIPEojMgdNUpi8IC63LPo4HufMOHF591UDL00K97j/gSGBzAm3FxdlbBbdjmNd+gcw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@splitsoftware/splitio-commons/-/splitio-commons-1.3.1.tgz", + "integrity": "sha512-otHrBCNJ2BP2tby31juRFfBETYzBVJZVecg1d27o9v5IKsv9uhzF9Q8B35GPpbndFht/596O2OlxKH5HdbjBwQ==", "requires": { "tslib": "^2.3.1" } @@ -1037,9 +1037,9 @@ } }, "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", + "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==", "dev": true }, "asynckit": { @@ -5025,12 +5025,12 @@ "integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==" }, "redis-dumpz": { - "version": "0.1.11", - "resolved": "https://registry.npmjs.org/redis-dumpz/-/redis-dumpz-0.1.11.tgz", - "integrity": "sha512-xQPKGflg8yZGDQPy51mDZp47oSjbVv1YIBQJM0RGo9JPKx3NeOVingwUSWWpB5EKpNiTVQ9KzbB585wkh5ersg==", + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/redis-dumpz/-/redis-dumpz-0.1.12.tgz", + "integrity": "sha512-AldHfK5aL7qOXSJzMNFM1U4nwICmGqwPxPqseQ3w4hiVq253IkrcKt/mTcQhqbdG+ppEVhHd5xwwhzAGaSG5Ag==", "dev": true, "requires": { - "async": "^1.5.2", + "async": "^3.2.3", "optimist": "^0.3.7", "redis": "^3.1.1" } diff --git a/package.json b/package.json index e22df53e1..ee0e0149c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@splitsoftware/splitio", - "version": "10.18.1-rc.0", + "version": "10.18.1", "description": "Split SDK", "files": [ "README.md", @@ -32,7 +32,7 @@ "node": ">=6" }, "dependencies": { - "@splitsoftware/splitio-commons": "1.3.1-rc.0", + "@splitsoftware/splitio-commons": "1.3.1", "@types/google.analytics": "0.0.40", "@types/ioredis": "^4.28.0", "ioredis": "^4.28.0", @@ -61,7 +61,7 @@ "node-polyfill-webpack-plugin": "^1.1.4", "proxyquire": "^2.1.3", "puppeteer": "^3.3.0", - "redis-dumpz": "0.1.11", + "redis-dumpz": "0.1.12", "redis-server": "1.2.2", "replace": "^1.2.1", "rimraf": "^3.0.2", diff --git a/src/settings/defaults/version.js b/src/settings/defaults/version.js index 2f86c0145..457b9b5f8 100644 --- a/src/settings/defaults/version.js +++ b/src/settings/defaults/version.js @@ -1 +1 @@ -export const packageVersion = '10.18.1-rc.0'; +export const packageVersion = '10.18.1'; From 02f2a73cbdacbac04528071080efd807ef87bc7a Mon Sep 17 00:00:00 2001 From: Emiliano Sanchez Date: Tue, 19 Apr 2022 19:25:50 -0300 Subject: [PATCH 4/4] updated changelog --- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index a43f307b7..8b8da6a10 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,6 @@ 10.18.1 (April 20, 2022) - Updated some dependencies for vulnerability fixes. - - Bugfixing - Added peer dependencies to avoid issues when requiring some third-party dependencies used by modules of the package (Related to issue https://github.com/splitio/javascript-client/issues/662). + - Bugfixing - Updated @splitsoftware/splitio-commons package to avoid an error when requiring some third-party dependencies used by the package (Related to issue https://github.com/splitio/javascript-client/issues/662). - Bugfixing - Updated `ready` method to rejects the promise with an Error object instead of a string value (Related to issue https://github.com/splitio/javascript-client/issues/654). 10.18.0 (April 7, 2022)