Skip to content

Commit

Permalink
preset-env: fix opera from esmodules target and Browserslist not …
Browse files Browse the repository at this point in the history
…used (#8555)
  • Loading branch information
ylemkimon authored and existentialism committed Nov 8, 2018
1 parent 343f776 commit 7b54ab6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
5 changes: 3 additions & 2 deletions packages/babel-preset-env/src/targets-parser.js
Expand Up @@ -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 = (
Expand Down
7 changes: 6 additions & 1 deletion packages/babel-preset-env/test/targets-parser.spec.js
Expand Up @@ -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",
});
});

Expand Down Expand Up @@ -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",
});
Expand All @@ -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",
});
Expand All @@ -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",
Expand All @@ -228,6 +232,7 @@ describe("getTargets", () => {
ie: "11.0.0",
edge: "16.0.0",
firefox: "60.0.0",
opera: "48.0.0",
});
});
});
Expand Down

0 comments on commit 7b54ab6

Please sign in to comment.