Skip to content

Commit 709ede7

Browse files
rafecafacebook-github-bot
authored andcommitted
Upgrade connect dependency
Reviewed By: cpojer Differential Revision: D6732727 fbshipit-source-id: 80181ef184c90e3312789579034d70e2c3bcbf98
1 parent 9e34cbd commit 709ede7

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

local-cli/server/runServer.js

+8-7
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ const HmrServer = require('metro/src/HmrServer');
2121
const {Terminal} = require('metro-core');
2222

2323
const attachWebsocketServer = require('./util/attachWebsocketServer');
24-
/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
25-
* found when Flow v0.54 was deployed. To see the error delete this comment and
26-
* run Flow. */
24+
const compression = require('compression');
2725
const connect = require('connect');
2826
const copyToClipBoardMiddleware = require('./middleware/copyToClipBoardMiddleware');
2927
const defaultAssetExts = Metro.defaults.assetExts;
@@ -34,15 +32,18 @@ const defaultPlatforms = Metro.defaults.platforms;
3432
* run Flow. */
3533
const defaultProvidesModuleNodeModules =
3634
Metro.defaults.providesModuleNodeModules;
35+
const errorhandler = require('errorhandler');
3736
const fs = require('fs');
3837
const getDevToolsMiddleware = require('./middleware/getDevToolsMiddleware');
3938
const http = require('http');
4039
const https = require('https');
4140
const indexPageMiddleware = require('./middleware/indexPage');
4241
const loadRawBodyMiddleware = require('./middleware/loadRawBodyMiddleware');
4342
const messageSocket = require('./util/messageSocket.js');
43+
const morgan = require('morgan');
4444
const openStackFrameInEditorMiddleware = require('./middleware/openStackFrameInEditorMiddleware');
4545
const path = require('path');
46+
const serveStatic = require('serve-static');
4647
const statusPageMiddleware = require('./middleware/statusPageMiddleware.js');
4748
const systraceProfileMiddleware = require('./middleware/systraceProfileMiddleware.js');
4849
const webSocketProxy = require('./util/webSocketProxy.js');
@@ -92,10 +93,10 @@ function runServer(
9293

9394
const app = connect()
9495
.use(loadRawBodyMiddleware)
95-
.use(connect.compress())
96+
.use(compression())
9697
.use(
9798
'/debugger-ui',
98-
connect.static(path.join(__dirname, 'util', 'debugger-ui')),
99+
serveStatic(path.join(__dirname, 'util', 'debugger-ui')),
99100
)
100101
.use(
101102
getDevToolsMiddleware(args, () => wsProxy && wsProxy.isChromeConnected()),
@@ -108,9 +109,9 @@ function runServer(
108109
.use(indexPageMiddleware)
109110
.use(packagerServer.processRequest.bind(packagerServer));
110111

111-
args.projectRoots.forEach(root => app.use(connect.static(root)));
112+
args.projectRoots.forEach(root => app.use(serveStatic(root)));
112113

113-
app.use(connect.logger()).use(connect.errorHandler());
114+
app.use(morgan('combined')).use(errorhandler());
114115

115116
if (args.https && (!args.key || !args.cert)) {
116117
throw new Error('Cannot use https without specifying key and cert options');

package.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,13 @@
159159
"base64-js": "^1.1.2",
160160
"chalk": "^1.1.1",
161161
"commander": "^2.9.0",
162-
"connect": "^2.8.3",
162+
"compression": "^1.7.1",
163+
"connect": "^3.6.5",
163164
"create-react-class": "^15.5.2",
164165
"debug": "^2.2.0",
165166
"denodeify": "^1.2.1",
166167
"envinfo": "^3.0.0",
168+
"errorhandler": "^1.5.0",
167169
"event-target-shim": "^1.0.5",
168170
"fbjs": "^0.8.14",
169171
"fbjs-scripts": "^0.8.1",
@@ -177,6 +179,7 @@
177179
"mime": "^1.3.4",
178180
"minimist": "^1.2.0",
179181
"mkdirp": "^0.5.1",
182+
"morgan": "^1.9.0",
180183
"node-fetch": "^1.3.3",
181184
"node-notifier": "^5.1.2",
182185
"npmlog": "^2.0.4",
@@ -192,6 +195,7 @@
192195
"regenerator-runtime": "^0.11.0",
193196
"rimraf": "^2.5.4",
194197
"semver": "^5.0.3",
198+
"serve-static": "^1.13.1",
195199
"shell-quote": "1.6.1",
196200
"stacktrace-parser": "^0.1.3",
197201
"whatwg-fetch": "^1.0.0",

0 commit comments

Comments
 (0)