Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into nurl_support
Browse files Browse the repository at this point in the history
  • Loading branch information
TheMediaGrid committed Sep 7, 2021
2 parents 4452dff + 5b87fdc commit d16e2ec
Show file tree
Hide file tree
Showing 302 changed files with 32,097 additions and 3,099 deletions.
10 changes: 5 additions & 5 deletions .babelrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ module.exports = {
{
"targets": {
"browsers": [
"chrome >= 61",
"safari >=8",
"edge >= 14",
"ff >= 57",
"chrome >= 75",
"safari >=10",
"edge >= 70",
"ff >= 70",
"ie >= 11",
"ios >= 8"
"ios >= 11"
]
}
}
Expand Down
65 changes: 34 additions & 31 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,50 +1,53 @@

const allowedModules = require("./allowedModules");
const allowedModules = require('./allowedModules.js');

module.exports = {
"env": {
"browser": true,
"commonjs": true
env: {
browser: true,
commonjs: true
},
"settings": {
"import/resolver": {
"node": {
"moduleDirectory": ["node_modules", "./"]
settings: {
'import/resolver': {
node: {
moduleDirectory: ['node_modules', './']
}
}
},
"extends": "standard",
"plugins": [
"prebid",
"import"
extends: 'standard',
plugins: [
'prebid',
'import'
],
"globals": {
"$$PREBID_GLOBAL$$": false
globals: {
'$$PREBID_GLOBAL$$': false,
'BROWSERSTACK_USERNAME': false,
'BROWSERSTACK_KEY': false
},
"parserOptions": {
"sourceType": "module"
parserOptions: {
sourceType: 'module',
ecmaVersion: 2018,
},
"rules": {
"comma-dangle": "off",
"semi": "off",
"space-before-function-paren": "off",
"import/extensions": ["error", "ignorePackages"],
rules: {
'comma-dangle': 'off',
semi: 'off',
'space-before-function-paren': 'off',
'import/extensions': ['error', 'ignorePackages'],

// Exceptions below this line are temporary, so that eslint can be added into the CI process.
// Violations of these styles should be fixed, and the exceptions removed over time.
//
// See Issue #1111.
"eqeqeq": "off",
"no-return-assign": "off",
"no-throw-literal": "off",
"no-undef": 2,
"no-useless-escape": "off",
"no-console": "error"
eqeqeq: 'off',
'no-return-assign': 'off',
'no-throw-literal': 'off',
'no-undef': 2,
'no-useless-escape': 'off',
'no-console': 'error'
},
"overrides": Object.keys(allowedModules).map((key) => ({
"files": key + "/**/*.js",
"rules": {
"prebid/validate-imports": ["error", allowedModules[key]]
overrides: Object.keys(allowedModules).map((key) => ({
files: key + '/**/*.js',
rules: {
'prebid/validate-imports': ['error', allowedModules[key]]
}
}))
};
1 change: 0 additions & 1 deletion gulpHelpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ module.exports = {
},

jsonifyHTML: function (str) {
console.log(arguments);
return str.replace(/\n/g, '')
.replace(/<\//g, '<\\/')
.replace(/\/>/g, '\\/>');
Expand Down
14 changes: 10 additions & 4 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ var webpackStream = require('webpack-stream');
var terser = require('gulp-terser');
var gulpClean = require('gulp-clean');
var KarmaServer = require('karma').Server;
var karmaConfMaker = require('./karma.conf.maker');
var karmaConfMaker = require('./karma.conf.maker.js');
var opens = require('opn');
var webpackConfig = require('./webpack.conf');
var helpers = require('./gulpHelpers');
var webpackConfig = require('./webpack.conf.js');
var helpers = require('./gulpHelpers.js');
var concat = require('gulp-concat');
var header = require('gulp-header');
var footer = require('gulp-footer');
Expand Down Expand Up @@ -71,7 +71,13 @@ function lint(done) {
const isFixed = function (file) {
return file.eslint != null && file.eslint.fixed;
}
return gulp.src(['src/**/*.js', 'modules/**/*.js', 'test/**/*.js'], { base: './' })
return gulp.src([
'src/**/*.js',
'modules/**/*.js',
'test/**/*.js',
'plugins/**/*.js',
'./*.js'
], { base: './' })
.pipe(gulpif(argv.nolintfix, eslint(), eslint({ fix: true })))
.pipe(eslint.format('stylish'))
.pipe(eslint.failAfterError())
Expand Down
35 changes: 28 additions & 7 deletions integrationExamples/gpt/adloox.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,11 @@
playerSize: [ 640, 480 ]
}
},
fpd: {
context: {
pbAdSlot: '/19968336/prebid_cache_video_adunit'
ortb2Imp: {
ext: {
data: {
pbadslot: '/19968336/prebid_cache_video_adunit'
}
}
},
bids: [
Expand Down Expand Up @@ -106,12 +108,14 @@
pbjs.initAdserverSet = true;

googletag.cmd.push(function() {
pbjs.setTargetingForGPTAsync && pbjs.setTargetingForGPTAsync(adUnits);
const adUnitCodes = adUnits.map(adUnit => adUnit.code);
pbjs.setTargetingForGPTAsync(adUnitCodes);
googletag.pubads().refresh();
});

var videoBids = bids[videoAdUnit.code];
if (videoBids) {
// DEMO NOTES: your environment likely will use the commented section ////
var videoUrl = videoBids.bids[0].vastUrl;
// var videoUrl = pbjs.adServers.dfp.buildVideoUrl({
// adUnit: videoAdUnit,
Expand All @@ -124,17 +128,34 @@
// output: 'vast'
// }
// });
invokeVideoPlayer(videoUrl);
//////////////////////////////////////////////////////////////////////////
var ret = pbjs.adServers.adloox.buildVideoUrl({
adUnit: videoAdUnit,
url: videoUrl
}, invokeVideoPlayer);
if (!ret) console.log('Error building Adloox video URL');
}
}

// optionally wrap with googletag to have gpt-pre-auction
// automatically populate Prebid Ad Slot (pbAdSlot)
// automatically populate Prebid Ad Slot (pbadslot)
// https://docs.prebid.org/dev-docs/modules/gpt-pre-auction.html
// alternatively remove wrapping and set AdUnit.fpd.context.pbAdSlot
// alternatively remove wrapping and set AdUnit.ortb2Imp.ext.data.pbadslot
googletag.cmd.push(function() {
pbjs.que.push(function() {
pbjs.setConfig({
realTimeData: {
auctionDelay: AUCTION_DELAY,
dataProviders: [
{
name: 'adloox',
params: { // optional, defaults shown
thresholds: [ 50, 60, 70, 80, 90 ],
slotinpath: false
}
}
]
},
instreamTracking: {
enabled: true
},
Expand Down
152 changes: 152 additions & 0 deletions integrationExamples/gpt/airgridRtdProvider_example.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
<html>
<head>
<script>
var matchedAudiences = ["sport", "travel"];
window.localStorage.setItem(
"edkt_matched_audience_ids",
JSON.stringify(matchedAudiences)
);
</script>
<script>
var FAILSAFE_TIMEOUT = 2000;

var adUnits = [
{
code: "test-div",
mediaTypes: {
banner: {
sizes: [
[300, 250],
[300, 600],
[728, 90],
],
},
},
bids: [
{
bidder: "appnexus",
params: {
placementId: 13144370,
},
},
],
},
];

var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];
</script>
<script src="../../build/dev/prebid.js" async></script>

<script>
var googletag = googletag || {};
var AUCTION_DELAY = 2000;
googletag.cmd = googletag.cmd || [];
googletag.cmd.push(function () {
googletag.pubads().disableInitialLoad();
});

pbjs.que.push(function () {
pbjs.setConfig({
debug: true,
realTimeData: {
auctionDelay: AUCTION_DELAY,
dataProviders: [
{
name: "airgrid",
waitForIt: true,
params: {
apiKey: "key123",
accountId: "sdk",
publisherId: "pub123",
},
},
],
},
});
pbjs.setBidderConfig({
bidders: ["appnexus", "pubmatic"],
config: {
ortb2: {
user: {
ext: {
data: {
registered: true,
interests: ["cars"],
},
},
},
},
},
});

pbjs.addAdUnits(adUnits);
pbjs.requestBids({ bidsBackHandler: sendAdserverRequest });
});

function sendAdserverRequest() {
document.getElementById("airgrid_audiences").innerHTML =
window.localStorage.getItem("edkt_matched_audience_ids");

if (pbjs.adserverRequestSent) return;
pbjs.adserverRequestSent = true;
googletag.cmd.push(function () {
pbjs.que.push(function () {
pbjs.setTargetingForGPTAsync();
googletag.pubads().refresh();
});
});
}

setTimeout(function () {
sendAdserverRequest();
}, FAILSAFE_TIMEOUT);
</script>

<script>
(function () {
var gads = document.createElement("script");
gads.async = true;
gads.type = "text/javascript";
var useSSL = "https:" == document.location.protocol;
gads.src =
(useSSL ? "https:" : "http:") +
"//www.googletagservices.com/tag/js/gpt.js";
var node = document.getElementsByTagName("script")[0];
node.parentNode.insertBefore(gads, node);
})();
</script>

<script>
googletag.cmd.push(function () {
googletag
.defineSlot(
"/112115922/FL_PB_MedRect",
[
[300, 250],
[300, 600],
],
"test-div"
)
.addService(googletag.pubads());
googletag.pubads().enableSingleRequest();
googletag.enableServices();
});
</script>
</head>

<body>
<h2>AirGrid RTD Prebid</h2>

<div id="test-div">
<script>
googletag.cmd.push(function () {
googletag.display("test-div");
});
</script>
</div>

AirGrid Audiences:
<div id="airgrid_audiences"></div>
</body>
</html>
Loading

0 comments on commit d16e2ec

Please sign in to comment.