From 82e1db02075fe8a50dea002c3c5d2120e68f170b Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Tue, 25 Feb 2020 18:43:29 -0800 Subject: [PATCH 1/8] removed promise polyfill --- packages/optimizely-sdk/lib/index.browser.js | 1 - packages/optimizely-sdk/package.json | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/optimizely-sdk/lib/index.browser.js b/packages/optimizely-sdk/lib/index.browser.js index af6ffba08..089363ffd 100644 --- a/packages/optimizely-sdk/lib/index.browser.js +++ b/packages/optimizely-sdk/lib/index.browser.js @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -require('promise-polyfill/dist/polyfill'); var logging = require('@optimizely/js-sdk-logging'); var fns = require('./utils/fns'); var configValidator = require('./utils/config_validator'); diff --git a/packages/optimizely-sdk/package.json b/packages/optimizely-sdk/package.json index 3304b396e..5d42a2141 100644 --- a/packages/optimizely-sdk/package.json +++ b/packages/optimizely-sdk/package.json @@ -40,7 +40,6 @@ "json-schema": "^0.2.3", "lodash": "^4.17.11", "murmurhash": "0.0.2", - "promise-polyfill": "8.1.0", "uuid": "^3.3.2" }, "devDependencies": { From 38f52d7ca187844b4d448137a72059c118bffeb4 Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Tue, 25 Feb 2020 18:52:41 -0800 Subject: [PATCH 2/8] removed i.e from browserstack list --- packages/optimizely-sdk/karma.base.conf.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/optimizely-sdk/karma.base.conf.js b/packages/optimizely-sdk/karma.base.conf.js index b4c52db72..7b493f07f 100644 --- a/packages/optimizely-sdk/karma.base.conf.js +++ b/packages/optimizely-sdk/karma.base.conf.js @@ -62,14 +62,6 @@ module.exports = { os: 'OS X', os_version: 'Mountain Lion' }, - bs_ie: { - base: 'BrowserStack', - os: 'Windows', - os_version: '7', - browser: 'ie', - device: null, - browser_version: '10.0' - }, bs_opera_mac: { base: 'BrowserStack', browser: 'opera', From ceab04d1623184dddc83d0b6fd4249d44accff50 Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Tue, 25 Feb 2020 18:59:33 -0800 Subject: [PATCH 3/8] fixed a minor error --- packages/optimizely-sdk/karma.base.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/optimizely-sdk/karma.base.conf.js b/packages/optimizely-sdk/karma.base.conf.js index 7b493f07f..557506f3c 100644 --- a/packages/optimizely-sdk/karma.base.conf.js +++ b/packages/optimizely-sdk/karma.base.conf.js @@ -79,7 +79,7 @@ module.exports = { } }, - browsers: ['bs_chrome_mac', 'bs_edge', 'bs_firefox_mac', 'bs_ie', 'bs_opera_mac', 'bs_safari'], + browsers: ['bs_chrome_mac', 'bs_edge', 'bs_firefox_mac', 'bs_opera_mac', 'bs_safari'], // frameworks to use // available frameworks: https://npmjs.org/browse/keyword/karma-adapter From 83851997b65794e80a38f1514a0b8a03ee7851e8 Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Tue, 25 Feb 2020 19:29:16 -0800 Subject: [PATCH 4/8] removed older browsers which dont support promises --- packages/optimizely-sdk/karma.base.conf.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/optimizely-sdk/karma.base.conf.js b/packages/optimizely-sdk/karma.base.conf.js index 557506f3c..00597e06c 100644 --- a/packages/optimizely-sdk/karma.base.conf.js +++ b/packages/optimizely-sdk/karma.base.conf.js @@ -62,6 +62,14 @@ module.exports = { os: 'OS X', os_version: 'Mountain Lion' }, + bs_ie: { + base: 'BrowserStack', + os: 'Windows', + os_version: '7', + browser: 'ie', + device: null, + browser_version: '10.0' + }, bs_opera_mac: { base: 'BrowserStack', browser: 'opera', @@ -79,7 +87,7 @@ module.exports = { } }, - browsers: ['bs_chrome_mac', 'bs_edge', 'bs_firefox_mac', 'bs_opera_mac', 'bs_safari'], + browsers: ['bs_edge', 'bs_opera_mac', 'bs_safari'], // frameworks to use // available frameworks: https://npmjs.org/browse/keyword/karma-adapter From 93f6227d1371e0356dd78b0a74df3c65247d1c2e Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Tue, 25 Feb 2020 19:41:43 -0800 Subject: [PATCH 5/8] removed old browsers from base config --- packages/optimizely-sdk/karma.base.conf.js | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/packages/optimizely-sdk/karma.base.conf.js b/packages/optimizely-sdk/karma.base.conf.js index 00597e06c..04bf4c3d1 100644 --- a/packages/optimizely-sdk/karma.base.conf.js +++ b/packages/optimizely-sdk/karma.base.conf.js @@ -40,13 +40,6 @@ module.exports = { // define browsers customLaunchers: { - bs_chrome_mac: { - base: 'BrowserStack', - browser: 'chrome', - browser_version: '21.0', - os: 'OS X', - os_version: 'Mountain Lion' - }, bs_edge: { base: 'BrowserStack', os: 'Windows', @@ -55,21 +48,6 @@ module.exports = { device: null, browser_version: '15.0' }, - bs_firefox_mac: { - base: 'BrowserStack', - browser: 'firefox', - browser_version: '21.0', - os: 'OS X', - os_version: 'Mountain Lion' - }, - bs_ie: { - base: 'BrowserStack', - os: 'Windows', - os_version: '7', - browser: 'ie', - device: null, - browser_version: '10.0' - }, bs_opera_mac: { base: 'BrowserStack', browser: 'opera', From 928f47c8e0e3cd81d34d69cd85c07b3e0be2b59c Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Wed, 26 Feb 2020 19:14:08 -0800 Subject: [PATCH 6/8] added promise polyfill include in browser umd tests --- packages/optimizely-sdk/karma.base.conf.js | 24 +++++++++++++++++++++- packages/optimizely-sdk/karma.bs.conf.js | 1 + packages/optimizely-sdk/package.json | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/packages/optimizely-sdk/karma.base.conf.js b/packages/optimizely-sdk/karma.base.conf.js index 04bf4c3d1..b4c52db72 100644 --- a/packages/optimizely-sdk/karma.base.conf.js +++ b/packages/optimizely-sdk/karma.base.conf.js @@ -40,6 +40,13 @@ module.exports = { // define browsers customLaunchers: { + bs_chrome_mac: { + base: 'BrowserStack', + browser: 'chrome', + browser_version: '21.0', + os: 'OS X', + os_version: 'Mountain Lion' + }, bs_edge: { base: 'BrowserStack', os: 'Windows', @@ -48,6 +55,21 @@ module.exports = { device: null, browser_version: '15.0' }, + bs_firefox_mac: { + base: 'BrowserStack', + browser: 'firefox', + browser_version: '21.0', + os: 'OS X', + os_version: 'Mountain Lion' + }, + bs_ie: { + base: 'BrowserStack', + os: 'Windows', + os_version: '7', + browser: 'ie', + device: null, + browser_version: '10.0' + }, bs_opera_mac: { base: 'BrowserStack', browser: 'opera', @@ -65,7 +87,7 @@ module.exports = { } }, - browsers: ['bs_edge', 'bs_opera_mac', 'bs_safari'], + browsers: ['bs_chrome_mac', 'bs_edge', 'bs_firefox_mac', 'bs_ie', 'bs_opera_mac', 'bs_safari'], // frameworks to use // available frameworks: https://npmjs.org/browse/keyword/karma-adapter diff --git a/packages/optimizely-sdk/karma.bs.conf.js b/packages/optimizely-sdk/karma.bs.conf.js index d7b8df6ce..45e2385c1 100644 --- a/packages/optimizely-sdk/karma.bs.conf.js +++ b/packages/optimizely-sdk/karma.bs.conf.js @@ -27,6 +27,7 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ + './node_modules/promise-polyfill/dist/polyfill.min.js', './lib/index.browser.tests.js' ], }); diff --git a/packages/optimizely-sdk/package.json b/packages/optimizely-sdk/package.json index 5d42a2141..3304b396e 100644 --- a/packages/optimizely-sdk/package.json +++ b/packages/optimizely-sdk/package.json @@ -40,6 +40,7 @@ "json-schema": "^0.2.3", "lodash": "^4.17.11", "murmurhash": "0.0.2", + "promise-polyfill": "8.1.0", "uuid": "^3.3.2" }, "devDependencies": { From 646d0e49fed1b896f11d53dfda2fc4aa35e6bf05 Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Wed, 26 Feb 2020 19:23:50 -0800 Subject: [PATCH 7/8] include polyfill in a missing place --- packages/optimizely-sdk/karma.umd.conf.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/optimizely-sdk/karma.umd.conf.js b/packages/optimizely-sdk/karma.umd.conf.js index ea0f59e27..0613b850a 100644 --- a/packages/optimizely-sdk/karma.umd.conf.js +++ b/packages/optimizely-sdk/karma.umd.conf.js @@ -27,6 +27,7 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ + './node_modules/promise-polyfill/dist/polyfill.min.js', './dist/optimizely.browser.umd.min.js', './lib/index.browser.umdtests.js' ], From 51468c9da9df01330de6ddaf83346ecfb36456b2 Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Fri, 28 Feb 2020 14:37:01 -0800 Subject: [PATCH 8/8] moved promise polyfill to dev dependencies --- packages/optimizely-sdk/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/optimizely-sdk/package.json b/packages/optimizely-sdk/package.json index 3304b396e..144ca1934 100644 --- a/packages/optimizely-sdk/package.json +++ b/packages/optimizely-sdk/package.json @@ -40,7 +40,6 @@ "json-schema": "^0.2.3", "lodash": "^4.17.11", "murmurhash": "0.0.2", - "promise-polyfill": "8.1.0", "uuid": "^3.3.2" }, "devDependencies": { @@ -62,7 +61,8 @@ "nock": "^7.7.2", "sinon": "^2.3.1", "webpack": "^4.25.1", - "webpack-cli": "^3.1.2" + "webpack-cli": "^3.1.2", + "promise-polyfill": "8.1.0" }, "publishConfig": { "access": "public"