Revert "chore: skip android until upstream support is resolved"

This reverts commit 436e9af.
babel · Jan 21, 2020 · 551f2d9 · 551f2d9
1 parent 436e9af
commit 551f2d9
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 29 deletions.
diff --git a/packages/babel-compat-data/data/built-in-modules.json b/packages/babel-compat-data/data/built-in-modules.json
@@ -6,6 +6,7 @@
     "safari": "10.1",
     "opera": "48",
     "ios_saf": "10.3",
+    "android": "61",
     "op_mob": "48",
     "and_chr": "61",
     "and_ff": "60",

diff --git a/packages/babel-compat-data/scripts/build-modules-support.js b/packages/babel-compat-data/scripts/build-modules-support.js
@@ -16,10 +16,6 @@ const { stats } = moduleSupport;
 const allowedBrowsers = {};
 
 Object.keys(stats).forEach(browser => {
-  //todo: skip android until https://github.com/browserslist/browserslist/pull/428 is resolved
-  if (browser === "android") {
-    return;
-  }
   const browserName = browserNameMap[browser] || browser;
   const browserVersions = stats[browserName];
   const allowedVersions = Object.keys(browserVersions)

diff --git a/packages/babel-helper-compilation-targets/test/targets-parser.spec.js b/packages/babel-helper-compilation-targets/test/targets-parser.spec.js
@@ -120,7 +120,7 @@ describe("getTargets", () => {
     it("does throws on unsupported versions", () => {
       expect(() => {
         getTargets({
-          browsers: "node 1000.0.0, chrome 1000",
+          browsers: "node 15.0.0, chrome 1000",
         });
       }).toThrow();
     });
@@ -187,7 +187,6 @@ describe("getTargets", () => {
       ).toEqual({
         chrome: "61.0.0",
         safari: "10.1.0",
-        samsung: "8.2.0",
         firefox: "60.0.0",
         opera: "48.0.0",
         ios: "10.3.0",
@@ -204,7 +203,6 @@ describe("getTargets", () => {
       ).toEqual({
         chrome: "61.0.0",
         safari: "10.1.0",
-        samsung: "8.2.0",
         firefox: "60.0.0",
         opera: "48.0.0",
         ios: "10.3.0",
@@ -221,7 +219,6 @@ describe("getTargets", () => {
       ).toEqual({
         chrome: "61.0.0",
         safari: "10.1.0",
-        samsung: "8.2.0",
         firefox: "60.0.0",
         opera: "48.0.0",
         ios: "10.3.0",
@@ -240,7 +237,6 @@ describe("getTargets", () => {
       ).toEqual({
         chrome: "61.0.0",
         safari: "10.1.0",
-        samsung: "8.2.0",
         ios: "10.3.0",
         ie: "11.0.0",
         edge: "16.0.0",

diff --git a/packages/babel-preset-env/test/fixtures/debug/browserslists-defaults-not-ie/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/browserslists-defaults-not-ie/stdout.txt
@@ -2,7 +2,7 @@
 
 Using targets:
 {
-  "android": "78",
+  "android": "77",
   "chrome": "49",
   "edge": "17",
   "firefox": "68",
@@ -15,8 +15,8 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  proposal-nullish-coalescing-operator { "android":"78", "chrome":"49", "edge":"17", "firefox":"68", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
-  proposal-optional-chaining { "android":"78", "chrome":"49", "edge":"17", "firefox":"68", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
+  proposal-nullish-coalescing-operator { "android":"77", "chrome":"49", "edge":"17", "firefox":"68", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
+  proposal-optional-chaining { "android":"77", "chrome":"49", "edge":"17", "firefox":"68", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
   proposal-json-strings { "chrome":"49", "edge":"17", "safari":"5.1" }
   proposal-optional-catch-binding { "chrome":"49", "edge":"17", "safari":"5.1" }
   proposal-async-generator-functions { "chrome":"49", "edge":"17", "safari":"5.1" }
@@ -46,7 +46,7 @@ Using plugins:
   transform-typeof-symbol { "safari":"5.1" }
   transform-new-target { "safari":"5.1" }
   transform-regenerator { "chrome":"49", "safari":"5.1" }
-  transform-modules-commonjs { "android":"78", "chrome":"49", "edge":"17", "firefox":"68", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
-  proposal-dynamic-import { "android":"78", "chrome":"49", "edge":"17", "firefox":"68", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
+  transform-modules-commonjs { "android":"77", "chrome":"49", "edge":"17", "firefox":"68", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
+  proposal-dynamic-import { "android":"77", "chrome":"49", "edge":"17", "firefox":"68", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
 
 Using polyfills: No polyfills were added, since the `useBuiltIns` option was not set.
diff --git a/packages/babel-preset-env/test/fixtures/debug/browserslists-defaults/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/browserslists-defaults/stdout.txt
@@ -2,7 +2,7 @@
 
 Using targets:
 {
-  "android": "78",
+  "android": "77",
   "chrome": "49",
   "edge": "17",
   "firefox": "68",
@@ -16,8 +16,8 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  proposal-nullish-coalescing-operator { "android":"78", "chrome":"49", "edge":"17", "firefox":"68", "ie":"11", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
-  proposal-optional-chaining { "android":"78", "chrome":"49", "edge":"17", "firefox":"68", "ie":"11", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
+  proposal-nullish-coalescing-operator { "android":"77", "chrome":"49", "edge":"17", "firefox":"68", "ie":"11", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
+  proposal-optional-chaining { "android":"77", "chrome":"49", "edge":"17", "firefox":"68", "ie":"11", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
   proposal-json-strings { "chrome":"49", "edge":"17", "ie":"11", "safari":"5.1" }
   proposal-optional-catch-binding { "chrome":"49", "edge":"17", "ie":"11", "safari":"5.1" }
   proposal-async-generator-functions { "chrome":"49", "edge":"17", "ie":"11", "safari":"5.1" }
@@ -47,7 +47,7 @@ Using plugins:
   transform-typeof-symbol { "ie":"11", "safari":"5.1" }
   transform-new-target { "ie":"11", "safari":"5.1" }
   transform-regenerator { "chrome":"49", "ie":"11", "safari":"5.1" }
-  transform-modules-commonjs { "android":"78", "chrome":"49", "edge":"17", "firefox":"68", "ie":"11", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
-  proposal-dynamic-import { "android":"78", "chrome":"49", "edge":"17", "firefox":"68", "ie":"11", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
+  transform-modules-commonjs { "android":"77", "chrome":"49", "edge":"17", "firefox":"68", "ie":"11", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
+  proposal-dynamic-import { "android":"77", "chrome":"49", "edge":"17", "firefox":"68", "ie":"11", "ios":"12.2", "opera":"63", "safari":"5.1", "samsung":"9.2" }
 
 Using polyfills: No polyfills were added, since the `useBuiltIns` option was not set.
diff --git a/...ages/babel-preset-env/test/fixtures/debug/browserslists-last-2-versions-not-ie/stdout.txt b/...ages/babel-preset-env/test/fixtures/debug/browserslists-last-2-versions-not-ie/stdout.txt
@@ -2,10 +2,10 @@
 
 Using targets:
 {
-  "android": "78",
-  "chrome": "78",
+  "android": "77",
+  "chrome": "77",
   "edge": "17",
-  "firefox": "71",
+  "firefox": "70",
   "ios": "13",
   "opera": "63",
   "safari": "12.1",
@@ -15,19 +15,19 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  proposal-nullish-coalescing-operator { "android":"78", "chrome":"78", "edge":"17", "firefox":"71", "ios":"13", "opera":"63", "safari":"12.1", "samsung":"9.2" }
-  proposal-optional-chaining { "android":"78", "chrome":"78", "edge":"17", "firefox":"71", "ios":"13", "opera":"63", "safari":"12.1", "samsung":"9.2" }
+  proposal-nullish-coalescing-operator { "android":"77", "chrome":"77", "edge":"17", "firefox":"70", "ios":"13", "opera":"63", "safari":"12.1", "samsung":"9.2" }
+  proposal-optional-chaining { "android":"77", "chrome":"77", "edge":"17", "firefox":"70", "ios":"13", "opera":"63", "safari":"12.1", "samsung":"9.2" }
   proposal-json-strings { "edge":"17" }
   proposal-optional-catch-binding { "edge":"17" }
   proposal-async-generator-functions { "edge":"17" }
   proposal-object-rest-spread { "edge":"17" }
-  transform-dotall-regex { "edge":"17", "firefox":"71" }
-  proposal-unicode-property-regex { "edge":"17", "firefox":"71" }
-  transform-named-capturing-groups-regex { "edge":"17", "firefox":"71" }
+  transform-dotall-regex { "edge":"17", "firefox":"70" }
+  proposal-unicode-property-regex { "edge":"17", "firefox":"70" }
+  transform-named-capturing-groups-regex { "edge":"17", "firefox":"70" }
   transform-template-literals { "safari":"12.1" }
   transform-function-name { "edge":"17" }
   transform-parameters { "edge":"17" }
-  transform-modules-commonjs { "android":"78", "chrome":"78", "edge":"17", "firefox":"71", "ios":"13", "opera":"63", "safari":"12.1", "samsung":"9.2" }
-  proposal-dynamic-import { "android":"78", "chrome":"78", "edge":"17", "firefox":"71", "ios":"13", "opera":"63", "safari":"12.1", "samsung":"9.2" }
+  transform-modules-commonjs { "android":"77", "chrome":"77", "edge":"17", "firefox":"70", "ios":"13", "opera":"63", "safari":"12.1", "samsung":"9.2" }
+  proposal-dynamic-import { "android":"77", "chrome":"77", "edge":"17", "firefox":"70", "ios":"13", "opera":"63", "safari":"12.1", "samsung":"9.2" }
 
 Using polyfills: No polyfills were added, since the `useBuiltIns` option was not set.