Revert "Merge branch 'prebid:master' into setupad-adapter"

This reverts commit 1c14dbe, reversing
changes made to 7fe9ea5.

.devcontainer/devcontainer.json

@@ -9,9 +9,7 @@
 	},
 
 	"postCreateCommand": "bash .devcontainer/postCreate.sh",
-	// Make is-docker work again
-	"postStartCommand": "test -f /.dockerenv || sudo touch /.dockerenv",
-
+
 	// Set *default* container specific settings.json values on container create.
 	"settings": {},
 

.eslintrc.js

@@ -11,25 +11,12 @@ module.exports = {
       node: {
         moduleDirectory: ['node_modules', './']
       }
-    },
-    'jsdoc': {
-      mode: 'typescript',
-      tagNamePreference: {
-        'tag constructor': 'constructor',
-        extends: 'extends',
-        method: 'method',
-        return: 'return',
-      }
     }
   },
-  extends: [
-    'standard',
-    'plugin:jsdoc/recommended'
-  ],
+  extends: 'standard',
   plugins: [
     'prebid',
-    'import',
-    'jsdoc'
+    'import'
   ],
   globals: {
     'BROWSERSTACK_USERNAME': false,
@@ -59,24 +46,6 @@ module.exports = {
     'no-undef': 2,
     'no-useless-escape': 'off',
     'no-console': 'error',
-    'jsdoc/check-types': 'off',
-    'jsdoc/newline-after-description': 'off',
-    'jsdoc/require-jsdoc': 'off',
-    'jsdoc/require-param': 'off',
-    'jsdoc/require-param-description': 'off',
-    'jsdoc/require-param-name': 'off',
-    'jsdoc/require-param-type': 'off',
-    'jsdoc/require-property': 'off',
-    'jsdoc/require-property-description': 'off',
-    'jsdoc/require-property-name': 'off',
-    'jsdoc/require-property-type': 'off',
-    'jsdoc/require-returns': 'off',
-    'jsdoc/require-returns-check': 'off',
-    'jsdoc/require-returns-description': 'off',
-    'jsdoc/require-returns-type': 'off',
-    'jsdoc/require-yields': 'off',
-    'jsdoc/require-yields-check': 'off',
-    'jsdoc/tag-lines': 'off'
   },
   overrides: Object.keys(allowedModules).map((key) => ({
     files: key + '/**/*.js',

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         config-file: ./.github/codeql/codeql-config.yml
@@ -57,7 +57,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -70,4 +70,4 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v2

.github/workflows/issue_tracker.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
         with:
           app_id: ${{ secrets.ISSUE_APP_ID }}
           private_key: ${{ secrets.ISSUE_APP_PEM }}

PR_REVIEW.md

@@ -55,6 +55,7 @@ Follow steps above for general review process. In addition, please verify the fo
     - Adapters that accept a floor parameter must also support the [floors module](https://docs.prebid.org/dev-docs/modules/floors.html) -- look for a call to the `getFloor()` function.
     - Adapters cannot accept an schain parameter. Rather, they must look for the schain parameter at bidRequest.schain.
     - The bidderRequest.refererInfo.referer must be checked in addition to any bidder-specific parameter.
+    - If they're getting the COPPA flag, it must come from config.getConfig('coppa');
     - Page position must come from bidrequest.mediaTypes.banner.pos or bidrequest.mediaTypes.video.pos
     - Global OpenRTB fields should come from [getConfig('ortb2');](https://docs.prebid.org/dev-docs/publisher-api-reference/setConfig.html#setConfig-fpd):
         - bcat, battr, badv

features.json

@@ -1,5 +1,4 @@
 [
   "NATIVE",
-  "VIDEO",
-  "UID2_CSTG"
+  "VIDEO"
 ]

gulpfile.js

@@ -158,20 +158,6 @@ function makeWebpackPkg(extraConfig = {}) {
   }
 }
 
-function buildCreative() {
-  return gulp.src(['**/*'])
-    .pipe(webpackStream(require('./webpack.creative.js')))
-    .pipe(gulp.dest('build/creative'))
-}
-
-function updateCreativeExample(cb) {
-  const CREATIVE_EXAMPLE = 'integrationExamples/gpt/x-domain/creative.html';
-  const root = require('node-html-parser').parse(fs.readFileSync(CREATIVE_EXAMPLE));
-  root.querySelectorAll('script')[0].textContent = fs.readFileSync('build/creative/creative.js')
-  fs.writeFileSync(CREATIVE_EXAMPLE, root.toString())
-  cb();
-}
-
 function getModulesListToAddInBanner(modules) {
   if (!modules || modules.length === helpers.getModuleNames().length) {
     return 'All available modules for this version.'
@@ -419,7 +405,6 @@ function watchTaskMaker(options = {}) {
   return function watch(done) {
     var mainWatcher = gulp.watch([
       'src/**/*.js',
-      'libraries/**/*.js',
       'modules/**/*.js',
     ].concat(options.alsoWatch));
 
@@ -430,8 +415,8 @@ function watchTaskMaker(options = {}) {
   }
 }
 
-const watch = watchTaskMaker({alsoWatch: ['test/**/*.js'], task: () => gulp.series(clean, gulp.parallel(lint, 'build-bundle-dev', test, buildCreative))});
-const watchFast = watchTaskMaker({livereload: false, task: () => gulp.parallel('build-bundle-dev', buildCreative)});
+const watch = watchTaskMaker({alsoWatch: ['test/**/*.js'], task: () => gulp.series(clean, gulp.parallel(lint, 'build-bundle-dev', test))});
+const watchFast = watchTaskMaker({livereload: false, task: () => gulp.series('build-bundle-dev')});
 
 // support tasks
 gulp.task(lint);
@@ -462,23 +447,21 @@ gulp.task('build-bundle-verbose', gulp.series(makeWebpackPkg({
   }
 }), gulpBundle.bind(null, false)));
 
-gulp.task('build-creative', gulp.series(buildCreative, updateCreativeExample));
-
 // public tasks (dependencies are needed for each task since they can be ran on their own)
 gulp.task('test-only', test);
 gulp.task('test-all-features-disabled', testTaskMaker({disableFeatures: require('./features.json'), oneBrowser: 'chrome', watch: false}));
-gulp.task('test', gulp.series(clean, lint, gulp.parallel('build-creative', gulp.series('test-all-features-disabled', 'test-only'))));
+gulp.task('test', gulp.series(clean, lint, gulp.series('test-all-features-disabled', 'test-only')));
 
 gulp.task('test-coverage', gulp.series(clean, testCoverage));
 gulp.task(viewCoverage);
 
 gulp.task('coveralls', gulp.series('test-coverage', coveralls));
 
-gulp.task('build', gulp.series(clean, 'build-bundle-prod', 'build-creative'));
+gulp.task('build', gulp.series(clean, 'build-bundle-prod'));
 gulp.task('build-postbid', gulp.series(escapePostbidConfig, buildPostbid));
 
 gulp.task('serve', gulp.series(clean, lint, gulp.parallel('build-bundle-dev', watch, test)));
-gulp.task('serve-fast', gulp.series(clean, gulp.parallel('build-bundle-dev', buildCreative, watchFast)));
+gulp.task('serve-fast', gulp.series(clean, gulp.parallel('build-bundle-dev', watchFast)));
 gulp.task('serve-prod', gulp.series(clean, gulp.parallel('build-bundle-prod', startLocalServer)));
 gulp.task('serve-and-test', gulp.series(clean, gulp.parallel('build-bundle-dev', watchFast, testTaskMaker({watch: true}))));
 gulp.task('serve-e2e', gulp.series(clean, 'build-bundle-prod', gulp.parallel(() => startIntegServer(), startLocalServer)));

integrationExamples/gpt/adUnitFloors.html

@@ -109,3 +109,4 @@ <h5>Div-1</h5>
 </body>
 
 </html>
+