Merge branch 'master' into fayyaz/replace_lodash_isEmpty

Matt Carroll · Matt Carroll · commit 89f476c8c76d · 2020-02-21T14:37:08.000-08:00
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(): Promise<{ success: boolean; reason?: string }>;
   }
 
   // An event to be submitted to Optimizely, enabling tracking the reach and impact of
diff --git a/packages/optimizely-sdk/lib/plugins/event_dispatcher/index.browser.js b/packages/optimizely-sdk/lib/plugins/event_dispatcher/index.browser.js
@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var fns = require('../../utils/fns');
-
 var POST_METHOD = 'POST';
 var GET_METHOD = 'GET';
 var READYSTATE_COMPLETE = 4;
@@ -68,7 +66,7 @@ module.exports = {
 };
 
 var toQueryString = function(obj) {
-  return fns.map(obj, function(v, k) {
-    return encodeURIComponent(k) + '=' + encodeURIComponent(v);
+  return Object.keys(obj).map(function(k) {
+    return encodeURIComponent(k) + '=' + encodeURIComponent(obj[k]);
   }).join('&');
 };
diff --git a/packages/optimizely-sdk/lib/utils/fns/index.js b/packages/optimizely-sdk/lib/utils/fns/index.js
@@ -24,14 +24,12 @@ module.exports = {
   currentTimestamp: function() {
     return Math.round(new Date().getTime());
   },
-  isArray: require('lodash/isArray'),
   isFinite: function(number) {
     return _isFinite(number) && Math.abs(number) <= MAX_NUMBER_LIMIT;
   },
   keyBy: require('lodash/keyBy'),
   forEach: require('lodash/forEach'),
   forOwn: require('lodash/forOwn'),
-  map: require('lodash/map'),
   uuid: function() {
     return uuid.v4();
   },
diff --git a/packages/optimizely-sdk/lib/utils/json_schema_validator/index.js b/packages/optimizely-sdk/lib/utils/json_schema_validator/index.js
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var fns = require('../fns');
 var validate = require('json-schema').validate;
 var sprintf = require('@optimizely/js-sdk-utils').sprintf;
 
@@ -40,7 +39,7 @@ module.exports = {
     if (result.valid) {
       return true;
     } else {
-      if (fns.isArray(result.errors)) {
+      if (Array.isArray(result.errors)) {
         throw new Error(sprintf(ERROR_MESSAGES.INVALID_DATAFILE, MODULE_NAME, result.errors[0].property, result.errors[0].message));
       }
       throw new Error(sprintf(ERROR_MESSAGES.INVALID_JSON, MODULE_NAME));

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ declare module "@optimizely/optimizely-sdk" {`
`115`	`115`	`onReady(options?: {`
`116`	`116`	`timeout?: number;`
`117`	`117`	`}): Promise<{ success: boolean; reason?: string }>;`
`118`		`- close(): void;`
	`118`	`+ close(): Promise<{ success: boolean; reason?: string }>;`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`// An event to be submitted to Optimizely, enabling tracking the reach and impact of`