Merging latest master code

.eslintrc → .eslintrc.js

@@ -1,4 +1,4 @@
-{
+module.exports = {
   "env": {
     "browser": true,
     "commonjs": true
@@ -19,24 +19,14 @@
     // Violations of these styles should be fixed, and the exceptions removed over time.
     //
     // See Issue #1111.
-    "brace-style": "off",
     "camelcase": "off",
     "eqeqeq": "off",
-    "import/first": "off",
     "no-control-regex": "off",
-    "no-mixed-operators": "off",
-    "no-multiple-empty-lines": "off",
-    "no-redeclare": "off",
     "no-return-assign": "off",
     "no-throw-literal": "off",
     "no-undef": "off",
-    "no-unused-vars": "off",
     "no-use-before-define": "off",
-    "no-useless-call": "off",
     "no-useless-escape": "off",
-    "one-var": "off",
     "standard/no-callback-literal": "off",
-    "standard/object-curly-even-spacing": "off",
-    "valid-typeof": "off"
   }
-}
+};

.github/ISSUE_TEMPLATE.md

@@ -6,8 +6,12 @@
 
 ## Steps to reproduce
 <!--
-  If this is a bug, please provide a list of steps to reproduce the issue and
-  if possible a link to a test page or minimal demo of the problem via
+  If this is a bug, please provide a list of steps to reproduce the issue
+-->
+
+## Test page
+<!--
+Include a link to a test page or minimal demo of the problem via
   https://jsfiddle.net, http://jsbin.com or similar.
 -->
 

.nvmrc

@@ -1 +1 @@
-5.1
+7.0

.travis.yml

@@ -1,23 +1,17 @@
-sudo: required
 dist: trusty
 
 language: node_js
 
 node_js:
-  - "5.1"
+  - "7.0"
 
+# See https://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-the-Chrome-addon-in-the-headless-mode
 addons:
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - google-chrome-stable
+  chrome: stable
 
 before_install:
   - npm install -g gulp
-  - export CHROME_BIN=google-chrome
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+  - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
 
 script:
   - gulp run-tests

README.md

@@ -28,10 +28,12 @@ Working examples can be found in [the developer docs](http://prebid.org/dev-docs
     $ cd Prebid.js
     $ yarn install
 
-Prebid also supports the `yarn` npm client. This is an alternative to using `npm` for package management, though `npm` will continue to work as before.
+Prebid supports the `yarn` npm client. This is an alternative to using `npm` for package management, though `npm install` will continue to work as before.
 
 For more info, see [the Yarn documentation](https://yarnpkg.com).
 
+*Note:* You need to have `NodeJS` 4.x or greater installed.
+
 <a name="Build"></a>
 
 ## Build for Development
@@ -47,8 +49,6 @@ This runs some code quality checks, starts a web server at `http://localhost:999
 + `./build/dist/prebid.js` - Minified production code
 + `./prebid.js_<version>.zip` - Distributable zip archive
 
-*Note:* You need to have `node.js` 4.x or greater installed to be able to run the `gulp build` commands.
-
 ### Build Optimization
 
 The standard build output contains all the available modules from within the `modules` folder.
@@ -102,7 +102,26 @@ Having said that, you are probably safe to check your custom bundle into your pr
 
 ## Test locally
 
-To configure Prebid.js to run locally, edit the example file `./integrationExamples/gpt/pbjs_example_gpt.html`:
+To lint the code:
+
+```bash
+gulp lint
+```
+
+To run the unit tests:
+
+```bash
+gulp test
+```
+
+To generate and view the code coverage reports:
+
+```bash
+gulp test-coverage
+gulp view-coverage
+```
+
+For end-to-end testing, edit the example file `./integrationExamples/gpt/pbjs_example_gpt.html`:
 
 1. Change `{id}` values appropriately to set up ad units and bidders
 2. Set the path to Prebid.js in your example file as shown below (see `pbs.src`).
@@ -131,21 +150,21 @@ For deployment:
 })();
 ```
 
-To run the project locally, use:
+Build and run the project locally with:
 
-    $ gulp serve
+```bash
+gulp serve
+```
 
-This runs code quality checks, generates all the necessary files and starts a web server at `http://localhost:9999` serving from the project root. Navigate to your example implementation to test, and if your `prebid.js` file is sourced from the `./build/dev` directory you will have sourcemaps available in your browser's developer tools.
+This runs `lint` and `test`, then starts a web server at `http://localhost:9999` serving from the project root.
+Navigate to your example implementation to test, and if your `prebid.js` file is sourced from the `./build/dev`
+directory you will have sourcemaps available in your browser's developer tools.
 
 To run the example file, go to:
 
 + `http://localhost:9999/integrationExamples/gpt/pbjs_example_gpt.html`
 
-To view a test coverage report, go to:
-
-+ `http://localhost:9999/build/coverage/karma_html/report`
-
-A watch is also in place that will run continuous tests in the terminal as you edit code and tests.
+As you make code changes, the bundles will be rebuilt and the page reloaded automatically.
 
 <a name="Contribute"></a>
 
@@ -171,7 +190,7 @@ If you are contributing code, you should [configure your editor](http://eslint.o
 
 ### Unit Testing with Karma
 
-        $ gulp test --watch
+        $ gulp test --watch --browsers=chrome
 
 This will run tests and keep the Karma test browser open. If your `prebid.js` file is sourced from the `./build/dev` directory you will also have sourcemaps available when using your browser's developer tools.
 
@@ -195,7 +214,7 @@ For instructions on writing tests for Prebid.js, see [Testing Prebid.js](http://
 
 ### Supported Browsers
 
-Prebid.js is supported on IE9+ and modern browsers.
+Prebid.js is supported on IE10+ and modern browsers.
 
 ### Governance
 Review our governance model [here](https://github.com/prebid/Prebid.js/tree/master/governance.md).

browsers.json

@@ -214,9 +214,5 @@
     "browser": "iphone",
     "device": "iPhone 6S",
     "browser_version": null
-  },
-  "Chrome_travis_ci": {
-    "base": "Chrome",
-    "flags": ["--no-sandbox"]
   }
 }

governance.md

@@ -20,3 +20,4 @@ This document describes the governance model for the Prebid project. The Prebid
 - @jaiminpanchal27
 - @snapwich
 - @harpere
+- @dbemiller

gulpHelpers.js

@@ -64,14 +64,14 @@ module.exports = {
     externalModules = externalModules || [];
     var internalModules;
     try {
-      internalModules = fs.readdirSync(MODULE_PATH)
+      var absoluteModulePath = path.join(__dirname, MODULE_PATH);
+      internalModules = fs.readdirSync(absoluteModulePath)
         .filter(file => !(/(^|\/)\.[^\/\.]/g).test(file))
         .reduce((memo, file) => {
-          var moduleName = file.split(new RegExp('[.' + path.sep + ']'))[0];
-          var filePath = path.join(MODULE_PATH, file);
-          var modulePath = path.join(__dirname, filePath)
-          if (fs.lstatSync(filePath).isDirectory()) {
-            modulePath = path.join(__dirname, filePath, "index.js")
+          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")
           }
           memo[modulePath] = moduleName;
           return memo;