From 7b54ab620bd0ca6ca40680631285e3a89c72a628 Mon Sep 17 00:00:00 2001
From: ylemkimon <mail@ylem.kim>
Date: Fri, 9 Nov 2018 01:29:49 +0900
Subject: [PATCH] preset-env: fix `opera` from `esmodules` target and
 Browserslist not used (#8555)

---
 packages/babel-preset-env/src/targets-parser.js       | 5 +++--
 packages/babel-preset-env/test/targets-parser.spec.js | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/babel-preset-env/src/targets-parser.js b/packages/babel-preset-env/src/targets-parser.js
index c2a446d7ea84..2e8cd51f612c 100644
--- a/packages/babel-preset-env/src/targets-parser.js
+++ b/packages/babel-preset-env/src/targets-parser.js
@@ -30,15 +30,16 @@ const validateTargetNames = (validTargets, targets) => {
 };
 
 const browserNameMap = {
+  and_chr: "chrome",
   android: "android",
   chrome: "chrome",
-  and_chr: "chrome",
   edge: "edge",
   firefox: "firefox",
   ie: "ie",
   ios_saf: "ios",
-  safari: "safari",
   node: "node",
+  opera: "opera",
+  safari: "safari",
 };
 
 export const isBrowsersQueryValid = (
diff --git a/packages/babel-preset-env/test/targets-parser.spec.js b/packages/babel-preset-env/test/targets-parser.spec.js
index fe6e2fac314a..95e9a3ef41fe 100644
--- a/packages/babel-preset-env/test/targets-parser.spec.js
+++ b/packages/babel-preset-env/test/targets-parser.spec.js
@@ -99,11 +99,12 @@ describe("getTargets", () => {
     it("works with current node version and string type browsers", () => {
       expect(
         getTargets({
-          browsers: "current node, chrome 55",
+          browsers: "current node, chrome 55, opera 42",
         }),
       ).toEqual({
         node: process.versions.node,
         chrome: "55.0.0",
+        opera: "42.0.0",
       });
     });
 
@@ -178,6 +179,7 @@ describe("getTargets", () => {
         chrome: "61.0.0",
         safari: "10.1.0",
         firefox: "60.0.0",
+        opera: "48.0.0",
         ios: "10.3.0",
         edge: "16.0.0",
       });
@@ -193,6 +195,7 @@ describe("getTargets", () => {
         chrome: "61.0.0",
         safari: "10.1.0",
         firefox: "60.0.0",
+        opera: "48.0.0",
         ios: "10.3.0",
         edge: "16.0.0",
       });
@@ -208,6 +211,7 @@ describe("getTargets", () => {
         chrome: "61.0.0",
         safari: "10.1.0",
         firefox: "60.0.0",
+        opera: "48.0.0",
         ios: "10.3.0",
         ie: "11.0.0",
         edge: "16.0.0",
@@ -228,6 +232,7 @@ describe("getTargets", () => {
         ie: "11.0.0",
         edge: "16.0.0",
         firefox: "60.0.0",
+        opera: "48.0.0",
       });
     });
   });