Resolved conflicts

.babelrc.js

@@ -1,26 +1 @@
-
-let path = require('path');
-
-function useLocal(module) {
-  return require.resolve(module, {
-    paths: [
-      __dirname
-    ]
-  })
-}
-
-module.exports = {
-  "presets": [
-    [
-      useLocal('@babel/preset-env'),
-      {
-        "useBuiltIns": "entry",
-        "corejs": "3.13.0"
-      }
-    ]
-  ],
-  "plugins": [
-    path.resolve(__dirname, './plugins/pbjsGlobals.js'),
-    useLocal('babel-plugin-transform-object-assign')
-  ]
-};
+module.exports = require('./babelConfig.js')();

.github/workflows/issue_tracker.yml

@@ -0,0 +1,89 @@
+name: Issue tracking
+on:
+  issues:
+    types:
+      - opened
+jobs:
+  track_issue:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate token
+        id: generate_token
+        uses: tibdex/github-app-token@36464acb844fc53b9b8b2401da68844f6b05ebb0
+        with:
+          app_id: ${{ secrets.ISSUE_APP_ID }}
+          private_key: ${{ secrets.ISSUE_APP_PEM }}
+
+      - name: Get project data
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          ORGANIZATION: prebid
+          DATE_FIELD: Created on
+          PROJECT_NUMBER: 2
+        run: |
+          gh api graphql -f query='
+            query($org: String!, $number: Int!) {
+              organization(login: $org){
+                projectNext(number: $number) {
+                  id
+                  fields(first:100) {
+                    nodes {
+                      id
+                      name
+                      settings
+                    }
+                  }
+                }
+              }
+            }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
+
+          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
+          echo 'DATE_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "'"$DATE_FIELD"'") | .id' project_data.json) >> $GITHUB_ENV
+
+      - name: Add issue to project
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+        run: |
+          gh api graphql -f query='
+            mutation($project:ID!, $issue:ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $issue}) {
+                projectNextItem {
+                  id,
+                  content {
+                     ... on Issue {
+                        createdAt
+                     }
+                     ... on PullRequest {
+                        createdAt
+                     }                     
+                  }
+                }
+              }
+            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID > issue_data.json
+
+          echo 'ITEM_ID='$(jq '.data.addProjectNextItem.projectNextItem.id' issue_data.json) >> $GITHUB_ENV
+          echo 'ITEM_CREATION_DATE='$(jq '.data.addProjectNextItem.projectNextItem.content.createdAt' issue_data.json) >> $GITHUB_ENV
+
+      - name: Set fields
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+        run: |
+          gh api graphql -f query='
+            mutation (
+              $project: ID!
+              $item: ID!
+              $date_field: ID!
+              $date_value: String!
+            ) {
+              set_creation_date: updateProjectNextItemField(input: {
+                projectId: $project
+                itemId: $item
+                fieldId: $date_field
+                value: $date_value
+              }) {
+                projectNextItem {
+                  id
+                }
+              }
+            }' -f project=$PROJECT_ID -f item=$ITEM_ID -f date_field=$DATE_FIELD_ID -f date_value=$ITEM_CREATION_DATE --silent

RELEASE_SCHEDULE.md

@@ -3,12 +3,7 @@
 - [Release Process](#release-process)
   - [1. Make sure that all PRs have been named and labeled properly per the PR Process](#1-make-sure-that-all-prs-have-been-named-and-labeled-properly-per-the-pr-process)
   - [2. Make sure all browserstack tests are passing](#2-make-sure-all-browserstack-tests-are-passing)
-  - [3. Prepare Prebid Code](#3-prepare-prebid-code)
-  - [4. Verify the Release](#4-verify-the-release)
-  - [5. Create a GitHub release](#5-create-a-github-release)
-  - [6. Update coveralls _(skip for legacy)_](#6-update-coveralls-skip-for-legacy)
-  - [7. Distribute the code](#7-distribute-the-code)
-  - [8. Increment Version for Next Release](#8-increment-version-for-next-release)
+  - [3. Start the release](#3-start-the-release)
 - [Beta Releases](#beta-releases)
 - [FAQs](#faqs)
 
@@ -21,12 +16,10 @@ it will be about a week before the Prebid Org [Download Page](http://prebid.org/
 
 You can determine what is in a given build using the [releases page](https://github.com/prebid/Prebid.js/releases)
 
-Announcements regarding releases will be made to the #headerbidding-dev channel in subredditadops.slack.com.
+Announcements regarding releases will be made to the #prebid-js channel in prebid.slack.com.
 
 ## Release Process
 
-_Note: If `github.com/prebid/Prebid.js` is not configured as the git origin for your repo, all of the following git commands will have to be modified to reference the proper remote (e.g. `upstream`)_
-
 ### 1. Make sure that all PRs have been named and labeled properly per the [PR Process](https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md#general-pr-review-process)
    * Do this by checking the latest draft release from the [releases page](https://github.com/prebid/Prebid.js/releases) and make sure nothing appears in the first section called "In This Release". If they do, please open the PRs and add the appropriate labels.
    * Do a quick check that all the titles/descriptions look ok, and if not, adjust the PR title.
@@ -57,61 +50,10 @@ _Note: If `github.com/prebid/Prebid.js` is not configured as the git origin for
    ```
 
 
-### 3. Prepare Prebid Code
-
-   Update the package.json version to become the current release. Then commit your changes.
-
-   ```
-   git commit -m "Prebid 4.x.x Release"
-   git push
-   ```
-
-### 4. Verify the Release
-
-   Make sure your there are no more merges to master branch. Prebid code is clean and up to date.
-
-### 5. Create a GitHub release
-
-   Edit the most recent [release notes](https://github.com/prebid/Prebid.js/releases) draft and make sure the correct version is set and the master branch is selected in the dropdown. Click `Publish release`. GitHub will create release tag.
-
-   Pull these changes locally by running command
-   ```
-   git pull
-   git fetch --tags
-   ```
-
-   and verify the tag.
-
-### 6. Update coveralls _(skip for legacy)_
-
-   We use https://coveralls.io/ to show parts of code covered by unit tests.
-
-   Set the environment variables. You may want to add these to your `~/.bashrc` for convenience.
-   ```
-   export COVERALLS_SERVICE_NAME="travis-ci"
-   export COVERALLS_REPO_TOKEN="talk to Matt Kendall"
-   ```
-
-   Run `gulp coveralls` to update code coverage history.
-
-### 7. Distribute the code
-
-   _Note: do not go to step 8 until step 7 has been verified completed._
-
-   Reach out to any of the Appnexus folks to trigger the jenkins job.
-
-   // TODO:
-   Jenkins job is moving files to appnexus cdn, pushing prebid.js to npm, purging cache and sending notification to slack.
-   Move all the files from Appnexus CDN to jsDelivr and create bash script to do above tasks.
-
-### 8. Increment Version for Next Release
-
-   Update the version by manually editing Prebid's `package.json` to become "4.x.x-pre" (using the values for the next release). Then commit your changes.
-   ```
-   git commit -m "Increment pre version"
-   git push
-   ```
+### 3. Start the release
 
+Follow the instructions at https://github.com/prebid/prebidjs-releaser. Note that you will need to be a member of the [https://github.com/orgs/prebid/teams/prebidjs-release](prebidjs-release) GitHub team.
+
 ## Beta Releases
 
 Prebid.js features may be released as Beta or as Generally Available (GA).

allowedModules.js

@@ -1,12 +1,5 @@
 
 const sharedWhiteList = [
-  'core-js-pure/features/array/find', // no ie11
-  'core-js-pure/features/array/includes', // no ie11
-  'core-js-pure/features/set', // ie11 supports Set but not Set#values
-  'core-js-pure/features/string/includes', // no ie11
-  'core-js-pure/features/number/is-integer', // no ie11,
-  'core-js-pure/features/array/from', // no ie11
-  'core-js-pure/web/url-search-params' // no ie11
 ];
 
 module.exports = {

babelConfig.js

@@ -0,0 +1,30 @@
+
+let path = require('path');
+
+function useLocal(module) {
+  return require.resolve(module, {
+    paths: [
+      __dirname
+    ]
+  })
+}
+
+module.exports = function (test = false) {
+  return {
+    'presets': [
+      [
+        useLocal('@babel/preset-env'),
+        {
+          'useBuiltIns': 'entry',
+          'corejs': '3.13.0',
+          // a lot of tests use sinon.stub & others that stopped working on ES6 modules with webpack 5
+          'modules': test ? 'commonjs' : 'auto',
+        }
+      ]
+    ],
+    'plugins': [
+      path.resolve(__dirname, './plugins/pbjsGlobals.js'),
+      useLocal('babel-plugin-transform-object-assign'),
+    ],
+  }
+}

gulpfile.js

@@ -8,7 +8,6 @@ var gutil = require('gulp-util');
 var connect = require('gulp-connect');
 var webpack = require('webpack');
 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.js');
@@ -117,7 +116,10 @@ viewReview.displayName = 'view-review';
 
 function makeDevpackPkg() {
   var cloned = _.cloneDeep(webpackConfig);
-  cloned.devtool = 'source-map';
+  Object.assign(cloned, {
+    devtool: 'source-map',
+    mode: 'development'
+  })
   var externalModules = helpers.getArgModules();
 
   const analyticsSources = helpers.getAnalyticsSources();
@@ -142,7 +144,6 @@ function makeWebpackPkg() {
   return gulp.src([].concat(moduleSources, analyticsSources, 'src/prebid.js'))
     .pipe(helpers.nameModules(externalModules))
     .pipe(webpackStream(cloned, webpack))
-    .pipe(terser())
     .pipe(gulpif(file => file.basename === 'prebid-core.js', header(banner, { prebid: prebid })))
     .pipe(gulp.dest('build/dist'));
 }

integrationExamples/gpt/adloox.html

@@ -161,7 +161,11 @@
                         },
                         rubicon: {
                             singleRequest: true
-                        }
+                        },
+                        // RTD module honors pageUrl for referrer detection and
+                        // the analytics module uses this for the 'pageurl' macro
+                        // N.B. set this to a non-example.com URL to see the video
+                        //pageUrl: 'https://yourdomain.com/some/path/to/content.html'
                     });
                     pbjs.enableAnalytics({
                         provider: 'adloox',

integrationExamples/gpt/userId_example.html

@@ -252,6 +252,9 @@
               "params": {
                 "cid": 5126 // Set your Intimate Merger Customer ID here for production
               }
+            },
+            {
+              "name": "dacId"
             }
           ],
           "syncDelay": 5000,

karma.conf.maker.js

@@ -2,6 +2,7 @@
 //
 // For more information, see http://karma-runner.github.io/1.0/config/configuration-file.html
 
+const babelConfig = require('./babelConfig.js');
 var _ = require('lodash');
 var webpackConf = require('./webpack.conf.js');
 var karmaConstants = require('karma').constants;
@@ -10,10 +11,19 @@ function newWebpackConfig(codeCoverage) {
   // Make a clone here because we plan on mutating this object, and don't want parallel tasks to trample each other.
   var webpackConfig = _.cloneDeep(webpackConf);
 
-  // remove optimize plugin for tests
-  webpackConfig.plugins.pop()
+  Object.assign(webpackConfig, {
+    mode: 'development',
+    devtool: 'inline-source-map',
+  });
 
-  webpackConfig.devtool = 'inline-source-map';
+  delete webpackConfig.entry;
+
+  webpackConfig.module.rules
+    .flatMap((r) => r.use)
+    .filter((use) => use.loader === 'babel-loader')
+    .forEach((use) => {
+      use.options = babelConfig(true);
+    });
 
   if (codeCoverage) {
     webpackConfig.module.rules.push({

modules/.submodules.json

@@ -7,6 +7,7 @@
     "britepoolIdSystem",
     "connectIdSystem",
     "criteoIdSystem",
+    "dacIdSystem",
     "deepintentDpesIdSystem",
     "dmdIdSystem",
     "fabrickIdSystem",