From bbc8bb1f9d6b9f99d7bdca09f553c4015555bd51 Mon Sep 17 00:00:00 2001
From: Miguel Jimenez Esun <mjimenez@fb.com>
Date: Tue, 3 Jul 2018 13:44:54 -0700
Subject: [PATCH] Do not use morgan internally

Summary: `morgan` produces non-json output, which affects `js1 run` when ran with the `--json` flag.

Reviewed By: Kureev

Differential Revision: D8724830

fbshipit-source-id: 11377f6ef39341c658a7f905383398423a721630
---
 local-cli/server/middleware/MiddlewareManager.js | 5 ++---
 local-cli/server/runServer.js                    | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/local-cli/server/middleware/MiddlewareManager.js b/local-cli/server/middleware/MiddlewareManager.js
index 78b69c777ab..25fe213c287 100644
--- a/local-cli/server/middleware/MiddlewareManager.js
+++ b/local-cli/server/middleware/MiddlewareManager.js
@@ -11,7 +11,6 @@
 const compression = require('compression');
 const connect = require('connect');
 const errorhandler = require('errorhandler');
-const morgan = require('morgan');
 const path = require('path');
 const serveStatic = require('serve-static');
 const WebSocketServer = require('ws').Server;
@@ -33,7 +32,8 @@ type WebSocketProxy = {
   server: WebSocketServer,
   isChromeConnected: () => boolean,
 };
-type Connect = any;
+
+type Connect = $Call<connect>;
 
 module.exports = class MiddlewareManager {
   app: Connect;
@@ -52,7 +52,6 @@ module.exports = class MiddlewareManager {
       .use(statusPageMiddleware)
       .use(systraceProfileMiddleware)
       .use(indexPageMiddleware)
-      .use(morgan('combined'))
       .use(errorhandler());
   }
 
diff --git a/local-cli/server/runServer.js b/local-cli/server/runServer.js
index 59f822f44da..f5a94b73958 100644
--- a/local-cli/server/runServer.js
+++ b/local-cli/server/runServer.js
@@ -16,6 +16,7 @@ const Metro = require('metro');
 
 const {Terminal} = require('metro-core');
 
+const morgan = require('morgan');
 const path = require('path');
 const MiddlewareManager = require('./middleware/MiddlewareManager');
 
@@ -47,6 +48,8 @@ async function runServer(args: Args, config: ConfigT) {
   const reporter = new ReporterImpl(terminal);
   const middlewareManager = new MiddlewareManager(args);
 
+  middlewareManager.getConnectInstance().use(morgan('combined'));
+
   args.watchFolders.forEach(middlewareManager.serveStatic);
 
   const serverInstance = await Metro.runServer({