Skip to content

Commit bbc8bb1

Browse files
Miguel Jimenez Esunfacebook-github-bot
Miguel Jimenez Esun
authored andcommittedJul 3, 2018
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
1 parent ba56725 commit bbc8bb1

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed
 

‎local-cli/server/middleware/MiddlewareManager.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
const compression = require('compression');
1212
const connect = require('connect');
1313
const errorhandler = require('errorhandler');
14-
const morgan = require('morgan');
1514
const path = require('path');
1615
const serveStatic = require('serve-static');
1716
const WebSocketServer = require('ws').Server;
@@ -33,7 +32,8 @@ type WebSocketProxy = {
3332
server: WebSocketServer,
3433
isChromeConnected: () => boolean,
3534
};
36-
type Connect = any;
35+
36+
type Connect = $Call<connect>;
3737

3838
module.exports = class MiddlewareManager {
3939
app: Connect;
@@ -52,7 +52,6 @@ module.exports = class MiddlewareManager {
5252
.use(statusPageMiddleware)
5353
.use(systraceProfileMiddleware)
5454
.use(indexPageMiddleware)
55-
.use(morgan('combined'))
5655
.use(errorhandler());
5756
}
5857

‎local-cli/server/runServer.js

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const Metro = require('metro');
1616

1717
const {Terminal} = require('metro-core');
1818

19+
const morgan = require('morgan');
1920
const path = require('path');
2021
const MiddlewareManager = require('./middleware/MiddlewareManager');
2122

@@ -47,6 +48,8 @@ async function runServer(args: Args, config: ConfigT) {
4748
const reporter = new ReporterImpl(terminal);
4849
const middlewareManager = new MiddlewareManager(args);
4950

51+
middlewareManager.getConnectInstance().use(morgan('combined'));
52+
5053
args.watchFolders.forEach(middlewareManager.serveStatic);
5154

5255
const serverInstance = await Metro.runServer({

0 commit comments

Comments
 (0)
Please sign in to comment.