Merge branch 'master' into 2.0
This commit is contained in:
@@ -3,3 +3,4 @@ debug-fixtures
|
||||
fixtures
|
||||
/data
|
||||
/flow-typed
|
||||
test/tmp
|
||||
|
||||
@@ -805,6 +805,7 @@
|
||||
"firefox": "47",
|
||||
"safari": "10.1",
|
||||
"node": "7",
|
||||
"ios": "10.3",
|
||||
"opera": "41",
|
||||
"electron": "1.5"
|
||||
},
|
||||
@@ -814,6 +815,7 @@
|
||||
"firefox": "47",
|
||||
"safari": "10.1",
|
||||
"node": "7",
|
||||
"ios": "10.3",
|
||||
"opera": "41",
|
||||
"electron": "1.5"
|
||||
},
|
||||
@@ -823,6 +825,7 @@
|
||||
"firefox": "50",
|
||||
"safari": "10.1",
|
||||
"node": "7",
|
||||
"ios": "10.3",
|
||||
"opera": "41",
|
||||
"electron": "1.5"
|
||||
},
|
||||
|
||||
@@ -206,6 +206,7 @@
|
||||
"firefox": "52",
|
||||
"safari": "10.1",
|
||||
"node": "7",
|
||||
"ios": "10.3",
|
||||
"opera": "39",
|
||||
"electron": "1.3"
|
||||
},
|
||||
@@ -215,6 +216,7 @@
|
||||
"firefox": "52",
|
||||
"safari": "10.1",
|
||||
"node": "7.6",
|
||||
"ios": "10.3",
|
||||
"opera": "42",
|
||||
"electron": "1.6"
|
||||
},
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
"babel-register": "7.0.0-alpha.9",
|
||||
"chai": "^3.5.0",
|
||||
"codecov": "^2.0.1",
|
||||
"compat-table": "kangax/compat-table#861954b6e13d3eaa1ba9ef1a016906c0fc1072db",
|
||||
"compat-table": "kangax/compat-table#f49f1b23ad35e61819c388bc1876d936bc6ad8bf",
|
||||
"electron-to-chromium": "^1.3.2",
|
||||
"eslint": "^3.17.1",
|
||||
"eslint-config-babel": "^6.0.0",
|
||||
|
||||
@@ -154,6 +154,7 @@ const envMap = {
|
||||
android50: "android5.0",
|
||||
android51: "android5.1",
|
||||
ios51: "ios5.1",
|
||||
ios10_3: "ios10.3",
|
||||
};
|
||||
|
||||
const compatibilityTests = flattenDeep(
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user