From eb174a44bb385bddbd2d21daae20a3012602a800 Mon Sep 17 00:00:00 2001 From: Sebastian Markbage Date: Tue, 20 Feb 2024 20:08:55 -0500 Subject: [PATCH] Capitalize the default Flight environment It's cleaner and more in line with how we style other badges like "Memo" and "ForwardRef" in DevTools. --- packages/react-client/src/__tests__/ReactFlight-test.js | 6 +++--- packages/react-server/src/ReactFlightServer.js | 2 +- packages/react/src/__tests__/ReactFetch-test.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react-client/src/__tests__/ReactFlight-test.js b/packages/react-client/src/__tests__/ReactFlight-test.js index 5508a52c920..d61ba085fab 100644 --- a/packages/react-client/src/__tests__/ReactFlight-test.js +++ b/packages/react-client/src/__tests__/ReactFlight-test.js @@ -197,7 +197,7 @@ describe('ReactFlight', () => { const rootModel = await ReactNoopFlightClient.read(transport); const greeting = rootModel.greeting; expect(greeting._debugInfo).toEqual( - __DEV__ ? [{name: 'Greeting', env: 'server'}] : undefined, + __DEV__ ? [{name: 'Greeting', env: 'Server'}] : undefined, ); ReactNoop.render(greeting); }); @@ -224,7 +224,7 @@ describe('ReactFlight', () => { await act(async () => { const promise = ReactNoopFlightClient.read(transport); expect(promise._debugInfo).toEqual( - __DEV__ ? [{name: 'Greeting', env: 'server'}] : undefined, + __DEV__ ? [{name: 'Greeting', env: 'Server'}] : undefined, ); ReactNoop.render(await promise); }); @@ -1970,7 +1970,7 @@ describe('ReactFlight', () => { await act(async () => { const promise = ReactNoopFlightClient.read(transport); expect(promise._debugInfo).toEqual( - __DEV__ ? [{name: 'ServerComponent', env: 'server'}] : undefined, + __DEV__ ? [{name: 'ServerComponent', env: 'Server'}] : undefined, ); const result = await promise; const thirdPartyChildren = await result.props.children[1]; diff --git a/packages/react-server/src/ReactFlightServer.js b/packages/react-server/src/ReactFlightServer.js index 1444b6c6e60..0a5a79374bf 100644 --- a/packages/react-server/src/ReactFlightServer.js +++ b/packages/react-server/src/ReactFlightServer.js @@ -305,7 +305,7 @@ export function createRequest( }: any); if (__DEV__) { request.environmentName = - environmentName === undefined ? 'server' : environmentName; + environmentName === undefined ? 'Server' : environmentName; } const rootTask = createTask(request, model, null, false, abortSet); pingedTasks.push(rootTask); diff --git a/packages/react/src/__tests__/ReactFetch-test.js b/packages/react/src/__tests__/ReactFetch-test.js index 78fd5d622cd..cd658066c8c 100644 --- a/packages/react/src/__tests__/ReactFetch-test.js +++ b/packages/react/src/__tests__/ReactFetch-test.js @@ -86,7 +86,7 @@ describe('ReactFetch', () => { const promise = render(Component); expect(await promise).toMatchInlineSnapshot(`"GET world []"`); expect(promise._debugInfo).toEqual( - __DEV__ ? [{name: 'Component', env: 'server'}] : undefined, + __DEV__ ? [{name: 'Component', env: 'Server'}] : undefined, ); expect(fetchCount).toBe(1); });