Merge branch 'prebid:master' into master

Author: IlliaMil

.github/workflows/browser_testing.json

@@ -18,7 +18,8 @@
   },
   "SafariNative": {
     "wdioName": "safari technology preview",
-    "runsOn": "macos-latest"
+    "runsOn": "macos-latest",
+    "bsName": "safari"
   },
   "FirefoxHeadless": {
     "wdioName": "firefox",

.github/workflows/scripts/getPRProperties.js

@@ -147,7 +147,7 @@ async function getPRProperties({github, context, prNo, reviewerTeam, engTeam, au
     prebidReviewers,
     prebidEngineers,
     review,
-  }
+  };
   data.review.requires = reviewRequirements(data);
   data.review.ok = data.draft || satisfiesReviewRequirements(data.review);
   return data;

AGENTS.md

@@ -69,3 +69,5 @@ This file contains instructions for the Codex agent and its friends when working
 - Submodules need to register in submodules.json
 - No one should be accessing navigator from vendor modules, if navigator needs to be accessed it should be in a common method or library
 - Low priority calls should be import ajax method and use fetch keepalive; they shouldnt use trigger pixel when it can be avoided or fail to specify keepalive.
+- Analytics modules must provide a disableAnalytics method.
+- Metadata files that say do not edit in the comments should not be edited; the build process is responsible for updating the metadata files.

PR_REVIEW.md

@@ -81,6 +81,8 @@ Follow steps above for general review process. In addition, please verify the fo
 
 Documentation: https://docs.prebid.org/dev-docs/integrate-with-the-prebid-analytics-api.html
 
+Make sure a disableAnalytics method is provided.
+
 No additional steps above the general review process and making sure it conforms to the [Module Rules](https://docs.prebid.org/dev-docs/module-rules.html).
 
 Make sure there's a docs pull request

browsers.json

@@ -33,7 +33,7 @@
   },
   "bs_safari_latest_mac": {
     "base": "BrowserStack",
-    "os_version": "Sonoma",
+    "os_version": "Tahoe",
     "browser": "safari",
     "browser_version": "latest",
     "device": null,

creative/renderers/native/constants.js

@@ -11,4 +11,4 @@ export const ORTB_ASSETS = {
   data: 'value',
   img: 'url',
   video: 'vasttag'
-}
+};

creative/renderers/native/renderer.js

@@ -48,7 +48,7 @@ function loadScript(url, doc) {
 }
 
 function getRenderFrames(node) {
-  return Array.from(node.querySelectorAll('iframe[srcdoc*="render"]'))
+  return Array.from(node.querySelectorAll('iframe[srcdoc*="render"]'));
 }
 
 function getInnerHTML(node) {
@@ -91,7 +91,7 @@ export function render({ adId, native }, { sendMessage }, win, getMarkup = getAd
       height: body.offsetHeight || win.document.documentElement.scrollHeight,
       width: body.offsetWidth
     });
-  }
+  };
   function replaceMarkup(target, markup) {
     // do not remove the rendering logic if it's embedded in this window; things will break otherwise
     const renderFrames = getRenderFrames(target);

eslint.config.js

@@ -112,8 +112,7 @@ module.exports = [
     rules: {
       'comma-dangle': 'off',
       '@stylistic/comma-dangle': 'off',
-      semi: 'off',
-      '@stylistic/semi': 'off',
+      '@stylistic/semi': ['error', 'always'],
       'no-undef': 2,
       'no-console': 'error',
       'space-before-function-paren': 'off',

gulpfile.js

@@ -509,8 +509,8 @@ gulp.task('build-bundle-verbose', gulp.series(precompile(), makeWebpackPkg(makeV
 
 // public tasks (dependencies are needed for each task since they can be ran on their own)
 gulp.task('update-browserslist', execaTask('npx update-browserslist-db@latest'));
-gulp.task('test-build-logic', execaTask('npx mocha ./test/build-logic'))
-gulp.task('test-only-nobuild', gulp.series(testTaskMaker({coverage: argv.coverage ?? true})))
+gulp.task('test-build-logic', execaTask('npx mocha ./test/build-logic'));
+gulp.task('test-only-nobuild', gulp.series(testTaskMaker({coverage: argv.coverage ?? true})));
 gulp.task('test-only', gulp.series('test-build-logic', 'precompile', test));
 
 gulp.task('test-all-features-disabled-nobuild', testTaskMaker({disableFeatures: helpers.getTestDisableFeatures(), oneBrowser: 'chrome', watch: false}));
@@ -523,16 +523,16 @@ gulp.task('test-coverage', gulp.series(clean, precompile(), testCoverage));
 gulp.task('update-codeql', function (done) {
   import('./fingerprintApis.mjs').then(({updateQueries}) => {
     updateQueries().then(() => done(), done);
-  })
-})
+  });
+});
 
 // npm will by default use .gitignore, so create an .npmignore that is a copy of it except it includes "dist"
 gulp.task('setup-npmignore', execaTask("sed 's/^\\/\\?dist\\/\\?$//g;w .npmignore' .gitignore", {quiet: true}));
 gulp.task('build', gulp.series(clean, 'build-bundle-prod', setupDist));
 // build for release - in addition to 'build', run tasks that update the codebase to be included in a release commit
 gulp.task('build-release', gulp.series('update-codeql', 'build', updateCreativeExample, 'update-browserslist'));
 // prepare NPM release - 'build' to generate files in dist/; 'setup-npmignore' to make sure 'dist' is published in NPM
-gulp.task('prepare-release', gulp.series('build', 'setup-npmignore'))
+gulp.task('prepare-release', gulp.series('build', 'setup-npmignore'));
 gulp.task('build-postbid', gulp.series(escapePostbidConfig, buildPostbid));
 
 gulp.task('serve', gulp.series(clean, lint, precompile(), gulp.parallel('build-bundle-dev-no-precomp', watch, test)));
@@ -546,7 +546,7 @@ gulp.task('default', gulp.series('build'));
 
 gulp.task('e2e-test-only', gulp.series(requireNodeVersion(16), () => runWebdriver({file: argv.file})));
 gulp.task('e2e-test', gulp.series(requireNodeVersion(16), clean, 'build-bundle-prod', e2eTestTaskMaker()));
-gulp.task('e2e-test-nobuild', gulp.series(requireNodeVersion(16), e2eTestTaskMaker()))
+gulp.task('e2e-test-nobuild', gulp.series(requireNodeVersion(16), e2eTestTaskMaker()));
 
 // other tasks
 gulp.task(bundleToStdout);
@@ -561,16 +561,16 @@ gulp.task('extract-metadata', function (done) {
   const server = startLocalServer();
   import('./metadata/extractMetadata.mjs').then(({default: extract}) => {
     extract().then(metadata => {
-      fs.writeFileSync('./metadata/modules.json', JSON.stringify(metadata, null, 2))
+      fs.writeFileSync('./metadata/modules.json', JSON.stringify(metadata, null, 2));
     }).finally(() => {
-      server.close()
+      server.close();
     }).then(() => done(), done);
   });
-})
+});
 gulp.task('compile-metadata', function (done) {
   import('./metadata/compileMetadata.mjs').then(({default: compile}) => {
     compile(argv.fetch ?? true).then(() => done(), done);
-  })
-})
+  });
+});
 gulp.task('update-metadata', gulp.series('build', 'extract-metadata', 'compile-metadata'));
 module.exports = nodeBundle;

integrationExamples/gpt/amp/remote.html

@@ -26,6 +26,8 @@
 
 <script>
     // The Prebid global must match Prebid.js setting. This example file is not preprocessed so below we refer to global as `pbjs`.
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
     var $$PREBID_GLOBAL$$ = pbjs;
     var prebidSrc = 'https://publisher.com:9999/build/dev/prebid.js';
     var adUnits;
@@ -40,8 +42,6 @@
         target.insertBefore(pbs, target.firstChild);
     })();
 
-    var pbjs = pbjs || {};
-    pbjs.que = pbjs.que || [];
 
     var date = new Date().getTime();