From 0599cd3442b5be5e8e60561752180f6ffc574ea3 Mon Sep 17 00:00:00 2001 From: Spencer Wilson Date: Mon, 20 Aug 2018 16:32:14 -0700 Subject: [PATCH 1/2] chore(deps): Migrate from sprintf -> sprintf-js --- packages/optimizely-sdk/package-lock.json | 20 +++++++++++--------- packages/optimizely-sdk/package.json | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/optimizely-sdk/package-lock.json b/packages/optimizely-sdk/package-lock.json index 8742602d6..15aa9a59d 100644 --- a/packages/optimizely-sdk/package-lock.json +++ b/packages/optimizely-sdk/package-lock.json @@ -196,6 +196,14 @@ "dev": true, "requires": { "sprintf-js": "~1.0.2" + }, + "dependencies": { + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + } } }, "arr-diff": { @@ -6510,16 +6518,10 @@ "extend-shallow": "^3.0.0" } }, - "sprintf": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz", - "integrity": "sha1-j4PjmpMXwaUCy324BQ5Rxnn27c8=" - }, "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz", + "integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=" }, "sshpk": { "version": "1.14.1", diff --git a/packages/optimizely-sdk/package.json b/packages/optimizely-sdk/package.json index 1558a7ed7..c38d369c2 100644 --- a/packages/optimizely-sdk/package.json +++ b/packages/optimizely-sdk/package.json @@ -32,7 +32,7 @@ "json-schema": "^0.2.3", "lodash": "^4.0.0", "murmurhash": "0.0.2", - "sprintf": "^0.1.5", + "sprintf-js": "^1.1.1", "uuid": "^3.0.1" }, "devDependencies": { From d93b369c84c9812eca3d931967659330744d158c Mon Sep 17 00:00:00 2001 From: Spencer Wilson Date: Mon, 20 Aug 2018 16:33:28 -0700 Subject: [PATCH 2/2] Port imports to new format --- packages/optimizely-sdk/lib/core/bucketer/index.js | 2 +- packages/optimizely-sdk/lib/core/bucketer/index.tests.js | 2 +- packages/optimizely-sdk/lib/core/decision_service/index.js | 2 +- .../optimizely-sdk/lib/core/decision_service/index.tests.js | 2 +- packages/optimizely-sdk/lib/core/notification_center/index.js | 2 +- packages/optimizely-sdk/lib/core/project_config/index.js | 2 +- packages/optimizely-sdk/lib/core/project_config/index.tests.js | 2 +- packages/optimizely-sdk/lib/index.node.js | 2 +- packages/optimizely-sdk/lib/optimizely/index.js | 2 +- packages/optimizely-sdk/lib/optimizely/index.tests.js | 2 +- packages/optimizely-sdk/lib/utils/attributes_validator/index.js | 2 +- .../lib/utils/attributes_validator/index.tests.js | 2 +- packages/optimizely-sdk/lib/utils/config_validator/index.js | 2 +- .../optimizely-sdk/lib/utils/config_validator/index.tests.js | 2 +- packages/optimizely-sdk/lib/utils/event_tag_utils/index.js | 2 +- packages/optimizely-sdk/lib/utils/event_tags_validator/index.js | 2 +- .../lib/utils/event_tags_validator/index.tests.js | 2 +- .../optimizely-sdk/lib/utils/json_schema_validator/index.js | 2 +- .../lib/utils/json_schema_validator/index.tests.js | 2 +- .../lib/utils/user_profile_service_validator/index.js | 2 +- .../lib/utils/user_profile_service_validator/index.tests.js | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/optimizely-sdk/lib/core/bucketer/index.js b/packages/optimizely-sdk/lib/core/bucketer/index.js index dc6149f90..964bbc423 100644 --- a/packages/optimizely-sdk/lib/core/bucketer/index.js +++ b/packages/optimizely-sdk/lib/core/bucketer/index.js @@ -19,7 +19,7 @@ */ var enums = require('../../utils/enums'); var murmurhash = require('murmurhash'); -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var ERROR_MESSAGES = enums.ERROR_MESSAGES; var HASH_SEED = 1; diff --git a/packages/optimizely-sdk/lib/core/bucketer/index.tests.js b/packages/optimizely-sdk/lib/core/bucketer/index.tests.js index e54db86c1..40117251d 100644 --- a/packages/optimizely-sdk/lib/core/bucketer/index.tests.js +++ b/packages/optimizely-sdk/lib/core/bucketer/index.tests.js @@ -17,7 +17,7 @@ var bucketer = require('./'); var enums = require('../../utils/enums'); var logger = require('../../plugins/logger'); var projectConfig = require('../project_config'); -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var testData = require('../../tests/test_data').getTestProjectConfig(); var chai = require('chai'); diff --git a/packages/optimizely-sdk/lib/core/decision_service/index.js b/packages/optimizely-sdk/lib/core/decision_service/index.js index 7a549131f..214473316 100644 --- a/packages/optimizely-sdk/lib/core/decision_service/index.js +++ b/packages/optimizely-sdk/lib/core/decision_service/index.js @@ -20,7 +20,7 @@ var enums = require('../../utils/enums'); var fns = require('../../utils/fns'); var projectConfig = require('../project_config'); -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var MODULE_NAME = 'DECISION_SERVICE'; var ERROR_MESSAGES = enums.ERROR_MESSAGES; diff --git a/packages/optimizely-sdk/lib/core/decision_service/index.tests.js b/packages/optimizely-sdk/lib/core/decision_service/index.tests.js index 1e4a3ec2a..b757f1b5d 100644 --- a/packages/optimizely-sdk/lib/core/decision_service/index.tests.js +++ b/packages/optimizely-sdk/lib/core/decision_service/index.tests.js @@ -23,7 +23,7 @@ var DecisionService = require('./'); var enums = require('../../utils/enums'); var logger = require('../../plugins/logger'); var projectConfig = require('../project_config'); -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var testData = require('../../tests/test_data').getTestProjectConfig(); var testDataWithFeatures = require('../../tests/test_data').getTestProjectConfigWithFeatures(); var jsonSchemaValidator = require('../../utils/json_schema_validator'); diff --git a/packages/optimizely-sdk/lib/core/notification_center/index.js b/packages/optimizely-sdk/lib/core/notification_center/index.js index e923aca51..44025bdbc 100644 --- a/packages/optimizely-sdk/lib/core/notification_center/index.js +++ b/packages/optimizely-sdk/lib/core/notification_center/index.js @@ -16,7 +16,7 @@ var enums = require('../../utils/enums'); var fns = require('../../utils/fns'); -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var LOG_LEVEL = enums.LOG_LEVEL; var LOG_MESSAGES = enums.LOG_MESSAGES; diff --git a/packages/optimizely-sdk/lib/core/project_config/index.js b/packages/optimizely-sdk/lib/core/project_config/index.js index 47f232003..87256fc74 100644 --- a/packages/optimizely-sdk/lib/core/project_config/index.js +++ b/packages/optimizely-sdk/lib/core/project_config/index.js @@ -15,7 +15,7 @@ */ var fns = require('../../utils/fns'); var enums = require('../../utils/enums'); -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var EXPERIMENT_LAUNCHED_STATUS = 'Launched'; var EXPERIMENT_RUNNING_STATUS = 'Running'; diff --git a/packages/optimizely-sdk/lib/core/project_config/index.tests.js b/packages/optimizely-sdk/lib/core/project_config/index.tests.js index ae0315904..5daaef45c 100644 --- a/packages/optimizely-sdk/lib/core/project_config/index.tests.js +++ b/packages/optimizely-sdk/lib/core/project_config/index.tests.js @@ -23,7 +23,7 @@ var chai = require('chai'); var assert = chai.assert; var logger = require('../../plugins/logger'); var sinon = require('sinon'); -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var ERROR_MESSAGES = enums.ERROR_MESSAGES; var FEATURE_VARIABLE_TYPES = enums.FEATURE_VARIABLE_TYPES; diff --git a/packages/optimizely-sdk/lib/index.node.js b/packages/optimizely-sdk/lib/index.node.js index e4b772705..d7b69bf0f 100644 --- a/packages/optimizely-sdk/lib/index.node.js +++ b/packages/optimizely-sdk/lib/index.node.js @@ -21,7 +21,7 @@ var enums = require('./utils/enums'); var fns = require('./utils/fns'); var jsonSchemaValidator = require('./utils/json_schema_validator'); var logger = require('./plugins/logger'); -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var Optimizely = require('./optimizely'); diff --git a/packages/optimizely-sdk/lib/optimizely/index.js b/packages/optimizely-sdk/lib/optimizely/index.js index 92cb19468..e8fb3d028 100644 --- a/packages/optimizely-sdk/lib/optimizely/index.js +++ b/packages/optimizely-sdk/lib/optimizely/index.js @@ -23,7 +23,7 @@ var eventTagsValidator = require('../utils/event_tags_validator'); var notificationCenter = require('../core/notification_center'); var projectConfig = require('../core/project_config'); var projectConfigSchema = require('./project_config_schema'); -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var userProfileServiceValidator = require('../utils/user_profile_service_validator'); var stringValidator = require('../utils/string_value_validator'); diff --git a/packages/optimizely-sdk/lib/optimizely/index.tests.js b/packages/optimizely-sdk/lib/optimizely/index.tests.js index c9c167a92..bf8b88588 100644 --- a/packages/optimizely-sdk/lib/optimizely/index.tests.js +++ b/packages/optimizely-sdk/lib/optimizely/index.tests.js @@ -32,7 +32,7 @@ var projectConfig = require('../core/project_config'); var chai = require('chai'); var assert = chai.assert; var sinon = require('sinon'); -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var uuid = require('uuid'); var ERROR_MESSAGES = enums.ERROR_MESSAGES; diff --git a/packages/optimizely-sdk/lib/utils/attributes_validator/index.js b/packages/optimizely-sdk/lib/utils/attributes_validator/index.js index ae4a96532..7e38c1ade 100644 --- a/packages/optimizely-sdk/lib/utils/attributes_validator/index.js +++ b/packages/optimizely-sdk/lib/utils/attributes_validator/index.js @@ -18,7 +18,7 @@ * Provides utility method for validating that the attributes user has provided are valid */ -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var lodashForOwn = require('lodash/forOwn'); var ERROR_MESSAGES = require('../enums').ERROR_MESSAGES; diff --git a/packages/optimizely-sdk/lib/utils/attributes_validator/index.tests.js b/packages/optimizely-sdk/lib/utils/attributes_validator/index.tests.js index 1fc946a0d..6abd5862e 100644 --- a/packages/optimizely-sdk/lib/utils/attributes_validator/index.tests.js +++ b/packages/optimizely-sdk/lib/utils/attributes_validator/index.tests.js @@ -15,7 +15,7 @@ */ var chai = require('chai'); var assert = chai.assert; -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var attributesValidator = require('./'); var ERROR_MESSAGES = require('../enums').ERROR_MESSAGES; diff --git a/packages/optimizely-sdk/lib/utils/config_validator/index.js b/packages/optimizely-sdk/lib/utils/config_validator/index.js index 13551d1f7..0e173c48f 100644 --- a/packages/optimizely-sdk/lib/utils/config_validator/index.js +++ b/packages/optimizely-sdk/lib/utils/config_validator/index.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var ERROR_MESSAGES = require('../enums').ERROR_MESSAGES; var MODULE_NAME = 'CONFIG_VALIDATOR'; diff --git a/packages/optimizely-sdk/lib/utils/config_validator/index.tests.js b/packages/optimizely-sdk/lib/utils/config_validator/index.tests.js index dab89e8cd..3d4d64b01 100644 --- a/packages/optimizely-sdk/lib/utils/config_validator/index.tests.js +++ b/packages/optimizely-sdk/lib/utils/config_validator/index.tests.js @@ -16,7 +16,7 @@ var chai = require('chai'); var assert = chai.assert; var configValidator = require('./'); -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var ERROR_MESSAGES = require('../enums').ERROR_MESSAGES; diff --git a/packages/optimizely-sdk/lib/utils/event_tag_utils/index.js b/packages/optimizely-sdk/lib/utils/event_tag_utils/index.js index 95fc70cd1..ac3745735 100644 --- a/packages/optimizely-sdk/lib/utils/event_tag_utils/index.js +++ b/packages/optimizely-sdk/lib/utils/event_tag_utils/index.js @@ -18,7 +18,7 @@ * Provides utility method for parsing event tag values */ var enums = require('../enums'); -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var LOG_LEVEL = enums.LOG_LEVEL; var LOG_MESSAGES = enums.LOG_MESSAGES; diff --git a/packages/optimizely-sdk/lib/utils/event_tags_validator/index.js b/packages/optimizely-sdk/lib/utils/event_tags_validator/index.js index 759cb4915..f10177c9e 100644 --- a/packages/optimizely-sdk/lib/utils/event_tags_validator/index.js +++ b/packages/optimizely-sdk/lib/utils/event_tags_validator/index.js @@ -18,7 +18,7 @@ * Provides utility method for validating that event tags user has provided are valid */ -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var ERROR_MESSAGES = require('../enums').ERROR_MESSAGES; var MODULE_NAME = 'EVENT_TAGS_VALIDATOR'; diff --git a/packages/optimizely-sdk/lib/utils/event_tags_validator/index.tests.js b/packages/optimizely-sdk/lib/utils/event_tags_validator/index.tests.js index 672f6271d..bf775c9a0 100644 --- a/packages/optimizely-sdk/lib/utils/event_tags_validator/index.tests.js +++ b/packages/optimizely-sdk/lib/utils/event_tags_validator/index.tests.js @@ -15,7 +15,7 @@ */ var chai = require('chai'); var assert = chai.assert; -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var eventTagsValidator = require('./'); var ERROR_MESSAGES = require('../enums').ERROR_MESSAGES; diff --git a/packages/optimizely-sdk/lib/utils/json_schema_validator/index.js b/packages/optimizely-sdk/lib/utils/json_schema_validator/index.js index 40206ee2c..aef06c827 100644 --- a/packages/optimizely-sdk/lib/utils/json_schema_validator/index.js +++ b/packages/optimizely-sdk/lib/utils/json_schema_validator/index.js @@ -15,7 +15,7 @@ */ var fns = require('../fns'); var validate = require('json-schema').validate; -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var ERROR_MESSAGES = require('../enums').ERROR_MESSAGES; var MODULE_NAME = 'JSON_SCHEMA_VALIDATOR'; diff --git a/packages/optimizely-sdk/lib/utils/json_schema_validator/index.tests.js b/packages/optimizely-sdk/lib/utils/json_schema_validator/index.tests.js index a73efb0b0..f6389243f 100644 --- a/packages/optimizely-sdk/lib/utils/json_schema_validator/index.tests.js +++ b/packages/optimizely-sdk/lib/utils/json_schema_validator/index.tests.js @@ -17,7 +17,7 @@ var chai = require('chai'); var assert = chai.assert; var jsonSchemaValidator = require('./'); var projectConfigSchema = require('../../optimizely/project_config_schema'); -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var testData = require('../../tests/test_data.js'); var ERROR_MESSAGES = require('../enums').ERROR_MESSAGES; diff --git a/packages/optimizely-sdk/lib/utils/user_profile_service_validator/index.js b/packages/optimizely-sdk/lib/utils/user_profile_service_validator/index.js index d69340909..366e1e20f 100644 --- a/packages/optimizely-sdk/lib/utils/user_profile_service_validator/index.js +++ b/packages/optimizely-sdk/lib/utils/user_profile_service_validator/index.js @@ -18,7 +18,7 @@ * Provides utility method for validating that the given user profile service implementation is valid. */ -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var ERROR_MESSAGES = require('../enums').ERROR_MESSAGES; var MODULE_NAME = 'USER_PROFILE_SERVICE_VALIDATOR'; diff --git a/packages/optimizely-sdk/lib/utils/user_profile_service_validator/index.tests.js b/packages/optimizely-sdk/lib/utils/user_profile_service_validator/index.tests.js index e8824b6a1..88660875f 100644 --- a/packages/optimizely-sdk/lib/utils/user_profile_service_validator/index.tests.js +++ b/packages/optimizely-sdk/lib/utils/user_profile_service_validator/index.tests.js @@ -16,7 +16,7 @@ var chai = require('chai'); var assert = chai.assert; -var sprintf = require('sprintf'); +var sprintf = require('sprintf-js').sprintf; var userProfileServiceValidator = require('./'); var ERROR_MESSAGES = require('../enums').ERROR_MESSAGES;