Merge branch 'main' into dependabot/npm_and_yarn/packages/sdk/cloudfl…

…are/example/wrangler-2.20.1
launchdarkly · Sep 6, 2023 · 1434ea8 · 1434ea8
2 parents 7a4136f + 9612387
commit 1434ea8
Show file tree

Hide file tree

Showing 24 changed files with 142 additions and 41 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,13 +1,13 @@
 {
   "packages/shared/common": "1.1.0",
-  "packages/shared/sdk-server": "1.2.2",
-  "packages/sdk/server-node": "8.2.3",
-  "packages/sdk/cloudflare": "2.1.3",
-  "packages/shared/sdk-server-edge": "1.0.12",
-  "packages/sdk/vercel": "1.1.3",
-  "packages/sdk/akamai-base": "1.0.6",
-  "packages/sdk/akamai-edgekv": "1.0.6",
-  "packages/shared/akamai-edgeworker-sdk": "0.3.3",
-  "packages/store/node-server-sdk-dynamodb": "5.0.10",
-  "packages/store/node-server-sdk-redis": "3.0.10"
+  "packages/shared/sdk-server": "1.2.3",
+  "packages/sdk/server-node": "8.2.4",
+  "packages/sdk/cloudflare": "2.1.4",
+  "packages/shared/sdk-server-edge": "1.0.13",
+  "packages/sdk/vercel": "1.1.4",
+  "packages/sdk/akamai-base": "1.0.7",
+  "packages/sdk/akamai-edgekv": "1.0.7",
+  "packages/shared/akamai-edgeworker-sdk": "0.3.4",
+  "packages/store/node-server-sdk-dynamodb": "5.0.11",
+  "packages/store/node-server-sdk-redis": "3.0.11"
 }
diff --git a/packages/sdk/akamai-base/CHANGELOG.md b/packages/sdk/akamai-base/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 All notable changes to the LaunchDarkly SDK for Akamai Workers will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org).
 
+## [1.0.7](https://github.com/launchdarkly/js-core/compare/akamai-server-base-sdk-v1.0.6...akamai-server-base-sdk-v1.0.7)  (2023-09-06)
+
+### Bug Fixes
+
+* Use clientSideAvailability instead of clientSide for filtering client side flags. ([#270](https://github.com/launchdarkly/js-core/issues/270)) ([2702342](https://github.com/launchdarkly/js-core/commit/27023429d36986466cda46aa4d95eb01c10cd455))
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @launchdarkly/akamai-edgeworker-sdk-common bumped from ^0.3.3 to ^0.3.4
+    * @launchdarkly/js-server-sdk-common bumped from ^1.2.2 to ^1.2.3
+
 ### Dependencies
 
 * The following workspace dependencies were updated

diff --git a/packages/sdk/akamai-base/package.json b/packages/sdk/akamai-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@launchdarkly/akamai-server-base-sdk",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Akamai LaunchDarkly EdgeWorker SDK",
   "homepage": "https://github.com/launchdarkly/js-core/tree/main/packages/sdk/akamai-base",
   "repository": {
@@ -72,7 +72,7 @@
     "typescript": "5.1.6"
   },
   "dependencies": {
-    "@launchdarkly/akamai-edgeworker-sdk-common": "^0.3.3",
-    "@launchdarkly/js-server-sdk-common": "^1.2.2"
+    "@launchdarkly/akamai-edgeworker-sdk-common": "^0.3.4",
+    "@launchdarkly/js-server-sdk-common": "^1.2.3"
   }
 }
diff --git a/packages/sdk/akamai-edgekv/CHANGELOG.md b/packages/sdk/akamai-edgekv/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 All notable changes to the LaunchDarkly SDK for Akamai Workers will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org).
 
+## [1.0.7](https://github.com/launchdarkly/js-core/compare/akamai-server-edgekv-sdk-v1.0.6...akamai-server-edgekv-sdk-v1.0.7)  (2023-08-14)
+
+### Bug Fixes
+
+* Use clientSideAvailability instead of clientSide for filtering client side flags. ([#270](https://github.com/launchdarkly/js-core/issues/270)) ([2702342](https://github.com/launchdarkly/js-core/commit/27023429d36986466cda46aa4d95eb01c10cd455))
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @launchdarkly/akamai-edgeworker-sdk-common bumped from ^0.3.3 to ^0.3.4
+    * @launchdarkly/js-server-sdk-common bumped from ^1.2.2 to ^1.2.3
+
 ### Dependencies
 
 * The following workspace dependencies were updated

diff --git a/packages/sdk/akamai-edgekv/package.json b/packages/sdk/akamai-edgekv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@launchdarkly/akamai-server-edgekv-sdk",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Akamai LaunchDarkly EdgeWorker SDK for EdgeKV feature store",
   "homepage": "https://github.com/launchdarkly/js-core/tree/main/packages/sdk/akamai-edgekv",
   "repository": {
@@ -72,7 +72,7 @@
     "typescript": "5.1.6"
   },
   "dependencies": {
-    "@launchdarkly/akamai-edgeworker-sdk-common": "^0.3.3",
-    "@launchdarkly/js-server-sdk-common": "^1.2.2"
+    "@launchdarkly/akamai-edgeworker-sdk-common": "^0.3.4",
+    "@launchdarkly/js-server-sdk-common": "^1.2.3"
   }
 }
diff --git a/packages/sdk/cloudflare/CHANGELOG.md b/packages/sdk/cloudflare/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to the LaunchDarkly SDK for Cloudflare Workers will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org).
 
+## [2.1.4](https://github.com/launchdarkly/js-core/compare/cloudflare-server-sdk-v2.1.3...cloudflare-server-sdk-v2.1.4) (2023-09-06)
+
+### Bug Fixes
+
+* Use clientSideAvailability instead of clientSide for filtering client side flags. ([#270](https://github.com/launchdarkly/js-core/issues/270)) ([2702342](https://github.com/launchdarkly/js-core/commit/27023429d36986466cda46aa4d95eb01c10cd455))
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @launchdarkly/js-server-sdk-common-edge bumped from 1.0.12 to 1.0.13
+
 ### Dependencies
 
 * The following workspace dependencies were updated
@@ -14,6 +26,7 @@ All notable changes to the LaunchDarkly SDK for Cloudflare Workers will be docum
   * dependencies
     * @launchdarkly/js-server-sdk-common-edge bumped from 1.0.11 to 1.0.12
 
+
 ## [2.1.1](https://github.com/launchdarkly/js-core/compare/cloudflare-server-sdk-v2.1.0...cloudflare-server-sdk-v2.1.1) (2023-08-14)
 
 Updated common dependency includes performance improvements.

diff --git a/packages/sdk/cloudflare/package.json b/packages/sdk/cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@launchdarkly/cloudflare-server-sdk",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Cloudflare LaunchDarkly SDK",
   "homepage": "https://github.com/launchdarkly/js-core/tree/main/packages/sdk/cloudflare",
   "repository": {
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@cloudflare/workers-types": "^4.20230321.0",
-    "@launchdarkly/js-server-sdk-common-edge": "1.0.12",
+    "@launchdarkly/js-server-sdk-common-edge": "1.0.13",
     "crypto-js": "^4.1.1"
   },
   "devDependencies": {

diff --git a/packages/sdk/server-node/CHANGELOG.md b/packages/sdk/server-node/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 All notable changes to `@launchdarkly/node-server-sdk` will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [8.2.4](https://github.com/launchdarkly/js-core/compare/node-server-sdk-v8.2.3...node-server-sdk-v8.2.4) (2023-09-06)
+
+### Bug Fixes
+
+* Use clientSideAvailability instead of clientSide for filtering client side flags. ([#270](https://github.com/launchdarkly/js-core/issues/270)) ([2702342](https://github.com/launchdarkly/js-core/commit/27023429d36986466cda46aa4d95eb01c10cd455))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @launchdarkly/js-server-sdk-common bumped from 1.2.2 to 1.2.3
+
 ## [8.2.3](https://github.com/launchdarkly/js-core/compare/node-server-sdk-v8.2.2...node-server-sdk-v8.2.3) (2023-08-28)
 
 ## Fixes:

diff --git a/packages/sdk/server-node/package.json b/packages/sdk/server-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@launchdarkly/node-server-sdk",
-  "version": "8.2.3",
+  "version": "8.2.4",
   "description": "LaunchDarkly Server-Side SDK for Node.js",
   "homepage": "https://github.com/launchdarkly/js-core/tree/main/packages/sdk/server-node",
   "repository": {
@@ -45,7 +45,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@launchdarkly/js-server-sdk-common": "1.2.2",
+    "@launchdarkly/js-server-sdk-common": "1.2.3",
     "https-proxy-agent": "^5.0.1",
     "launchdarkly-eventsource": "2.0.1"
   },

diff --git a/packages/sdk/vercel/CHANGELOG.md b/packages/sdk/vercel/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to the LaunchDarkly SDK for Vercel Edge Config will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org).
 
+## [1.1.4](https://github.com/launchdarkly/js-core/compare/vercel-server-sdk-v1.1.3...vercel-server-sdk-v1.1.4) (2023-09-06)
+
+### Bug Fixes
+
+* Use clientSideAvailability instead of clientSide for filtering client side flags. ([#270](https://github.com/launchdarkly/js-core/issues/270)) ([2702342](https://github.com/launchdarkly/js-core/commit/27023429d36986466cda46aa4d95eb01c10cd455))
+
 ### Dependencies
 
 * The following workspace dependencies were updated
@@ -10,6 +16,12 @@ All notable changes to the LaunchDarkly SDK for Vercel Edge Config will be docum
 
 ### Dependencies
 
+* The following workspace dependencies were updated
+  * dependencies
+    * @launchdarkly/js-server-sdk-common-edge bumped from 1.0.12 to 1.0.13
+
+### Dependencies
+
 * The following workspace dependencies were updated
   * dependencies
     * @launchdarkly/js-server-sdk-common-edge bumped from 1.0.11 to 1.0.12

diff --git a/packages/sdk/vercel/package.json b/packages/sdk/vercel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@launchdarkly/vercel-server-sdk",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "LaunchDarkly Server-Side SDK for Vercel Edge",
   "homepage": "https://github.com/launchdarkly/js-core/tree/main/packages/sdk/vercel",
   "repository": {
@@ -36,7 +36,7 @@
     "check": "yarn prettier && yarn lint && yarn build && yarn test && yarn doc"
   },
   "dependencies": {
-    "@launchdarkly/js-server-sdk-common-edge": "1.0.12",
+    "@launchdarkly/js-server-sdk-common-edge": "1.0.13",
     "@vercel/edge-config": "^0.1.8",
     "crypto-js": "^4.1.1"
   },

diff --git a/packages/shared/akamai-edgeworker-sdk/CHANGELOG.md b/packages/shared/akamai-edgeworker-sdk/CHANGELOG.md
@@ -50,6 +50,20 @@ All notable changes to the LaunchDarkly SDK for Akamai Workers will be documente
   * dependencies
     * @launchdarkly/js-server-sdk-common bumped from ^1.2.1 to ^1.2.2
 
+## [0.3.4](https://github.com/launchdarkly/js-core/compare/akamai-edgeworker-sdk-common-v0.3.3...akamai-edgeworker-sdk-common-v0.3.4) (2023-09-06)
+
+
+### Bug Fixes
+
+* Use clientSideAvailability instead of clientSide for filtering client side flags. ([#270](https://github.com/launchdarkly/js-core/issues/270)) ([2702342](https://github.com/launchdarkly/js-core/commit/27023429d36986466cda46aa4d95eb01c10cd455))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @launchdarkly/js-server-sdk-common bumped from ^1.2.2 to ^1.2.3
+
 ## [0.3.0](https://github.com/launchdarkly/js-core/compare/akamai-edgeworker-sdk-common-v0.2.7...akamai-edgeworker-sdk-common-v0.3.0) (2023-08-14)
 
 

diff --git a/packages/shared/akamai-edgeworker-sdk/package.json b/packages/shared/akamai-edgeworker-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@launchdarkly/akamai-edgeworker-sdk-common",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "homepage": "https://github.com/launchdarkly/js-core/tree/main/packages/shared/akamai-edge-sdk",
   "repository": {
     "type": "git",
@@ -54,7 +54,7 @@
     "typescript": "5.1.6"
   },
   "dependencies": {
-    "@launchdarkly/js-server-sdk-common": "^1.2.2",
+    "@launchdarkly/js-server-sdk-common": "^1.2.3",
     "crypto-js": "^4.1.1"
   }
 }
diff --git a/packages/shared/akamai-edgeworker-sdk/src/__tests__/testData.json b/packages/shared/akamai-edgeworker-sdk/src/__tests__/testData.json
@@ -97,7 +97,7 @@
       "variations": [true, false],
       "clientSideAvailability": {
         "usingMobileKey": true,
-        "usingEnvironmentId": true
+        "usingEnvironmentId": false
       },
       "clientSide": false,
       "salt": "aef830243d6640d0a973be89988e008d",

diff --git a/packages/shared/sdk-server-edge/CHANGELOG.md b/packages/shared/sdk-server-edge/CHANGELOG.md
@@ -60,6 +60,12 @@
   * dependencies
     * @launchdarkly/js-server-sdk-common bumped from 1.2.1 to 1.2.2
 
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @launchdarkly/js-server-sdk-common bumped from 1.2.2 to 1.2.3
+
 ## [1.0.8](https://github.com/launchdarkly/js-core/compare/js-server-sdk-common-edge-v1.0.7...js-server-sdk-common-edge-v1.0.8) (2023-08-10)
 
 

diff --git a/packages/shared/sdk-server-edge/package.json b/packages/shared/sdk-server-edge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@launchdarkly/js-server-sdk-common-edge",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "homepage": "https://github.com/launchdarkly/js-core/tree/main/packages/shared/sdk-server-edge",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "check": "yarn prettier && yarn lint && yarn build && yarn test && yarn doc"
   },
   "dependencies": {
-    "@launchdarkly/js-server-sdk-common": "1.2.2",
+    "@launchdarkly/js-server-sdk-common": "1.2.3",
     "crypto-js": "^4.1.1"
   },
   "devDependencies": {

diff --git a/packages/shared/sdk-server/CHANGELOG.md b/packages/shared/sdk-server/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to `@launchdarkly/js-server-sdk-common` will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [1.2.3](https://github.com/launchdarkly/js-core/compare/js-server-sdk-common-v1.2.2...js-server-sdk-common-v1.2.3) (2023-09-06)
+
+
+### Bug Fixes
+
+* Use clientSideAvailability instead of clientSide for filtering client side flags. ([#270](https://github.com/launchdarkly/js-core/issues/270)) ([2702342](https://github.com/launchdarkly/js-core/commit/27023429d36986466cda46aa4d95eb01c10cd455))
+
 ## [1.2.2](https://github.com/launchdarkly/js-core/compare/js-server-sdk-common-v1.2.1...js-server-sdk-common-v1.2.2) (2023-08-28)
 
 

diff --git a/packages/shared/sdk-server/__tests__/LDClient.allFlags.test.ts b/packages/shared/sdk-server/__tests__/LDClient.allFlags.test.ts
@@ -108,28 +108,28 @@ describe('given an LDClient with test data', () => {
       on: false,
       offVariation: 0,
       variations: ['a'],
-      clientSide: false,
     });
     td.usePreconfiguredFlag({
       key: 'server-side-2',
       on: false,
       offVariation: 0,
       variations: ['b'],
-      clientSide: false,
+      // Absence and false should be equivalent, so we add a false one here.
+      clientSideAvailability: { usingEnvironmentId: false },
     });
     td.usePreconfiguredFlag({
       key: 'client-side-1',
       on: false,
       offVariation: 0,
       variations: ['value1'],
-      clientSide: true,
+      clientSideAvailability: { usingEnvironmentId: true },
     });
     td.usePreconfiguredFlag({
       key: 'client-side-2',
       on: false,
       offVariation: 0,
       variations: ['value2'],
-      clientSide: true,
+      clientSideAvailability: { usingEnvironmentId: true },
     });
     const state = await client.allFlagsState(defaultUser, { clientSideOnly: true });
     expect(state.valid).toEqual(true);
@@ -241,28 +241,26 @@ describe('given an LDClient with test data', () => {
       on: false,
       offVariation: 0,
       variations: ['a'],
-      clientSide: false,
     });
     td.usePreconfiguredFlag({
       key: 'server-side-2',
       on: false,
       offVariation: 0,
       variations: ['b'],
-      clientSide: false,
     });
     td.usePreconfiguredFlag({
       key: 'client-side-1',
       on: false,
       offVariation: 0,
       variations: ['value1'],
-      clientSide: true,
+      clientSideAvailability: { usingEnvironmentId: true },
     });
     td.usePreconfiguredFlag({
       key: 'client-side-2',
       on: false,
       offVariation: 0,
       variations: ['value2'],
-      clientSide: true,
+      clientSideAvailability: { usingEnvironmentId: true },
     });
     client.allFlagsState(defaultUser, { clientSideOnly: true }, (err, state) => {
       expect(state.valid).toEqual(true);

diff --git a/packages/shared/sdk-server/package.json b/packages/shared/sdk-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@launchdarkly/js-server-sdk-common",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "type": "commonjs",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/shared/sdk-server/src/LDClientImpl.ts b/packages/shared/sdk-server/src/LDClientImpl.ts
@@ -301,7 +301,7 @@ export default class LDClientImpl implements LDClient {
             Object.values(allFlags),
             (storeItem, iterCb) => {
               const flag = storeItem as Flag;
-              if (clientOnly && !flag.clientSide) {
+              if (clientOnly && !flag.clientSideAvailability?.usingEnvironmentId) {
                 iterCb(true);
                 return;
               }