Merge pull request #1 from prebid/master

Sync up prebid master to fork master

.circleci/config.yml

@@ -38,28 +38,12 @@ aliases:
  name: BrowserStack End to end testing
  command: gulp e2e-test
 
- # Download and run BrowserStack local
- - &download_browserstack
- name : Download BrowserStackLocal binary
- command : |
- # Download the browserstack binary file
- wget "https://www.browserstack.com/browserstack-local/BrowserStackLocal-linux-x64.zip"
- # Unzip it
- unzip BrowserStackLocal-linux-x64.zip
-
- - &start_browserstack
- name: Start BrowserStackLocal
- command: ./BrowserStackLocal --key ${BROWSERSTACK_ACCESS_KEY} --automate-only --local-identifier ${CIRCLE_WORKFLOW_JOB_ID}
- background: true
-
  - &unit_test_steps
  - checkout
  - restore_cache: *restore_dep_cache
  - run: npm ci
  - save_cache: *save_dep_cache
  - run: *install
- - run: *download_browserstack
- - run: *start_browserstack
  - run: *run_unit_test
 
  - &endtoend_test_steps
@@ -68,8 +52,6 @@ aliases:
  - run: npm install
  - save_cache: *save_dep_cache
  - run: *install
- - run: *download_browserstack
- - run: *start_browserstack
  - run: *run_endtoend_test
 
 version: 2
@@ -87,6 +69,9 @@ workflows:
  commit:
  jobs:
  - build
+ - e2etest:
+ requires:
+ - build
 
 experimental:
  pipelines: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,15 @@
 <!--
-Thank you for your pull request. Please make sure this PR is scoped to one change, and that any added or changed code includes tests with greater than 80% code coverage. See https://github.com/prebid/Prebid.js/blob/master/CONTRIBUTING.md#testing-prebidjs for documentation on testing Prebid.js.
+Thank you for your pull request! 
+
+Please title your pull request like this: 'Module: Change', eg 'Fraggles Bid Adapter: support fragglerock'
+
+Please make sure this PR is scoped to one change or you may be asked to resubmit. 
+ 
+Please make sure any added or changed code includes tests with greater than 80% code coverage. 
+
+See https://github.com/prebid/Prebid.js/blob/master/CONTRIBUTING.md#testing-prebidjs for documentation on testing Prebid.js.
+
+For any user facing change, submit a link to a PR on the docs repo at https://github.com/prebid/prebid.github.io/
 -->
 
 ## Type of change
@@ -11,14 +21,16 @@ Thank you for your pull request. Please make sure this PR is scoped to one chang
 - [ ] Refactoring (no functional changes, no api changes)
 - [ ] Build related changes
 - [ ] CI related changes
+
 - [ ] Does this change affect user-facing APIs or examples documented on http://prebid.org?
 - [ ] Other
 
 ## Description of change
 <!-- Describe the change proposed in this pull request -->
 
-<!-- For new bidder adapters, please provide the following -->
-- test parameters for validating bids
+<!-- For new bidder adapters, please provide the following
+- contact email of the adapter’s maintainer
+- test parameters for validating bids:
 ```
 {
  bidder: '<bidder name>',
@@ -28,14 +40,8 @@ Thank you for your pull request. Please make sure this PR is scoped to one chang
 }
 ```
 
-Be sure to test the integration with your adserver using the [Hello World](/integrationExamples/gpt/hello_world.html) sample page.
-
-- contact email of the adapter’s maintainer
-- [ ] official adapter submission
-
-For any changes that affect user-facing APIs or example code documented on http://prebid.org, please provide:
+Be sure to test the integration with your adserver using the [Hello World](/integrationExamples/gpt/hello_world.html) sample page. -->
 
-- A link to a PR on the docs repo at https://github.com/prebid/prebid.github.io/
 
 ## Other information
 <!-- References to related PR or issue #s, @mentions of the person or team responsible for reviewing changes, etc. -->

.github/codeql/codeql-config.yml

@@ -0,0 +1,4 @@
+paths:
+ - src
+ - modules
+ - libraries

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,73 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+ push:
+ branches: [ "master" ]
+ pull_request:
+ # The branches below must be a subset of the branches above
+ branches: [ "master" ]
+ schedule:
+ - cron: '22 11 * * 0'
+
+jobs:
+ analyze:
+ name: Analyze
+ runs-on: ubuntu-latest
+ permissions:
+ actions: read
+ contents: read
+ security-events: write
+
+ strategy:
+ fail-fast: false
+ matrix:
+ language: [ 'javascript' ]
+ # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+ # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v2
+ with:
+ languages: ${{ matrix.language }}
+ config-file: ./.github/codeql/codeql-config.yml
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file.
+ # Prefix the list here with "+" to use these queries and those in the config file.
+
+ # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+ # queries: security-extended,security-and-quality
+
+
+ # 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@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
+
+ # If the Autobuild fails above, remove it and uncomment the following three lines.
+ # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+ # - run: |
+ # echo "Run, Build Application using script"
+ # ./location_of_script_within_repo/buildscript.sh
+
+ - name: Perform CodeQL Analysis
+ 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@36464acb844fc53b9b8b2401da68844f6b05ebb0
+ uses: tibdex/github-app-token@f717b5ecd4534d3c4df4ce9b5c1c2214f0f7cd06
  with:
  app_id: ${{ secrets.ISSUE_APP_ID }}
  private_key: ${{ secrets.ISSUE_APP_PEM }}

.gitignore

@@ -15,7 +15,7 @@ selenium*.log
 integrationExamples/gpt/gpt.html
 integrationExamples/gpt/*-test.html
 integrationExamples/implementations/
-src/adapters/analytics/libraries
+libraries/analyticsAdapter/examples/libraries
 
 # Coverage reports
 build/coverage/

README.md

@@ -1,8 +1,6 @@
 [![Build Status](https://circleci.com/gh/prebid/Prebid.js.svg?style=svg)](https://circleci.com/gh/prebid/Prebid.js)
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/prebid/Prebid.js.svg)](http://isitmaintained.com/project/prebid/Prebid.js "Percentage of issues still open")
-[![Code Climate](https://codeclimate.com/github/prebid/Prebid.js/badges/gpa.svg)](https://codeclimate.com/github/prebid/Prebid.js)
 [![Coverage Status](https://coveralls.io/repos/github/prebid/Prebid.js/badge.svg)](https://coveralls.io/github/prebid/Prebid.js)
-[![devDependencies Status](https://david-dm.org/prebid/Prebid.js/dev-status.svg)](https://david-dm.org/prebid/Prebid.js?type=dev)
 [![Total Alerts](https://img.shields.io/lgtm/alerts/g/prebid/Prebid.js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/prebid/Prebid.js/alerts/)
 
 # Prebid.js

RELEASE_SCHEDULE.md

@@ -12,7 +12,7 @@
 We aim to push a new release of Prebid.js every week on Tuesday.
 
 While the releases will be available immediately for those using direct Git access,
-it will be about a week before the Prebid Org [Download Page](http://prebid.org/download.html) will be updated.
+it will be about a week before the Prebid Org [Download Page](https://docs.prebid.org/download.html) will be updated.
 
 You can determine what is in a given build using the [releases page](https://github.com/prebid/Prebid.js/releases)
 

allowedModules.js

@@ -15,5 +15,8 @@ module.exports = {
  'just-clone',
  'dlv',
  'dset'
+ ],
+ 'libraries': [
+ ...sharedWhiteList // empty for now, but keep it to enable linting
  ]
 };

babelConfig.js

@@ -22,9 +22,15 @@ module.exports = function (options = {}) {
  }
  ]
  ],
- 'plugins': [
- [path.resolve(__dirname, './plugins/pbjsGlobals.js'), options],
- [useLocal('@babel/plugin-transform-runtime')],
- ],
+ 'plugins': (() => {
+ const plugins = [
+ [path.resolve(__dirname, './plugins/pbjsGlobals.js'), options],
+ [useLocal('@babel/plugin-transform-runtime')],
+ ];
+ if (options.codeCoverage) {
+ plugins.push([useLocal('babel-plugin-istanbul')])
+ }
+ return plugins;
+ })(),
  }
 }

gulpHelpers.js

@@ -6,12 +6,9 @@ const MANIFEST = 'package.json';
 const through = require('through2');
 const _ = require('lodash');
 const gutil = require('gulp-util');
-const dependencyMap = require('./modules/.submodules.json');
-const submodules = dependencyMap.parentModules;
-const libraries = dependencyMap.libraries;
+const submodules = require('./modules/.submodules.json').parentModules;
 
 const MODULE_PATH = './modules';
-const LIBRARY_PATH = './libraries';
 const BUILD_PATH = './build/dist';
 const DEV_PATH = './build/dev';
 const ANALYTICS_PATH = '../analytics';
@@ -71,68 +68,34 @@ module.exports = {
  }
  });
 
- Object.keys(libraries).forEach(library => {
- if (!modules.includes(library) && modules.some(module => libraries[library].dependants.includes(module))) {
- modules.unshift(library);
- }
- });
-
  return modules;
  },
- getParentLibraries(moduleName) {
- const libraryNames = [];
- Object.keys(libraries).forEach(libraryName => {
- const library = libraries[libraryName];
- if (library.dependants.includes(moduleName)) {
- libraryNames.push(libraryName);
- }
- });
- return libraryNames;
- },
- getLibraryFiles(name) {
- const library = libraries[name];
- const files = library.files.map((file) => path.resolve('./libraries/', name, file))
- return files;
- },
- isLibrary(name) {
- return !!libraries[name];
- },
  getModules: _.memoize(function(externalModules) {
  externalModules = externalModules || [];
  var internalModules;
  try {
- var getInternalModules = function(absolutePath) {
- return fs.readdirSync(absolutePath)
- .filter(file => (/^[^\.]+(\.js)?$/).test(file))
- .reduce((memo, file) => {
- var moduleName = file.split(new RegExp('[.\\' + path.sep + ']'))[0];
- var modulePath = path.join(absolutePath, file);
- if (fs.lstatSync(modulePath).isDirectory()) {
- modulePath = path.join(modulePath, 'index.js')
- }
- if (fs.existsSync(modulePath)) {
- memo[modulePath] = moduleName;
- }
- return memo;
- }, {});
- };
-
  var absoluteModulePath = path.join(__dirname, MODULE_PATH);
- var absoluteLibraryPath = path.join(__dirname, LIBRARY_PATH);
-
- internalModules = getInternalModules(absoluteModulePath);
- var internalLibraries = getInternalModules(absoluteLibraryPath);
- Object.assign(internalModules, internalLibraries);
+ internalModules = fs.readdirSync(absoluteModulePath)
+ .filter(file => (/^[^\.]+(\.js)?$/).test(file))
+ .reduce((memo, file) => {
+ var moduleName = file.split(new RegExp('[.\\' + path.sep + ']'))[0];
+ var modulePath = path.join(absoluteModulePath, file);
+ if (fs.lstatSync(modulePath).isDirectory()) {
+ modulePath = path.join(modulePath, 'index.js')
+ }
+ if (fs.existsSync(modulePath)) {
+ memo[modulePath] = moduleName;
+ }
+ return memo;
+ }, {});
  } catch (err) {
  internalModules = {};
  }
  return Object.assign(externalModules.reduce((memo, module) => {
  try {
  // prefer internal project modules before looking at project dependencies
- var modulePath = require.resolve(module, {paths: [MODULE_PATH, LIBRARY_PATH]});
- if (modulePath === '') {
- modulePath = require.resolve(module);
- }
+ var modulePath = require.resolve(module, {paths: ['./modules']});
+ if (modulePath === '') modulePath = require.resolve(module);
 
  memo[modulePath] = module;
  } catch (err) {
@@ -142,16 +105,20 @@ module.exports = {
  }, internalModules));
  }),
 
+ getBuiltPath(dev, assetPath) {
+ return path.join(__dirname, dev ? DEV_PATH : BUILD_PATH, assetPath)
+ },
+
  getBuiltModules: function(dev, externalModules) {
  var modules = this.getModuleNames(externalModules);
  if (Array.isArray(externalModules)) {
  modules = _.intersection(modules, externalModules);
  }
- return modules.map(name => path.join(__dirname, dev ? DEV_PATH : BUILD_PATH, name + '.js'));
+ return modules.map(name => this.getBuiltPath(dev, name + '.js'));
  },
 
  getBuiltPrebidCoreFile: function(dev) {
- return path.join(__dirname, dev ? DEV_PATH : BUILD_PATH, 'prebid-core' + '.js');
+ return this.getBuiltPath(dev, 'prebid-core.js')
  },
 
  getModulePaths: function(externalModules) {