[Flight] Transport AggregateErrors.errors (#36156)

Author: eps1lon

.eslintrc.js

@@ -566,6 +566,7 @@ module.exports = {
 CallSite: 'readonly',
 ConsoleTask: 'readonly',// TOOD: Figure out what the official name of this will be.
 ReturnType: 'readonly',
+AggregateError: 'readonly',
 AnimationFrameID: 'readonly',
 WeakRef: 'readonly',
 // For Flow type annotation. Only `BigInt` is valid at runtime.

packages/internal-test-utils/ReactInternalTestUtils.js

@@ -122,7 +122,6 @@ ${diff(expectedLog, actualLog)}
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/internal-test-utils/internalAct.js

@@ -34,7 +34,6 @@ async function waitForMicrotasks() {
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/react-client/src/ReactFlightClient.js

@@ -3525,7 +3525,8 @@ function resolveErrorDev(
 
 leterror;
 consterrorOptions=
-'cause'inerrorInfo
+// We don't serialize Error.cause in prod so we never need to deserialize
+__DEV__&&'cause'inerrorInfo
  ? {
 cause: reviveModel(
 response,
@@ -3536,18 +3537,40 @@ function resolveErrorDev(
 ),
 }
  : undefined;
+constisAggregateError=
+typeofAggregateError!=='undefined'&&'errors'inerrorInfo;
+constrevivedErrors=
+// We don't serialize AggregateError.errors in prod so we never need to deserialize
+__DEV__&&isAggregateError
+ ? reviveModel(
+response,
+// $FlowFixMe[incompatible-cast]
+(errorInfo.errors: JSONValue),
+errorInfo,
+'errors',
+)
+ : null;
 constcallStack=buildFakeCallStack(
 response,
 stack,
 env,
 false,
-// $FlowFixMe[incompatible-use]
-Error.bind(
-null,
-message||
-'An error occurred in the Server Components render but no message was provided',
-errorOptions,
-),
+isAggregateError
+ ? // $FlowFixMe[incompatible-use]
+AggregateError.bind(
+null,
+revivedErrors,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+)
+ : // $FlowFixMe[incompatible-use]
+Error.bind(
+null,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+),
 );
 
 letownerTask: null|ConsoleTask=null;

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

@@ -840,6 +840,204 @@ describe('ReactFlight', () => {
 }
 });
 
+it('can transport AggregateError',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+functionComponentClient({error}){
+returnrenderError(error);
+}
+constComponent=clientReference(ComponentClient);
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror=newAggregateError([error1,error2],'aggregate');
+return<Componenterror={error}/>;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+
+if(__DEV__){
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
+it('includes AggregateError.errors in thrown errors',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror3=newError('third error');
+consterror4=newError('fourth error');
+consterror5=newError('fifth error');
+consterror6=newError('sixth error');
+consterror=newAggregateError(
+[error1,error2,error3,error4,error5,error6],
+'aggregate',
+);
+throwerror;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+leterror;
+try{
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+}catch(x){
+error=x;
+}
+
+if(__DEV__){
+expect(renderError(error)).toEqual(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: third error
+ stack: Error: third error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fourth error
+ stack: Error: fourth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fifth error
+ stack: Error: fifth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: sixth error
+ stack: Error: sixth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(renderError(error)).toEqual(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
 it('can transport cyclic objects',async()=>{
 functionComponentClient({prop}){
 expect(prop.obj.obj.obj).toBe(prop.obj.obj);

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

@@ -1485,7 +1485,6 @@ describe('ReactDOMSelect', () => {
 );
 }),
 ).rejects.toThrowError(
-// eslint-disable-next-line no-undef
 newAggregateError([
 newTypeError('prod message'),
 newTypeError('prod message'),

packages/react-reconciler/src/__tests__/ReactFlushSync-test.js

@@ -337,7 +337,6 @@ describe('ReactFlushSync', () => {
 expect(getVisibleChildren(container3)).toEqual('aww');
 
 // Because there were multiple errors, React threw an AggregateError.
-// eslint-disable-next-line no-undef
 expect(error).toBeInstanceOf(AggregateError);
 expect(error.errors.length).toBe(2);
 expect(error.errors[0]).toBe(aahh);

packages/react-server/src/ReactFlightServer.js

@@ -4169,6 +4169,14 @@ function serializeErrorValue(request: Request, error: Error): string {
 constcauseId=outlineModel(request,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineModel(request,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineModel(request,errorInfo);
 return'$Z'+id.toString(16);
 }else{
@@ -4211,6 +4219,15 @@ function serializeDebugErrorValue(
 constcauseId=outlineDebugModel(request,counter,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+counter.objectLimit--;
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineDebugModel(request,counter,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineDebugModel(
 request,
 {objectLimit: stack.length*2+1},
@@ -4240,6 +4257,7 @@ function emitErrorChunk(
 letstack: ReactStackTrace;
 letenv=(0,request.environmentName)();
 letcauseReference: null|string=null;
+leterrorsReference: null|string=null;
 try{
 if(errorinstanceofError){
 name=error.name;
@@ -4259,6 +4277,16 @@ function emitErrorChunk(
  : outlineModel(request,cause);
 causeReference=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=debug
+ ? outlineDebugModel(request,{objectLimit: 5},errors)
+ : outlineModel(request,errors);
+errorsReference=serializeByValueID(errorsId);
+}
 }elseif(typeoferror==='object'&&error!==null){
 message=describeObjectForErrorMessage(error);
 stack=[];
@@ -4277,6 +4305,9 @@ function emitErrorChunk(
 if(causeReference!==null){
 (errorInfo: ReactErrorInfoDev).cause=causeReference;
 }
+if(errorsReference!==null){
+(errorInfo: ReactErrorInfoDev).errors=errorsReference;
+}
 }else{
  errorInfo ={digest};
 }

packages/react/src/ReactAct.js

@@ -23,7 +23,6 @@ let didWarnNoAwaitAct = false;
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/shared/ReactTypes.js

@@ -244,6 +244,7 @@ export type ReactErrorInfoDev = {
 +env: string,
 +owner?: null|string,
 cause?: JSONValue,
+errors?: JSONValue,
 };
 
 export type ReactErrorInfo = ReactErrorInfoProd | ReactErrorInfoDev;

.eslintrc.js

@@ -566,6 +566,7 @@ module.exports = {
 CallSite: 'readonly',
 ConsoleTask: 'readonly',// TOOD: Figure out what the official name of this will be.
 ReturnType: 'readonly',
+AggregateError: 'readonly',
 AnimationFrameID: 'readonly',
 WeakRef: 'readonly',
 // For Flow type annotation. Only `BigInt` is valid at runtime.

packages/internal-test-utils/ReactInternalTestUtils.js

@@ -122,7 +122,6 @@ ${diff(expectedLog, actualLog)}
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/internal-test-utils/internalAct.js

@@ -34,7 +34,6 @@ async function waitForMicrotasks() {
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/react-client/src/ReactFlightClient.js

@@ -3525,7 +3525,8 @@ function resolveErrorDev(
 
 leterror;
 consterrorOptions=
-'cause'inerrorInfo
+// We don't serialize Error.cause in prod so we never need to deserialize
+__DEV__&&'cause'inerrorInfo
  ? {
 cause: reviveModel(
 response,
@@ -3536,18 +3537,40 @@ function resolveErrorDev(
 ),
 }
  : undefined;
+constisAggregateError=
+typeofAggregateError!=='undefined'&&'errors'inerrorInfo;
+constrevivedErrors=
+// We don't serialize AggregateError.errors in prod so we never need to deserialize
+__DEV__&&isAggregateError
+ ? reviveModel(
+response,
+// $FlowFixMe[incompatible-cast]
+(errorInfo.errors: JSONValue),
+errorInfo,
+'errors',
+)
+ : null;
 constcallStack=buildFakeCallStack(
 response,
 stack,
 env,
 false,
-// $FlowFixMe[incompatible-use]
-Error.bind(
-null,
-message||
-'An error occurred in the Server Components render but no message was provided',
-errorOptions,
-),
+isAggregateError
+ ? // $FlowFixMe[incompatible-use]
+AggregateError.bind(
+null,
+revivedErrors,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+)
+ : // $FlowFixMe[incompatible-use]
+Error.bind(
+null,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+),
 );
 
 letownerTask: null|ConsoleTask=null;

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

@@ -840,6 +840,204 @@ describe('ReactFlight', () => {
 }
 });
 
+it('can transport AggregateError',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+functionComponentClient({error}){
+returnrenderError(error);
+}
+constComponent=clientReference(ComponentClient);
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror=newAggregateError([error1,error2],'aggregate');
+return<Componenterror={error}/>;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+
+if(__DEV__){
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
+it('includes AggregateError.errors in thrown errors',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror3=newError('third error');
+consterror4=newError('fourth error');
+consterror5=newError('fifth error');
+consterror6=newError('sixth error');
+consterror=newAggregateError(
+[error1,error2,error3,error4,error5,error6],
+'aggregate',
+);
+throwerror;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+leterror;
+try{
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+}catch(x){
+error=x;
+}
+
+if(__DEV__){
+expect(renderError(error)).toEqual(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: third error
+ stack: Error: third error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fourth error
+ stack: Error: fourth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fifth error
+ stack: Error: fifth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: sixth error
+ stack: Error: sixth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(renderError(error)).toEqual(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
 it('can transport cyclic objects',async()=>{
 functionComponentClient({prop}){
 expect(prop.obj.obj.obj).toBe(prop.obj.obj);

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

@@ -1485,7 +1485,6 @@ describe('ReactDOMSelect', () => {
 );
 }),
 ).rejects.toThrowError(
-// eslint-disable-next-line no-undef
 newAggregateError([
 newTypeError('prod message'),
 newTypeError('prod message'),

packages/react-reconciler/src/__tests__/ReactFlushSync-test.js

@@ -337,7 +337,6 @@ describe('ReactFlushSync', () => {
 expect(getVisibleChildren(container3)).toEqual('aww');
 
 // Because there were multiple errors, React threw an AggregateError.
-// eslint-disable-next-line no-undef
 expect(error).toBeInstanceOf(AggregateError);
 expect(error.errors.length).toBe(2);
 expect(error.errors[0]).toBe(aahh);

packages/react-server/src/ReactFlightServer.js

@@ -4169,6 +4169,14 @@ function serializeErrorValue(request: Request, error: Error): string {
 constcauseId=outlineModel(request,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineModel(request,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineModel(request,errorInfo);
 return'$Z'+id.toString(16);
 }else{
@@ -4211,6 +4219,15 @@ function serializeDebugErrorValue(
 constcauseId=outlineDebugModel(request,counter,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+counter.objectLimit--;
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineDebugModel(request,counter,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineDebugModel(
 request,
 {objectLimit: stack.length*2+1},
@@ -4240,6 +4257,7 @@ function emitErrorChunk(
 letstack: ReactStackTrace;
 letenv=(0,request.environmentName)();
 letcauseReference: null|string=null;
+leterrorsReference: null|string=null;
 try{
 if(errorinstanceofError){
 name=error.name;
@@ -4259,6 +4277,16 @@ function emitErrorChunk(
  : outlineModel(request,cause);
 causeReference=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=debug
+ ? outlineDebugModel(request,{objectLimit: 5},errors)
+ : outlineModel(request,errors);
+errorsReference=serializeByValueID(errorsId);
+}
 }elseif(typeoferror==='object'&&error!==null){
 message=describeObjectForErrorMessage(error);
 stack=[];
@@ -4277,6 +4305,9 @@ function emitErrorChunk(
 if(causeReference!==null){
 (errorInfo: ReactErrorInfoDev).cause=causeReference;
 }
+if(errorsReference!==null){
+(errorInfo: ReactErrorInfoDev).errors=errorsReference;
+}
 }else{
  errorInfo ={digest};
 }

packages/react/src/ReactAct.js

@@ -23,7 +23,6 @@ let didWarnNoAwaitAct = false;
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/shared/ReactTypes.js

@@ -244,6 +244,7 @@ export type ReactErrorInfoDev = {
 +env: string,
 +owner?: null|string,
 cause?: JSONValue,
+errors?: JSONValue,
 };
 
 export type ReactErrorInfo = ReactErrorInfoProd | ReactErrorInfoDev;

.eslintrc.js

@@ -566,6 +566,7 @@ module.exports = {
 CallSite: 'readonly',
 ConsoleTask: 'readonly',// TOOD: Figure out what the official name of this will be.
 ReturnType: 'readonly',
+AggregateError: 'readonly',
 AnimationFrameID: 'readonly',
 WeakRef: 'readonly',
 // For Flow type annotation. Only `BigInt` is valid at runtime.

packages/internal-test-utils/ReactInternalTestUtils.js

@@ -122,7 +122,6 @@ ${diff(expectedLog, actualLog)}
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/internal-test-utils/internalAct.js

@@ -34,7 +34,6 @@ async function waitForMicrotasks() {
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/react-client/src/ReactFlightClient.js

@@ -3525,7 +3525,8 @@ function resolveErrorDev(
 
 leterror;
 consterrorOptions=
-'cause'inerrorInfo
+// We don't serialize Error.cause in prod so we never need to deserialize
+__DEV__&&'cause'inerrorInfo
  ? {
 cause: reviveModel(
 response,
@@ -3536,18 +3537,40 @@ function resolveErrorDev(
 ),
 }
  : undefined;
+constisAggregateError=
+typeofAggregateError!=='undefined'&&'errors'inerrorInfo;
+constrevivedErrors=
+// We don't serialize AggregateError.errors in prod so we never need to deserialize
+__DEV__&&isAggregateError
+ ? reviveModel(
+response,
+// $FlowFixMe[incompatible-cast]
+(errorInfo.errors: JSONValue),
+errorInfo,
+'errors',
+)
+ : null;
 constcallStack=buildFakeCallStack(
 response,
 stack,
 env,
 false,
-// $FlowFixMe[incompatible-use]
-Error.bind(
-null,
-message||
-'An error occurred in the Server Components render but no message was provided',
-errorOptions,
-),
+isAggregateError
+ ? // $FlowFixMe[incompatible-use]
+AggregateError.bind(
+null,
+revivedErrors,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+)
+ : // $FlowFixMe[incompatible-use]
+Error.bind(
+null,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+),
 );
 
 letownerTask: null|ConsoleTask=null;

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

@@ -840,6 +840,204 @@ describe('ReactFlight', () => {
 }
 });
 
+it('can transport AggregateError',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+functionComponentClient({error}){
+returnrenderError(error);
+}
+constComponent=clientReference(ComponentClient);
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror=newAggregateError([error1,error2],'aggregate');
+return<Componenterror={error}/>;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+
+if(__DEV__){
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
+it('includes AggregateError.errors in thrown errors',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror3=newError('third error');
+consterror4=newError('fourth error');
+consterror5=newError('fifth error');
+consterror6=newError('sixth error');
+consterror=newAggregateError(
+[error1,error2,error3,error4,error5,error6],
+'aggregate',
+);
+throwerror;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+leterror;
+try{
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+}catch(x){
+error=x;
+}
+
+if(__DEV__){
+expect(renderError(error)).toEqual(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: third error
+ stack: Error: third error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fourth error
+ stack: Error: fourth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fifth error
+ stack: Error: fifth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: sixth error
+ stack: Error: sixth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(renderError(error)).toEqual(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
 it('can transport cyclic objects',async()=>{
 functionComponentClient({prop}){
 expect(prop.obj.obj.obj).toBe(prop.obj.obj);

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

@@ -1485,7 +1485,6 @@ describe('ReactDOMSelect', () => {
 );
 }),
 ).rejects.toThrowError(
-// eslint-disable-next-line no-undef
 newAggregateError([
 newTypeError('prod message'),
 newTypeError('prod message'),

packages/react-reconciler/src/__tests__/ReactFlushSync-test.js

@@ -337,7 +337,6 @@ describe('ReactFlushSync', () => {
 expect(getVisibleChildren(container3)).toEqual('aww');
 
 // Because there were multiple errors, React threw an AggregateError.
-// eslint-disable-next-line no-undef
 expect(error).toBeInstanceOf(AggregateError);
 expect(error.errors.length).toBe(2);
 expect(error.errors[0]).toBe(aahh);

packages/react-server/src/ReactFlightServer.js

@@ -4169,6 +4169,14 @@ function serializeErrorValue(request: Request, error: Error): string {
 constcauseId=outlineModel(request,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineModel(request,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineModel(request,errorInfo);
 return'$Z'+id.toString(16);
 }else{
@@ -4211,6 +4219,15 @@ function serializeDebugErrorValue(
 constcauseId=outlineDebugModel(request,counter,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+counter.objectLimit--;
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineDebugModel(request,counter,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineDebugModel(
 request,
 {objectLimit: stack.length*2+1},
@@ -4240,6 +4257,7 @@ function emitErrorChunk(
 letstack: ReactStackTrace;
 letenv=(0,request.environmentName)();
 letcauseReference: null|string=null;
+leterrorsReference: null|string=null;
 try{
 if(errorinstanceofError){
 name=error.name;
@@ -4259,6 +4277,16 @@ function emitErrorChunk(
  : outlineModel(request,cause);
 causeReference=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=debug
+ ? outlineDebugModel(request,{objectLimit: 5},errors)
+ : outlineModel(request,errors);
+errorsReference=serializeByValueID(errorsId);
+}
 }elseif(typeoferror==='object'&&error!==null){
 message=describeObjectForErrorMessage(error);
 stack=[];
@@ -4277,6 +4305,9 @@ function emitErrorChunk(
 if(causeReference!==null){
 (errorInfo: ReactErrorInfoDev).cause=causeReference;
 }
+if(errorsReference!==null){
+(errorInfo: ReactErrorInfoDev).errors=errorsReference;
+}
 }else{
  errorInfo ={digest};
 }

packages/react/src/ReactAct.js

@@ -23,7 +23,6 @@ let didWarnNoAwaitAct = false;
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/shared/ReactTypes.js

@@ -244,6 +244,7 @@ export type ReactErrorInfoDev = {
 +env: string,
 +owner?: null|string,
 cause?: JSONValue,
+errors?: JSONValue,
 };
 
 export type ReactErrorInfo = ReactErrorInfoProd | ReactErrorInfoDev;

.eslintrc.js

@@ -566,6 +566,7 @@ module.exports = {
 CallSite: 'readonly',
 ConsoleTask: 'readonly',// TOOD: Figure out what the official name of this will be.
 ReturnType: 'readonly',
+AggregateError: 'readonly',
 AnimationFrameID: 'readonly',
 WeakRef: 'readonly',
 // For Flow type annotation. Only `BigInt` is valid at runtime.

packages/internal-test-utils/ReactInternalTestUtils.js

@@ -122,7 +122,6 @@ ${diff(expectedLog, actualLog)}
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/internal-test-utils/internalAct.js

@@ -34,7 +34,6 @@ async function waitForMicrotasks() {
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/react-client/src/ReactFlightClient.js

@@ -3525,7 +3525,8 @@ function resolveErrorDev(
 
 leterror;
 consterrorOptions=
-'cause'inerrorInfo
+// We don't serialize Error.cause in prod so we never need to deserialize
+__DEV__&&'cause'inerrorInfo
  ? {
 cause: reviveModel(
 response,
@@ -3536,18 +3537,40 @@ function resolveErrorDev(
 ),
 }
  : undefined;
+constisAggregateError=
+typeofAggregateError!=='undefined'&&'errors'inerrorInfo;
+constrevivedErrors=
+// We don't serialize AggregateError.errors in prod so we never need to deserialize
+__DEV__&&isAggregateError
+ ? reviveModel(
+response,
+// $FlowFixMe[incompatible-cast]
+(errorInfo.errors: JSONValue),
+errorInfo,
+'errors',
+)
+ : null;
 constcallStack=buildFakeCallStack(
 response,
 stack,
 env,
 false,
-// $FlowFixMe[incompatible-use]
-Error.bind(
-null,
-message||
-'An error occurred in the Server Components render but no message was provided',
-errorOptions,
-),
+isAggregateError
+ ? // $FlowFixMe[incompatible-use]
+AggregateError.bind(
+null,
+revivedErrors,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+)
+ : // $FlowFixMe[incompatible-use]
+Error.bind(
+null,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+),
 );
 
 letownerTask: null|ConsoleTask=null;

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

@@ -840,6 +840,204 @@ describe('ReactFlight', () => {
 }
 });
 
+it('can transport AggregateError',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+functionComponentClient({error}){
+returnrenderError(error);
+}
+constComponent=clientReference(ComponentClient);
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror=newAggregateError([error1,error2],'aggregate');
+return<Componenterror={error}/>;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+
+if(__DEV__){
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
+it('includes AggregateError.errors in thrown errors',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror3=newError('third error');
+consterror4=newError('fourth error');
+consterror5=newError('fifth error');
+consterror6=newError('sixth error');
+consterror=newAggregateError(
+[error1,error2,error3,error4,error5,error6],
+'aggregate',
+);
+throwerror;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+leterror;
+try{
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+}catch(x){
+error=x;
+}
+
+if(__DEV__){
+expect(renderError(error)).toEqual(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: third error
+ stack: Error: third error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fourth error
+ stack: Error: fourth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fifth error
+ stack: Error: fifth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: sixth error
+ stack: Error: sixth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(renderError(error)).toEqual(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
 it('can transport cyclic objects',async()=>{
 functionComponentClient({prop}){
 expect(prop.obj.obj.obj).toBe(prop.obj.obj);

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

@@ -1485,7 +1485,6 @@ describe('ReactDOMSelect', () => {
 );
 }),
 ).rejects.toThrowError(
-// eslint-disable-next-line no-undef
 newAggregateError([
 newTypeError('prod message'),
 newTypeError('prod message'),

packages/react-reconciler/src/__tests__/ReactFlushSync-test.js

@@ -337,7 +337,6 @@ describe('ReactFlushSync', () => {
 expect(getVisibleChildren(container3)).toEqual('aww');
 
 // Because there were multiple errors, React threw an AggregateError.
-// eslint-disable-next-line no-undef
 expect(error).toBeInstanceOf(AggregateError);
 expect(error.errors.length).toBe(2);
 expect(error.errors[0]).toBe(aahh);

packages/react-server/src/ReactFlightServer.js

@@ -4169,6 +4169,14 @@ function serializeErrorValue(request: Request, error: Error): string {
 constcauseId=outlineModel(request,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineModel(request,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineModel(request,errorInfo);
 return'$Z'+id.toString(16);
 }else{
@@ -4211,6 +4219,15 @@ function serializeDebugErrorValue(
 constcauseId=outlineDebugModel(request,counter,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+counter.objectLimit--;
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineDebugModel(request,counter,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineDebugModel(
 request,
 {objectLimit: stack.length*2+1},
@@ -4240,6 +4257,7 @@ function emitErrorChunk(
 letstack: ReactStackTrace;
 letenv=(0,request.environmentName)();
 letcauseReference: null|string=null;
+leterrorsReference: null|string=null;
 try{
 if(errorinstanceofError){
 name=error.name;
@@ -4259,6 +4277,16 @@ function emitErrorChunk(
  : outlineModel(request,cause);
 causeReference=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=debug
+ ? outlineDebugModel(request,{objectLimit: 5},errors)
+ : outlineModel(request,errors);
+errorsReference=serializeByValueID(errorsId);
+}
 }elseif(typeoferror==='object'&&error!==null){
 message=describeObjectForErrorMessage(error);
 stack=[];
@@ -4277,6 +4305,9 @@ function emitErrorChunk(
 if(causeReference!==null){
 (errorInfo: ReactErrorInfoDev).cause=causeReference;
 }
+if(errorsReference!==null){
+(errorInfo: ReactErrorInfoDev).errors=errorsReference;
+}
 }else{
  errorInfo ={digest};
 }

packages/react/src/ReactAct.js

@@ -23,7 +23,6 @@ let didWarnNoAwaitAct = false;
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/shared/ReactTypes.js

@@ -244,6 +244,7 @@ export type ReactErrorInfoDev = {
 +env: string,
 +owner?: null|string,
 cause?: JSONValue,
+errors?: JSONValue,
 };
 
 export type ReactErrorInfo = ReactErrorInfoProd | ReactErrorInfoDev;

.eslintrc.js

@@ -566,6 +566,7 @@ module.exports = {
 CallSite: 'readonly',
 ConsoleTask: 'readonly',// TOOD: Figure out what the official name of this will be.
 ReturnType: 'readonly',
+AggregateError: 'readonly',
 AnimationFrameID: 'readonly',
 WeakRef: 'readonly',
 // For Flow type annotation. Only `BigInt` is valid at runtime.

packages/internal-test-utils/ReactInternalTestUtils.js

@@ -122,7 +122,6 @@ ${diff(expectedLog, actualLog)}
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/internal-test-utils/internalAct.js

@@ -34,7 +34,6 @@ async function waitForMicrotasks() {
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/react-client/src/ReactFlightClient.js

@@ -3525,7 +3525,8 @@ function resolveErrorDev(
 
 leterror;
 consterrorOptions=
-'cause'inerrorInfo
+// We don't serialize Error.cause in prod so we never need to deserialize
+__DEV__&&'cause'inerrorInfo
  ? {
 cause: reviveModel(
 response,
@@ -3536,18 +3537,40 @@ function resolveErrorDev(
 ),
 }
  : undefined;
+constisAggregateError=
+typeofAggregateError!=='undefined'&&'errors'inerrorInfo;
+constrevivedErrors=
+// We don't serialize AggregateError.errors in prod so we never need to deserialize
+__DEV__&&isAggregateError
+ ? reviveModel(
+response,
+// $FlowFixMe[incompatible-cast]
+(errorInfo.errors: JSONValue),
+errorInfo,
+'errors',
+)
+ : null;
 constcallStack=buildFakeCallStack(
 response,
 stack,
 env,
 false,
-// $FlowFixMe[incompatible-use]
-Error.bind(
-null,
-message||
-'An error occurred in the Server Components render but no message was provided',
-errorOptions,
-),
+isAggregateError
+ ? // $FlowFixMe[incompatible-use]
+AggregateError.bind(
+null,
+revivedErrors,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+)
+ : // $FlowFixMe[incompatible-use]
+Error.bind(
+null,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+),
 );
 
 letownerTask: null|ConsoleTask=null;

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

@@ -840,6 +840,204 @@ describe('ReactFlight', () => {
 }
 });
 
+it('can transport AggregateError',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+functionComponentClient({error}){
+returnrenderError(error);
+}
+constComponent=clientReference(ComponentClient);
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror=newAggregateError([error1,error2],'aggregate');
+return<Componenterror={error}/>;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+
+if(__DEV__){
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
+it('includes AggregateError.errors in thrown errors',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror3=newError('third error');
+consterror4=newError('fourth error');
+consterror5=newError('fifth error');
+consterror6=newError('sixth error');
+consterror=newAggregateError(
+[error1,error2,error3,error4,error5,error6],
+'aggregate',
+);
+throwerror;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+leterror;
+try{
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+}catch(x){
+error=x;
+}
+
+if(__DEV__){
+expect(renderError(error)).toEqual(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: third error
+ stack: Error: third error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fourth error
+ stack: Error: fourth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fifth error
+ stack: Error: fifth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: sixth error
+ stack: Error: sixth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(renderError(error)).toEqual(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
 it('can transport cyclic objects',async()=>{
 functionComponentClient({prop}){
 expect(prop.obj.obj.obj).toBe(prop.obj.obj);

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

@@ -1485,7 +1485,6 @@ describe('ReactDOMSelect', () => {
 );
 }),
 ).rejects.toThrowError(
-// eslint-disable-next-line no-undef
 newAggregateError([
 newTypeError('prod message'),
 newTypeError('prod message'),

packages/react-reconciler/src/__tests__/ReactFlushSync-test.js

@@ -337,7 +337,6 @@ describe('ReactFlushSync', () => {
 expect(getVisibleChildren(container3)).toEqual('aww');
 
 // Because there were multiple errors, React threw an AggregateError.
-// eslint-disable-next-line no-undef
 expect(error).toBeInstanceOf(AggregateError);
 expect(error.errors.length).toBe(2);
 expect(error.errors[0]).toBe(aahh);

packages/react-server/src/ReactFlightServer.js

@@ -4169,6 +4169,14 @@ function serializeErrorValue(request: Request, error: Error): string {
 constcauseId=outlineModel(request,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineModel(request,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineModel(request,errorInfo);
 return'$Z'+id.toString(16);
 }else{
@@ -4211,6 +4219,15 @@ function serializeDebugErrorValue(
 constcauseId=outlineDebugModel(request,counter,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+counter.objectLimit--;
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineDebugModel(request,counter,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineDebugModel(
 request,
 {objectLimit: stack.length*2+1},
@@ -4240,6 +4257,7 @@ function emitErrorChunk(
 letstack: ReactStackTrace;
 letenv=(0,request.environmentName)();
 letcauseReference: null|string=null;
+leterrorsReference: null|string=null;
 try{
 if(errorinstanceofError){
 name=error.name;
@@ -4259,6 +4277,16 @@ function emitErrorChunk(
  : outlineModel(request,cause);
 causeReference=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=debug
+ ? outlineDebugModel(request,{objectLimit: 5},errors)
+ : outlineModel(request,errors);
+errorsReference=serializeByValueID(errorsId);
+}
 }elseif(typeoferror==='object'&&error!==null){
 message=describeObjectForErrorMessage(error);
 stack=[];
@@ -4277,6 +4305,9 @@ function emitErrorChunk(
 if(causeReference!==null){
 (errorInfo: ReactErrorInfoDev).cause=causeReference;
 }
+if(errorsReference!==null){
+(errorInfo: ReactErrorInfoDev).errors=errorsReference;
+}
 }else{
  errorInfo ={digest};
 }

packages/react/src/ReactAct.js

@@ -23,7 +23,6 @@ let didWarnNoAwaitAct = false;
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/shared/ReactTypes.js

@@ -244,6 +244,7 @@ export type ReactErrorInfoDev = {
 +env: string,
 +owner?: null|string,
 cause?: JSONValue,
+errors?: JSONValue,
 };
 
 export type ReactErrorInfo = ReactErrorInfoProd | ReactErrorInfoDev;

.eslintrc.js

@@ -566,6 +566,7 @@ module.exports = {
 CallSite: 'readonly',
 ConsoleTask: 'readonly',// TOOD: Figure out what the official name of this will be.
 ReturnType: 'readonly',
+AggregateError: 'readonly',
 AnimationFrameID: 'readonly',
 WeakRef: 'readonly',
 // For Flow type annotation. Only `BigInt` is valid at runtime.

packages/internal-test-utils/ReactInternalTestUtils.js

@@ -122,7 +122,6 @@ ${diff(expectedLog, actualLog)}
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/internal-test-utils/internalAct.js

@@ -34,7 +34,6 @@ async function waitForMicrotasks() {
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/react-client/src/ReactFlightClient.js

@@ -3525,7 +3525,8 @@ function resolveErrorDev(
 
 leterror;
 consterrorOptions=
-'cause'inerrorInfo
+// We don't serialize Error.cause in prod so we never need to deserialize
+__DEV__&&'cause'inerrorInfo
  ? {
 cause: reviveModel(
 response,
@@ -3536,18 +3537,40 @@ function resolveErrorDev(
 ),
 }
  : undefined;
+constisAggregateError=
+typeofAggregateError!=='undefined'&&'errors'inerrorInfo;
+constrevivedErrors=
+// We don't serialize AggregateError.errors in prod so we never need to deserialize
+__DEV__&&isAggregateError
+ ? reviveModel(
+response,
+// $FlowFixMe[incompatible-cast]
+(errorInfo.errors: JSONValue),
+errorInfo,
+'errors',
+)
+ : null;
 constcallStack=buildFakeCallStack(
 response,
 stack,
 env,
 false,
-// $FlowFixMe[incompatible-use]
-Error.bind(
-null,
-message||
-'An error occurred in the Server Components render but no message was provided',
-errorOptions,
-),
+isAggregateError
+ ? // $FlowFixMe[incompatible-use]
+AggregateError.bind(
+null,
+revivedErrors,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+)
+ : // $FlowFixMe[incompatible-use]
+Error.bind(
+null,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+),
 );
 
 letownerTask: null|ConsoleTask=null;

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

@@ -840,6 +840,204 @@ describe('ReactFlight', () => {
 }
 });
 
+it('can transport AggregateError',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+functionComponentClient({error}){
+returnrenderError(error);
+}
+constComponent=clientReference(ComponentClient);
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror=newAggregateError([error1,error2],'aggregate');
+return<Componenterror={error}/>;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+
+if(__DEV__){
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
+it('includes AggregateError.errors in thrown errors',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror3=newError('third error');
+consterror4=newError('fourth error');
+consterror5=newError('fifth error');
+consterror6=newError('sixth error');
+consterror=newAggregateError(
+[error1,error2,error3,error4,error5,error6],
+'aggregate',
+);
+throwerror;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+leterror;
+try{
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+}catch(x){
+error=x;
+}
+
+if(__DEV__){
+expect(renderError(error)).toEqual(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: third error
+ stack: Error: third error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fourth error
+ stack: Error: fourth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fifth error
+ stack: Error: fifth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: sixth error
+ stack: Error: sixth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(renderError(error)).toEqual(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
 it('can transport cyclic objects',async()=>{
 functionComponentClient({prop}){
 expect(prop.obj.obj.obj).toBe(prop.obj.obj);

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

@@ -1485,7 +1485,6 @@ describe('ReactDOMSelect', () => {
 );
 }),
 ).rejects.toThrowError(
-// eslint-disable-next-line no-undef
 newAggregateError([
 newTypeError('prod message'),
 newTypeError('prod message'),

packages/react-reconciler/src/__tests__/ReactFlushSync-test.js

@@ -337,7 +337,6 @@ describe('ReactFlushSync', () => {
 expect(getVisibleChildren(container3)).toEqual('aww');
 
 // Because there were multiple errors, React threw an AggregateError.
-// eslint-disable-next-line no-undef
 expect(error).toBeInstanceOf(AggregateError);
 expect(error.errors.length).toBe(2);
 expect(error.errors[0]).toBe(aahh);

packages/react-server/src/ReactFlightServer.js

@@ -4169,6 +4169,14 @@ function serializeErrorValue(request: Request, error: Error): string {
 constcauseId=outlineModel(request,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineModel(request,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineModel(request,errorInfo);
 return'$Z'+id.toString(16);
 }else{
@@ -4211,6 +4219,15 @@ function serializeDebugErrorValue(
 constcauseId=outlineDebugModel(request,counter,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+counter.objectLimit--;
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineDebugModel(request,counter,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineDebugModel(
 request,
 {objectLimit: stack.length*2+1},
@@ -4240,6 +4257,7 @@ function emitErrorChunk(
 letstack: ReactStackTrace;
 letenv=(0,request.environmentName)();
 letcauseReference: null|string=null;
+leterrorsReference: null|string=null;
 try{
 if(errorinstanceofError){
 name=error.name;
@@ -4259,6 +4277,16 @@ function emitErrorChunk(
  : outlineModel(request,cause);
 causeReference=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=debug
+ ? outlineDebugModel(request,{objectLimit: 5},errors)
+ : outlineModel(request,errors);
+errorsReference=serializeByValueID(errorsId);
+}
 }elseif(typeoferror==='object'&&error!==null){
 message=describeObjectForErrorMessage(error);
 stack=[];
@@ -4277,6 +4305,9 @@ function emitErrorChunk(
 if(causeReference!==null){
 (errorInfo: ReactErrorInfoDev).cause=causeReference;
 }
+if(errorsReference!==null){
+(errorInfo: ReactErrorInfoDev).errors=errorsReference;
+}
 }else{
  errorInfo ={digest};
 }

packages/react/src/ReactAct.js

@@ -23,7 +23,6 @@ let didWarnNoAwaitAct = false;
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/shared/ReactTypes.js

@@ -244,6 +244,7 @@ export type ReactErrorInfoDev = {
 +env: string,
 +owner?: null|string,
 cause?: JSONValue,
+errors?: JSONValue,
 };
 
 export type ReactErrorInfo = ReactErrorInfoProd | ReactErrorInfoDev;

.eslintrc.js

@@ -566,6 +566,7 @@ module.exports = {
 CallSite: 'readonly',
 ConsoleTask: 'readonly',// TOOD: Figure out what the official name of this will be.
 ReturnType: 'readonly',
+AggregateError: 'readonly',
 AnimationFrameID: 'readonly',
 WeakRef: 'readonly',
 // For Flow type annotation. Only `BigInt` is valid at runtime.

packages/internal-test-utils/ReactInternalTestUtils.js

@@ -122,7 +122,6 @@ ${diff(expectedLog, actualLog)}
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/internal-test-utils/internalAct.js

@@ -34,7 +34,6 @@ async function waitForMicrotasks() {
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/react-client/src/ReactFlightClient.js

@@ -3525,7 +3525,8 @@ function resolveErrorDev(
 
 leterror;
 consterrorOptions=
-'cause'inerrorInfo
+// We don't serialize Error.cause in prod so we never need to deserialize
+__DEV__&&'cause'inerrorInfo
  ? {
 cause: reviveModel(
 response,
@@ -3536,18 +3537,40 @@ function resolveErrorDev(
 ),
 }
  : undefined;
+constisAggregateError=
+typeofAggregateError!=='undefined'&&'errors'inerrorInfo;
+constrevivedErrors=
+// We don't serialize AggregateError.errors in prod so we never need to deserialize
+__DEV__&&isAggregateError
+ ? reviveModel(
+response,
+// $FlowFixMe[incompatible-cast]
+(errorInfo.errors: JSONValue),
+errorInfo,
+'errors',
+)
+ : null;
 constcallStack=buildFakeCallStack(
 response,
 stack,
 env,
 false,
-// $FlowFixMe[incompatible-use]
-Error.bind(
-null,
-message||
-'An error occurred in the Server Components render but no message was provided',
-errorOptions,
-),
+isAggregateError
+ ? // $FlowFixMe[incompatible-use]
+AggregateError.bind(
+null,
+revivedErrors,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+)
+ : // $FlowFixMe[incompatible-use]
+Error.bind(
+null,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+),
 );
 
 letownerTask: null|ConsoleTask=null;

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

@@ -840,6 +840,204 @@ describe('ReactFlight', () => {
 }
 });
 
+it('can transport AggregateError',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+functionComponentClient({error}){
+returnrenderError(error);
+}
+constComponent=clientReference(ComponentClient);
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror=newAggregateError([error1,error2],'aggregate');
+return<Componenterror={error}/>;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+
+if(__DEV__){
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
+it('includes AggregateError.errors in thrown errors',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror3=newError('third error');
+consterror4=newError('fourth error');
+consterror5=newError('fifth error');
+consterror6=newError('sixth error');
+consterror=newAggregateError(
+[error1,error2,error3,error4,error5,error6],
+'aggregate',
+);
+throwerror;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+leterror;
+try{
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+}catch(x){
+error=x;
+}
+
+if(__DEV__){
+expect(renderError(error)).toEqual(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: third error
+ stack: Error: third error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fourth error
+ stack: Error: fourth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fifth error
+ stack: Error: fifth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: sixth error
+ stack: Error: sixth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(renderError(error)).toEqual(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
 it('can transport cyclic objects',async()=>{
 functionComponentClient({prop}){
 expect(prop.obj.obj.obj).toBe(prop.obj.obj);

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

@@ -1485,7 +1485,6 @@ describe('ReactDOMSelect', () => {
 );
 }),
 ).rejects.toThrowError(
-// eslint-disable-next-line no-undef
 newAggregateError([
 newTypeError('prod message'),
 newTypeError('prod message'),

packages/react-reconciler/src/__tests__/ReactFlushSync-test.js

@@ -337,7 +337,6 @@ describe('ReactFlushSync', () => {
 expect(getVisibleChildren(container3)).toEqual('aww');
 
 // Because there were multiple errors, React threw an AggregateError.
-// eslint-disable-next-line no-undef
 expect(error).toBeInstanceOf(AggregateError);
 expect(error.errors.length).toBe(2);
 expect(error.errors[0]).toBe(aahh);

packages/react-server/src/ReactFlightServer.js

@@ -4169,6 +4169,14 @@ function serializeErrorValue(request: Request, error: Error): string {
 constcauseId=outlineModel(request,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineModel(request,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineModel(request,errorInfo);
 return'$Z'+id.toString(16);
 }else{
@@ -4211,6 +4219,15 @@ function serializeDebugErrorValue(
 constcauseId=outlineDebugModel(request,counter,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+counter.objectLimit--;
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineDebugModel(request,counter,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineDebugModel(
 request,
 {objectLimit: stack.length*2+1},
@@ -4240,6 +4257,7 @@ function emitErrorChunk(
 letstack: ReactStackTrace;
 letenv=(0,request.environmentName)();
 letcauseReference: null|string=null;
+leterrorsReference: null|string=null;
 try{
 if(errorinstanceofError){
 name=error.name;
@@ -4259,6 +4277,16 @@ function emitErrorChunk(
  : outlineModel(request,cause);
 causeReference=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=debug
+ ? outlineDebugModel(request,{objectLimit: 5},errors)
+ : outlineModel(request,errors);
+errorsReference=serializeByValueID(errorsId);
+}
 }elseif(typeoferror==='object'&&error!==null){
 message=describeObjectForErrorMessage(error);
 stack=[];
@@ -4277,6 +4305,9 @@ function emitErrorChunk(
 if(causeReference!==null){
 (errorInfo: ReactErrorInfoDev).cause=causeReference;
 }
+if(errorsReference!==null){
+(errorInfo: ReactErrorInfoDev).errors=errorsReference;
+}
 }else{
  errorInfo ={digest};
 }

packages/react/src/ReactAct.js

@@ -23,7 +23,6 @@ let didWarnNoAwaitAct = false;
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/shared/ReactTypes.js

@@ -244,6 +244,7 @@ export type ReactErrorInfoDev = {
 +env: string,
 +owner?: null|string,
 cause?: JSONValue,
+errors?: JSONValue,
 };
 
 export type ReactErrorInfo = ReactErrorInfoProd | ReactErrorInfoDev;

.eslintrc.js

@@ -566,6 +566,7 @@ module.exports = {
 CallSite: 'readonly',
 ConsoleTask: 'readonly',// TOOD: Figure out what the official name of this will be.
 ReturnType: 'readonly',
+AggregateError: 'readonly',
 AnimationFrameID: 'readonly',
 WeakRef: 'readonly',
 // For Flow type annotation. Only `BigInt` is valid at runtime.

packages/internal-test-utils/ReactInternalTestUtils.js

@@ -122,7 +122,6 @@ ${diff(expectedLog, actualLog)}
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/internal-test-utils/internalAct.js

@@ -34,7 +34,6 @@ async function waitForMicrotasks() {
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/react-client/src/ReactFlightClient.js

@@ -3525,7 +3525,8 @@ function resolveErrorDev(
 
 leterror;
 consterrorOptions=
-'cause'inerrorInfo
+// We don't serialize Error.cause in prod so we never need to deserialize
+__DEV__&&'cause'inerrorInfo
  ? {
 cause: reviveModel(
 response,
@@ -3536,18 +3537,40 @@ function resolveErrorDev(
 ),
 }
  : undefined;
+constisAggregateError=
+typeofAggregateError!=='undefined'&&'errors'inerrorInfo;
+constrevivedErrors=
+// We don't serialize AggregateError.errors in prod so we never need to deserialize
+__DEV__&&isAggregateError
+ ? reviveModel(
+response,
+// $FlowFixMe[incompatible-cast]
+(errorInfo.errors: JSONValue),
+errorInfo,
+'errors',
+)
+ : null;
 constcallStack=buildFakeCallStack(
 response,
 stack,
 env,
 false,
-// $FlowFixMe[incompatible-use]
-Error.bind(
-null,
-message||
-'An error occurred in the Server Components render but no message was provided',
-errorOptions,
-),
+isAggregateError
+ ? // $FlowFixMe[incompatible-use]
+AggregateError.bind(
+null,
+revivedErrors,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+)
+ : // $FlowFixMe[incompatible-use]
+Error.bind(
+null,
+message||
+'An error occurred in the Server Components render but no message was provided',
+errorOptions,
+),
 );
 
 letownerTask: null|ConsoleTask=null;

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

@@ -840,6 +840,204 @@ describe('ReactFlight', () => {
 }
 });
 
+it('can transport AggregateError',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+functionComponentClient({error}){
+returnrenderError(error);
+}
+constComponent=clientReference(ComponentClient);
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror=newAggregateError([error1,error2],'aggregate');
+return<Componenterror={error}/>;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+
+if(__DEV__){
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(ReactNoop).toMatchRenderedOutput(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
+it('includes AggregateError.errors in thrown errors',async()=>{
+functionrenderError(error){
+if(!(errorinstanceofError)){
+return`${JSON.stringify(error)}`;
+}
+letresult=`
+ is error: ${errorinstanceofAggregateError ? 'AggregateError' : 'Error'}
+ name: ${error.name}
+ message: ${error.message}
+ stack: ${normalizeCodeLocInfo(error.stack).split('\n').slice(0,2).join('\n')}
+ environmentName: ${error.environmentName}
+ cause: ${'cause'inerror ? renderError(error.cause) : 'no cause'}`;
+if('errors'inerror){
+result+=`
+ errors: [${error.errors.map(e=>renderError(e)).join(',\n')}]`;
+}
+returnresult;
+}
+
+functionServerComponent(){
+consterror1=newTypeError('first error');
+consterror2=newRangeError('second error');
+consterror3=newError('third error');
+consterror4=newError('fourth error');
+consterror5=newError('fifth error');
+consterror6=newError('sixth error');
+consterror=newAggregateError(
+[error1,error2,error3,error4,error5,error6],
+'aggregate',
+);
+throwerror;
+}
+
+consttransport=ReactNoopFlightServer.render(<ServerComponent/>,{
+onError(x){
+if(__DEV__){
+return'a dev digest';
+}
+return`digest("${x.message}")`;
+},
+});
+
+leterror;
+try{
+awaitact(()=>{
+ReactNoop.render(ReactNoopFlightClient.read(transport));
+});
+}catch(x){
+error=x;
+}
+
+if(__DEV__){
+expect(renderError(error)).toEqual(`
+ is error: AggregateError
+ name: AggregateError
+ message: aggregate
+ stack: AggregateError: aggregate
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause
+ errors: [
+ is error: Error
+ name: TypeError
+ message: first error
+ stack: TypeError: first error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: RangeError
+ message: second error
+ stack: RangeError: second error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: third error
+ stack: Error: third error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fourth error
+ stack: Error: fourth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: fifth error
+ stack: Error: fifth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause,
+
+ is error: Error
+ name: Error
+ message: sixth error
+ stack: Error: sixth error
+ in ServerComponent (at **)
+ environmentName: Server
+ cause: no cause]`);
+}else{
+expect(renderError(error)).toEqual(`
+ is error: Error
+ name: Error
+ message: 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.
+ stack: 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.
+ environmentName: undefined
+ cause: no cause`);
+}
+});
+
 it('can transport cyclic objects',async()=>{
 functionComponentClient({prop}){
 expect(prop.obj.obj.obj).toBe(prop.obj.obj);

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

@@ -1485,7 +1485,6 @@ describe('ReactDOMSelect', () => {
 );
 }),
 ).rejects.toThrowError(
-// eslint-disable-next-line no-undef
 newAggregateError([
 newTypeError('prod message'),
 newTypeError('prod message'),

packages/react-reconciler/src/__tests__/ReactFlushSync-test.js

@@ -337,7 +337,6 @@ describe('ReactFlushSync', () => {
 expect(getVisibleChildren(container3)).toEqual('aww');
 
 // Because there were multiple errors, React threw an AggregateError.
-// eslint-disable-next-line no-undef
 expect(error).toBeInstanceOf(AggregateError);
 expect(error.errors.length).toBe(2);
 expect(error.errors[0]).toBe(aahh);

packages/react-server/src/ReactFlightServer.js

@@ -4169,6 +4169,14 @@ function serializeErrorValue(request: Request, error: Error): string {
 constcauseId=outlineModel(request,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineModel(request,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineModel(request,errorInfo);
 return'$Z'+id.toString(16);
 }else{
@@ -4211,6 +4219,15 @@ function serializeDebugErrorValue(
 constcauseId=outlineDebugModel(request,counter,cause);
 errorInfo.cause=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+counter.objectLimit--;
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=outlineDebugModel(request,counter,errors);
+errorInfo.errors=serializeByValueID(errorsId);
+}
 constid=outlineDebugModel(
 request,
 {objectLimit: stack.length*2+1},
@@ -4240,6 +4257,7 @@ function emitErrorChunk(
 letstack: ReactStackTrace;
 letenv=(0,request.environmentName)();
 letcauseReference: null|string=null;
+leterrorsReference: null|string=null;
 try{
 if(errorinstanceofError){
 name=error.name;
@@ -4259,6 +4277,16 @@ function emitErrorChunk(
  : outlineModel(request,cause);
 causeReference=serializeByValueID(causeId);
 }
+if(
+typeofAggregateError!=='undefined'&&
+errorinstanceofAggregateError
+){
+consterrors: ReactClientValue=(error.errors: any);
+consterrorsId=debug
+ ? outlineDebugModel(request,{objectLimit: 5},errors)
+ : outlineModel(request,errors);
+errorsReference=serializeByValueID(errorsId);
+}
 }elseif(typeoferror==='object'&&error!==null){
 message=describeObjectForErrorMessage(error);
 stack=[];
@@ -4277,6 +4305,9 @@ function emitErrorChunk(
 if(causeReference!==null){
 (errorInfo: ReactErrorInfoDev).cause=causeReference;
 }
+if(errorsReference!==null){
+(errorInfo: ReactErrorInfoDev).errors=errorsReference;
+}
 }else{
  errorInfo ={digest};
 }

packages/react/src/ReactAct.js

@@ -23,7 +23,6 @@ let didWarnNoAwaitAct = false;
 
 functionaggregateErrors(errors: Array<mixed>): mixed{
 if(errors.length>1&&typeofAggregateError==='function'){
-// eslint-disable-next-line no-undef
 returnnewAggregateError(errors);
 }
 returnerrors[0];

packages/shared/ReactTypes.js

@@ -244,6 +244,7 @@ export type ReactErrorInfoDev = {
 +env: string,
 +owner?: null|string,
 cause?: JSONValue,
+errors?: JSONValue,
 };
 
 export type ReactErrorInfo = ReactErrorInfoProd | ReactErrorInfoDev;