Upgrade to Babel 7

.babelrc

@@ -1,13 +1,17 @@
 {
   "presets": [
     [
-      "env",
+      "@babel/preset-env",
       {
         "targets": {
           "node": 4
         },
-        "include": ["transform-async-to-generator"],
-        "exclude": ["transform-regenerator"]
+        "include": [
+          "transform-async-to-generator"
+        ],
+        "exclude": [
+          "transform-regenerator"
+        ]
       }
     ]
   ]

gulpfile.babel.js → gulpfile.js

@@ -1,3 +1,5 @@
+"use strict";
+
 const through = require("through2");
 const chalk = require("chalk");
 const newer = require("gulp-newer");
@@ -6,25 +8,28 @@ const log = require("fancy-log");
 const gulp = require("gulp");
 const path = require("path");
 
-export const build = gulp.series(buildPackages, buildUtils);
+const build = gulp.series(buildPackages, buildUtils);
 
-export const watch = gulp.series(build, () => {
+const watch = gulp.series(build, () => {
   const scripts = [
     getBuildConfig("packages").scripts,
     getBuildConfig("utils").scripts
   ];
   gulp.watch(scripts, { debounceDelay: 200 }, build).on("error", () => {});
 });
 
-export function buildPackages() {
+function buildPackages() {
   return getBuildTask(getBuildConfig("packages"));
 }
 
-export function buildUtils() {
+function buildUtils() {
   return getBuildTask(getBuildConfig("utils"));
 }
 
-export default build;
+exports.build = build;
+exports.watch = watch;
+exports.buildPackages = buildPackages;
+exports.buildUtils = buildUtils;
 
 function getBuildTask({ scripts, dest }) {
   return gulp

package.json

@@ -19,39 +19,37 @@
     "watch": "gulp watch"
   },
   "devDependencies": {
-    "babel-core": "^6.26.0",
-    "babel-eslint": "^8.0.3",
-    "babel-jest": "^22.0.3",
-    "babel-plugin-transform-es2015-block-scoping": "^6.26.0",
-    "babel-preset-env": "^1.6.1",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-traverse": "^6.26.0",
+    "@babel/core": "^7.0.0-beta.40",
+    "@babel/plugin-transform-block-scoping": "^7.0.0-beta.40",
+    "@babel/preset-env": "^7.0.0-beta.40",
+    "babel-core": "^7.0.0-bridge.0",
+    "babel-jest": "^22.2.2",
     "butternut": "^0.4.6",
     "bytes": "^3.0.0",
-    "chalk": "^2.3.0",
+    "chalk": "^2.3.1",
     "cli-table": "^0.3.1",
     "closure-compiler": "^0.2.12",
     "codecov": "^3.0.0",
-    "commander": "^2.12.2",
-    "eslint": "^4.13.1",
-    "eslint-plugin-prettier": "^2.4.0",
+    "commander": "^2.14.1",
+    "eslint": "^4.17.0",
+    "eslint-plugin-prettier": "^2.6.0",
     "fancy-log": "^1.3.2",
     "fs-readdir-recursive": "^1.1.0",
-    "google-closure-compiler-js": "^20171203.0.0",
+    "google-closure-compiler-js": "^20180204.0.0",
     "gulp": "github:gulpjs/gulp#4.0",
-    "gulp-babel": "^7.0.0",
-    "gulp-newer": "^1.3.0",
-    "jest-cli": "^22.0.3",
-    "lerna": "^2.5.1",
+    "gulp-babel": "^8.0.0-beta.1",
+    "gulp-newer": "^1.4.0",
+    "jest-cli": "^22.3.0",
+    "lerna": "^2.9.0",
     "lerna-changelog": "^0.7.0",
-    "lint-staged": "^6.0.1",
+    "lint-staged": "^6.1.0",
     "markdown-table": "^1.1.1",
     "minimist": "^1.2.0",
-    "prettier": "^1.9.2",
+    "prettier": "^1.10.2",
     "request": "^2.83.0",
     "rimraf": "^2.6.2",
     "through2": "^2.0.3",
-    "uglify-js": "^3.2.2",
+    "uglify-js": "^3.3.10",
     "util.promisify": "^1.0.0"
   },
   "engines": {

packages/babel-minify/package.json

@@ -18,11 +18,11 @@
   },
   "repository": "https://github.com/babel/minify/tree/master/packages/babel-minify",
   "dependencies": {
-    "babel-core": "^6.26.0",
+    "@babel/core": "^7.0.0-beta.40",
     "babel-preset-minify": "^0.3.0",
     "fs-readdir-recursive": "^1.1.0",
     "mkdirp": "^0.5.1",
     "util.promisify": "^1.0.0",
-    "yargs-parser": "^8.0.0"
+    "yargs-parser": "^9.0.2"
   }
 }

packages/babel-minify/src/index.js

@@ -1,4 +1,4 @@
-const babelCore = require("babel-core");
+const babelCore = require("@babel/core");
 const babelPresetMinify = require("babel-preset-minify");
 
 module.exports = function babelMinify(
@@ -9,7 +9,7 @@ module.exports = function babelMinify(
   // overrides and other options
   {
     minified = true,
-    inputSourceMap = null,
+    inputSourceMap,
     sourceMaps = false,
 
     // to override the default babelCore used

packages/babel-plugin-minify-builtins/__tests__/fixtures/builtin-methods/expected.js

@@ -1,6 +1,5 @@
 function c() {
   var _Mathmax = Math.max;
-
   let a = 10;
   const d = false;
   _Mathmax(a, b) + _Mathmax(b, a);

packages/babel-plugin-minify-builtins/__tests__/fixtures/builtin-props/expected.js

@@ -1,7 +1,6 @@
 function a() {
   var _MathPI = Math.PI;
   var _NumberNAN = Number.NAN;
-
   _NumberNAN + _NumberNAN;
   return _MathPI + _MathPI + Number.EPSILON + _NumberNAN;
 }

packages/babel-plugin-minify-builtins/__tests__/fixtures/deep-occurences/expected.js

@@ -1,11 +1,14 @@
 function a() {
   Math.max(c, a);
+
   const b = () => {
     var _Mathmin = Math.min;
     var _Mathfloor = Math.floor;
 
     const a = _Mathfloor(c);
+
     _Mathmin(b, a) * _Mathfloor(b);
+
     function c() {
       _Mathfloor(c) + _Mathmin(b, a);
     }

packages/babel-plugin-minify-builtins/__tests__/fixtures/in-class-methods/expected.js

@@ -3,19 +3,26 @@ class Test {
     var _Mathmax = Math.max;
 
     _Mathmax(a, d);
+
     _Mathmax(a, d);
+
     const c = function () {
       var _Mathfloor = Math.floor;
 
       _Mathmax(c, d);
+
       _Mathfloor(m);
+
       _Mathfloor(m);
     };
   }
+
   bar() {
     var _Mathmin = Math.min;
 
     _Mathmin(c, d);
+
     _Mathmin(c, d);
   }
+
 }

packages/babel-plugin-minify-builtins/__tests__/fixtures/in-function-scope/expected.js

@@ -2,21 +2,24 @@ var a = () => {
   var _Mathfloor = Math.floor;
 
   _Mathfloor(b);
+
   _Mathfloor(b);
+
   c: () => {
     _Mathfloor(d);
+
     2;
   };
 };
+
 A.b("asdas", function () {
   var _Mathmax = Math.max;
-
   Math.floor(d) + _Mathmax(d, e);
+
   _Mathmax(e, d);
 });
 A.b("asdas1", function () {
   var _Mathfloor2 = Math.floor;
-
   _Mathfloor2(d) + _Mathfloor2(d, e);
   Math.max(e, d);
 });

packages/babel-plugin-minify-builtins/__tests__/fixtures/multiple-occurences/expected.js

@@ -1,5 +1,4 @@
 function a() {
   var _Mathfloor = Math.floor;
-
   _Mathfloor(a) + _Mathfloor(b) + Math.min(a, b);
 }

packages/babel-plugin-minify-builtins/__tests__/fixtures/program-scope/expected.js

@@ -1,7 +1,8 @@
 Math.max(c, d);
+
 function a() {
   var _Mathmax = Math.max;
-
   _Mathmax(b, a) + _Mathmax(c, d);
 }
+
 Math.max(e, f);

packages/babel-plugin-minify-builtins/__tests__/fixtures/without-lca/expected.js

@@ -2,43 +2,54 @@ function b() {
   var _Mathfloor = Math.floor;
 
   _Mathfloor(as, bb);
+
   function d() {
     _Mathfloor(as, bb);
   }
 }
+
 const a = {
   c: () => Math.floor(bbb) + Math.floor(bbb),
   d: () => {
     var _Mathabs = Math.abs;
     var _Mathfloor2 = Math.floor;
 
     _Mathabs(aa);
+
     _Mathabs(aa);
+
     _Mathfloor2(aa);
+
     return () => {
       _Mathfloor2(aa);
     };
   },
   e: () => Math.abs(aa) + Math.abs(aa)
 };
+
 class A {
   constructor() {
     var _Mathfloor3 = Math.floor;
 
     let a = _Mathfloor3(b, c) + _Mathfloor3(b, c);
   }
+
   c() {
     var _Mathfloor4 = Math.floor;
 
     _Mathfloor4(asdas);
+
     _Mathfloor4(dasda);
   }
+
   d() {
     var _Mathfloor5 = Math.floor;
-
     var a = _Mathfloor5;
     a(aa, bb);
+
     _Mathfloor5(aa, bb);
   }
+
 }
+
 new A();

packages/babel-plugin-minify-builtins/src/index.js

@@ -45,7 +45,7 @@ module.exports = function({ types: t }) {
           if (
             !isComputed(path) &&
             isBuiltin(path) &&
-            !path.getFunctionParent().isProgram()
+            !getFunctionParent(path).isProgram()
           ) {
             const expName = memberToString(path.node);
             addToMap(context.pathsToUpdate, expName, path);
@@ -68,7 +68,7 @@ module.exports = function({ types: t }) {
               // Math.floor(1) --> 1
               if (result.confident && hasPureArgs(path)) {
                 path.replaceWith(t.valueToNode(result.value));
-              } else if (!callee.getFunctionParent().isProgram()) {
+              } else if (!getFunctionParent(callee).isProgram()) {
                 const expName = memberToString(callee.node);
                 addToMap(context.pathsToUpdate, expName, callee);
               }
@@ -180,7 +180,7 @@ function getSegmentedSubPaths(paths) {
           segments.set(lastCommon, paths);
           return;
         } else if (
-          !(fnParent = lastCommon.getFunctionParent()).isProgram() &&
+          !(fnParent = getFunctionParent(lastCommon)).isProgram() &&
           fnParent.get("body").isBlockStatement()
         ) {
           segments.set(fnParent, paths);
@@ -225,3 +225,11 @@ function isComputed(path) {
   const { node } = path;
   return node.computed;
 }
+
+/**
+ * Babel-7 returns null if there is no function parent
+ * and uses getProgramParent to get Program
+ */
+function getFunctionParent(path) {
+  return (path.scope.getFunctionParent() || path.scope.getProgramParent()).path;
+}

packages/babel-plugin-minify-constant-folding/__tests__/fixtures/array-literals-methods/expected.js

@@ -1,38 +1,30 @@
 4;
 4;
-
 "1,2,3";
 "a,b,c";
 "a@b@c";
 "/1";
 [/xyz/im, true].join("abc");
 [`a${xyz}`].join("1");
 "abc";
-
 3;
 2;
 2;
 void 0;
-
 void 0;
 2;
-
 [1, 2, 3];
 [2, 3];
 [1, 2];
 [1, 2, 3].slice(0, -1);
-
 3;
 c;
 void 0;
-
 [c, b, a];
 [3, 2, 1];
-
-[2, 3];
 [2, 3];
+[2, 3]; // bad calls
 
-// bad calls
 [1, 2, 3][concat]([4, 5, 6]);
 [a, "b", "c"].join();
 ["a", "b", "c"].join(a);

packages/babel-plugin-minify-constant-folding/__tests__/fixtures/basic/expected.js

@@ -4,5 +4,5 @@
 7;
 a(), b();
 var x = 1;
-foo(x);
+foo(1);
 "b" + a + "cd" + g + z + "fhz";