Use babel-polyfill and babel-preset-env

.babelrc

@@ -1,24 +1,47 @@
 {
   "only": "*.js",
   "env": {
-    "pre-node5": {
-      "presets": ["es2015-node4"],
+    "node4": {
       "plugins": [
-        ["array-includes"],
-        ["transform-inline-imports-commonjs"],
-        ["transform-runtime", { "polyfill": true, "regenerator": false }]
-      ]
+        "transform-flow-strip-types",
+        "transform-object-rest-spread",
+        "transform-class-properties",
+        "transform-inline-imports-commonjs"
+      ],
+      "presets": [["env", {
+        "targets": {
+          "node": 4
+        },
+        "useBuiltIns": true
+      }]]
+    },
+    "node6": {
+      "plugins": [
+        "transform-flow-strip-types",
+        "transform-object-rest-spread",
+        "transform-class-properties",
+        "transform-inline-imports-commonjs"
+      ],
+      "presets": [["env", {
+        "targets": {
+          "node": 6
+        },
+        "useBuiltIns": true
+      }]]
     },
     "test": {
-      "presets": ["es2015-node4"],
       "plugins": [
-        ["transform-inline-imports-commonjs"]
-      ]
+        "transform-flow-strip-types",
+        "transform-object-rest-spread",
+        "transform-class-properties",
+        "transform-inline-imports-commonjs"
+      ],
+      "presets": [["env", {
+        "targets": {
+          "node": 4
+        },
+        "useBuiltIns": true
+      }]]
     }
-  },
-  "presets": ["node5", "stage-0"],
-  "plugins": [
-    ["transform-inline-imports-commonjs"],
-    ["transform-runtime", { "polyfill": false, "regenerator": true }]
-  ]
+  }
 }

flow-typed/npm/babel-polyfill_vx.x.x.js

@@ -0,0 +1,67 @@
+// flow-typed signature: cbd31882f6edff2e4390624598ed8b77
+// flow-typed version: <<STUB>>/babel-polyfill_v^6.6.1/flow_v0.32.0
+
+/**
+ * This is an autogenerated libdef stub for:
+ *
+ *   'babel-polyfill'
+ *
+ * Fill this stub out by replacing all the `any` types.
+ *
+ * Once filled out, we encourage you to share your work with the 
+ * community by sending a pull request to: 
+ * https://github.com/flowtype/flow-typed
+ */
+
+declare module 'babel-polyfill' {
+  declare module.exports: any;
+}
+
+/**
+ * We include stubs for each file inside this npm package in case you need to
+ * require those files directly. Feel free to delete any files that aren't
+ * needed.
+ */
+declare module 'babel-polyfill/browser' {
+  declare module.exports: any;
+}
+
+declare module 'babel-polyfill/dist/polyfill' {
+  declare module.exports: any;
+}
+
+declare module 'babel-polyfill/dist/polyfill.min' {
+  declare module.exports: any;
+}
+
+declare module 'babel-polyfill/lib/index' {
+  declare module.exports: any;
+}
+
+declare module 'babel-polyfill/scripts/postpublish' {
+  declare module.exports: any;
+}
+
+declare module 'babel-polyfill/scripts/prepublish' {
+  declare module.exports: any;
+}
+
+// Filename aliases
+declare module 'babel-polyfill/browser.js' {
+  declare module.exports: $Exports<'babel-polyfill/browser'>;
+}
+declare module 'babel-polyfill/dist/polyfill.js' {
+  declare module.exports: $Exports<'babel-polyfill/dist/polyfill'>;
+}
+declare module 'babel-polyfill/dist/polyfill.min.js' {
+  declare module.exports: $Exports<'babel-polyfill/dist/polyfill.min'>;
+}
+declare module 'babel-polyfill/lib/index.js' {
+  declare module.exports: $Exports<'babel-polyfill/lib/index'>;
+}
+declare module 'babel-polyfill/scripts/postpublish.js' {
+  declare module.exports: $Exports<'babel-polyfill/scripts/postpublish'>;
+}
+declare module 'babel-polyfill/scripts/prepublish.js' {
+  declare module.exports: $Exports<'babel-polyfill/scripts/prepublish'>;
+}

gulpfile.js

@@ -32,11 +32,11 @@ gulp.task('default', ['build']);
 gulp.task('build', ['build-modern', 'build-legacy']);
 
 gulp.task('build-modern', () =>
-  build('lib', babelRc.env.node5)
+  build('lib', babelRc.env.node6)
 );
 
 gulp.task('build-legacy', () =>
-  build('lib-legacy', babelRc.env['pre-node5'])
+  build('lib-legacy', babelRc.env.node4)
 );
 
 gulp.task('watch', ['build'], () => {

package.json

@@ -6,6 +6,7 @@
   "preferGlobal": true,
   "description": "📦🐈 Fast, reliable, and secure dependency management.",
   "dependencies": {
+    "babel-polyfill": "^6.23.0",
     "babel-runtime": "^6.0.0",
     "bytes": "^2.4.0",
     "camelcase": "^4.0.0",
@@ -42,18 +43,15 @@
     "validate-npm-package-license": "^3.0.1"
   },
   "devDependencies": {
-    "babel-core": "^6.24.1",
+    "babel-core": "^6.25.0",
     "babel-eslint": "^6.1.2",
-    "babel-jest": "^19.0.0",
+    "babel-jest": "^20.0.3",
     "babel-loader": "^6.2.5",
-    "babel-plugin-array-includes": "^2.0.3",
-    "babel-plugin-transform-es2015-typeof-symbol": "^6.8.0",
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-plugin-transform-flow-strip-types": "^6.22.0",
     "babel-plugin-transform-inline-imports-commonjs": "^1.0.0",
-    "babel-plugin-transform-runtime": "^6.4.3",
-    "babel-preset-es2015-node4": "^2.1.0",
-    "babel-preset-node5": "^10.2.0",
-    "babel-preset-stage-0": "^6.0.0",
-    "babylon": "^6.5.0",
+    "babel-plugin-transform-object-rest-spread": "^6.23.0",
+    "babel-preset-env": "^1.5.2",
     "eslint": "^3.19.0",
     "eslint-config-fb-strict": "^20.0.1",
     "eslint-plugin-babel": "^3.3.0",

scripts/build-webpack.js

@@ -23,6 +23,7 @@ const compiler = webpack({
         test: /\.js$/,
         exclude: /node_modules/,
         loader: 'babel-loader',
+        query: babelRc.env.node6,
       },
     ],
   },
@@ -58,7 +59,7 @@ const compilerLegacy = webpack({
         test: /\.js$/,
         exclude: /node_modules/,
         loader: 'babel-loader',
-        query: babelRc.env['pre-node5'],
+        query: babelRc.env.node4,
       },
     ],
   },

src/cli/commands/check.js

@@ -351,7 +351,7 @@ export async function run(config: Config, reporter: Reporter, flags: Object, arg
             const rootDep = packagePath[0];
             const packageName = packagePath[1] || packageJson.name;
 
-            const bundledDep = bundledDeps[rootDep] && bundledDeps[rootDep].indexOf(packageName) !== -1;
+            const bundledDep = bundledDeps[rootDep] && bundledDeps[rootDep].includes(packageName);
             if (
               !bundledDep &&
               (packageJson.version === depPkg.version ||

src/cli/index.js

@@ -1,5 +1,6 @@
 /* @flow */
 
+import 'babel-polyfill';
 import {ConsoleReporter, JSONReporter} from '../reporters/index.js';
 import {registries, registryNames} from '../registries/index.js';
 import commands from './commands/index.js';

src/util/execute-lifecycle-script.js

@@ -145,7 +145,7 @@ export async function executeLifecycleScript(
   // Add global bin folder if it is not present already, as some packages depend
   // on a globally-installed version of node-gyp.
   const globalBin = getGlobalBinFolder(config, {});
-  if (pathParts.indexOf(globalBin) === -1) {
+  if (!pathParts.includes(globalBin)) {
     pathParts.unshift(globalBin);
   }