From d626c7393ae1ff6cb1bade195d0126d173b579b1 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 16 Jan 2019 12:00:43 +0000 Subject: [PATCH 1/4] Tests: ensure 12:00:00 hour part on fake timestamp (#3452) --- test/spec/modules/currency_spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/spec/modules/currency_spec.js b/test/spec/modules/currency_spec.js index 64c966bdf18..c7342c2971d 100644 --- a/test/spec/modules/currency_spec.js +++ b/test/spec/modules/currency_spec.js @@ -34,7 +34,7 @@ describe('currency', function () { describe('setConfig', function () { beforeEach(function() { sandbox = sinon.sandbox.create(); - clock = sinon.useFakeTimers(1047010195974); + clock = sinon.useFakeTimers(1046952000000); // 2003-03-06T12:00:00Z }); afterEach(function () { From 4f88aa6323d6b47cc55a804e1241ba0797c99d9f Mon Sep 17 00:00:00 2001 From: Rich Snapp Date: Wed, 16 Jan 2019 09:26:09 -0700 Subject: [PATCH 2/4] pass esModules flag for istanbul-instrumenter-loader --- karma.conf.maker.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/karma.conf.maker.js b/karma.conf.maker.js index 6073ee2585a..649a13a16fc 100644 --- a/karma.conf.maker.js +++ b/karma.conf.maker.js @@ -20,7 +20,10 @@ function newWebpackConfig(codeCoverage) { webpackConfig.module.rules.push({ enforce: 'post', exclude: /(node_modules)|(test)|(integrationExamples)|(build)|polyfill.js|(src\/adapters\/analytics\/ga.js)/, - loader: 'istanbul-instrumenter-loader', + use: { + loader: 'istanbul-instrumenter-loader', + options: { esModules: true } + }, test: /\.js$/ }) } From 55a56d0ba742d17e88f23784fd2bc9cef6eb9844 Mon Sep 17 00:00:00 2001 From: Mike Chowla Date: Wed, 16 Jan 2019 13:20:12 -0600 Subject: [PATCH 3/4] Prebid 1.38.0 Release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 328bb91cdf4..a14761f5c51 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "prebid.js", - "version": "1.38.0-pre", + "version": "1.38.0", "description": "Header Bidding Management Library", "main": "src/prebid.js", "scripts": { From 92bfb2904e2633c5da3fd78386f67d82488f490a Mon Sep 17 00:00:00 2001 From: Mike Chowla Date: Wed, 16 Jan 2019 14:07:03 -0600 Subject: [PATCH 4/4] Increment pre version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a14761f5c51..8170092153a 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "prebid.js", - "version": "1.38.0", + "version": "1.39.0-pre", "description": "Header Bidding Management Library", "main": "src/prebid.js", "scripts": {