Skip to content

Tolerate configs without the newer server middleware options (fix accidental breaking change) #2099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robhogan wants to merge 1 commit into from
Closed

Tolerate configs without the newer server middleware options (fix accidental breaking change) #2099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/metro/src/index.flow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,8 @@ export const createConnectMiddleware = async function (
options?: RunMetroOptions,
): Promise<MetroMiddleWare> {
const metroServer = await runMetro(config, options);
config.server.unstable_onServerCreated(metroServer);
// Absent from configs built by older metro-config versions.
config.server.unstable_onServerCreated?.(metroServer);

let enhancedMiddleware: Middleware = metroServer.processRequest;

Expand Down Expand Up @@ -276,9 +277,9 @@ export const createConnectMiddleware = async function (
},
metroServer,
middleware: composeMiddleware(
config.server.unstable_priorityMiddleware,
config.server.unstable_priorityMiddleware ?? [],
enhancedMiddleware,
config.server.unstable_middleware,
config.server.unstable_middleware ?? [],
),
async end(): Promise<void> {
await metroServer.end();
Expand Down
14 changes: 14 additions & 0 deletions packages/metro/src/integration_tests/__tests__/server-extraMiddleware-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,20 @@ describe('runServer custom middleware', () => {
]);
});

test('serves with a config that lacks the newer server options', async () => {
const config = await loadConfig();
// As from an older metro-config.
const {
unstable_middleware: _middleware,
unstable_onServerCreated: _onServerCreated,
unstable_priorityMiddleware: _priorityMiddleware,
...server
} = config.server;
await startServer({...config, server});

expect((await request(BUNDLE_PATH)).status).toBe(200);
});

test('mounts deprecated unstable_extraMiddleware before unstable_priorityMiddleware', async () => {
const calls = [];
await startServer(await loadConfig(), {
Expand Down
Loading