From 99598062ef6ac6af6924bf9392d2146f8b833f71 Mon Sep 17 00:00:00 2001
From: Peter van der Zee <kuvos@fb.com>
Date: Thu, 10 May 2018 07:47:52 -0700
Subject: [PATCH] Swap out metro-babylon7 for babylon in metro

Reviewed By: mjesun

Differential Revision: D7948314

fbshipit-source-id: e9f16cae195a5aecba3c33bd3ae528935f792e2f
---
 docs/GettingStarted.md                                          | 2 +-
 packages/metro/package.json                                     | 1 -
 packages/metro/src/Bundler/util.js                              | 2 +-
 packages/metro/src/JSTransformer/worker.js                      | 2 +-
 .../src/ModuleGraph/worker/__tests__/JsFileWrapping-test.js     | 2 +-
 .../ModuleGraph/worker/__tests__/collectDependencies-test.js    | 2 +-
 .../ModuleGraph/worker/__tests__/optimizeDependencies-test.js   | 2 +-
 .../src/ModuleGraph/worker/__tests__/transform-module-test.js   | 2 +-
 8 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md
index 39dcda5a..5cd2ee6a 100644
--- a/docs/GettingStarted.md
+++ b/docs/GettingStarted.md
@@ -142,7 +142,7 @@ The JavaScript transformer (`transformModulePath`) is the place where JS code wi
 Mandatory method that will transform code. The object received has information about the module being transformed (e.g its path, code...) and the returned object has to contain an `ast` key that is the AST representation of the transformed code. The default shipped transformer does the bare minimum amount of work by just parsing the code to AST:
 
 ```js
-const babylon = require('metro-babylon7');
+const babylon = require('babylon');
 
 module.exports.transform = (file: {filename: string, src: string}) => {
   const ast = babylon.parse(code, {sourceType: 'module'});
diff --git a/packages/metro/package.json b/packages/metro/package.json
index 5e857a9d..788cb74e 100644
--- a/packages/metro/package.json
+++ b/packages/metro/package.json
@@ -76,7 +76,6 @@
     "merge-stream": "^1.0.1",
     "metro-babel-register": "0.36.1",
     "metro-babel7-plugin-react-transform": "0.36.1",
-    "metro-babylon7": "0.36.1",
     "metro-cache": "0.36.1",
     "metro-core": "0.36.1",
     "metro-minify-uglify": "0.36.1",
diff --git a/packages/metro/src/Bundler/util.js b/packages/metro/src/Bundler/util.js
index 34196634..e3354313 100644
--- a/packages/metro/src/Bundler/util.js
+++ b/packages/metro/src/Bundler/util.js
@@ -11,7 +11,7 @@
 'use strict';
 
 const babelTypes = require('@babel/types');
-const babylon = require('metro-babylon7');
+const babylon = require('babylon');
 
 import type {AssetDataWithoutFiles} from '../Assets';
 import type {ModuleTransportLike} from '../shared/types.flow';
diff --git a/packages/metro/src/JSTransformer/worker.js b/packages/metro/src/JSTransformer/worker.js
index 66c6fddd..c1520d53 100644
--- a/packages/metro/src/JSTransformer/worker.js
+++ b/packages/metro/src/JSTransformer/worker.js
@@ -13,7 +13,7 @@
 const JsFileWrapping = require('../ModuleGraph/worker/JsFileWrapping');
 
 const assetTransformer = require('../assetTransformer');
-const babylon = require('metro-babylon7');
+const babylon = require('babylon');
 const collectDependencies = require('../ModuleGraph/worker/collectDependencies');
 const constantFoldingPlugin = require('./worker/constant-folding-plugin');
 const crypto = require('crypto');
diff --git a/packages/metro/src/ModuleGraph/worker/__tests__/JsFileWrapping-test.js b/packages/metro/src/ModuleGraph/worker/__tests__/JsFileWrapping-test.js
index 59c1dc47..b0ce06a2 100644
--- a/packages/metro/src/ModuleGraph/worker/__tests__/JsFileWrapping-test.js
+++ b/packages/metro/src/ModuleGraph/worker/__tests__/JsFileWrapping-test.js
@@ -13,7 +13,7 @@
 
 const JsFileWrapping = require('../JsFileWrapping');
 
-const babylon = require('metro-babylon7');
+const babylon = require('babylon');
 
 const {codeFromAst, comparableCode} = require('../../test-helpers');
 
diff --git a/packages/metro/src/ModuleGraph/worker/__tests__/collectDependencies-test.js b/packages/metro/src/ModuleGraph/worker/__tests__/collectDependencies-test.js
index c2d5d3f3..1fe81450 100644
--- a/packages/metro/src/ModuleGraph/worker/__tests__/collectDependencies-test.js
+++ b/packages/metro/src/ModuleGraph/worker/__tests__/collectDependencies-test.js
@@ -11,7 +11,7 @@
 
 'use strict';
 
-const babylon = require('metro-babylon7');
+const babylon = require('babylon');
 const collectDependencies = require('../collectDependencies');
 
 const {codeFromAst, comparableCode} = require('../../test-helpers');
diff --git a/packages/metro/src/ModuleGraph/worker/__tests__/optimizeDependencies-test.js b/packages/metro/src/ModuleGraph/worker/__tests__/optimizeDependencies-test.js
index 75d4c72b..2776523c 100644
--- a/packages/metro/src/ModuleGraph/worker/__tests__/optimizeDependencies-test.js
+++ b/packages/metro/src/ModuleGraph/worker/__tests__/optimizeDependencies-test.js
@@ -11,7 +11,7 @@
 
 'use strict';
 
-const babylon = require('metro-babylon7');
+const babylon = require('babylon');
 const optimizeDependencies = require('../optimizeDependencies');
 
 const {InvalidRequireCallError} = optimizeDependencies;
diff --git a/packages/metro/src/ModuleGraph/worker/__tests__/transform-module-test.js b/packages/metro/src/ModuleGraph/worker/__tests__/transform-module-test.js
index c7bdf368..a0ed89f3 100644
--- a/packages/metro/src/ModuleGraph/worker/__tests__/transform-module-test.js
+++ b/packages/metro/src/ModuleGraph/worker/__tests__/transform-module-test.js
@@ -20,7 +20,7 @@ const generate = require('@babel/generator').default;
 const traverse = require('@babel/traverse').default;
 
 const {fn} = require('../../test-helpers');
-const {parse} = require('metro-babylon7');
+const {parse} = require('babylon');
 const {SourceMapConsumer} = require('source-map');
 
 import type {TransformVariants} from '../../types.flow';