Revert "[Fizz] Refactor Component Stack Nodes (facebook#30298)"

This reverts commit b73dcdc.

Author: kassens

packages/react-devtools-shared/src/backend/DevToolsFiberComponentStack.js

@@ -47,7 +47,6 @@ export function describeFiber(
     case HostComponent:
       return describeBuiltInComponentFrame(workInProgress.type);
     case LazyComponent:
-      // TODO: When we support Thenables as component types we should rename this.
       return describeBuiltInComponentFrame('Lazy');
     case SuspenseComponent:
       return describeBuiltInComponentFrame('Suspense');

packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js

@@ -704,39 +704,17 @@ describe('ReactDOMFizzServer', () => {
 
   it('should client render a boundary if a lazy component rejects', async () => {
     let rejectComponent;
-    const promise = new Promise((resolve, reject) => {
-      rejectComponent = reject;
-    });
     const LazyComponent = React.lazy(() => {
-      return promise;
-    });
-
-    const LazyLazy = React.lazy(async () => {
-      return {
-        default: LazyComponent,
-      };
-    });
-
-    function Wrapper({children}) {
-      return children;
-    }
-    const LazyWrapper = React.lazy(() => {
-      return {
-        then(callback) {
-          callback({
-            default: Wrapper,
-          });
-        },
-      };
+      return new Promise((resolve, reject) => {
+        rejectComponent = reject;
+      });
     });
 
     function App({isClient}) {
       return (
         <div>
           <Suspense fallback={<Text text="Loading..." />}>
-            <LazyWrapper>
-              {isClient ? <Text text="Hello" /> : <LazyLazy text="Hello" />}
-            </LazyWrapper>
+            {isClient ? <Text text="Hello" /> : <LazyComponent text="Hello" />}
           </Suspense>
         </div>
       );
@@ -770,7 +748,6 @@ describe('ReactDOMFizzServer', () => {
       });
       pipe(writable);
     });
-
     expect(loggedErrors).toEqual([]);
     expect(bootstrapped).toBe(true);
 
@@ -799,7 +776,7 @@ describe('ReactDOMFizzServer', () => {
           'Switched to client rendering because the server rendering errored:\n\n' +
             theError.message,
           expectedDigest,
-          componentStack(['Lazy', 'Wrapper', 'Suspense', 'div', 'App']),
+          componentStack(['Lazy', 'Suspense', 'div', 'App']),
         ],
       ],
       [
@@ -879,9 +856,13 @@ describe('ReactDOMFizzServer', () => {
     }
 
     await act(() => {
-      const {pipe} = renderToPipeableStream(<App isClient={false} />, {
-        onError,
-      });
+      const {pipe} = renderToPipeableStream(
+        <App isClient={false} />,
+
+        {
+          onError,
+        },
+      );
       pipe(writable);
     });
     expect(loggedErrors).toEqual([]);
@@ -919,7 +900,7 @@ describe('ReactDOMFizzServer', () => {
           'Switched to client rendering because the server rendering errored:\n\n' +
             theError.message,
           expectedDigest,
-          componentStack(['Suspense', 'div', 'App']),
+          componentStack(['Lazy', 'Suspense', 'div', 'App']),
         ],
       ],
       [
@@ -1418,13 +1399,13 @@ describe('ReactDOMFizzServer', () => {
             'The render was aborted by the server without a reason.',
           expectedDigest,
           // We get the stack of the task when it was aborted which is why we see `h1`
-          componentStack(['AsyncText', 'h1', 'Suspense', 'div', 'App']),
+          componentStack(['h1', 'Suspense', 'div', 'App']),
         ],
         [
           'Switched to client rendering because the server rendering aborted due to:\n\n' +
             'The render was aborted by the server without a reason.',
           expectedDigest,
-          componentStack(['AsyncText', 'Suspense', 'main', 'div', 'App']),
+          componentStack(['Suspense', 'main', 'div', 'App']),
         ],
       ],
       [
@@ -3526,13 +3507,13 @@ describe('ReactDOMFizzServer', () => {
           'Switched to client rendering because the server rendering aborted due to:\n\n' +
             'foobar',
           'a digest',
-          componentStack(['AsyncText', 'Suspense', 'p', 'div', 'App']),
+          componentStack(['Suspense', 'p', 'div', 'App']),
         ],
         [
           'Switched to client rendering because the server rendering aborted due to:\n\n' +
             'foobar',
           'a digest',
-          componentStack(['AsyncText', 'Suspense', 'span', 'div', 'App']),
+          componentStack(['Suspense', 'span', 'div', 'App']),
         ],
       ],
       [
@@ -3609,13 +3590,13 @@ describe('ReactDOMFizzServer', () => {
           'Switched to client rendering because the server rendering aborted due to:\n\n' +
             'uh oh',
           'a digest',
-          componentStack(['AsyncText', 'Suspense', 'p', 'div', 'App']),
+          componentStack(['Suspense', 'p', 'div', 'App']),
         ],
         [
           'Switched to client rendering because the server rendering aborted due to:\n\n' +
             'uh oh',
           'a digest',
-          componentStack(['AsyncText', 'Suspense', 'span', 'div', 'App']),
+          componentStack(['Suspense', 'span', 'div', 'App']),
         ],
       ],
       [

packages/react-dom/src/__tests__/ReactDOMFizzServerNode-test.js

@@ -585,7 +585,7 @@ describe('ReactDOMFizzServerNode', () => {
     let isComplete = false;
     let rendered = false;
     const promise = new Promise(r => (resolve = r));
-    function Wait({prop}) {
+    function Wait() {
       if (!hasLoaded) {
         throw promise;
       }

packages/react-html/src/__tests__/ReactHTMLServer-test.js

@@ -250,7 +250,9 @@ if (!__EXPERIMENTAL__) {
               '\n    in Bar (at **)' +
               '\n    in Foo (at **)' +
               '\n    in div (at **)'
-          : '\n    in div (at **)' + '\n    in div (at **)',
+          : '\n    in Lazy (at **)' +
+              '\n    in div (at **)' +
+              '\n    in div (at **)',
       );
       expect(normalizeCodeLocInfo(caughtErrors[0].ownerStack)).toBe(
         __DEV__ && gate(flags => flags.enableOwnerStacks)

packages/react-reconciler/src/ReactFiberComponentStack.js

@@ -39,7 +39,6 @@ function describeFiber(fiber: Fiber): string {
     case HostComponent:
       return describeBuiltInComponentFrame(fiber.type);
     case LazyComponent:
-      // TODO: When we support Thenables as component types we should rename this.
       return describeBuiltInComponentFrame('Lazy');
     case SuspenseComponent:
       return describeBuiltInComponentFrame('Suspense');

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

@@ -930,74 +930,4 @@ describe('ReactFlightDOMEdge', () => {
       '\n    in Bar (at **)' + '\n    in Foo (at **)',
     );
   });
-
-  it('supports server components in ssr component stacks', async () => {
-    let reject;
-    const promise = new Promise((_, r) => (reject = r));
-    async function Erroring() {
-      await promise;
-      return 'should not render';
-    }
-
-    const model = {
-      root: ReactServer.createElement(Erroring),
-    };
-
-    const stream = ReactServerDOMServer.renderToReadableStream(
-      model,
-      webpackMap,
-      {
-        onError() {},
-      },
-    );
-
-    const rootModel = await ReactServerDOMClient.createFromReadableStream(
-      stream,
-      {
-        ssrManifest: {
-          moduleMap: null,
-          moduleLoading: null,
-        },
-      },
-    );
-
-    const errors = [];
-    const result = ReactDOMServer.renderToReadableStream(
-      <div>{rootModel.root}</div>,
-      {
-        onError(error, {componentStack}) {
-          errors.push({
-            error,
-            componentStack: normalizeCodeLocInfo(componentStack),
-          });
-        },
-      },
-    );
-
-    const theError = new Error('my error');
-    reject(theError);
-
-    const expectedMessage = __DEV__
-      ? 'my error'
-      : 'An error occurred in the Server Components render. The specific message is omitted in production builds to avoid leaking sensitive details. A digest property is included on this error instance which may provide additional details about the nature of the error.';
-
-    try {
-      await result;
-    } catch (x) {
-      expect(x).toEqual(
-        expect.objectContaining({
-          message: expectedMessage,
-        }),
-      );
-    }
-
-    expect(errors).toEqual([
-      {
-        error: expect.objectContaining({
-          message: expectedMessage,
-        }),
-        componentStack: (__DEV__ ? '\n    in Erroring' : '') + '\n    in div',
-      },
-    ]);
-  });
 });