From 75c7b381eb31cee84a8e0baf04952bab0abc7943 Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Wed, 29 Apr 2020 11:10:37 -0700 Subject: [PATCH] removed react native client engine --- packages/optimizely-sdk/lib/index.react_native.js | 7 +------ packages/optimizely-sdk/lib/index.react_native.tests.js | 8 ++++---- packages/optimizely-sdk/lib/utils/enums/index.js | 6 ------ 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/packages/optimizely-sdk/lib/index.react_native.js b/packages/optimizely-sdk/lib/index.react_native.js index f94407977..38dccc1bc 100644 --- a/packages/optimizely-sdk/lib/index.react_native.js +++ b/packages/optimizely-sdk/lib/index.react_native.js @@ -78,7 +78,7 @@ var createInstance = function(config) { config = fns.assign( { - clientEngine: enums.REACT_NATIVE_JS_CLIENT_ENGINE, + clientEngine: enums.JAVASCRIPT_CLIENT_ENGINE, eventBatchSize: DEFAULT_EVENT_BATCH_SIZE, eventDispatcher: defaultEventDispatcher, eventFlushInterval: DEFAULT_EVENT_FLUSH_INTERVAL, @@ -91,11 +91,6 @@ var createInstance = function(config) { } ); - // If client engine is react, convert it to react native - if (config.clientEngine === enums.REACT_CLIENT_ENGINE) { - config.clientEngine = enums.REACT_NATIVE_CLIENT_ENGINE - } - if (!eventProcessorConfigValidator.validateEventBatchSize(config.eventBatchSize)) { logger.warn('Invalid eventBatchSize %s, defaulting to %s', config.eventBatchSize, DEFAULT_EVENT_BATCH_SIZE); config.eventBatchSize = DEFAULT_EVENT_BATCH_SIZE; diff --git a/packages/optimizely-sdk/lib/index.react_native.tests.js b/packages/optimizely-sdk/lib/index.react_native.tests.js index 701b8ae9f..169443236 100644 --- 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() { assert.equal(optlyInstance.clientVersion, '4.0.0-rc.2'); }); - it('should set the React Native JS client engine and javascript SDK version', function() { + it('should set the Javascript client engine and version', function() { var optlyInstance = optimizelyFactory.createInstance({ datafile: {}, errorHandler: fakeErrorHandler, @@ -101,11 +101,11 @@ describe('javascript-sdk/react-native', function() { }); // Invalid datafile causes onReady Promise rejection - catch this error optlyInstance.onReady().catch(function() {}); - assert.equal('react-native-js-sdk', optlyInstance.clientEngine); + assert.equal('javascript-sdk', optlyInstance.clientEngine); assert.equal(packageJSON.version, optlyInstance.clientVersion); }); - it('should allow passing of "react-sdk" as the clientEngine and convert it to "react-native-sdk"', function() { + it('should allow passing of "react-sdk" as the clientEngine', function() { var optlyInstance = optimizelyFactory.createInstance({ clientEngine: 'react-sdk', datafile: {}, @@ -115,7 +115,7 @@ describe('javascript-sdk/react-native', function() { }); // Invalid datafile causes onReady Promise rejection - catch this error optlyInstance.onReady().catch(function() {}); - assert.equal('react-native-sdk', optlyInstance.clientEngine); + assert.equal('react-sdk', optlyInstance.clientEngine); }); it('should activate with provided event dispatcher', function() { diff --git a/packages/optimizely-sdk/lib/utils/enums/index.js b/packages/optimizely-sdk/lib/utils/enums/index.js index d213bb6d2..5182d2c51 100644 --- a/packages/optimizely-sdk/lib/utils/enums/index.js +++ b/packages/optimizely-sdk/lib/utils/enums/index.js @@ -173,16 +173,12 @@ export var CONTROL_ATTRIBUTES = { export var JAVASCRIPT_CLIENT_ENGINE = 'javascript-sdk'; export var NODE_CLIENT_ENGINE = 'node-sdk'; export var REACT_CLIENT_ENGINE = 'react-sdk'; -export var REACT_NATIVE_CLIENT_ENGINE = 'react-native-sdk'; -export var REACT_NATIVE_JS_CLIENT_ENGINE = 'react-native-js-sdk'; export var NODE_CLIENT_VERSION = '4.0.0-rc.2'; export var VALID_CLIENT_ENGINES = [ NODE_CLIENT_ENGINE, REACT_CLIENT_ENGINE, JAVASCRIPT_CLIENT_ENGINE, - REACT_NATIVE_CLIENT_ENGINE, - REACT_NATIVE_JS_CLIENT_ENGINE, ]; export var NOTIFICATION_TYPES = notificationTypesEnum; @@ -233,8 +229,6 @@ export default { JAVASCRIPT_CLIENT_ENGINE: JAVASCRIPT_CLIENT_ENGINE, NODE_CLIENT_ENGINE: NODE_CLIENT_ENGINE, REACT_CLIENT_ENGINE: REACT_CLIENT_ENGINE, - REACT_NATIVE_CLIENT_ENGINE: REACT_NATIVE_CLIENT_ENGINE, - REACT_NATIVE_JS_CLIENT_ENGINE: REACT_NATIVE_JS_CLIENT_ENGINE, NODE_CLIENT_VERSION: NODE_CLIENT_VERSION, VALID_CLIENT_ENGINES: VALID_CLIENT_ENGINES, NOTIFICATION_TYPES: NOTIFICATION_TYPES,