Merge branch 'master' into 2.0

# Conflicts:
#	.travis.yml
#	package.json
#	src/targets-parser.js
#	yarn.lock
This commit is contained in:
Artem Yavorsky 2017-07-01 17:50:54 +03:00
commit 899c57b960
6 changed files with 38 additions and 29 deletions

View File

@ -0,0 +1,24 @@
# Configuration for probot-stale - https://github.com/probot/stale
# Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale Issue or Pull Request is closed
daysUntilClose: 7
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
exemptLabels:
- has pr
- pinned
- security
# Label to use when marking as stale
staleLabel: stale
# Comment to post when marking as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as `stale` because it has not had
recent activity 😴. It will be closed if no further activity occurs. Thank you
for your contributions 👌!
# Comment to post when removing the stale label. Set to `false` to disable
unmarkComment: false
# Comment to post when closing a stale Issue or Pull Request. Set to `false` to disable
closeComment: false
# Limit to only `issues` or `pulls`
# only: issues

View File

@ -1,5 +1,13 @@
# Changelog
## v1.5.2 (2017-06-07)
### :bug: Bug Fix
- Ensure explicit targets always override browsers key targets ([#346](https://github.com/babel/babel-preset-env/pull/346)) (@existentialism)
`browser` targets should be overridden by explicit targets, and we inadvertently broke this when we landed string version support.
## v1.5.1 (2017-05-22)
### :bug: Bug Fix

View File

@ -327,7 +327,6 @@
"safari": "9",
"node": "0.12",
"ie": "11",
"android": "5",
"ios": "9",
"opera": "21",
"electron": "0.2"
@ -522,7 +521,6 @@
"firefox": "28",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -543,7 +541,6 @@
"firefox": "16",
"safari": "9",
"node": "0.12",
"android": "5",
"ios": "9",
"opera": "21",
"electron": "0.2"
@ -554,7 +551,6 @@
"firefox": "32",
"safari": "9",
"node": "0.12",
"android": "5",
"ios": "9",
"opera": "21",
"electron": "0.2"
@ -575,7 +571,6 @@
"firefox": "25",
"safari": "9",
"node": "0.12",
"android": "5",
"ios": "9",
"opera": "21",
"electron": "0.2"
@ -586,7 +581,6 @@
"firefox": "31",
"safari": "9",
"node": "0.12",
"android": "5",
"ios": "9",
"opera": "21",
"electron": "0.2"
@ -597,7 +591,6 @@
"firefox": "31",
"safari": "9",
"node": "0.12",
"android": "5",
"ios": "9",
"opera": "21",
"electron": "0.2"
@ -608,7 +601,6 @@
"firefox": "25",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -619,7 +611,6 @@
"firefox": "25",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -630,7 +621,6 @@
"firefox": "25",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -641,7 +631,6 @@
"firefox": "25",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -652,7 +641,6 @@
"firefox": "31",
"safari": "9",
"node": "0.12",
"android": "5.1",
"ios": "9",
"opera": "25",
"electron": "0.2"
@ -663,7 +651,6 @@
"firefox": "25",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -674,7 +661,6 @@
"firefox": "25",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -685,7 +671,6 @@
"firefox": "26",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -696,7 +681,6 @@
"firefox": "27",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -707,7 +691,6 @@
"firefox": "23",
"safari": "7",
"node": "0.12",
"android": "4.4",
"ios": "7",
"opera": "17",
"electron": "0.2"
@ -718,7 +701,6 @@
"firefox": "25",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -729,7 +711,6 @@
"firefox": "25",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -740,7 +721,6 @@
"firefox": "25",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -751,7 +731,6 @@
"firefox": "25",
"safari": "9",
"node": "0.12",
"android": "5.1",
"ios": "9",
"opera": "25",
"electron": "0.2"
@ -762,7 +741,6 @@
"firefox": "25",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -773,7 +751,6 @@
"firefox": "25",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -784,7 +761,6 @@
"firefox": "25",
"safari": "7.1",
"node": "0.12",
"android": "5.1",
"ios": "8",
"opera": "25",
"electron": "0.2"
@ -834,6 +810,7 @@
"edge": "15",
"firefox": "48",
"safari": "10",
"node": "8",
"ios": "10",
"opera": "44",
"electron": "1.7"
@ -843,6 +820,7 @@
"edge": "15",
"firefox": "48",
"safari": "10",
"node": "8",
"ios": "10",
"opera": "44",
"electron": "1.7"

View File

@ -175,7 +175,6 @@
"firefox": "36",
"safari": "9",
"node": "0.12",
"android": "5.1",
"ios": "9",
"opera": "25",
"electron": "0.2"
@ -225,6 +224,7 @@
"edge": "14",
"firefox": "52",
"safari": "10",
"node": "8",
"ios": "10",
"opera": "45",
"electron": "1.7"

View File

@ -66,9 +66,8 @@
"babel-preset-env": "2.0.0-alpha.1",
"babel-register": "7.0.0-alpha.12",
"chai": "^3.5.0",
"codecov": "^2.0.1",
"compat-table": "kangax/compat-table#1f0bb0913736fe8c4c11b139766c73b9cbedb9f2",
"electron-to-chromium": "^1.3.11",
"codecov": "^1.0.1",
"compat-table": "kangax/compat-table#d88c80ea6dcbc7064112eb46bb020718107892f7",
"eslint": "^3.17.1",
"eslint-config-babel": "^6.0.0",
"eslint-plugin-flowtype": "^2.33.0",

View File

@ -32,7 +32,7 @@ describe("getTargets", () => {
}),
{
chrome: "49.0.0",
firefox: "51.0.0",
firefox: "55.0.0",
ie: "9.0.0",
safari: "9.0.0",
},