From 0721da5a82afa501f10dc85cfada62d598a2ba9a Mon Sep 17 00:00:00 2001
From: Brian Ng <bng412@gmail.com>
Date: Wed, 20 Nov 2019 10:46:21 -0600
Subject: [PATCH] Update preset-env mappings

---
 .../data/built-in-modules.json                |  4 +--
 .../data/corejs2-built-in-features.js         | 26 ++++++++++++++++++-
 .../data/corejs2-built-ins.json               |  3 +++
 packages/babel-preset-env/data/plugins.json   |  6 +++++
 packages/babel-preset-env/package.json        |  2 +-
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/packages/babel-preset-env/data/built-in-modules.json b/packages/babel-preset-env/data/built-in-modules.json
index 5bada5f51b38..7e33f27eb290 100644
--- a/packages/babel-preset-env/data/built-in-modules.json
+++ b/packages/babel-preset-env/data/built-in-modules.json
@@ -6,7 +6,7 @@
     "safari": "10.1",
     "opera": "48",
     "ios_saf": "10.3",
-    "and_chr": "71",
-    "and_ff": "64"
+    "and_chr": "74",
+    "and_ff": "66"
   }
 }
diff --git a/packages/babel-preset-env/data/corejs2-built-in-features.js b/packages/babel-preset-env/data/corejs2-built-in-features.js
index f18244b4c9ad..df73164fb6a7 100644
--- a/packages/babel-preset-env/data/corejs2-built-in-features.js
+++ b/packages/babel-preset-env/data/corejs2-built-in-features.js
@@ -95,7 +95,31 @@ const es = {
     ],
   },
 
-  "es6.map": "Map",
+  // This is explicit to prevent Map-related proposals (like
+  // Map.prototype.upsert) from being included
+  "es6.map": {
+    features: [
+      "Map / basic functionality",
+      "Map / constructor arguments",
+      "Map / constructor requires new",
+      "Map / constructor accepts null",
+      "Map / constructor invokes set",
+      "Map / iterator closing",
+      "Map / Map.prototype.add returns this",
+      "Map / -0 key converts to +0",
+      "Map / Map.prototype.size",
+      "Map / Map.prototype.delete",
+      "Map / Map.prototype.clear",
+      "Map / Map.prototype.forEach",
+      "Map / Map.prototype.keys",
+      "Map / Map.prototype.values",
+      "Map / Map.prototype.entries",
+      "Map / Map.prototype[Symbol.iterator]",
+      "Map / Map.prototype isn't an instance",
+      "Map / Map iterator prototype chain",
+      "Map / Map[Symbol.species]",
+    ],
+  },
 
   "es6.math.acosh": "Math methods / Math.acosh",
   "es6.math.asinh": "Math methods / Math.asinh",
diff --git a/packages/babel-preset-env/data/corejs2-built-ins.json b/packages/babel-preset-env/data/corejs2-built-ins.json
index 2079f1c3d74a..5c81e27f27f5 100644
--- a/packages/babel-preset-env/data/corejs2-built-ins.json
+++ b/packages/babel-preset-env/data/corejs2-built-ins.json
@@ -77,6 +77,7 @@
     "safari": "12",
     "node": "11",
     "ios": "12",
+    "samsung": "10.2",
     "opera": "56",
     "electron": "4"
   },
@@ -1496,6 +1497,7 @@
     "safari": "12",
     "node": "10",
     "ios": "12",
+    "samsung": "9.2",
     "opera": "53",
     "electron": "3.1"
   },
@@ -1505,6 +1507,7 @@
     "safari": "12",
     "node": "10",
     "ios": "12",
+    "samsung": "9.2",
     "opera": "53",
     "electron": "3.1"
   },
diff --git a/packages/babel-preset-env/data/plugins.json b/packages/babel-preset-env/data/plugins.json
index 382a51399431..f4a5771b01c3 100644
--- a/packages/babel-preset-env/data/plugins.json
+++ b/packages/babel-preset-env/data/plugins.json
@@ -3,7 +3,9 @@
     "chrome": "41",
     "edge": "13",
     "firefox": "34",
+    "safari": "13",
     "node": "4",
+    "ios": "13",
     "samsung": "3.4",
     "opera": "28",
     "electron": "0.24"
@@ -273,6 +275,7 @@
     "safari": "11.1",
     "node": "10",
     "ios": "11.3",
+    "samsung": "9.2",
     "opera": "51",
     "electron": "3.1"
   },
@@ -282,6 +285,7 @@
     "safari": "12",
     "node": "10",
     "ios": "12",
+    "samsung": "9.2",
     "opera": "53",
     "electron": "3.1"
   },
@@ -291,6 +295,7 @@
     "safari": "11.1",
     "node": "10",
     "ios": "11.3",
+    "samsung": "9.2",
     "opera": "53",
     "electron": "3.1"
   },
@@ -299,6 +304,7 @@
     "safari": "11.1",
     "node": "10",
     "ios": "11.3",
+    "samsung": "9.2",
     "opera": "51",
     "electron": "3.1"
   },
diff --git a/packages/babel-preset-env/package.json b/packages/babel-preset-env/package.json
index 7648965e88be..f8c13559c29b 100644
--- a/packages/babel-preset-env/package.json
+++ b/packages/babel-preset-env/package.json
@@ -76,7 +76,7 @@
     "@babel/helper-plugin-test-runner": "^7.0.0",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "caniuse-db": "1.0.30000969",
-    "compat-table": "kangax/compat-table#071b478a44694cbf72a78db8ab39189c5ae31b2c",
+    "compat-table": "kangax/compat-table#4195aca631ad904cb0efeb62a9c2d8c8511706f8",
     "electron-to-chromium": "1.3.113"
   }
 }