status-im/metro
2
0
Fork 0
mirror of https://github.com/status-im/metro.git synced 2025-01-12 12:04:30 +00:00
Code Issues Projects Releases Wiki Activity

Stop pulling babylon from babel-bridge

Browse Source 
Reviewed By: rubennorte

Differential Revision: D7788535

fbshipit-source-id: 243824de7cecc32fbf47c57df6009178ca57f5fd
This commit is contained in:
Peter van der Zee 2018-04-27 09:23:27 -07:00 committed by Facebook Github Bot
parent de30633c37
commit ec4bad47e0
7 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/metro/src/Bundler/util.js
View File

@ -11,8 +11,7 @@
'use strict'; 'use strict';
const babelTypes = require('@babel/types'); const babelTypes = require('@babel/types');
const babylon = require('metro-babylon7');
const {babylon} = require('../babel-bridge');
import type {AssetDataWithoutFiles} from '../Assets'; import type {AssetDataWithoutFiles} from '../Assets';
import type {ModuleTransportLike} from '../shared/types.flow'; import type {ModuleTransportLike} from '../shared/types.flow';

2
packages/metro/src/JSTransformer/worker.js
View File

@ -13,6 +13,7 @@
const JsFileWrapping = require('../ModuleGraph/worker/JsFileWrapping'); const JsFileWrapping = require('../ModuleGraph/worker/JsFileWrapping');
const assetTransformer = require('../assetTransformer'); const assetTransformer = require('../assetTransformer');
const babylon = require('metro-babylon7');
const collectDependencies = require('../ModuleGraph/worker/collectDependencies'); const collectDependencies = require('../ModuleGraph/worker/collectDependencies');
const constantFoldingPlugin = require('./worker/constant-folding-plugin'); const constantFoldingPlugin = require('./worker/constant-folding-plugin');
const crypto = require('crypto'); const crypto = require('crypto');
@ -23,7 +24,6 @@ const inlinePlugin = require('./worker/inline-plugin');
const optimizeDependencies = require('../ModuleGraph/worker/optimizeDependencies'); const optimizeDependencies = require('../ModuleGraph/worker/optimizeDependencies');
const path = require('path'); const path = require('path');
const {babylon} = require('../babel-bridge');
const { const {
fromRawMappings, fromRawMappings,
toBabelSegments, toBabelSegments,

3
packages/metro/src/ModuleGraph/worker/__tests__/JsFileWrapping-test.js
View File

@ -13,7 +13,8 @@
const JsFileWrapping = require('../JsFileWrapping'); const JsFileWrapping = require('../JsFileWrapping');
const {babylon} = require('../../../babel-bridge'); const babylon = require('metro-babylon7');
const {codeFromAst, comparableCode} = require('../../test-helpers'); const {codeFromAst, comparableCode} = require('../../test-helpers');
const {WRAP_NAME} = JsFileWrapping; const {WRAP_NAME} = JsFileWrapping;

2
packages/metro/src/ModuleGraph/worker/__tests__/collectDependencies-test.js
View File

@ -11,9 +11,9 @@
'use strict'; 'use strict';
const babylon = require('metro-babylon7');
const collectDependencies = require('../collectDependencies'); const collectDependencies = require('../collectDependencies');
const {babylon} = require('../../../babel-bridge');
const {codeFromAst, comparableCode} = require('../../test-helpers'); const {codeFromAst, comparableCode} = require('../../test-helpers');
const {any} = expect; const {any} = expect;

2
packages/metro/src/ModuleGraph/worker/__tests__/optimizeDependencies-test.js
View File

@ -11,9 +11,9 @@
'use strict'; 'use strict';
const babylon = require('metro-babylon7');
const optimizeDependencies = require('../optimizeDependencies'); const optimizeDependencies = require('../optimizeDependencies');
const {babylon} = require('../../../babel-bridge');
const {InvalidRequireCallError} = optimizeDependencies; const {InvalidRequireCallError} = optimizeDependencies;
const {codeFromAst, comparableCode} = require('../../test-helpers'); const {codeFromAst, comparableCode} = require('../../test-helpers');

4
packages/metro/src/ModuleGraph/worker/__tests__/transform-module-test.js
View File

@ -19,10 +19,8 @@ const types = require('@babel/types');
const generate = require('@babel/generator').default; const generate = require('@babel/generator').default;
const traverse = require('@babel/traverse').default; const traverse = require('@babel/traverse').default;
const {
babylon: {parse},
} = require('../../../babel-bridge');
const {fn} = require('../../test-helpers'); const {fn} = require('../../test-helpers');
const {parse} = require('metro-babylon7');
const {SourceMapConsumer} = require('source-map'); const {SourceMapConsumer} = require('source-map');
import type {TransformVariants} from '../../types.flow'; import type {TransformVariants} from '../../types.flow';

2
packages/metro/src/babel-bridge.js
View File

@ -13,7 +13,6 @@
// This is a temporary migration bridge to switch between babel 6 and 7 // 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 externalHelpersPlugin7 = require('babel-plugin-external-helpers');
const inlineRequiresPlugin7 = require('babel-preset-fbjs/plugins/inline-requires'); const inlineRequiresPlugin7 = require('babel-preset-fbjs/plugins/inline-requires');
@ -49,7 +48,6 @@ function resolvePlugins7(plugins: Array<any>) {
module.exports = { module.exports = {
getBabelRegisterConfig: getBabelRegisterConfig7, getBabelRegisterConfig: getBabelRegisterConfig7,
babylon: babylon7,
externalHelpersPlugin: externalHelpersPlugin7, externalHelpersPlugin: externalHelpersPlugin7,
inlineRequiresPlugin: inlineRequiresPlugin7, inlineRequiresPlugin: inlineRequiresPlugin7,