From 6ae350773e942547d48ed702b1db4a89e5f4c3d5 Mon Sep 17 00:00:00 2001
From: Ryan Tsao <ryan.j.tsao@gmail.com>
Date: Mon, 17 Jul 2017 13:08:15 -0700
Subject: [PATCH] Normalize module format of plugins/built-ins data (#376)

* Reference plugins json instead of module in normalize-options.js

* Make plugins module format match built-ins module
---
 .../babel-preset-env/data/plugin-features.js      | 15 +++++++++------
 .../babel-preset-env/src/normalize-options.js     |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/experimental/babel-preset-env/data/plugin-features.js b/experimental/babel-preset-env/data/plugin-features.js
index fef5180525..8879232308 100644
--- a/experimental/babel-preset-env/data/plugin-features.js
+++ b/experimental/babel-preset-env/data/plugin-features.js
@@ -1,5 +1,4 @@
-module.exports = {
-  // es2015
+const es2015 = {
   "check-es2015-constants": {
     features: [
       "const",
@@ -107,16 +106,18 @@ module.exports = {
     features: [
       "generators",
     ],
-  },
+  }
+};
 
-  // es2016
+const es2016 = {
   "transform-exponentiation-operator": {
     features: [
       "exponentiation (**) operator",
     ],
-  },
+  }
+};
 
-  // es2017
+const es2017 = {
   "transform-async-to-generator": {
     features: [
       "async functions",
@@ -128,3 +129,5 @@ module.exports = {
     ],
   }
 };
+
+module.exports = Object.assign({}, es2015, es2016, es2017);
diff --git a/experimental/babel-preset-env/src/normalize-options.js b/experimental/babel-preset-env/src/normalize-options.js
index 9b8ebd014a..5e95ca9093 100644
--- a/experimental/babel-preset-env/src/normalize-options.js
+++ b/experimental/babel-preset-env/src/normalize-options.js
@@ -2,10 +2,10 @@ import invariant from "invariant";
 import builtInsList from "../data/built-ins.json";
 import { defaultWebIncludes } from "./default-includes";
 import moduleTransformations from "./module-transformations";
-import pluginFeatures from "../data/plugin-features";
+import pluginsList from "../data/plugins.json";
 
 const validIncludesAndExcludes = [
-  ...Object.keys(pluginFeatures),
+  ...Object.keys(pluginsList),
   ...Object.keys(moduleTransformations).map((m) => moduleTransformations[m]),
   ...Object.keys(builtInsList),
   ...defaultWebIncludes,