Skip to content

Commit

Permalink
Merge pull request #39 from voyagegroup/update/prebid-6.7
Browse files Browse the repository at this point in the history
update: prebid version to 6.7
  • Loading branch information
saxsir authored Nov 14, 2022
2 parents 5427c77 + 4cd95a9 commit 49aee95
Show file tree
Hide file tree
Showing 281 changed files with 18,552 additions and 2,715 deletions.
11 changes: 1 addition & 10 deletions .babelrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,7 @@ module.exports = {
[
useLocal('@babel/preset-env'),
{
"targets": {
"browsers": [
"chrome >= 75",
"safari >=10",
"edge >= 70",
"ff >= 70",
"ie >= 11",
"ios >= 11"
]
}
"useBuiltIns": "entry"
}
]
],
Expand Down
11 changes: 6 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Check https://circleci.com/docs/2.0/language-javascript/ for more details
#

aliases:
aliases:
- &environment
docker:
# specify the version you desire here
Expand All @@ -17,8 +17,9 @@ aliases:

- &restore_dep_cache
keys:
- v5.20.x-legacy-dependencies-{{ checksum "package.json" }}
- v5.20.x-legacy-dependencies-
- v1-dependencies-{{ checksum "package.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-

- &save_dep_cache
paths:
Expand Down Expand Up @@ -51,7 +52,7 @@ aliases:
- &unit_test_steps
- checkout
- restore_cache: *restore_dep_cache
- run: npm install
- run: npm ci
- save_cache: *save_dep_cache
- run: *install
- run: *setup_browserstack
Expand All @@ -71,7 +72,7 @@ jobs:
build:
<<: *environment
steps: *unit_test_steps

e2etest:
<<: *environment
steps: *endtoend_test_steps
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ module.exports = {
loader: 'babel-loader',
// presets and plugins for Prebid.js must be manually specified separate from your other babel rule.
// this can be accomplished by requiring prebid's .babelrc.js file (requires Babel 7 and Node v8.9.0+)
// as of Prebid 6, babelrc.js only targets modern browsers. One can change the targets and build for
// older browsers if they prefer, but integration tests on ie11 were removed in Prebid.js 6.0
options: require('prebid.js/.babelrc.js')
}
}
Expand Down Expand Up @@ -272,7 +274,7 @@ As you make code changes, the bundles will be rebuilt and the page reloaded auto

## Contribute

Many SSPs, bidders, and publishers have contributed to this project. [Hundreds of bidders](https://github.com/prebid/Prebid.js/tree/master/src/adapters) are supported by Prebid.js.
Many SSPs, bidders, and publishers have contributed to this project. [Hundreds of bidders](https://github.com/prebid/Prebid.js/tree/master/modules) are supported by Prebid.js.

For guidelines, see [Contributing](./CONTRIBUTING.md).

Expand Down Expand Up @@ -314,7 +316,7 @@ For instructions on writing tests for Prebid.js, see [Testing Prebid.js](http://

### Supported Browsers

Prebid.js is supported on IE11 and modern browsers.
Prebid.js is supported on IE11 and modern browsers until 5.x. 6.x+ transpiles to target >0.25%; not Opera Mini; not IE11.

### Governance
Review our governance model [here](https://github.com/prebid/Prebid.js/tree/master/governance.md).
50 changes: 13 additions & 37 deletions browsers.json
Original file line number Diff line number Diff line change
@@ -1,73 +1,49 @@
{
"bs_edge_17_windows_10": {
"bs_edge_latest_windows_10": {
"base": "BrowserStack",
"os_version": "10",
"browser": "edge",
"browser_version": "17.0",
"browser_version": "latest",
"device": null,
"os": "Windows"
},
"bs_edge_90_windows_10": {
"base": "BrowserStack",
"os_version": "10",
"browser": "edge",
"browser_version": "90.0",
"device": null,
"os": "Windows"
},
"bs_ie_11_windows_10": {
"base": "BrowserStack",
"os_version": "10",
"browser": "ie",
"browser_version": "11.0",
"device": null,
"os": "Windows"
},
"bs_chrome_90_windows_10": {
"bs_chrome_latest_windows_10": {
"base": "BrowserStack",
"os_version": "10",
"browser": "chrome",
"browser_version": "90.0",
"browser_version": "latest",
"device": null,
"os": "Windows"
},
"bs_chrome_79_windows_10": {
"bs_chrome_87_windows_10": {
"base": "BrowserStack",
"os_version": "10",
"browser": "chrome",
"browser_version": "79.0",
"device": null,
"os": "Windows"
},
"bs_firefox_88_windows_10": {
"base": "BrowserStack",
"os_version": "10",
"browser": "firefox",
"browser_version": "88.0",
"browser_version": "87.0",
"device": null,
"os": "Windows"
},
"bs_firefox_72_windows_10": {
"bs_firefox_latest_windows_10": {
"base": "BrowserStack",
"os_version": "10",
"browser": "firefox",
"browser_version": "72.0",
"browser_version": "latest",
"device": null,
"os": "Windows"
},
"bs_safari_14_mac_bigsur": {
"bs_safari_latest_mac_bigsur": {
"base": "BrowserStack",
"os_version": "Big Sur",
"browser": "safari",
"browser_version": "14.0",
"browser_version": "latest",
"device": null,
"os": "OS X"
},
"bs_safari_12_mac_mojave": {
"bs_safari_15_catalina": {
"base": "BrowserStack",
"os_version": "Mojave",
"os_version": "Catalina",
"browser": "safari",
"browser_version": "12.0",
"browser_version": "13.1",
"device": null,
"os": "OS X"
}
Expand Down
Loading

0 comments on commit 49aee95

Please sign in to comment.