From ec4bad47e0c472bb3a2d937a0624237d53518833 Mon Sep 17 00:00:00 2001
From: Peter van der Zee <kuvos@fb.com>
Date: Fri, 27 Apr 2018 09:23:27 -0700
Subject: [PATCH] Stop pulling babylon from babel-bridge

Reviewed By: rubennorte

Differential Revision: D7788535

fbshipit-source-id: 243824de7cecc32fbf47c57df6009178ca57f5fd
---
 packages/metro/src/Bundler/util.js                            | 3 +--
 packages/metro/src/JSTransformer/worker.js                    | 2 +-
 .../src/ModuleGraph/worker/__tests__/JsFileWrapping-test.js   | 3 ++-
 .../ModuleGraph/worker/__tests__/collectDependencies-test.js  | 2 +-
 .../ModuleGraph/worker/__tests__/optimizeDependencies-test.js | 2 +-
 .../src/ModuleGraph/worker/__tests__/transform-module-test.js | 4 +---
 packages/metro/src/babel-bridge.js                            | 2 --
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/metro/src/Bundler/util.js b/packages/metro/src/Bundler/util.js
index 1074b0d3..34196634 100644
--- a/packages/metro/src/Bundler/util.js
+++ b/packages/metro/src/Bundler/util.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const babelTypes = require('@babel/types');
-
-const {babylon} = require('../babel-bridge');
+const babylon = require('metro-babylon7');
 
 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 3d4445b1..66c6fddd 100644
--- a/packages/metro/src/JSTransformer/worker.js
+++ b/packages/metro/src/JSTransformer/worker.js
@@ -13,6 +13,7 @@
 const JsFileWrapping = require('../ModuleGraph/worker/JsFileWrapping');
 
 const assetTransformer = require('../assetTransformer');
+const babylon = require('metro-babylon7');
 const collectDependencies = require('../ModuleGraph/worker/collectDependencies');
 const constantFoldingPlugin = require('./worker/constant-folding-plugin');
 const crypto = require('crypto');
@@ -23,7 +24,6 @@ const inlinePlugin = require('./worker/inline-plugin');
 const optimizeDependencies = require('../ModuleGraph/worker/optimizeDependencies');
 const path = require('path');
 
-const {babylon} = require('../babel-bridge');
 const {
   fromRawMappings,
   toBabelSegments,
diff --git a/packages/metro/src/ModuleGraph/worker/__tests__/JsFileWrapping-test.js b/packages/metro/src/ModuleGraph/worker/__tests__/JsFileWrapping-test.js
index 818a97a5..59c1dc47 100644
--- a/packages/metro/src/ModuleGraph/worker/__tests__/JsFileWrapping-test.js
+++ b/packages/metro/src/ModuleGraph/worker/__tests__/JsFileWrapping-test.js
@@ -13,7 +13,8 @@
 
 const JsFileWrapping = require('../JsFileWrapping');
 
-const {babylon} = require('../../../babel-bridge');
+const babylon = require('metro-babylon7');
+
 const {codeFromAst, comparableCode} = require('../../test-helpers');
 
 const {WRAP_NAME} = JsFileWrapping;
diff --git a/packages/metro/src/ModuleGraph/worker/__tests__/collectDependencies-test.js b/packages/metro/src/ModuleGraph/worker/__tests__/collectDependencies-test.js
index 38775ec0..c2d5d3f3 100644
--- a/packages/metro/src/ModuleGraph/worker/__tests__/collectDependencies-test.js
+++ b/packages/metro/src/ModuleGraph/worker/__tests__/collectDependencies-test.js
@@ -11,9 +11,9 @@
 
 'use strict';
 
+const babylon = require('metro-babylon7');
 const collectDependencies = require('../collectDependencies');
 
-const {babylon} = require('../../../babel-bridge');
 const {codeFromAst, comparableCode} = require('../../test-helpers');
 
 const {any} = expect;
diff --git a/packages/metro/src/ModuleGraph/worker/__tests__/optimizeDependencies-test.js b/packages/metro/src/ModuleGraph/worker/__tests__/optimizeDependencies-test.js
index bfec57f6..75d4c72b 100644
--- a/packages/metro/src/ModuleGraph/worker/__tests__/optimizeDependencies-test.js
+++ b/packages/metro/src/ModuleGraph/worker/__tests__/optimizeDependencies-test.js
@@ -11,9 +11,9 @@
 
 'use strict';
 
+const babylon = require('metro-babylon7');
 const optimizeDependencies = require('../optimizeDependencies');
 
-const {babylon} = require('../../../babel-bridge');
 const {InvalidRequireCallError} = optimizeDependencies;
 
 const {codeFromAst, comparableCode} = require('../../test-helpers');
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 206557e9..c7bdf368 100644
--- a/packages/metro/src/ModuleGraph/worker/__tests__/transform-module-test.js
+++ b/packages/metro/src/ModuleGraph/worker/__tests__/transform-module-test.js
@@ -19,10 +19,8 @@ const types = require('@babel/types');
 const generate = require('@babel/generator').default;
 const traverse = require('@babel/traverse').default;
 
-const {
-  babylon: {parse},
-} = require('../../../babel-bridge');
 const {fn} = require('../../test-helpers');
+const {parse} = require('metro-babylon7');
 const {SourceMapConsumer} = require('source-map');
 
 import type {TransformVariants} from '../../types.flow';
diff --git a/packages/metro/src/babel-bridge.js b/packages/metro/src/babel-bridge.js
index baa3a53f..e6781e8c 100644
--- a/packages/metro/src/babel-bridge.js
+++ b/packages/metro/src/babel-bridge.js
@@ -13,7 +13,6 @@
 
 // This is a temporary migration bridge to switch between babel 6 and 7
 
-const babylon7 = require('metro-babylon7');
 const externalHelpersPlugin7 = require('babel-plugin-external-helpers');
 const inlineRequiresPlugin7 = require('babel-preset-fbjs/plugins/inline-requires');
 
@@ -49,7 +48,6 @@ function resolvePlugins7(plugins: Array<any>) {
 
 module.exports = {
   getBabelRegisterConfig: getBabelRegisterConfig7,
-  babylon: babylon7,
 
   externalHelpersPlugin: externalHelpersPlugin7,
   inlineRequiresPlugin: inlineRequiresPlugin7,