From 2866a4235155f9e3014ab04d0d7a7f2b17b1644c Mon Sep 17 00:00:00 2001
From: Boopathi Rajaa <me@boopathi.in>
Date: Mon, 3 Apr 2017 17:21:32 +0200
Subject: [PATCH] Upgrade to Babel 7

---
 package.json                                                | 5 ++---
 .../__tests__/helper-mark-eval-scopes-test.js               | 2 +-
 .../babel-plugin-minify-dead-code-elimination/src/index.js  | 2 +-
 .../__tests__/mangle-names-test.js                          | 6 +++---
 packages/babel-plugin-minify-mangle-names/src/index.js      | 2 +-
 packages/babili/package.json                                | 2 +-
 .../__tests__/__snapshots__/gulp-babili-test.js.snap        | 4 ++--
 packages/gulp-babili/package.json                           | 2 +-
 8 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 2a25cefb7..bae4e6582 100644
--- a/package.json
+++ b/package.json
@@ -36,12 +36,11 @@
     "coverageDirectory": "./coverage/"
   },
   "devDependencies": {
-    "babel-core": "^6.24.0",
+    "babel-core": "7.0.0-alpha.6",
     "babel-eslint": "^7.2.1",
     "babel-jest": "^19.0.0",
-    "babel-plugin-transform-es2015-block-scoping": "^6.23.0",
     "babel-preset-env": "^1.2.2",
-    "babel-traverse": "^6.23.1",
+    "babel-traverse": "7.0.0-alpha.3",
     "bytes": "^2.5.0",
     "chalk": "^1.1.3",
     "cli-table": "^0.3.1",
diff --git a/packages/babel-helper-mark-eval-scopes/__tests__/helper-mark-eval-scopes-test.js b/packages/babel-helper-mark-eval-scopes/__tests__/helper-mark-eval-scopes-test.js
index 18fed9900..75443a9d4 100644
--- a/packages/babel-helper-mark-eval-scopes/__tests__/helper-mark-eval-scopes-test.js
+++ b/packages/babel-helper-mark-eval-scopes/__tests__/helper-mark-eval-scopes-test.js
@@ -10,7 +10,7 @@ function getPath(source) {
     babelrc: false,
     plugins: [
       function({ traverse }) {
-        traverse.clearCache();
+        traverse.cache.clear();
         return {
           visitor: {
             Program(programPath) {
diff --git a/packages/babel-plugin-minify-dead-code-elimination/src/index.js b/packages/babel-plugin-minify-dead-code-elimination/src/index.js
index 586fbae41..9b6db6b37 100644
--- a/packages/babel-plugin-minify-dead-code-elimination/src/index.js
+++ b/packages/babel-plugin-minify-dead-code-elimination/src/index.js
@@ -842,7 +842,7 @@ module.exports = ({ types: t, traverse }) => {
             } = {}
           } = {}
         ) {
-          traverse.clearCache();
+          traverse.cache.clear();
           path.scope.crawl();
 
           markEvalScopes(path);
diff --git a/packages/babel-plugin-minify-mangle-names/__tests__/mangle-names-test.js b/packages/babel-plugin-minify-mangle-names/__tests__/mangle-names-test.js
index 44e117e29..6d9961bea 100644
--- a/packages/babel-plugin-minify-mangle-names/__tests__/mangle-names-test.js
+++ b/packages/babel-plugin-minify-mangle-names/__tests__/mangle-names-test.js
@@ -682,7 +682,7 @@ describe("mangle-names", () => {
       code: false
     });
 
-    traverse.clearCache();
+    traverse.cache.clear();
 
     const actual = babel.transformFromAst(first.ast, null, {
       plugins: [require("../src/index")]
@@ -734,7 +734,7 @@ describe("mangle-names", () => {
       code: false
     });
 
-    traverse.clearCache();
+    traverse.cache.clear();
 
     const actual = babel.transformFromAst(first.ast, null, {
       plugins: [require("../src/index")]
@@ -847,7 +847,7 @@ describe("mangle-names", () => {
       code: false
     }).ast;
 
-    traverse.clearCache();
+    traverse.cache.clear();
 
     const actual = babel.transformFromAst(ast, null, {
       sourceType: "script",
diff --git a/packages/babel-plugin-minify-mangle-names/src/index.js b/packages/babel-plugin-minify-mangle-names/src/index.js
index 59cb22b5c..79da9a41f 100644
--- a/packages/babel-plugin-minify-mangle-names/src/index.js
+++ b/packages/babel-plugin-minify-mangle-names/src/index.js
@@ -45,7 +45,7 @@ module.exports = ({ types: t, traverse }) => {
     }
 
     cleanup() {
-      traverse.clearCache();
+      traverse.cache.clear();
       this.program.scope.crawl();
     }
 
diff --git a/packages/babili/package.json b/packages/babili/package.json
index cec495de5..1ce97d5a9 100644
--- a/packages/babili/package.json
+++ b/packages/babili/package.json
@@ -16,7 +16,7 @@
   ],
   "dependencies": {
     "babel-preset-babili": "^0.0.12",
-    "babel-cli": "^6.10.1"
+    "babel-cli": "7.0.0-alpha.6"
   },
   "devDependencies": {}
 }
diff --git a/packages/gulp-babili/__tests__/__snapshots__/gulp-babili-test.js.snap b/packages/gulp-babili/__tests__/__snapshots__/gulp-babili-test.js.snap
index 4f574e8fc..b9d034f56 100644
--- a/packages/gulp-babili/__tests__/__snapshots__/gulp-babili-test.js.snap
+++ b/packages/gulp-babili/__tests__/__snapshots__/gulp-babili-test.js.snap
@@ -12,6 +12,6 @@ exports[`gulp-babili comments should remove comments by default except license a
 exports[`gulp-babili comments should take a custom function 1`] = `"function foo(){}bar();/* YAC - yet another comment */var a=baz();"`;
 
 exports[`gulp-babili should remove comments while doing DCE and simplify 1`] = `
-"var a=function(){(function(){foo(),bar(),baz();// comments should be optimized away
-})()};"
+"var a=function(){(function(){// comments should be optimized away
+foo(),bar(),baz()})()};"
 `;
diff --git a/packages/gulp-babili/package.json b/packages/gulp-babili/package.json
index 2cba1b088..346a538ae 100644
--- a/packages/gulp-babili/package.json
+++ b/packages/gulp-babili/package.json
@@ -13,7 +13,7 @@
     "babili"
   ],
   "dependencies": {
-    "babel-core": "^6.22.1",
+    "babel-core": "7.0.0-alpha.6",
     "babel-preset-babili": "^0.0.12",
     "vinyl-sourcemaps-apply": "^0.2.1"
   },