Drop babel 6 stuff from babel-bridge

Reviewed By: rubennorte

Differential Revision: D7788530

fbshipit-source-id: ba9d5b120989ff86148a2a9ddd1ef84996c5cc02

packages/metro/src/JSTransformer/worker/__tests__/worker-test.js

@@ -23,7 +23,6 @@ jest
 const path = require('path');
 const transformCode = require('..').transform;
 const {InvalidRequireCallError} = require('..');
-const {version: BABEL_VERSION} = require('../../../babel-bridge');
 
 describe('code transformation worker:', () => {
   it('transforms a simple script', async () => {
@@ -84,8 +83,7 @@ describe('code transformation worker:', () => {
     expect(result.dependencies).toEqual([]);
   });
 
-  if (BABEL_VERSION === 7) {
+  it(`transforms a module with dependencies`, async () => {
-    it(`transforms a module with dependencies (v${BABEL_VERSION})`, async () => {
     const {result} = await transformCode(
       'arbitrary/file.js',
       `local/file.js`,
@@ -109,7 +107,6 @@ describe('code transformation worker:', () => {
       'reject',
     );
 
-      expect(BABEL_VERSION).toBe(7);
     expect(result.code).toBe(
       [
         '__d(function (global, _$$_REQUIRE, module, exports, _dependencyMap) {',
@@ -132,50 +129,6 @@ describe('code transformation worker:', () => {
       {isAsync: false, name: 'b'},
     ]);
   });
-  } else {
-    it(`transforms a module with dependencies (v${BABEL_VERSION})`, async () => {
-      const {result} = await transformCode(
-        'arbitrary/file.js',
-        `local/file.js`,
-        [
-          'require("./a");',
-          'arbitrary(code);',
-          'const b = require("b");',
-          'import c from "./c";',
-        ].join('\n'),
-        path.join(__dirname, '../../../transformer.js'),
-        false,
-        {
-          dev: true,
-          transform: {},
-        },
-        [],
-        '',
-        'minifyModulePath',
-        'asyncRequire',
-        'reject',
-      );
-
-      expect(BABEL_VERSION).toBe(6);
-      expect(result.code).toBe(
-        [
-          '__d(function (global, _$$_REQUIRE, module, exports, _dependencyMap) {',
-          '  var _c = _$$_REQUIRE(_dependencyMap[0], "./c");',
-          '',
-          '  var _c2 = babelHelpers.interopRequireDefault(_c);',
-          '',
-          '  _$$_REQUIRE(_dependencyMap[1], "./a");',
-          '',
-          '  arbitrary(code);',
-          '',
-          '  var b = _$$_REQUIRE(_dependencyMap[2], "b");',
-          '});',
-        ].join('\n'),
-      );
-      expect(result.map).toHaveLength(13);
-      expect(result.dependencies).toEqual(['./c', './a', 'b']);
-    });
-  }
 
   it('reports filename when encountering unsupported dynamic dependency', async () => {
     try {

packages/metro/src/babel-bridge.js

@@ -13,27 +13,6 @@
 
 // This is a temporary migration bridge to switch between babel 6 and 7
 
-const IS_BABEL7 = true; // process.env.BABEL_VERSION === '7';
-
-// ## Babel 6 stuff
-
-const babelCore6 = require('babel-core');
-const babelGenerate6 = require('babel-generator').default;
-const babelTemplate6 = require('babel-template');
-const babelTraverse6 = require('babel-core').traverse;
-const babelTypes6 = require('babel-core').types;
-const babylon6 = require('babylon');
-
-const externalHelpersPlugin6 = require('babel-plugin-external-helpers');
-const inlineRequiresPlugin6 = require('babel-preset-fbjs/plugins/inline-requires');
-const makeHMRConfig6 = require('babel-preset-react-native/configs/hmr');
-const resolvePlugins6 = require('babel-preset-react-native/lib/resolvePlugins');
-// register has side effects so don't include by default (only used in a test)
-const getBabelRegisterConfig6 = () => require('metro-babel-register').config;
-// load given preset as a babel6 preset
-
-// ## Babel 7 stuff
-
 const babelCore7 = require('@babel/core');
 const babelGenerate7 = require('@babel/generator').default;
 const babelTemplate7 = require('@babel/template').default;
@@ -74,34 +53,21 @@ function resolvePlugins7(plugins: Array<any>) {
 }
 
 module.exports = {
-  version: IS_BABEL7 ? 7 : 6,
-
   // need to abstract the transform* funcs here since their name changed
-  transformSync: IS_BABEL7 ? babelCore7.transformSync : babelCore6.transform,
+  transformSync: babelCore7.transformSync,
-  transformFileSync: IS_BABEL7
+  transformFileSync: babelCore7.transformFileSync,
-    ? babelCore7.transformFileSync
+  transformFromAstSync: babelCore7.transformFromAstSync,
-    : babelCore6.transformFile,
+  babelGenerate: babelGenerate7,
-  transformFromAstSync: IS_BABEL7
+  babelTemplate: babelTemplate7,
-    ? babelCore7.transformFromAstSync
+  babelTraverse: babelTraverse7,
-    : babelCore6.transformFromAst,
+  babelTypes: babelTypes7,
+  getBabelRegisterConfig: getBabelRegisterConfig7,
+  babylon: babylon7,
 
-  babelGenerate: IS_BABEL7 ? babelGenerate7 : babelGenerate6,
+  externalHelpersPlugin: externalHelpersPlugin7,
-  babelTemplate: IS_BABEL7 ? babelTemplate7 : babelTemplate6,
+  inlineRequiresPlugin: inlineRequiresPlugin7,
-  babelTraverse: IS_BABEL7 ? babelTraverse7 : babelTraverse6,
+  makeHMRConfig: makeHMRConfig7,
-  babelTypes: IS_BABEL7 ? babelTypes7 : babelTypes6,
+  resolvePlugins: resolvePlugins7,
-  getBabelRegisterConfig: IS_BABEL7
-    ? getBabelRegisterConfig7
-    : getBabelRegisterConfig6,
-  babylon: IS_BABEL7 ? babylon7 : babylon6,
-
-  externalHelpersPlugin: IS_BABEL7
-    ? externalHelpersPlugin7
-    : externalHelpersPlugin6,
-  inlineRequiresPlugin: IS_BABEL7
-    ? inlineRequiresPlugin7
-    : inlineRequiresPlugin6,
-  makeHMRConfig: IS_BABEL7 ? makeHMRConfig7 : makeHMRConfig6,
-  resolvePlugins: IS_BABEL7 ? resolvePlugins7 : resolvePlugins6,
   getPreset,
 };