Don't add undefined properties when forwarding

Maybe we should keep the nulls.

Author: sebmarkbage

packages/react-client/src/ReactFlightClient.js

@@ -2658,7 +2658,7 @@ function resolveDebugInfo(
     // to initialize it when we need it, we might be inside user code.
     initializeFakeTask(response, componentInfoOrAsyncInfo);
   }
-  if (debugInfo.owner === null && response._debugRootOwner != null) {
+  if (debugInfo.owner == null && response._debugRootOwner != null) {
     const componentInfoOrAsyncInfo: ReactComponentInfo | ReactAsyncInfo =
       // $FlowFixMe: By narrowing `owner` to `null`, we narrowed `debugInfo` to `ReactComponentInfo`
       debugInfo;

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -320,7 +320,6 @@ describe('ReactFlight', () => {
                 name: 'Greeting',
                 env: 'Server',
                 key: null,
-                owner: null,
                 stack: '    in Object.<anonymous> (at **)',
                 props: {
                   firstName: 'Seb',
@@ -364,7 +363,6 @@ describe('ReactFlight', () => {
                 name: 'Greeting',
                 env: 'Server',
                 key: null,
-                owner: null,
                 stack: '    in Object.<anonymous> (at **)',
                 props: {
                   firstName: 'Seb',
@@ -2812,7 +2810,6 @@ describe('ReactFlight', () => {
                 name: 'ServerComponent',
                 env: 'Server',
                 key: null,
-                owner: null,
                 stack: '    in Object.<anonymous> (at **)',
                 props: {
                   transport: expect.arrayContaining([]),
@@ -2834,7 +2831,6 @@ describe('ReactFlight', () => {
                 name: 'ThirdPartyComponent',
                 env: 'third-party',
                 key: null,
-                owner: null,
                 stack: '    in Object.<anonymous> (at **)',
                 props: {},
               },
@@ -2851,7 +2847,6 @@ describe('ReactFlight', () => {
                 name: 'ThirdPartyLazyComponent',
                 env: 'third-party',
                 key: null,
-                owner: null,
                 stack: '    in myLazy (at **)\n    in lazyInitializer (at **)',
                 props: {},
               },
@@ -2867,7 +2862,6 @@ describe('ReactFlight', () => {
                 name: 'ThirdPartyFragmentComponent',
                 env: 'third-party',
                 key: '3',
-                owner: null,
                 stack: '    in Object.<anonymous> (at **)',
                 props: {},
               },
@@ -2941,7 +2935,6 @@ describe('ReactFlight', () => {
                 name: 'ServerComponent',
                 env: 'Server',
                 key: null,
-                owner: null,
                 stack: '    in Object.<anonymous> (at **)',
                 props: {
                   transport: expect.arrayContaining([]),
@@ -2961,7 +2954,6 @@ describe('ReactFlight', () => {
                 name: 'Keyed',
                 env: 'Server',
                 key: 'keyed',
-                owner: null,
                 stack: '    in ServerComponent (at **)',
                 props: {
                   children: {},
@@ -2980,7 +2972,6 @@ describe('ReactFlight', () => {
                 name: 'ThirdPartyAsyncIterableComponent',
                 env: 'third-party',
                 key: null,
-                owner: null,
                 stack: '    in Object.<anonymous> (at **)',
                 props: {},
               },
@@ -3137,7 +3128,6 @@ describe('ReactFlight', () => {
                 name: 'Component',
                 env: 'A',
                 key: null,
-                owner: null,
                 stack: '    in Object.<anonymous> (at **)',
                 props: {},
               },
@@ -3325,7 +3315,6 @@ describe('ReactFlight', () => {
           name: 'Greeting',
           env: 'Server',
           key: null,
-          owner: null,
           stack: '    in Object.<anonymous> (at **)',
           props: {
             firstName: 'Seb',

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js

@@ -708,7 +708,6 @@ describe('ReactFlightDOMBrowser', () => {
             name: 'Server',
             env: 'Server',
             key: null,
-            owner: null,
           }),
         }),
       );
@@ -724,7 +723,6 @@ describe('ReactFlightDOMBrowser', () => {
             name: 'Server',
             env: 'Server',
             key: null,
-            owner: null,
           }),
         }),
       );

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js

@@ -1190,7 +1190,6 @@ describe('ReactFlightDOMEdge', () => {
       const greetInfo = expect.objectContaining({
         name: 'Greeting',
         env: 'Server',
-        owner: null,
       });
       expect(lazyWrapper._debugInfo).toEqual([
         {time: 12},

packages/react-server/src/ReactFlightServer.js

@@ -3587,18 +3587,24 @@ function outlineComponentInfo(
     'debugTask' | 'debugStack',
   > = {
     name: componentInfo.name,
-    env: componentInfo.env,
     key: componentInfo.key,
-    owner: componentInfo.owner,
   };
+  if (componentInfo.env != null) {
+    // $FlowFixMe[cannot-write]
+    componentDebugInfo.env = componentInfo.env;
+  }
+  if (componentInfo.owner != null) {
+    // $FlowFixMe[cannot-write]
+    componentDebugInfo.owner = componentInfo.owner;
+  }
   if (componentInfo.stack == null && componentInfo.debugStack != null) {
     // If we have a debugStack but no parsed stack we should parse it.
     // $FlowFixMe[cannot-write]
     componentDebugInfo.stack = filterStackTrace(
       request,
       parseStackTrace(componentInfo.debugStack, 1),
     );
-  } else {
+  } else if (componentInfo.stack != null) {
     // $FlowFixMe[cannot-write]
     componentDebugInfo.stack = componentInfo.stack;
   }
@@ -4293,10 +4299,19 @@ function forwardDebugInfo(
         const debugAsyncInfo: Omit<ReactAsyncInfo, 'debugTask' | 'debugStack'> =
           {
             awaited: ioInfo,
-            env: info.env,
-            owner: info.owner,
-            stack: debugStack,
           };
+        if (info.env != null) {
+          // $FlowFixMe[cannot-write]
+          debugAsyncInfo.env = info.env;
+        }
+        if (info.owner != null) {
+          // $FlowFixMe[cannot-write]
+          debugAsyncInfo.owner = info.owner;
+        }
+        if (debugStack != null) {
+          // $FlowFixMe[cannot-write]
+          debugAsyncInfo.stack = debugStack;
+        }
         emitDebugChunk(request, id, debugAsyncInfo);
       } else {
         emitDebugChunk(request, id, debugInfo[i]);