Merge branch 'master' into zeeshan/replace-lodash-keyby

zashraf1985 · web-flow · commit b3d1077ea1d7 · 2020-02-20T14:34:47.000-08:00
diff --git a/packages/optimizely-sdk/CHANGELOG.MD b/packages/optimizely-sdk/CHANGELOG.MD
@@ -5,8 +5,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [3.5.0] - February 20th, 2020
+
 ### Bug fixes
 - Fixed default event dispatcher not used in React Native entry point ([#383](https://github.com/optimizely/javascript-sdk/pull/383))
+- Fixed errors in `getOptimizelyConfig` TypeScript type definitions ([#406](https://github.com/optimizely/javascript-sdk/pull/406))
 
 ### New Features
 - Promise returned from `close` tracks the state of in-flight event dispatcher requests ([#404](https://github.com/optimizely/javascript-sdk/pull/404))
diff --git a/packages/optimizely-sdk/lib/index.browser.tests.js b/packages/optimizely-sdk/lib/index.browser.tests.js
@@ -148,7 +148,7 @@ describe('javascript-sdk', function() {
         optlyInstance.onReady().catch(function() {});
 
         assert.instanceOf(optlyInstance, Optimizely);
-        assert.equal(optlyInstance.clientVersion, '3.4.1');
+        assert.equal(optlyInstance.clientVersion, '3.5.0');
       });
 
       it('should set the JavaScript client engine and version', function() {
diff --git a/packages/optimizely-sdk/lib/index.d.ts b/packages/optimizely-sdk/lib/index.d.ts
@@ -115,7 +115,7 @@ declare module "@optimizely/optimizely-sdk" {
     onReady(options?: {
       timeout?: number;
     }): Promise<{ success: boolean; reason?: string }>;
-    close(): void;    
+    close(): void;
   }
 
   // An event to be submitted to Optimizely, enabling tracking the reach and impact of
@@ -225,53 +225,41 @@ declare module "@optimizely/optimizely-sdk" {
     type: string;
     value: string;
   }
-  
+
   export interface OptimizelyVariation {
     id: string;
     key: string;
     featureEnabled?: boolean;
     variablesMap: {
-      [variableKey: string]: {
-        variable: OptimizelyVariable;
-      };
+      [variableKey: string]: OptimizelyVariable;
     };
   }
 
   export interface OptimizelyExperiment {
     id: string;
     key: string;
     variationsMap: {
-      [variationKey: string]: {
-        variation: OptimizelyVariation;
-      };
+      [variationKey: string]: OptimizelyVariation;
     };
   }
 
   export interface OptimizelyFeature {
     id: string;
     key: string;
     experimentsMap: {
-      [experimentKey: string]: {
-        experiment: OptimizelyExperiment;
-      };
+      [experimentKey: string]: OptimizelyExperiment;
     };
     variablesMap: {
-      [variableKey: string]: {
-        variable: OptimizelyVariable;
-      };
+      [variableKey: string]: OptimizelyVariable;
     };
   }
 
   export interface OptimizelyConfig {
     experimentsMap: {
-      [experimentKey: string]: {
-        experiment: OptimizelyExperiment;
-      };
+      [experimentKey: string]: OptimizelyExperiment;
     };
     featuresMap: {
-      [featureKey: string]: {
-        feature: OptimizelyFeature;
-      };
+      [featureKey: string]: OptimizelyFeature;
     };
     revision: string;
   }
diff --git a/packages/optimizely-sdk/lib/index.node.tests.js b/packages/optimizely-sdk/lib/index.node.tests.js
@@ -92,7 +92,7 @@ describe('optimizelyFactory', function() {
         optlyInstance.onReady().catch(function() {});
 
         assert.instanceOf(optlyInstance, Optimizely);
-        assert.equal(optlyInstance.clientVersion, '3.4.1');
+        assert.equal(optlyInstance.clientVersion, '3.5.0');
       });
 
       describe('event processor configuration', function() {
diff --git a/packages/optimizely-sdk/lib/index.react_native.tests.js b/packages/optimizely-sdk/lib/index.react_native.tests.js
@@ -92,7 +92,7 @@ describe('javascript-sdk/react-native', function() {
         optlyInstance.onReady().catch(function() {});
 
         assert.instanceOf(optlyInstance, Optimizely);
-        assert.equal(optlyInstance.clientVersion, '3.4.1');
+        assert.equal(optlyInstance.clientVersion, '3.5.0');
       });
 
       it('should set the JavaScript client engine and version', function() {
diff --git a/packages/optimizely-sdk/lib/utils/enums/index.js b/packages/optimizely-sdk/lib/utils/enums/index.js
@@ -159,7 +159,7 @@ exports.CONTROL_ATTRIBUTES = {
 exports.JAVASCRIPT_CLIENT_ENGINE = 'javascript-sdk';
 exports.NODE_CLIENT_ENGINE = 'node-sdk';
 exports.REACT_CLIENT_ENGINE = 'react-sdk';
-exports.NODE_CLIENT_VERSION = '3.4.1';
+exports.NODE_CLIENT_VERSION = '3.5.0';
 
 exports.VALID_CLIENT_ENGINES = [
   exports.NODE_CLIENT_ENGINE,
diff --git a/packages/optimizely-sdk/package-lock.json b/packages/optimizely-sdk/package-lock.json
diff --git a/packages/optimizely-sdk/package.json b/packages/optimizely-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@optimizely/optimizely-sdk",
-  "version": "3.4.1",
+  "version": "3.5.0",
   "description": "JavaScript SDK for Optimizely X Full Stack",
   "main": "lib/index.node.js",
   "browser": "lib/index.browser.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@optimizely/optimizely-sdk",`
`3`		`- "version": "3.4.1",`
	`3`	`+ "version": "3.5.0",`
`4`	`4`	`"description": "JavaScript SDK for Optimizely X Full Stack",`
`5`	`5`	`"main": "lib/index.node.js",`
`6`	`6`	`"browser": "lib/index.browser.js",`