From 455c04e60a07c1add3082dfa2aae13a0c93a485a Mon Sep 17 00:00:00 2001
From: Brian Ng <bng412@gmail.com>
Date: Fri, 23 Feb 2018 08:46:14 -0600
Subject: [PATCH] Bump compat-table and regen preset-env data (#7401)

---
 .prettierignore                                     |  1 +
 packages/babel-preset-env/data/built-ins.json       |  2 +-
 packages/babel-preset-env/data/plugins.json         | 10 ++++++----
 packages/babel-preset-env/package.json              |  2 +-
 .../scripts/build-modules-support.js                | 13 ++++++++++---
 5 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 .prettierignore

diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000000..ec6d3cdd7f
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1 @@
+package.json
diff --git a/packages/babel-preset-env/data/built-ins.json b/packages/babel-preset-env/data/built-ins.json
index 96b619f845..42453508ae 100644
--- a/packages/babel-preset-env/data/built-ins.json
+++ b/packages/babel-preset-env/data/built-ins.json
@@ -1149,7 +1149,7 @@
   "es7.promise.finally": {
     "chrome": "63",
     "firefox": "58",
-    "safari": "tp",
+    "safari": "11.1",
     "opera": "50"
   }
 }
diff --git a/packages/babel-preset-env/data/plugins.json b/packages/babel-preset-env/data/plugins.json
index 99ed3351ee..c1020cfb92 100644
--- a/packages/babel-preset-env/data/plugins.json
+++ b/packages/babel-preset-env/data/plugins.json
@@ -220,7 +220,7 @@
   },
   "transform-dotall-regex": {
     "chrome": "62",
-    "safari": "tp",
+    "safari": "11.1",
     "opera": "49"
   },
   "proposal-async-generator-functions": {
@@ -232,17 +232,19 @@
   "proposal-object-rest-spread": {
     "chrome": "60",
     "firefox": "55",
-    "safari": "tp",
+    "safari": "11.1",
     "node": "8.3",
     "opera": "47"
   },
   "proposal-optional-catch-binding": {
+    "chrome": "66",
     "firefox": "58",
-    "safari": "tp"
+    "safari": "11.1",
+    "opera": "53"
   },
   "proposal-unicode-property-regex": {
     "chrome": "64",
-    "safari": "tp",
+    "safari": "11.1",
     "opera": "51"
   }
 }
diff --git a/packages/babel-preset-env/package.json b/packages/babel-preset-env/package.json
index 585cb5faea..e056465aa7 100644
--- a/packages/babel-preset-env/package.json
+++ b/packages/babel-preset-env/package.json
@@ -57,7 +57,7 @@
     "@babel/core": "7.0.0-beta.40",
     "@babel/helper-fixtures": "7.0.0-beta.40",
     "@babel/helper-plugin-test-runner": "7.0.0-beta.40",
-    "compat-table": "kangax/compat-table#3e30cd67a5d3d853caf8424d00ca66d100674d4f",
+    "compat-table": "kangax/compat-table#7c202e2da648fbd9d223d48d1680ec8f15147044",
     "electron-to-chromium": "^1.3.27",
     "request": "^2.83.0"
   }
diff --git a/packages/babel-preset-env/scripts/build-modules-support.js b/packages/babel-preset-env/scripts/build-modules-support.js
index 55cf110165..edbdd85b8b 100644
--- a/packages/babel-preset-env/scripts/build-modules-support.js
+++ b/packages/babel-preset-env/scripts/build-modules-support.js
@@ -8,12 +8,16 @@ const request = require("request");
 // * https://html.spec.whatwg.org/multipage/scripting.html#attr-script-type
 const lastKnown = {
   chrome: 61,
-  firefox: 59,
   safari: 10.1,
   ios_saf: 10.3,
   edge: 16,
 };
 
+const acceptedWithCaveats = {
+  safari: true,
+  ios_saf: true,
+};
+
 function input() {
   return new Promise(function(resolve, reject) {
     request(
@@ -38,12 +42,15 @@ function input() {
               const browserVersions = stats[browser];
               const allowedVersions = Object.keys(browserVersions)
                 .filter(value => {
-                  return browserVersions[value] === "y";
+                  return acceptedWithCaveats[browser]
+                    ? browserVersions[value][0] === "a"
+                    : browserVersions[value] === "y";
                 })
                 .sort((a, b) => a - b);
 
               if (allowedVersions[0] !== undefined) {
-                allowedBrowsers[browser] = allowedVersions[0];
+                // Handle cases where caniuse specifies version as: "11.0-11.2"
+                allowedBrowsers[browser] = allowedVersions[0].split("-")[0];
               }
             }
           });