Permalink
Browse files

Use new config internally in Metro

Summary: Change the internals of Metro to use the new configuration instead of `ServerOptions`.

Reviewed By: rafeca

Differential Revision: D8734685

fbshipit-source-id: 1215f799419fcaa0e5fb7814683da1cbba96795c
  • Loading branch information...
CompuIves authored and facebook-github-bot committed Jul 25, 2018
1 parent a32620d commit aaf797ad67b965f64450b199c554c65ad8dad351
Showing with 3 additions and 10 deletions.
  1. +1 −4 local-cli/bundle/buildBundle.js
  2. +1 −4 local-cli/dependencies/dependencies.js
  3. +1 −2 local-cli/server/runServer.js
@@ -16,7 +16,6 @@ const Server = require('metro/src/Server');
/* $FlowFixMe(site=react_native_oss) */
const outputBundle = require('metro/src/shared/output/bundle');
const {convert} = require('metro-config');
const path = require('path');
const saveAssets = require('./saveAssets');
@@ -57,9 +56,7 @@ async function buildBundle(
platform: args.platform,
};
const {serverOptions} = convert.convertNewToOld(config);
const server = new Server(serverOptions);
const server = new Server(config);
try {
const bundle = await output.build(server, requestOpts);
@@ -10,7 +10,6 @@
'use strict';
const Metro = require('metro');
const {convert} = require('metro-config');
const denodeify = require('denodeify');
const fs = require('fs');
@@ -48,12 +47,10 @@ async function dependencies(argv, configPromise, args, packagerInstance) {
? fs.createWriteStream(args.output)
: process.stdout;
const {serverOptions} = convert.convertNewToOld(config);
return Promise.resolve(
(packagerInstance
? packagerInstance.getOrderedDependencyPaths(options)
: Metro.getOrderedDependencyPaths(serverOptions, options)
: Metro.getOrderedDependencyPaths(config, options)
).then(deps => {
deps.forEach(modulePath => {
// Temporary hack to disable listing dependencies not under this directory.
@@ -60,8 +60,7 @@ async function runServer(args: Args, config: ConfigT) {
config.server.enhanceMiddleware = middleware =>
middlewareManager.getConnectInstance().use(middleware);
const serverInstance = await Metro.runServer({
config,
const serverInstance = await Metro.runServer(config, {
host: args.host,
secure: args.https,
secureCert: args.cert,

0 comments on commit aaf797a

Please sign in to comment.