Skip to content

Commit 0091496

Browse files
cpojerfacebook-github-bot
authored andcommitted
Export Config/defaults on Metro's main module
Reviewed By: arcanis Differential Revision: D6435529 fbshipit-source-id: a9549dc5900025fcc798ccb92b49e96c982c2e1e
1 parent 654fed4 commit 0091496

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

local-cli/bundle/buildBundle.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,27 @@ const TerminalReporter = require('metro/src/lib/TerminalReporter');
2929
* run Flow. */
3030
const TransformCaching = require('metro/src/lib/TransformCaching');
3131

32+
const {defaults} = require('metro');
3233
/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
3334
* found when Flow v0.54 was deployed. To see the error delete this comment and
3435
* run Flow. */
3536
const outputBundle = require('metro/src/shared/output/bundle');
3637
const path = require('path');
3738
const saveAssets = require('./saveAssets');
38-
const defaultAssetExts = require('metro/src/defaults').assetExts;
39-
const defaultSourceExts = require('metro/src/defaults').sourceExts;
40-
const defaultPlatforms = require('metro/src/defaults').platforms;
41-
/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
42-
* found when Flow v0.54 was deployed. To see the error delete this comment and
43-
* run Flow. */
44-
const defaultProvidesModuleNodeModules = require('metro/src/defaults').providesModuleNodeModules;
4539

4640
const {ASSET_REGISTRY_PATH} = require('../core/Constants');
4741

4842
import type {RequestOptions, OutputOptions} from './types.flow';
4943
import type {ConfigT} from 'metro';
5044

45+
const defaultAssetExts = defaults.assetExts;
46+
const defaultSourceExts = defaults.sourceExts;
47+
const defaultPlatforms = defaults.platforms;
48+
/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
49+
* found when Flow v0.54 was deployed. To see the error delete this comment and
50+
* run Flow. */
51+
const defaultProvidesModuleNodeModules = defaults.providesModuleNodeModules;
52+
5153
async function buildBundle(
5254
args: OutputOptions & {
5355
assetsDest: mixed,

local-cli/server/runServer.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require('../../setupBabel')();
1616
/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
1717
* found when Flow v0.54 was deployed. To see the error delete this comment and
1818
* run Flow. */
19-
const ReactPackager = require('metro');
19+
const Metro = require('metro');
2020

2121
const HmrServer = require('metro/src/HmrServer');
2222

@@ -31,14 +31,14 @@ const attachWebsocketServer = require('./util/attachWebsocketServer');
3131
* run Flow. */
3232
const connect = require('connect');
3333
const copyToClipBoardMiddleware = require('./middleware/copyToClipBoardMiddleware');
34-
const defaultAssetExts = require('metro/src/defaults').assetExts;
35-
const defaultSourceExts = require('metro/src/defaults').sourceExts;
36-
const defaultPlatforms = require('metro/src/defaults').platforms;
34+
const defaultAssetExts = Metro.defaults.assetExts;
35+
const defaultSourceExts = Metro.defaults.sourceExts;
36+
const defaultPlatforms = Metro.defaults.platforms;
3737
/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
3838
* found when Flow v0.54 was deployed. To see the error delete this comment and
3939
* run Flow. */
40-
const defaultProvidesModuleNodeModules = require('metro/src/defaults')
41-
.providesModuleNodeModules;
40+
const defaultProvidesModuleNodeModules =
41+
Metro.defaults.providesModuleNodeModules;
4242
const fs = require('fs');
4343
const getDevToolsMiddleware = require('./middleware/getDevToolsMiddleware');
4444
const http = require('http');
@@ -178,7 +178,7 @@ function getPackagerServer(args, config, reporter) {
178178
const providesModuleNodeModules =
179179
args.providesModuleNodeModules || defaultProvidesModuleNodeModules;
180180

181-
return ReactPackager.createServer({
181+
return Metro.createServer({
182182
assetExts: defaultAssetExts.concat(args.assetExts),
183183
assetRegistryPath: ASSET_REGISTRY_PATH,
184184
blacklistRE: config.getBlacklistRE(),

0 commit comments

Comments
 (0)