diff --git a/packages/react-server/src/ReactFlightServer.js b/packages/react-server/src/ReactFlightServer.js index 1c769c93ee7cb..587f38008f11b 100644 --- a/packages/react-server/src/ReactFlightServer.js +++ b/packages/react-server/src/ReactFlightServer.js @@ -4493,6 +4493,12 @@ function outlineIOInfo(request: Request, ioInfo: ReactIOInfo): void { } else { debugStack = ioInfo.stack; } + let env = ioInfo.env; + if (env == null) { + // If we're forwarding IO info from this environment, an empty env is effectively the "client" side. + // The "client" from the perspective of our client will be this current environment. + env = (0, request.environmentName)(); + } emitIOInfoChunk( request, id, @@ -4500,7 +4506,7 @@ function outlineIOInfo(request: Request, ioInfo: ReactIOInfo): void { ioInfo.start, ioInfo.end, ioInfo.value, - ioInfo.env, + env, owner, debugStack, ); @@ -5388,6 +5394,11 @@ function forwardDebugInfo( if (info.env != null) { // $FlowFixMe[cannot-write] debugAsyncInfo.env = info.env; + } else { + // If we're forwarding IO info from this environment, an empty env is effectively the "client" side. + // The "client" from the perspective of our client will be this current environment. + // $FlowFixMe[cannot-write] + debugAsyncInfo.env = (0, request.environmentName)(); } if (info.owner != null) { // $FlowFixMe[cannot-write] diff --git a/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js b/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js index 992b58d3880cf..acc73ed223af0 100644 --- a/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js +++ b/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js @@ -1483,12 +1483,14 @@ describe('ReactFlightAsyncDebugInfo', () => { "awaited": { "byteSize": 0, "end": 0, + "env": "Server", "name": "RSC stream", "start": 0, "value": { "value": "stream", }, }, + "env": "Server", }, { "time": 0, @@ -1566,9 +1568,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1530, + 1532, 40, - 1513, + 1515, 62, ], [ @@ -1598,9 +1600,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1530, + 1532, 40, - 1513, + 1515, 62, ], [ @@ -1625,17 +1627,17 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "getData", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1515, + 1517, 13, - 1514, + 1516, 25, ], [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1525, + 1527, 13, - 1524, + 1526, 5, ], ], @@ -1654,9 +1656,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1530, + 1532, 40, - 1513, + 1515, 62, ], [ @@ -1673,17 +1675,17 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "getData", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1515, + 1517, 13, - 1514, + 1516, 25, ], [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1525, + 1527, 13, - 1524, + 1526, 5, ], ], @@ -1703,9 +1705,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1526, + 1528, 60, - 1524, + 1526, 5, ], ], @@ -1727,9 +1729,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1530, + 1532, 40, - 1513, + 1515, 62, ], [ @@ -1754,17 +1756,17 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "getData", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1515, + 1517, 13, - 1514, + 1516, 25, ], [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1525, + 1527, 13, - 1524, + 1526, 5, ], ], @@ -1783,9 +1785,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1526, + 1528, 60, - 1524, + 1526, 5, ], ], @@ -1794,9 +1796,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Child", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1520, + 1522, 28, - 1519, + 1521, 5, ], ], @@ -1879,9 +1881,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1843, + 1845, 40, - 1827, + 1829, 57, ], [ @@ -1911,9 +1913,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1843, + 1845, 40, - 1827, + 1829, 57, ], [ @@ -1938,17 +1940,17 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "getData", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1829, + 1831, 13, - 1828, + 1830, 25, ], [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1838, + 1840, 23, - 1837, + 1839, 5, ], ], @@ -1967,9 +1969,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1843, + 1845, 40, - 1827, + 1829, 57, ], [ @@ -1986,17 +1988,17 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "getData", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1829, + 1831, 13, - 1828, + 1830, 25, ], [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1838, + 1840, 23, - 1837, + 1839, 5, ], ], @@ -2016,9 +2018,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1839, + 1841, 60, - 1837, + 1839, 5, ], ], @@ -2037,9 +2039,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1843, + 1845, 40, - 1827, + 1829, 57, ], [ @@ -2064,17 +2066,17 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "getData", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1829, + 1831, 13, - 1828, + 1830, 25, ], [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1838, + 1840, 23, - 1837, + 1839, 5, ], ], @@ -2088,9 +2090,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 1839, + 1841, 60, - 1837, + 1839, 5, ], ], @@ -2175,9 +2177,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2139, + 2141, 40, - 2121, + 2123, 80, ], [ @@ -2207,9 +2209,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2139, + 2141, 40, - 2121, + 2123, 80, ], [ @@ -2234,17 +2236,17 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "delayTrice", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2129, + 2131, 13, - 2127, + 2129, 5, ], [ "Bar", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2134, + 2136, 13, - 2133, + 2135, 5, ], ], @@ -2263,9 +2265,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2139, + 2141, 40, - 2121, + 2123, 80, ], [ @@ -2282,17 +2284,17 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "delayTrice", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2129, + 2131, 13, - 2127, + 2129, 5, ], [ "Bar", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2134, + 2136, 13, - 2133, + 2135, 5, ], ], @@ -2314,9 +2316,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2139, + 2141, 40, - 2121, + 2123, 80, ], [ @@ -2341,25 +2343,25 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "delayTwice", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2123, + 2125, 13, - 2122, + 2124, 5, ], [ "delayTrice", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2128, + 2130, 15, - 2127, + 2129, 5, ], [ "Bar", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2134, + 2136, 13, - 2133, + 2135, 5, ], ], @@ -2378,9 +2380,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2139, + 2141, 40, - 2121, + 2123, 80, ], [ @@ -2397,25 +2399,25 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "delayTwice", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2123, + 2125, 13, - 2122, + 2124, 5, ], [ "delayTrice", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2128, + 2130, 15, - 2127, + 2129, 5, ], [ "Bar", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2134, + 2136, 13, - 2133, + 2135, 5, ], ], @@ -2437,9 +2439,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2139, + 2141, 40, - 2121, + 2123, 80, ], [ @@ -2464,9 +2466,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "delayTwice", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2124, + 2126, 13, - 2122, + 2124, 5, ], ], @@ -2485,9 +2487,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2139, + 2141, 40, - 2121, + 2123, 80, ], [ @@ -2504,9 +2506,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "delayTwice", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2124, + 2126, 13, - 2122, + 2124, 5, ], ], @@ -2579,9 +2581,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2548, + 2550, 109, - 2537, + 2539, 58, ], ], @@ -2603,9 +2605,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2548, + 2550, 109, - 2537, + 2539, 58, ], ], @@ -2622,17 +2624,17 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "getData", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2539, + 2541, 14, - 2538, + 2540, 5, ], [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2545, + 2547, 20, - 2544, + 2546, 5, ], ], @@ -2651,9 +2653,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2548, + 2550, 109, - 2537, + 2539, 58, ], ], @@ -2662,17 +2664,17 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "getData", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2539, + 2541, 23, - 2538, + 2540, 5, ], [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2545, + 2547, 20, - 2544, + 2546, 5, ], ], @@ -2751,9 +2753,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2715, + 2717, 40, - 2703, + 2705, 56, ], [ @@ -2783,9 +2785,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2715, + 2717, 40, - 2703, + 2705, 56, ], [ @@ -2810,9 +2812,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2711, + 2713, 20, - 2710, + 2712, 5, ], ], @@ -2831,9 +2833,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2715, + 2717, 40, - 2703, + 2705, 56, ], [ @@ -2850,9 +2852,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2711, + 2713, 20, - 2710, + 2712, 5, ], ], @@ -2945,9 +2947,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2904, + 2906, 40, - 2883, + 2885, 42, ], [ @@ -2977,9 +2979,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2904, + 2906, 40, - 2883, + 2885, 42, ], [ @@ -2996,17 +2998,17 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2890, + 2892, 15, - 2889, + 2891, 15, ], [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2899, + 2901, 19, - 2898, + 2900, 5, ], ], @@ -3025,9 +3027,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2904, + 2906, 40, - 2883, + 2885, 42, ], [ @@ -3044,17 +3046,17 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2890, + 2892, 15, - 2889, + 2891, 15, ], [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2899, + 2901, 19, - 2898, + 2900, 5, ], ], @@ -3076,9 +3078,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2904, + 2906, 40, - 2883, + 2885, 42, ], [ @@ -3095,9 +3097,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2899, + 2901, 25, - 2898, + 2900, 5, ], ], @@ -3116,9 +3118,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2904, + 2906, 40, - 2883, + 2885, 42, ], [ @@ -3135,9 +3137,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 2899, + 2901, 25, - 2898, + 2900, 5, ], ], @@ -3213,9 +3215,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 3180, + 3182, 40, - 3168, + 3170, 36, ], ], @@ -3237,9 +3239,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 3180, + 3182, 40, - 3168, + 3170, 36, ], ], @@ -3248,9 +3250,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 3172, + 3174, 7, - 3170, + 3172, 5, ], ], @@ -3269,9 +3271,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Object.", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 3180, + 3182, 40, - 3168, + 3170, 36, ], ], @@ -3280,9 +3282,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 3174, + 3176, 7, - 3170, + 3172, 5, ], ], @@ -3407,9 +3409,9 @@ describe('ReactFlightAsyncDebugInfo', () => { [ "Component", "/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js", - 3325, + 3327, 20, - 3324, + 3326, 5, ], ],