Skip to content

Commit 123bfb8

Browse files
huntiereact-native-bot
authored andcommitted
Update cli-server-api middleware imports (facebook#48997)
Summary: Pull Request resolved: facebook#48997 Follows react-native-community/cli#2584. - Also add FIXME comment flagging potential core APIs gap without CLI. Changelog: [Internal] Reviewed By: cortinico Differential Revision: D68766565 fbshipit-source-id: 60747715f76c4323e306c39ab0613fb4818b4914
1 parent bdc83cb commit 123bfb8

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

packages/community-cli-plugin/src/commands/start/middleware.js

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @oncall react_native
1010
*/
1111

12-
import type {NextHandleFunction, Server} from 'connect';
12+
import type {Server} from 'connect';
1313
import type {TerminalReportableEvent} from 'metro/src/lib/TerminalReporter';
1414

1515
const debug = require('debug')('ReactNative:CommunityCliPlugin');
@@ -30,10 +30,6 @@ type MiddlewareReturn = {
3030
...
3131
};
3232

33-
const noopNextHandle: NextHandleFunction = (req, res, next) => {
34-
next();
35-
};
36-
3733
// $FlowFixMe
3834
const unusedStubWSServer: ws$WebSocketServer = {};
3935
// $FlowFixMe
@@ -45,6 +41,12 @@ const communityMiddlewareFallback = {
4541
port: number,
4642
watchFolders: $ReadOnlyArray<string>,
4743
}): MiddlewareReturn => ({
44+
// FIXME: Several features will break without community middleware and
45+
// should be migrated into core.
46+
// e.g. used by Libraries/Core/Devtools:
47+
// - /open-stack-frame
48+
// - /open-url
49+
// - /symbolicate
4850
middleware: unusedMiddlewareStub,
4951
websocketEndpoints: {},
5052
messageSocketEndpoint: {
@@ -59,15 +61,12 @@ const communityMiddlewareFallback = {
5961
reportEvent: (event: TerminalReportableEvent) => {},
6062
},
6163
}),
62-
indexPageMiddleware: noopNextHandle,
6364
};
6465

6566
// Attempt to use the community middleware if it exists, but fallback to
6667
// the stubs if it doesn't.
6768
try {
6869
const community = require('@react-native-community/cli-server-api');
69-
communityMiddlewareFallback.indexPageMiddleware =
70-
community.indexPageMiddleware;
7170
communityMiddlewareFallback.createDevServerMiddleware =
7271
community.createDevServerMiddleware;
7372
} catch {
@@ -77,5 +76,3 @@ Starting the server without the community middleware.`);
7776

7877
export const createDevServerMiddleware =
7978
communityMiddlewareFallback.createDevServerMiddleware;
80-
export const indexPageMiddleware =
81-
communityMiddlewareFallback.indexPageMiddleware;

packages/community-cli-plugin/src/commands/start/runServer.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import isDevServerRunning from '../../utils/isDevServerRunning';
1919
import loadMetroConfig from '../../utils/loadMetroConfig';
2020
import * as version from '../../utils/version';
2121
import attachKeyHandlers from './attachKeyHandlers';
22-
import {createDevServerMiddleware, indexPageMiddleware} from './middleware';
22+
import {createDevServerMiddleware} from './middleware';
2323
import {createDevMiddleware} from '@react-native/dev-middleware';
2424
import chalk from 'chalk';
2525
import Metro from 'metro';
@@ -152,11 +152,7 @@ async function runServer(
152152
secure: args.https,
153153
secureCert: args.cert,
154154
secureKey: args.key,
155-
unstable_extraMiddleware: [
156-
communityMiddleware,
157-
indexPageMiddleware,
158-
middleware,
159-
],
155+
unstable_extraMiddleware: [communityMiddleware, middleware],
160156
websocketEndpoints: {
161157
...communityWebsocketEndpoints,
162158
...websocketEndpoints,

0 commit comments

Comments
 (0)