diff --git a/README.md b/README.md index be07a27ddc1..0e07521ac3b 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ module.exports = { // override the regular exclusion from above (for being inside node_modules). { test: /.js$/, - include: new RegExp(`\\${path.sep}prebid\.js`), + include: new RegExp(`\\${path.sep}prebid\\.js`), use: { loader: 'babel-loader', // presets and plugins for Prebid.js must be manually specified separate from your other babel rule. diff --git a/allowedModules.js b/allowedModules.js index 0fee2cfdedd..4f8b8039d97 100644 --- a/allowedModules.js +++ b/allowedModules.js @@ -1,11 +1,11 @@ const sharedWhiteList = [ - "core-js/library/fn/array/find", // no ie11 - "core-js/library/fn/array/includes", // no ie11 - "core-js/library/fn/set", // ie11 supports Set but not Set#values - "core-js/library/fn/string/includes", // no ie11 - "core-js/library/fn/number/is-integer", // no ie11, - "core-js/library/fn/array/from" // no ie11 + 'core-js/library/fn/array/find', // no ie11 + 'core-js/library/fn/array/includes', // no ie11 + 'core-js/library/fn/set', // ie11 supports Set but not Set#values + 'core-js/library/fn/string/includes', // no ie11 + 'core-js/library/fn/number/is-integer', // no ie11, + 'core-js/library/fn/array/from' // no ie11 ]; module.exports = { @@ -21,6 +21,7 @@ module.exports = { 'fun-hooks/no-eval', 'just-clone', 'dlv', - 'dset' + 'dset', + 'deep-equal' ] }; diff --git a/gulpfile.js b/gulpfile.js index 111bd9dc3bb..1b5cd85abd6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -249,13 +249,13 @@ function test(done) { execa(wdioCmd, wdioOpts, { stdio: 'inherit' }) .then(stdout => { - //kill mock server + // kill mock server mockServer.kill('SIGINT'); done(); process.exit(0); }) .catch(err => { - //kill mock server + // kill mock server mockServer.kill('SIGINT'); done(new Error(`Tests failed with error: ${err}`)); process.exit(1); diff --git a/integrationExamples/gpt/digitrust_Full.html b/integrationExamples/gpt/digitrust_Full.html index 7ec268a619a..fc7704776f4 100644 --- a/integrationExamples/gpt/digitrust_Full.html +++ b/integrationExamples/gpt/digitrust_Full.html @@ -70,7 +70,7 @@ }()); var t = document.createElement('script'); t.async = false; - t.src = 'http://acdn.adnxs.com/cmp/cmp.bundle.js'; + t.src = 'https://acdn.adnxs.com/cmp/cmp.bundle.js'; var tag = document.getElementsByTagName('head')[0]; tag.appendChild(t); } diff --git a/integrationExamples/gpt/digitrust_Simple.html b/integrationExamples/gpt/digitrust_Simple.html index 91eca591898..2581c6ce7cc 100644 --- a/integrationExamples/gpt/digitrust_Simple.html +++ b/integrationExamples/gpt/digitrust_Simple.html @@ -71,7 +71,7 @@ }()); var t = document.createElement('script'); t.async = false; - t.src = 'http://acdn.adnxs.com/cmp/cmp.bundle.js'; + t.src = 'https://acdn.adnxs.com/cmp/cmp.bundle.js'; var tag = document.getElementsByTagName('head')[0]; tag.appendChild(t); } @@ -148,6 +148,9 @@ } else { console.error('Digitrust init failed'); + if(digiTrustResult.err){ + console.error(digiTrustResult.err); + } } } }, @@ -157,6 +160,12 @@ expires: 60 } }] + }, + userIdTargeting: { + "GAM": true, + "GAM_KEYS": { + "tdid": "TTD_ID" // send tdid as TTD_ID + } } }); pbjs.addAdUnits(adUnits); diff --git a/integrationExamples/gpt/digitrust_cmp_test.html b/integrationExamples/gpt/digitrust_cmp_test.html index f5fc0aace63..6f0a70188f3 100644 --- a/integrationExamples/gpt/digitrust_cmp_test.html +++ b/integrationExamples/gpt/digitrust_cmp_test.html @@ -187,6 +187,6 @@