Merge pull request #346 from babel/issue345

Ensure explicit targets always override browsers key targets
babel · Jun 2, 2017 · 00490ac · 00490ac
2 parents 2896925 + 0017129
commit 00490ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/src/targets-parser.js b/src/targets-parser.js
@@ -103,17 +103,7 @@ const getTargets = (targets = {}) => {
         const [parsedTarget, parsedValue] = parser(target, value);
 
         if (parsedValue) {
-          // Merge (lowest wins)
-          if (typeof parsedValue === "string") {
-            results.targets[parsedTarget] = semverMin(
-              results.targets[parsedTarget],
-              parsedValue,
-            );
-          } else {
-            // We can remove this block if/when we replace Uglify target
-            // with top level option
-            results.targets[parsedTarget] = parsedValue;
-          }
+          results.targets[parsedTarget] = parsedValue;
         }
       }
 

diff --git a/test/targets-parser.spec.js b/test/targets-parser.spec.js
@@ -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",
         },