[tests] remove withoutStack from assertConsole helpers (#35498)

Stacked on #35497
-----
Now that the assert helpers require a component stack, we don't need the
`{withoutStack: true}` option.

Author: rickhanlonii

packages/internal-test-utils/__tests__/ReactInternalTestUtils-test.js

@@ -290,26 +290,11 @@ export function createLogAssertion(
 }
 }
 
-constwithoutStack=options.withoutStack;
-
-if(consoleMethod==='log'&&withoutStack!==undefined){
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev, console.log does not have component stacks.`,
-);
-}elseif(withoutStack!==undefined&&withoutStack!==true){
-throwFormattedError(
-`The second argument must be {withoutStack: true}.`+
-`\n\nInstead received ${JSON.stringify(options)}.`,
-);
-}
-
 constobservedLogs=clearObservedErrors();
 constreceivedLogs=[];
 constmissingExpectedLogs=Array.from(expectedMessages);
 
 constunexpectedLogs=[];
-constunexpectedMissingComponentStack=[];
-constunexpectedIncludingComponentStack=[];
 constunexpectedMissingErrorStack=[];
 constunexpectedIncludingErrorStack=[];
 constlogsMismatchingFormat=[];
@@ -334,72 +319,12 @@ export function createLogAssertion(
 }
 
 letexpectedMessage;
-letexpectedWithoutStack;
 constexpectedMessageOrArray=expectedMessages[index];
-if(
-expectedMessageOrArray!=null&&
-Array.isArray(expectedMessageOrArray)
-){
-// Should be in the local form assert([['log', {withoutStack: true}]])
-
-// Some validations for common mistakes.
-if(expectedMessageOrArray.length===1){
-throwFormattedError(
-`Did you forget to remove the array around the log?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2, but there's only one item in the array. If this is intentional, remove the extra array.`,
-);
-}elseif(expectedMessageOrArray.length!==2){
-throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
-`Instead received ${expectedMessageOrArray}.`,
-);
-}elseif(consoleMethod==='log'){
-// We don't expect any console.log calls to have a stack.
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev logs, console.log does not have component stacks.`,
-);
-}
-
-// Format is correct, check the values.
-constcurrentExpectedMessage=expectedMessageOrArray[0];
-constcurrentExpectedOptions=expectedMessageOrArray[1];
-if(
-typeofcurrentExpectedMessage!=='string'||
-typeofcurrentExpectedOptions!=='object'||
-currentExpectedOptions.withoutStack!==true
-){
-throwFormattedError(
-`Log entries that are arrays must be of the form [string, {withoutStack: true}]`+
-`\n\nInstead received [${typeofcurrentExpectedMessage}, ${JSON.stringify(
-currentExpectedOptions,
-)}].`,
-);
-}
-
-expectedMessage=normalizeExpectedMessage(currentExpectedMessage);
-expectedWithoutStack=expectedMessageOrArray[1].withoutStack;
-}elseif(typeofexpectedMessageOrArray==='string'){
+if(typeofexpectedMessageOrArray==='string'){
 expectedMessage=normalizeExpectedMessage(expectedMessageOrArray);
-// withoutStack: inherit from global option - simplify when withoutStack is removed.
-if(consoleMethod==='log'){
-expectedWithoutStack=true;
-}else{
-expectedWithoutStack=withoutStack;
-}
-}elseif(
-typeofexpectedMessageOrArray==='object'&&
-expectedMessageOrArray!=null&&
-expectedMessageOrArray.withoutStack!=null
-){
-// Special case for common case of a wrong withoutStack value.
-throwFormattedError(
-`Did you forget to wrap a log with withoutStack in an array?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2.`+
-`\n\nInstead received ${JSON.stringify(expectedMessageOrArray)}.`,
-);
 }elseif(expectedMessageOrArray!=null){
 throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
+`The expected message for ${matcherName}() must be a string. `+
 `Instead received ${JSON.stringify(expectedMessageOrArray)}.`,
 );
 }
@@ -499,18 +424,6 @@ export function createLogAssertion(
 }
 
 if(matchesExpectedMessage){
-// withoutStack: Check for unexpected/missing component stacks.
-// These checks can be simplified when withoutStack is removed.
-if(isLikelyAComponentStack(normalizedMessage)){
-if(expectedWithoutStack===true&&!hasErrorStack){
-// Only report unexpected component stack if it's not an error stack
-// (error stacks look like component stacks after normalization)
-unexpectedIncludingComponentStack.push(normalizedMessage);
-}
-}elseif(expectedWithoutStack!==true&&!expectsErrorStack){
-unexpectedMissingComponentStack.push(normalizedMessage);
-}
-
 // Check for unexpected/missing error stacks
 if(hasErrorStack&&!expectsErrorStack){
 // Error stack is present but \n in <stack> was not in the expected message
@@ -538,12 +451,7 @@ export function createLogAssertion(
 functionprintDiff(){
 return`${diff(
 expectedMessages
-.map(messageOrTuple=>{
-constmessage=Array.isArray(messageOrTuple)
- ? messageOrTuple[0]
- : messageOrTuple;
-returnmessage.replace('\n',' ');
-})
+.map(message=>message.replace('\n',' '))
 .join('\n'),
 receivedLogs.map(message=>message.replace('\n',' ')).join('\n'),
 {
@@ -582,36 +490,6 @@ export function createLogAssertion(
 );
 }
 
-// Any logs that include a component stack but shouldn't.
-if(unexpectedIncludingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedIncludingComponentStack
-.map(
-stack=>
-`Unexpected component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should include a component stack, remove {withoutStack: true} from this ${logName()}.`+
-`\nIf all ${logName()}s should include the component stack, you may need to remove {withoutStack: true} from the ${matcherName} call.`,
-);
-}
-
-// Any logs that are missing a component stack without withoutStack.
-if(unexpectedMissingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedMissingComponentStack
-.map(
-stack=>
-`Missing component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should omit a component stack, pass [log, {withoutStack: true}].`+
-`\nIf all ${logName()}s should omit the component stack, add {withoutStack: true} to the ${matcherName} call.`,
-);
-}
-
 // Any logs that include an error stack trace but \n in <stack> wasn't expected.
 if(unexpectedIncludingErrorStack.length>0){
 throwFormattedError(

packages/internal-test-utils/consoleMock.js

@@ -1514,16 +1514,13 @@ describe('ReactFlight', () => {
 },
 };
 consttransport=ReactNoopFlightServer.render(<inputvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <input value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <input value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1545,14 +1542,11 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <div>Womp womp: {newMyError('spaghetti')}</div>,
 );
-assertConsoleErrorDev(
-[
-'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
-' <div>Womp womp: {Error}</div>\n'+
-' ^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
+' <div>Womp womp: {Error}</div>\n'+
+' ^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1565,15 +1559,12 @@ describe('ReactFlight', () => {
 
 it('should warn in DEV if a special object is passed to a host component',()=>{
 consttransport=ReactNoopFlightServer.render(<inputvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <input value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <input value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1589,15 +1580,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <inputvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <input value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <input value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1620,16 +1608,13 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <... value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <... value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1655,16 +1640,13 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Client>Current date: {obj}</Client>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <>Current date: {{toJSON: ...}}</>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <>Current date: {{toJSON: ...}}</>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1683,15 +1665,12 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <... value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <... value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1712,15 +1691,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Clientvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 
@@ -1744,13 +1720,10 @@ describe('ReactFlight', () => {
 ReactNoopFlightClient.read(transport);
 
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Objects with symbol properties like Symbol.iterator are not supported.\n'+
 ' <... value={{}}>\n'+
@@ -1769,13 +1742,10 @@ describe('ReactFlight', () => {
 );
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' [..., Math, <h1/>]\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' [..., Math, <h1/>]\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Math objects are not supported.\n'+
 ' [..., Math, <h1/>]\n'+

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

@@ -290,26 +290,11 @@ export function createLogAssertion(
 }
 }
 
-constwithoutStack=options.withoutStack;
-
-if(consoleMethod==='log'&&withoutStack!==undefined){
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev, console.log does not have component stacks.`,
-);
-}elseif(withoutStack!==undefined&&withoutStack!==true){
-throwFormattedError(
-`The second argument must be {withoutStack: true}.`+
-`\n\nInstead received ${JSON.stringify(options)}.`,
-);
-}
-
 constobservedLogs=clearObservedErrors();
 constreceivedLogs=[];
 constmissingExpectedLogs=Array.from(expectedMessages);
 
 constunexpectedLogs=[];
-constunexpectedMissingComponentStack=[];
-constunexpectedIncludingComponentStack=[];
 constunexpectedMissingErrorStack=[];
 constunexpectedIncludingErrorStack=[];
 constlogsMismatchingFormat=[];
@@ -334,72 +319,12 @@ export function createLogAssertion(
 }
 
 letexpectedMessage;
-letexpectedWithoutStack;
 constexpectedMessageOrArray=expectedMessages[index];
-if(
-expectedMessageOrArray!=null&&
-Array.isArray(expectedMessageOrArray)
-){
-// Should be in the local form assert([['log', {withoutStack: true}]])
-
-// Some validations for common mistakes.
-if(expectedMessageOrArray.length===1){
-throwFormattedError(
-`Did you forget to remove the array around the log?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2, but there's only one item in the array. If this is intentional, remove the extra array.`,
-);
-}elseif(expectedMessageOrArray.length!==2){
-throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
-`Instead received ${expectedMessageOrArray}.`,
-);
-}elseif(consoleMethod==='log'){
-// We don't expect any console.log calls to have a stack.
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev logs, console.log does not have component stacks.`,
-);
-}
-
-// Format is correct, check the values.
-constcurrentExpectedMessage=expectedMessageOrArray[0];
-constcurrentExpectedOptions=expectedMessageOrArray[1];
-if(
-typeofcurrentExpectedMessage!=='string'||
-typeofcurrentExpectedOptions!=='object'||
-currentExpectedOptions.withoutStack!==true
-){
-throwFormattedError(
-`Log entries that are arrays must be of the form [string, {withoutStack: true}]`+
-`\n\nInstead received [${typeofcurrentExpectedMessage}, ${JSON.stringify(
-currentExpectedOptions,
-)}].`,
-);
-}
-
-expectedMessage=normalizeExpectedMessage(currentExpectedMessage);
-expectedWithoutStack=expectedMessageOrArray[1].withoutStack;
-}elseif(typeofexpectedMessageOrArray==='string'){
+if(typeofexpectedMessageOrArray==='string'){
 expectedMessage=normalizeExpectedMessage(expectedMessageOrArray);
-// withoutStack: inherit from global option - simplify when withoutStack is removed.
-if(consoleMethod==='log'){
-expectedWithoutStack=true;
-}else{
-expectedWithoutStack=withoutStack;
-}
-}elseif(
-typeofexpectedMessageOrArray==='object'&&
-expectedMessageOrArray!=null&&
-expectedMessageOrArray.withoutStack!=null
-){
-// Special case for common case of a wrong withoutStack value.
-throwFormattedError(
-`Did you forget to wrap a log with withoutStack in an array?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2.`+
-`\n\nInstead received ${JSON.stringify(expectedMessageOrArray)}.`,
-);
 }elseif(expectedMessageOrArray!=null){
 throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
+`The expected message for ${matcherName}() must be a string. `+
 `Instead received ${JSON.stringify(expectedMessageOrArray)}.`,
 );
 }
@@ -499,18 +424,6 @@ export function createLogAssertion(
 }
 
 if(matchesExpectedMessage){
-// withoutStack: Check for unexpected/missing component stacks.
-// These checks can be simplified when withoutStack is removed.
-if(isLikelyAComponentStack(normalizedMessage)){
-if(expectedWithoutStack===true&&!hasErrorStack){
-// Only report unexpected component stack if it's not an error stack
-// (error stacks look like component stacks after normalization)
-unexpectedIncludingComponentStack.push(normalizedMessage);
-}
-}elseif(expectedWithoutStack!==true&&!expectsErrorStack){
-unexpectedMissingComponentStack.push(normalizedMessage);
-}
-
 // Check for unexpected/missing error stacks
 if(hasErrorStack&&!expectsErrorStack){
 // Error stack is present but \n in <stack> was not in the expected message
@@ -538,12 +451,7 @@ export function createLogAssertion(
 functionprintDiff(){
 return`${diff(
 expectedMessages
-.map(messageOrTuple=>{
-constmessage=Array.isArray(messageOrTuple)
- ? messageOrTuple[0]
- : messageOrTuple;
-returnmessage.replace('\n',' ');
-})
+.map(message=>message.replace('\n',' '))
 .join('\n'),
 receivedLogs.map(message=>message.replace('\n',' ')).join('\n'),
 {
@@ -582,36 +490,6 @@ export function createLogAssertion(
 );
 }
 
-// Any logs that include a component stack but shouldn't.
-if(unexpectedIncludingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedIncludingComponentStack
-.map(
-stack=>
-`Unexpected component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should include a component stack, remove {withoutStack: true} from this ${logName()}.`+
-`\nIf all ${logName()}s should include the component stack, you may need to remove {withoutStack: true} from the ${matcherName} call.`,
-);
-}
-
-// Any logs that are missing a component stack without withoutStack.
-if(unexpectedMissingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedMissingComponentStack
-.map(
-stack=>
-`Missing component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should omit a component stack, pass [log, {withoutStack: true}].`+
-`\nIf all ${logName()}s should omit the component stack, add {withoutStack: true} to the ${matcherName} call.`,
-);
-}
-
 // Any logs that include an error stack trace but \n in <stack> wasn't expected.
 if(unexpectedIncludingErrorStack.length>0){
 throwFormattedError(

packages/internal-test-utils/__tests__/ReactInternalTestUtils-test.js

@@ -1514,16 +1514,13 @@ describe('ReactFlight', () => {
 },
 };
 consttransport=ReactNoopFlightServer.render(<inputvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <input value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <input value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1545,14 +1542,11 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <div>Womp womp: {newMyError('spaghetti')}</div>,
 );
-assertConsoleErrorDev(
-[
-'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
-' <div>Womp womp: {Error}</div>\n'+
-' ^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
+' <div>Womp womp: {Error}</div>\n'+
+' ^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1565,15 +1559,12 @@ describe('ReactFlight', () => {
 
 it('should warn in DEV if a special object is passed to a host component',()=>{
 consttransport=ReactNoopFlightServer.render(<inputvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <input value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <input value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1589,15 +1580,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <inputvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <input value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <input value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1620,16 +1608,13 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <... value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <... value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1655,16 +1640,13 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Client>Current date: {obj}</Client>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <>Current date: {{toJSON: ...}}</>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <>Current date: {{toJSON: ...}}</>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1683,15 +1665,12 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <... value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <... value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1712,15 +1691,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Clientvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 
@@ -1744,13 +1720,10 @@ describe('ReactFlight', () => {
 ReactNoopFlightClient.read(transport);
 
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Objects with symbol properties like Symbol.iterator are not supported.\n'+
 ' <... value={{}}>\n'+
@@ -1769,13 +1742,10 @@ describe('ReactFlight', () => {
 );
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' [..., Math, <h1/>]\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' [..., Math, <h1/>]\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Math objects are not supported.\n'+
 ' [..., Math, <h1/>]\n'+

packages/internal-test-utils/consoleMock.js

@@ -290,26 +290,11 @@ export function createLogAssertion(
 }
 }
 
-constwithoutStack=options.withoutStack;
-
-if(consoleMethod==='log'&&withoutStack!==undefined){
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev, console.log does not have component stacks.`,
-);
-}elseif(withoutStack!==undefined&&withoutStack!==true){
-throwFormattedError(
-`The second argument must be {withoutStack: true}.`+
-`\n\nInstead received ${JSON.stringify(options)}.`,
-);
-}
-
 constobservedLogs=clearObservedErrors();
 constreceivedLogs=[];
 constmissingExpectedLogs=Array.from(expectedMessages);
 
 constunexpectedLogs=[];
-constunexpectedMissingComponentStack=[];
-constunexpectedIncludingComponentStack=[];
 constunexpectedMissingErrorStack=[];
 constunexpectedIncludingErrorStack=[];
 constlogsMismatchingFormat=[];
@@ -334,72 +319,12 @@ export function createLogAssertion(
 }
 
 letexpectedMessage;
-letexpectedWithoutStack;
 constexpectedMessageOrArray=expectedMessages[index];
-if(
-expectedMessageOrArray!=null&&
-Array.isArray(expectedMessageOrArray)
-){
-// Should be in the local form assert([['log', {withoutStack: true}]])
-
-// Some validations for common mistakes.
-if(expectedMessageOrArray.length===1){
-throwFormattedError(
-`Did you forget to remove the array around the log?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2, but there's only one item in the array. If this is intentional, remove the extra array.`,
-);
-}elseif(expectedMessageOrArray.length!==2){
-throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
-`Instead received ${expectedMessageOrArray}.`,
-);
-}elseif(consoleMethod==='log'){
-// We don't expect any console.log calls to have a stack.
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev logs, console.log does not have component stacks.`,
-);
-}
-
-// Format is correct, check the values.
-constcurrentExpectedMessage=expectedMessageOrArray[0];
-constcurrentExpectedOptions=expectedMessageOrArray[1];
-if(
-typeofcurrentExpectedMessage!=='string'||
-typeofcurrentExpectedOptions!=='object'||
-currentExpectedOptions.withoutStack!==true
-){
-throwFormattedError(
-`Log entries that are arrays must be of the form [string, {withoutStack: true}]`+
-`\n\nInstead received [${typeofcurrentExpectedMessage}, ${JSON.stringify(
-currentExpectedOptions,
-)}].`,
-);
-}
-
-expectedMessage=normalizeExpectedMessage(currentExpectedMessage);
-expectedWithoutStack=expectedMessageOrArray[1].withoutStack;
-}elseif(typeofexpectedMessageOrArray==='string'){
+if(typeofexpectedMessageOrArray==='string'){
 expectedMessage=normalizeExpectedMessage(expectedMessageOrArray);
-// withoutStack: inherit from global option - simplify when withoutStack is removed.
-if(consoleMethod==='log'){
-expectedWithoutStack=true;
-}else{
-expectedWithoutStack=withoutStack;
-}
-}elseif(
-typeofexpectedMessageOrArray==='object'&&
-expectedMessageOrArray!=null&&
-expectedMessageOrArray.withoutStack!=null
-){
-// Special case for common case of a wrong withoutStack value.
-throwFormattedError(
-`Did you forget to wrap a log with withoutStack in an array?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2.`+
-`\n\nInstead received ${JSON.stringify(expectedMessageOrArray)}.`,
-);
 }elseif(expectedMessageOrArray!=null){
 throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
+`The expected message for ${matcherName}() must be a string. `+
 `Instead received ${JSON.stringify(expectedMessageOrArray)}.`,
 );
 }
@@ -499,18 +424,6 @@ export function createLogAssertion(
 }
 
 if(matchesExpectedMessage){
-// withoutStack: Check for unexpected/missing component stacks.
-// These checks can be simplified when withoutStack is removed.
-if(isLikelyAComponentStack(normalizedMessage)){
-if(expectedWithoutStack===true&&!hasErrorStack){
-// Only report unexpected component stack if it's not an error stack
-// (error stacks look like component stacks after normalization)
-unexpectedIncludingComponentStack.push(normalizedMessage);
-}
-}elseif(expectedWithoutStack!==true&&!expectsErrorStack){
-unexpectedMissingComponentStack.push(normalizedMessage);
-}
-
 // Check for unexpected/missing error stacks
 if(hasErrorStack&&!expectsErrorStack){
 // Error stack is present but \n in <stack> was not in the expected message
@@ -538,12 +451,7 @@ export function createLogAssertion(
 functionprintDiff(){
 return`${diff(
 expectedMessages
-.map(messageOrTuple=>{
-constmessage=Array.isArray(messageOrTuple)
- ? messageOrTuple[0]
- : messageOrTuple;
-returnmessage.replace('\n',' ');
-})
+.map(message=>message.replace('\n',' '))
 .join('\n'),
 receivedLogs.map(message=>message.replace('\n',' ')).join('\n'),
 {
@@ -582,36 +490,6 @@ export function createLogAssertion(
 );
 }
 
-// Any logs that include a component stack but shouldn't.
-if(unexpectedIncludingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedIncludingComponentStack
-.map(
-stack=>
-`Unexpected component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should include a component stack, remove {withoutStack: true} from this ${logName()}.`+
-`\nIf all ${logName()}s should include the component stack, you may need to remove {withoutStack: true} from the ${matcherName} call.`,
-);
-}
-
-// Any logs that are missing a component stack without withoutStack.
-if(unexpectedMissingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedMissingComponentStack
-.map(
-stack=>
-`Missing component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should omit a component stack, pass [log, {withoutStack: true}].`+
-`\nIf all ${logName()}s should omit the component stack, add {withoutStack: true} to the ${matcherName} call.`,
-);
-}
-
 // Any logs that include an error stack trace but \n in <stack> wasn't expected.
 if(unexpectedIncludingErrorStack.length>0){
 throwFormattedError(

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

@@ -1514,16 +1514,13 @@ describe('ReactFlight', () => {
 },
 };
 consttransport=ReactNoopFlightServer.render(<inputvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <input value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <input value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1545,14 +1542,11 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <div>Womp womp: {newMyError('spaghetti')}</div>,
 );
-assertConsoleErrorDev(
-[
-'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
-' <div>Womp womp: {Error}</div>\n'+
-' ^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
+' <div>Womp womp: {Error}</div>\n'+
+' ^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1565,15 +1559,12 @@ describe('ReactFlight', () => {
 
 it('should warn in DEV if a special object is passed to a host component',()=>{
 consttransport=ReactNoopFlightServer.render(<inputvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <input value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <input value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1589,15 +1580,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <inputvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <input value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <input value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1620,16 +1608,13 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <... value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <... value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1655,16 +1640,13 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Client>Current date: {obj}</Client>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <>Current date: {{toJSON: ...}}</>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <>Current date: {{toJSON: ...}}</>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1683,15 +1665,12 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <... value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <... value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1712,15 +1691,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Clientvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 
@@ -1744,13 +1720,10 @@ describe('ReactFlight', () => {
 ReactNoopFlightClient.read(transport);
 
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Objects with symbol properties like Symbol.iterator are not supported.\n'+
 ' <... value={{}}>\n'+
@@ -1769,13 +1742,10 @@ describe('ReactFlight', () => {
 );
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' [..., Math, <h1/>]\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' [..., Math, <h1/>]\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Math objects are not supported.\n'+
 ' [..., Math, <h1/>]\n'+

packages/internal-test-utils/__tests__/ReactInternalTestUtils-test.js

@@ -290,26 +290,11 @@ export function createLogAssertion(
 }
 }
 
-constwithoutStack=options.withoutStack;
-
-if(consoleMethod==='log'&&withoutStack!==undefined){
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev, console.log does not have component stacks.`,
-);
-}elseif(withoutStack!==undefined&&withoutStack!==true){
-throwFormattedError(
-`The second argument must be {withoutStack: true}.`+
-`\n\nInstead received ${JSON.stringify(options)}.`,
-);
-}
-
 constobservedLogs=clearObservedErrors();
 constreceivedLogs=[];
 constmissingExpectedLogs=Array.from(expectedMessages);
 
 constunexpectedLogs=[];
-constunexpectedMissingComponentStack=[];
-constunexpectedIncludingComponentStack=[];
 constunexpectedMissingErrorStack=[];
 constunexpectedIncludingErrorStack=[];
 constlogsMismatchingFormat=[];
@@ -334,72 +319,12 @@ export function createLogAssertion(
 }
 
 letexpectedMessage;
-letexpectedWithoutStack;
 constexpectedMessageOrArray=expectedMessages[index];
-if(
-expectedMessageOrArray!=null&&
-Array.isArray(expectedMessageOrArray)
-){
-// Should be in the local form assert([['log', {withoutStack: true}]])
-
-// Some validations for common mistakes.
-if(expectedMessageOrArray.length===1){
-throwFormattedError(
-`Did you forget to remove the array around the log?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2, but there's only one item in the array. If this is intentional, remove the extra array.`,
-);
-}elseif(expectedMessageOrArray.length!==2){
-throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
-`Instead received ${expectedMessageOrArray}.`,
-);
-}elseif(consoleMethod==='log'){
-// We don't expect any console.log calls to have a stack.
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev logs, console.log does not have component stacks.`,
-);
-}
-
-// Format is correct, check the values.
-constcurrentExpectedMessage=expectedMessageOrArray[0];
-constcurrentExpectedOptions=expectedMessageOrArray[1];
-if(
-typeofcurrentExpectedMessage!=='string'||
-typeofcurrentExpectedOptions!=='object'||
-currentExpectedOptions.withoutStack!==true
-){
-throwFormattedError(
-`Log entries that are arrays must be of the form [string, {withoutStack: true}]`+
-`\n\nInstead received [${typeofcurrentExpectedMessage}, ${JSON.stringify(
-currentExpectedOptions,
-)}].`,
-);
-}
-
-expectedMessage=normalizeExpectedMessage(currentExpectedMessage);
-expectedWithoutStack=expectedMessageOrArray[1].withoutStack;
-}elseif(typeofexpectedMessageOrArray==='string'){
+if(typeofexpectedMessageOrArray==='string'){
 expectedMessage=normalizeExpectedMessage(expectedMessageOrArray);
-// withoutStack: inherit from global option - simplify when withoutStack is removed.
-if(consoleMethod==='log'){
-expectedWithoutStack=true;
-}else{
-expectedWithoutStack=withoutStack;
-}
-}elseif(
-typeofexpectedMessageOrArray==='object'&&
-expectedMessageOrArray!=null&&
-expectedMessageOrArray.withoutStack!=null
-){
-// Special case for common case of a wrong withoutStack value.
-throwFormattedError(
-`Did you forget to wrap a log with withoutStack in an array?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2.`+
-`\n\nInstead received ${JSON.stringify(expectedMessageOrArray)}.`,
-);
 }elseif(expectedMessageOrArray!=null){
 throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
+`The expected message for ${matcherName}() must be a string. `+
 `Instead received ${JSON.stringify(expectedMessageOrArray)}.`,
 );
 }
@@ -499,18 +424,6 @@ export function createLogAssertion(
 }
 
 if(matchesExpectedMessage){
-// withoutStack: Check for unexpected/missing component stacks.
-// These checks can be simplified when withoutStack is removed.
-if(isLikelyAComponentStack(normalizedMessage)){
-if(expectedWithoutStack===true&&!hasErrorStack){
-// Only report unexpected component stack if it's not an error stack
-// (error stacks look like component stacks after normalization)
-unexpectedIncludingComponentStack.push(normalizedMessage);
-}
-}elseif(expectedWithoutStack!==true&&!expectsErrorStack){
-unexpectedMissingComponentStack.push(normalizedMessage);
-}
-
 // Check for unexpected/missing error stacks
 if(hasErrorStack&&!expectsErrorStack){
 // Error stack is present but \n in <stack> was not in the expected message
@@ -538,12 +451,7 @@ export function createLogAssertion(
 functionprintDiff(){
 return`${diff(
 expectedMessages
-.map(messageOrTuple=>{
-constmessage=Array.isArray(messageOrTuple)
- ? messageOrTuple[0]
- : messageOrTuple;
-returnmessage.replace('\n',' ');
-})
+.map(message=>message.replace('\n',' '))
 .join('\n'),
 receivedLogs.map(message=>message.replace('\n',' ')).join('\n'),
 {
@@ -582,36 +490,6 @@ export function createLogAssertion(
 );
 }
 
-// Any logs that include a component stack but shouldn't.
-if(unexpectedIncludingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedIncludingComponentStack
-.map(
-stack=>
-`Unexpected component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should include a component stack, remove {withoutStack: true} from this ${logName()}.`+
-`\nIf all ${logName()}s should include the component stack, you may need to remove {withoutStack: true} from the ${matcherName} call.`,
-);
-}
-
-// Any logs that are missing a component stack without withoutStack.
-if(unexpectedMissingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedMissingComponentStack
-.map(
-stack=>
-`Missing component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should omit a component stack, pass [log, {withoutStack: true}].`+
-`\nIf all ${logName()}s should omit the component stack, add {withoutStack: true} to the ${matcherName} call.`,
-);
-}
-
 // Any logs that include an error stack trace but \n in <stack> wasn't expected.
 if(unexpectedIncludingErrorStack.length>0){
 throwFormattedError(

packages/internal-test-utils/consoleMock.js

@@ -1514,16 +1514,13 @@ describe('ReactFlight', () => {
 },
 };
 consttransport=ReactNoopFlightServer.render(<inputvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <input value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <input value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1545,14 +1542,11 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <div>Womp womp: {newMyError('spaghetti')}</div>,
 );
-assertConsoleErrorDev(
-[
-'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
-' <div>Womp womp: {Error}</div>\n'+
-' ^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
+' <div>Womp womp: {Error}</div>\n'+
+' ^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1565,15 +1559,12 @@ describe('ReactFlight', () => {
 
 it('should warn in DEV if a special object is passed to a host component',()=>{
 consttransport=ReactNoopFlightServer.render(<inputvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <input value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <input value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1589,15 +1580,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <inputvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <input value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <input value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1620,16 +1608,13 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <... value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <... value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1655,16 +1640,13 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Client>Current date: {obj}</Client>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <>Current date: {{toJSON: ...}}</>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <>Current date: {{toJSON: ...}}</>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1683,15 +1665,12 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <... value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <... value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1712,15 +1691,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Clientvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 
@@ -1744,13 +1720,10 @@ describe('ReactFlight', () => {
 ReactNoopFlightClient.read(transport);
 
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Objects with symbol properties like Symbol.iterator are not supported.\n'+
 ' <... value={{}}>\n'+
@@ -1769,13 +1742,10 @@ describe('ReactFlight', () => {
 );
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' [..., Math, <h1/>]\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' [..., Math, <h1/>]\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Math objects are not supported.\n'+
 ' [..., Math, <h1/>]\n'+

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

@@ -290,26 +290,11 @@ export function createLogAssertion(
 }
 }
 
-constwithoutStack=options.withoutStack;
-
-if(consoleMethod==='log'&&withoutStack!==undefined){
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev, console.log does not have component stacks.`,
-);
-}elseif(withoutStack!==undefined&&withoutStack!==true){
-throwFormattedError(
-`The second argument must be {withoutStack: true}.`+
-`\n\nInstead received ${JSON.stringify(options)}.`,
-);
-}
-
 constobservedLogs=clearObservedErrors();
 constreceivedLogs=[];
 constmissingExpectedLogs=Array.from(expectedMessages);
 
 constunexpectedLogs=[];
-constunexpectedMissingComponentStack=[];
-constunexpectedIncludingComponentStack=[];
 constunexpectedMissingErrorStack=[];
 constunexpectedIncludingErrorStack=[];
 constlogsMismatchingFormat=[];
@@ -334,72 +319,12 @@ export function createLogAssertion(
 }
 
 letexpectedMessage;
-letexpectedWithoutStack;
 constexpectedMessageOrArray=expectedMessages[index];
-if(
-expectedMessageOrArray!=null&&
-Array.isArray(expectedMessageOrArray)
-){
-// Should be in the local form assert([['log', {withoutStack: true}]])
-
-// Some validations for common mistakes.
-if(expectedMessageOrArray.length===1){
-throwFormattedError(
-`Did you forget to remove the array around the log?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2, but there's only one item in the array. If this is intentional, remove the extra array.`,
-);
-}elseif(expectedMessageOrArray.length!==2){
-throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
-`Instead received ${expectedMessageOrArray}.`,
-);
-}elseif(consoleMethod==='log'){
-// We don't expect any console.log calls to have a stack.
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev logs, console.log does not have component stacks.`,
-);
-}
-
-// Format is correct, check the values.
-constcurrentExpectedMessage=expectedMessageOrArray[0];
-constcurrentExpectedOptions=expectedMessageOrArray[1];
-if(
-typeofcurrentExpectedMessage!=='string'||
-typeofcurrentExpectedOptions!=='object'||
-currentExpectedOptions.withoutStack!==true
-){
-throwFormattedError(
-`Log entries that are arrays must be of the form [string, {withoutStack: true}]`+
-`\n\nInstead received [${typeofcurrentExpectedMessage}, ${JSON.stringify(
-currentExpectedOptions,
-)}].`,
-);
-}
-
-expectedMessage=normalizeExpectedMessage(currentExpectedMessage);
-expectedWithoutStack=expectedMessageOrArray[1].withoutStack;
-}elseif(typeofexpectedMessageOrArray==='string'){
+if(typeofexpectedMessageOrArray==='string'){
 expectedMessage=normalizeExpectedMessage(expectedMessageOrArray);
-// withoutStack: inherit from global option - simplify when withoutStack is removed.
-if(consoleMethod==='log'){
-expectedWithoutStack=true;
-}else{
-expectedWithoutStack=withoutStack;
-}
-}elseif(
-typeofexpectedMessageOrArray==='object'&&
-expectedMessageOrArray!=null&&
-expectedMessageOrArray.withoutStack!=null
-){
-// Special case for common case of a wrong withoutStack value.
-throwFormattedError(
-`Did you forget to wrap a log with withoutStack in an array?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2.`+
-`\n\nInstead received ${JSON.stringify(expectedMessageOrArray)}.`,
-);
 }elseif(expectedMessageOrArray!=null){
 throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
+`The expected message for ${matcherName}() must be a string. `+
 `Instead received ${JSON.stringify(expectedMessageOrArray)}.`,
 );
 }
@@ -499,18 +424,6 @@ export function createLogAssertion(
 }
 
 if(matchesExpectedMessage){
-// withoutStack: Check for unexpected/missing component stacks.
-// These checks can be simplified when withoutStack is removed.
-if(isLikelyAComponentStack(normalizedMessage)){
-if(expectedWithoutStack===true&&!hasErrorStack){
-// Only report unexpected component stack if it's not an error stack
-// (error stacks look like component stacks after normalization)
-unexpectedIncludingComponentStack.push(normalizedMessage);
-}
-}elseif(expectedWithoutStack!==true&&!expectsErrorStack){
-unexpectedMissingComponentStack.push(normalizedMessage);
-}
-
 // Check for unexpected/missing error stacks
 if(hasErrorStack&&!expectsErrorStack){
 // Error stack is present but \n in <stack> was not in the expected message
@@ -538,12 +451,7 @@ export function createLogAssertion(
 functionprintDiff(){
 return`${diff(
 expectedMessages
-.map(messageOrTuple=>{
-constmessage=Array.isArray(messageOrTuple)
- ? messageOrTuple[0]
- : messageOrTuple;
-returnmessage.replace('\n',' ');
-})
+.map(message=>message.replace('\n',' '))
 .join('\n'),
 receivedLogs.map(message=>message.replace('\n',' ')).join('\n'),
 {
@@ -582,36 +490,6 @@ export function createLogAssertion(
 );
 }
 
-// Any logs that include a component stack but shouldn't.
-if(unexpectedIncludingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedIncludingComponentStack
-.map(
-stack=>
-`Unexpected component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should include a component stack, remove {withoutStack: true} from this ${logName()}.`+
-`\nIf all ${logName()}s should include the component stack, you may need to remove {withoutStack: true} from the ${matcherName} call.`,
-);
-}
-
-// Any logs that are missing a component stack without withoutStack.
-if(unexpectedMissingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedMissingComponentStack
-.map(
-stack=>
-`Missing component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should omit a component stack, pass [log, {withoutStack: true}].`+
-`\nIf all ${logName()}s should omit the component stack, add {withoutStack: true} to the ${matcherName} call.`,
-);
-}
-
 // Any logs that include an error stack trace but \n in <stack> wasn't expected.
 if(unexpectedIncludingErrorStack.length>0){
 throwFormattedError(

packages/internal-test-utils/__tests__/ReactInternalTestUtils-test.js

@@ -1514,16 +1514,13 @@ describe('ReactFlight', () => {
 },
 };
 consttransport=ReactNoopFlightServer.render(<inputvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <input value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <input value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1545,14 +1542,11 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <div>Womp womp: {newMyError('spaghetti')}</div>,
 );
-assertConsoleErrorDev(
-[
-'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
-' <div>Womp womp: {Error}</div>\n'+
-' ^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
+' <div>Womp womp: {Error}</div>\n'+
+' ^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1565,15 +1559,12 @@ describe('ReactFlight', () => {
 
 it('should warn in DEV if a special object is passed to a host component',()=>{
 consttransport=ReactNoopFlightServer.render(<inputvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <input value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <input value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1589,15 +1580,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <inputvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <input value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <input value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1620,16 +1608,13 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <... value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <... value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1655,16 +1640,13 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Client>Current date: {obj}</Client>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <>Current date: {{toJSON: ...}}</>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <>Current date: {{toJSON: ...}}</>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1683,15 +1665,12 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <... value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <... value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1712,15 +1691,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Clientvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 
@@ -1744,13 +1720,10 @@ describe('ReactFlight', () => {
 ReactNoopFlightClient.read(transport);
 
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Objects with symbol properties like Symbol.iterator are not supported.\n'+
 ' <... value={{}}>\n'+
@@ -1769,13 +1742,10 @@ describe('ReactFlight', () => {
 );
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' [..., Math, <h1/>]\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' [..., Math, <h1/>]\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Math objects are not supported.\n'+
 ' [..., Math, <h1/>]\n'+

packages/internal-test-utils/consoleMock.js

@@ -290,26 +290,11 @@ export function createLogAssertion(
 }
 }
 
-constwithoutStack=options.withoutStack;
-
-if(consoleMethod==='log'&&withoutStack!==undefined){
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev, console.log does not have component stacks.`,
-);
-}elseif(withoutStack!==undefined&&withoutStack!==true){
-throwFormattedError(
-`The second argument must be {withoutStack: true}.`+
-`\n\nInstead received ${JSON.stringify(options)}.`,
-);
-}
-
 constobservedLogs=clearObservedErrors();
 constreceivedLogs=[];
 constmissingExpectedLogs=Array.from(expectedMessages);
 
 constunexpectedLogs=[];
-constunexpectedMissingComponentStack=[];
-constunexpectedIncludingComponentStack=[];
 constunexpectedMissingErrorStack=[];
 constunexpectedIncludingErrorStack=[];
 constlogsMismatchingFormat=[];
@@ -334,72 +319,12 @@ export function createLogAssertion(
 }
 
 letexpectedMessage;
-letexpectedWithoutStack;
 constexpectedMessageOrArray=expectedMessages[index];
-if(
-expectedMessageOrArray!=null&&
-Array.isArray(expectedMessageOrArray)
-){
-// Should be in the local form assert([['log', {withoutStack: true}]])
-
-// Some validations for common mistakes.
-if(expectedMessageOrArray.length===1){
-throwFormattedError(
-`Did you forget to remove the array around the log?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2, but there's only one item in the array. If this is intentional, remove the extra array.`,
-);
-}elseif(expectedMessageOrArray.length!==2){
-throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
-`Instead received ${expectedMessageOrArray}.`,
-);
-}elseif(consoleMethod==='log'){
-// We don't expect any console.log calls to have a stack.
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev logs, console.log does not have component stacks.`,
-);
-}
-
-// Format is correct, check the values.
-constcurrentExpectedMessage=expectedMessageOrArray[0];
-constcurrentExpectedOptions=expectedMessageOrArray[1];
-if(
-typeofcurrentExpectedMessage!=='string'||
-typeofcurrentExpectedOptions!=='object'||
-currentExpectedOptions.withoutStack!==true
-){
-throwFormattedError(
-`Log entries that are arrays must be of the form [string, {withoutStack: true}]`+
-`\n\nInstead received [${typeofcurrentExpectedMessage}, ${JSON.stringify(
-currentExpectedOptions,
-)}].`,
-);
-}
-
-expectedMessage=normalizeExpectedMessage(currentExpectedMessage);
-expectedWithoutStack=expectedMessageOrArray[1].withoutStack;
-}elseif(typeofexpectedMessageOrArray==='string'){
+if(typeofexpectedMessageOrArray==='string'){
 expectedMessage=normalizeExpectedMessage(expectedMessageOrArray);
-// withoutStack: inherit from global option - simplify when withoutStack is removed.
-if(consoleMethod==='log'){
-expectedWithoutStack=true;
-}else{
-expectedWithoutStack=withoutStack;
-}
-}elseif(
-typeofexpectedMessageOrArray==='object'&&
-expectedMessageOrArray!=null&&
-expectedMessageOrArray.withoutStack!=null
-){
-// Special case for common case of a wrong withoutStack value.
-throwFormattedError(
-`Did you forget to wrap a log with withoutStack in an array?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2.`+
-`\n\nInstead received ${JSON.stringify(expectedMessageOrArray)}.`,
-);
 }elseif(expectedMessageOrArray!=null){
 throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
+`The expected message for ${matcherName}() must be a string. `+
 `Instead received ${JSON.stringify(expectedMessageOrArray)}.`,
 );
 }
@@ -499,18 +424,6 @@ export function createLogAssertion(
 }
 
 if(matchesExpectedMessage){
-// withoutStack: Check for unexpected/missing component stacks.
-// These checks can be simplified when withoutStack is removed.
-if(isLikelyAComponentStack(normalizedMessage)){
-if(expectedWithoutStack===true&&!hasErrorStack){
-// Only report unexpected component stack if it's not an error stack
-// (error stacks look like component stacks after normalization)
-unexpectedIncludingComponentStack.push(normalizedMessage);
-}
-}elseif(expectedWithoutStack!==true&&!expectsErrorStack){
-unexpectedMissingComponentStack.push(normalizedMessage);
-}
-
 // Check for unexpected/missing error stacks
 if(hasErrorStack&&!expectsErrorStack){
 // Error stack is present but \n in <stack> was not in the expected message
@@ -538,12 +451,7 @@ export function createLogAssertion(
 functionprintDiff(){
 return`${diff(
 expectedMessages
-.map(messageOrTuple=>{
-constmessage=Array.isArray(messageOrTuple)
- ? messageOrTuple[0]
- : messageOrTuple;
-returnmessage.replace('\n',' ');
-})
+.map(message=>message.replace('\n',' '))
 .join('\n'),
 receivedLogs.map(message=>message.replace('\n',' ')).join('\n'),
 {
@@ -582,36 +490,6 @@ export function createLogAssertion(
 );
 }
 
-// Any logs that include a component stack but shouldn't.
-if(unexpectedIncludingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedIncludingComponentStack
-.map(
-stack=>
-`Unexpected component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should include a component stack, remove {withoutStack: true} from this ${logName()}.`+
-`\nIf all ${logName()}s should include the component stack, you may need to remove {withoutStack: true} from the ${matcherName} call.`,
-);
-}
-
-// Any logs that are missing a component stack without withoutStack.
-if(unexpectedMissingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedMissingComponentStack
-.map(
-stack=>
-`Missing component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should omit a component stack, pass [log, {withoutStack: true}].`+
-`\nIf all ${logName()}s should omit the component stack, add {withoutStack: true} to the ${matcherName} call.`,
-);
-}
-
 // Any logs that include an error stack trace but \n in <stack> wasn't expected.
 if(unexpectedIncludingErrorStack.length>0){
 throwFormattedError(

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

@@ -1514,16 +1514,13 @@ describe('ReactFlight', () => {
 },
 };
 consttransport=ReactNoopFlightServer.render(<inputvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <input value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <input value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1545,14 +1542,11 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <div>Womp womp: {newMyError('spaghetti')}</div>,
 );
-assertConsoleErrorDev(
-[
-'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
-' <div>Womp womp: {Error}</div>\n'+
-' ^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
+' <div>Womp womp: {Error}</div>\n'+
+' ^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1565,15 +1559,12 @@ describe('ReactFlight', () => {
 
 it('should warn in DEV if a special object is passed to a host component',()=>{
 consttransport=ReactNoopFlightServer.render(<inputvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <input value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <input value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1589,15 +1580,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <inputvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <input value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <input value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1620,16 +1608,13 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <... value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <... value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1655,16 +1640,13 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Client>Current date: {obj}</Client>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <>Current date: {{toJSON: ...}}</>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <>Current date: {{toJSON: ...}}</>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1683,15 +1665,12 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <... value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <... value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1712,15 +1691,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Clientvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 
@@ -1744,13 +1720,10 @@ describe('ReactFlight', () => {
 ReactNoopFlightClient.read(transport);
 
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Objects with symbol properties like Symbol.iterator are not supported.\n'+
 ' <... value={{}}>\n'+
@@ -1769,13 +1742,10 @@ describe('ReactFlight', () => {
 );
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' [..., Math, <h1/>]\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' [..., Math, <h1/>]\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Math objects are not supported.\n'+
 ' [..., Math, <h1/>]\n'+

packages/internal-test-utils/__tests__/ReactInternalTestUtils-test.js

@@ -290,26 +290,11 @@ export function createLogAssertion(
 }
 }
 
-constwithoutStack=options.withoutStack;
-
-if(consoleMethod==='log'&&withoutStack!==undefined){
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev, console.log does not have component stacks.`,
-);
-}elseif(withoutStack!==undefined&&withoutStack!==true){
-throwFormattedError(
-`The second argument must be {withoutStack: true}.`+
-`\n\nInstead received ${JSON.stringify(options)}.`,
-);
-}
-
 constobservedLogs=clearObservedErrors();
 constreceivedLogs=[];
 constmissingExpectedLogs=Array.from(expectedMessages);
 
 constunexpectedLogs=[];
-constunexpectedMissingComponentStack=[];
-constunexpectedIncludingComponentStack=[];
 constunexpectedMissingErrorStack=[];
 constunexpectedIncludingErrorStack=[];
 constlogsMismatchingFormat=[];
@@ -334,72 +319,12 @@ export function createLogAssertion(
 }
 
 letexpectedMessage;
-letexpectedWithoutStack;
 constexpectedMessageOrArray=expectedMessages[index];
-if(
-expectedMessageOrArray!=null&&
-Array.isArray(expectedMessageOrArray)
-){
-// Should be in the local form assert([['log', {withoutStack: true}]])
-
-// Some validations for common mistakes.
-if(expectedMessageOrArray.length===1){
-throwFormattedError(
-`Did you forget to remove the array around the log?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2, but there's only one item in the array. If this is intentional, remove the extra array.`,
-);
-}elseif(expectedMessageOrArray.length!==2){
-throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
-`Instead received ${expectedMessageOrArray}.`,
-);
-}elseif(consoleMethod==='log'){
-// We don't expect any console.log calls to have a stack.
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev logs, console.log does not have component stacks.`,
-);
-}
-
-// Format is correct, check the values.
-constcurrentExpectedMessage=expectedMessageOrArray[0];
-constcurrentExpectedOptions=expectedMessageOrArray[1];
-if(
-typeofcurrentExpectedMessage!=='string'||
-typeofcurrentExpectedOptions!=='object'||
-currentExpectedOptions.withoutStack!==true
-){
-throwFormattedError(
-`Log entries that are arrays must be of the form [string, {withoutStack: true}]`+
-`\n\nInstead received [${typeofcurrentExpectedMessage}, ${JSON.stringify(
-currentExpectedOptions,
-)}].`,
-);
-}
-
-expectedMessage=normalizeExpectedMessage(currentExpectedMessage);
-expectedWithoutStack=expectedMessageOrArray[1].withoutStack;
-}elseif(typeofexpectedMessageOrArray==='string'){
+if(typeofexpectedMessageOrArray==='string'){
 expectedMessage=normalizeExpectedMessage(expectedMessageOrArray);
-// withoutStack: inherit from global option - simplify when withoutStack is removed.
-if(consoleMethod==='log'){
-expectedWithoutStack=true;
-}else{
-expectedWithoutStack=withoutStack;
-}
-}elseif(
-typeofexpectedMessageOrArray==='object'&&
-expectedMessageOrArray!=null&&
-expectedMessageOrArray.withoutStack!=null
-){
-// Special case for common case of a wrong withoutStack value.
-throwFormattedError(
-`Did you forget to wrap a log with withoutStack in an array?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2.`+
-`\n\nInstead received ${JSON.stringify(expectedMessageOrArray)}.`,
-);
 }elseif(expectedMessageOrArray!=null){
 throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
+`The expected message for ${matcherName}() must be a string. `+
 `Instead received ${JSON.stringify(expectedMessageOrArray)}.`,
 );
 }
@@ -499,18 +424,6 @@ export function createLogAssertion(
 }
 
 if(matchesExpectedMessage){
-// withoutStack: Check for unexpected/missing component stacks.
-// These checks can be simplified when withoutStack is removed.
-if(isLikelyAComponentStack(normalizedMessage)){
-if(expectedWithoutStack===true&&!hasErrorStack){
-// Only report unexpected component stack if it's not an error stack
-// (error stacks look like component stacks after normalization)
-unexpectedIncludingComponentStack.push(normalizedMessage);
-}
-}elseif(expectedWithoutStack!==true&&!expectsErrorStack){
-unexpectedMissingComponentStack.push(normalizedMessage);
-}
-
 // Check for unexpected/missing error stacks
 if(hasErrorStack&&!expectsErrorStack){
 // Error stack is present but \n in <stack> was not in the expected message
@@ -538,12 +451,7 @@ export function createLogAssertion(
 functionprintDiff(){
 return`${diff(
 expectedMessages
-.map(messageOrTuple=>{
-constmessage=Array.isArray(messageOrTuple)
- ? messageOrTuple[0]
- : messageOrTuple;
-returnmessage.replace('\n',' ');
-})
+.map(message=>message.replace('\n',' '))
 .join('\n'),
 receivedLogs.map(message=>message.replace('\n',' ')).join('\n'),
 {
@@ -582,36 +490,6 @@ export function createLogAssertion(
 );
 }
 
-// Any logs that include a component stack but shouldn't.
-if(unexpectedIncludingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedIncludingComponentStack
-.map(
-stack=>
-`Unexpected component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should include a component stack, remove {withoutStack: true} from this ${logName()}.`+
-`\nIf all ${logName()}s should include the component stack, you may need to remove {withoutStack: true} from the ${matcherName} call.`,
-);
-}
-
-// Any logs that are missing a component stack without withoutStack.
-if(unexpectedMissingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedMissingComponentStack
-.map(
-stack=>
-`Missing component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should omit a component stack, pass [log, {withoutStack: true}].`+
-`\nIf all ${logName()}s should omit the component stack, add {withoutStack: true} to the ${matcherName} call.`,
-);
-}
-
 // Any logs that include an error stack trace but \n in <stack> wasn't expected.
 if(unexpectedIncludingErrorStack.length>0){
 throwFormattedError(

packages/internal-test-utils/consoleMock.js

@@ -1514,16 +1514,13 @@ describe('ReactFlight', () => {
 },
 };
 consttransport=ReactNoopFlightServer.render(<inputvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <input value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <input value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1545,14 +1542,11 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <div>Womp womp: {newMyError('spaghetti')}</div>,
 );
-assertConsoleErrorDev(
-[
-'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
-' <div>Womp womp: {Error}</div>\n'+
-' ^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
+' <div>Womp womp: {Error}</div>\n'+
+' ^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1565,15 +1559,12 @@ describe('ReactFlight', () => {
 
 it('should warn in DEV if a special object is passed to a host component',()=>{
 consttransport=ReactNoopFlightServer.render(<inputvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <input value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <input value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1589,15 +1580,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <inputvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <input value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <input value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1620,16 +1608,13 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <... value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <... value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1655,16 +1640,13 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Client>Current date: {obj}</Client>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <>Current date: {{toJSON: ...}}</>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <>Current date: {{toJSON: ...}}</>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1683,15 +1665,12 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <... value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <... value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1712,15 +1691,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Clientvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 
@@ -1744,13 +1720,10 @@ describe('ReactFlight', () => {
 ReactNoopFlightClient.read(transport);
 
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Objects with symbol properties like Symbol.iterator are not supported.\n'+
 ' <... value={{}}>\n'+
@@ -1769,13 +1742,10 @@ describe('ReactFlight', () => {
 );
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' [..., Math, <h1/>]\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' [..., Math, <h1/>]\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Math objects are not supported.\n'+
 ' [..., Math, <h1/>]\n'+

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

@@ -290,26 +290,11 @@ export function createLogAssertion(
 }
 }
 
-constwithoutStack=options.withoutStack;
-
-if(consoleMethod==='log'&&withoutStack!==undefined){
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev, console.log does not have component stacks.`,
-);
-}elseif(withoutStack!==undefined&&withoutStack!==true){
-throwFormattedError(
-`The second argument must be {withoutStack: true}.`+
-`\n\nInstead received ${JSON.stringify(options)}.`,
-);
-}
-
 constobservedLogs=clearObservedErrors();
 constreceivedLogs=[];
 constmissingExpectedLogs=Array.from(expectedMessages);
 
 constunexpectedLogs=[];
-constunexpectedMissingComponentStack=[];
-constunexpectedIncludingComponentStack=[];
 constunexpectedMissingErrorStack=[];
 constunexpectedIncludingErrorStack=[];
 constlogsMismatchingFormat=[];
@@ -334,72 +319,12 @@ export function createLogAssertion(
 }
 
 letexpectedMessage;
-letexpectedWithoutStack;
 constexpectedMessageOrArray=expectedMessages[index];
-if(
-expectedMessageOrArray!=null&&
-Array.isArray(expectedMessageOrArray)
-){
-// Should be in the local form assert([['log', {withoutStack: true}]])
-
-// Some validations for common mistakes.
-if(expectedMessageOrArray.length===1){
-throwFormattedError(
-`Did you forget to remove the array around the log?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2, but there's only one item in the array. If this is intentional, remove the extra array.`,
-);
-}elseif(expectedMessageOrArray.length!==2){
-throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
-`Instead received ${expectedMessageOrArray}.`,
-);
-}elseif(consoleMethod==='log'){
-// We don't expect any console.log calls to have a stack.
-throwFormattedError(
-`Do not pass withoutStack to assertConsoleLogDev logs, console.log does not have component stacks.`,
-);
-}
-
-// Format is correct, check the values.
-constcurrentExpectedMessage=expectedMessageOrArray[0];
-constcurrentExpectedOptions=expectedMessageOrArray[1];
-if(
-typeofcurrentExpectedMessage!=='string'||
-typeofcurrentExpectedOptions!=='object'||
-currentExpectedOptions.withoutStack!==true
-){
-throwFormattedError(
-`Log entries that are arrays must be of the form [string, {withoutStack: true}]`+
-`\n\nInstead received [${typeofcurrentExpectedMessage}, ${JSON.stringify(
-currentExpectedOptions,
-)}].`,
-);
-}
-
-expectedMessage=normalizeExpectedMessage(currentExpectedMessage);
-expectedWithoutStack=expectedMessageOrArray[1].withoutStack;
-}elseif(typeofexpectedMessageOrArray==='string'){
+if(typeofexpectedMessageOrArray==='string'){
 expectedMessage=normalizeExpectedMessage(expectedMessageOrArray);
-// withoutStack: inherit from global option - simplify when withoutStack is removed.
-if(consoleMethod==='log'){
-expectedWithoutStack=true;
-}else{
-expectedWithoutStack=withoutStack;
-}
-}elseif(
-typeofexpectedMessageOrArray==='object'&&
-expectedMessageOrArray!=null&&
-expectedMessageOrArray.withoutStack!=null
-){
-// Special case for common case of a wrong withoutStack value.
-throwFormattedError(
-`Did you forget to wrap a log with withoutStack in an array?`+
-`\n\nThe expected message for ${matcherName}() must be a string or an array of length 2.`+
-`\n\nInstead received ${JSON.stringify(expectedMessageOrArray)}.`,
-);
 }elseif(expectedMessageOrArray!=null){
 throwFormattedError(
-`The expected message for ${matcherName}() must be a string or an array of length 2. `+
+`The expected message for ${matcherName}() must be a string. `+
 `Instead received ${JSON.stringify(expectedMessageOrArray)}.`,
 );
 }
@@ -499,18 +424,6 @@ export function createLogAssertion(
 }
 
 if(matchesExpectedMessage){
-// withoutStack: Check for unexpected/missing component stacks.
-// These checks can be simplified when withoutStack is removed.
-if(isLikelyAComponentStack(normalizedMessage)){
-if(expectedWithoutStack===true&&!hasErrorStack){
-// Only report unexpected component stack if it's not an error stack
-// (error stacks look like component stacks after normalization)
-unexpectedIncludingComponentStack.push(normalizedMessage);
-}
-}elseif(expectedWithoutStack!==true&&!expectsErrorStack){
-unexpectedMissingComponentStack.push(normalizedMessage);
-}
-
 // Check for unexpected/missing error stacks
 if(hasErrorStack&&!expectsErrorStack){
 // Error stack is present but \n in <stack> was not in the expected message
@@ -538,12 +451,7 @@ export function createLogAssertion(
 functionprintDiff(){
 return`${diff(
 expectedMessages
-.map(messageOrTuple=>{
-constmessage=Array.isArray(messageOrTuple)
- ? messageOrTuple[0]
- : messageOrTuple;
-returnmessage.replace('\n',' ');
-})
+.map(message=>message.replace('\n',' '))
 .join('\n'),
 receivedLogs.map(message=>message.replace('\n',' ')).join('\n'),
 {
@@ -582,36 +490,6 @@ export function createLogAssertion(
 );
 }
 
-// Any logs that include a component stack but shouldn't.
-if(unexpectedIncludingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedIncludingComponentStack
-.map(
-stack=>
-`Unexpected component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should include a component stack, remove {withoutStack: true} from this ${logName()}.`+
-`\nIf all ${logName()}s should include the component stack, you may need to remove {withoutStack: true} from the ${matcherName} call.`,
-);
-}
-
-// Any logs that are missing a component stack without withoutStack.
-if(unexpectedMissingComponentStack.length>0){
-throwFormattedError(
-`${unexpectedMissingComponentStack
-.map(
-stack=>
-`Missing component stack for:\n ${printReceived(stack)}`,
-)
-.join(
-'\n\n',
-)}\n\nIf this ${logName()} should omit a component stack, pass [log, {withoutStack: true}].`+
-`\nIf all ${logName()}s should omit the component stack, add {withoutStack: true} to the ${matcherName} call.`,
-);
-}
-
 // Any logs that include an error stack trace but \n in <stack> wasn't expected.
 if(unexpectedIncludingErrorStack.length>0){
 throwFormattedError(

packages/internal-test-utils/__tests__/ReactInternalTestUtils-test.js

@@ -1514,16 +1514,13 @@ describe('ReactFlight', () => {
 },
 };
 consttransport=ReactNoopFlightServer.render(<inputvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <input value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <input value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1545,14 +1542,11 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <div>Womp womp: {newMyError('spaghetti')}</div>,
 );
-assertConsoleErrorDev(
-[
-'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
-' <div>Womp womp: {Error}</div>\n'+
-' ^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Error objects cannot be rendered as text children. Try formatting it using toString().\n'+
+' <div>Womp womp: {Error}</div>\n'+
+' ^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1565,15 +1559,12 @@ describe('ReactFlight', () => {
 
 it('should warn in DEV if a special object is passed to a host component',()=>{
 consttransport=ReactNoopFlightServer.render(<inputvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <input value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <input value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1589,15 +1580,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <inputvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <input value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <input value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1620,16 +1608,13 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={obj}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <... value={{toJSON: ...}}>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <... value={{toJSON: ...}}>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1655,16 +1640,13 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Client>Current date: {obj}</Client>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with toJSON methods are not supported. '+
-'Convert it manually to a simple value before passing it to props.\n'+
-' <>Current date: {{toJSON: ...}}</>\n'+
-' ^^^^^^^^^^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with toJSON methods are not supported. '+
+'Convert it manually to a simple value before passing it to props.\n'+
+' <>Current date: {{toJSON: ...}}</>\n'+
+' ^^^^^^^^^^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1683,15 +1665,12 @@ describe('ReactFlight', () => {
 }
 constClient=clientReference(ClientImpl);
 consttransport=ReactNoopFlightServer.render(<Clientvalue={Math}/>);
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' <... value={Math}>\n'+
-' ^^^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' <... value={Math}>\n'+
+' ^^^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
@@ -1712,15 +1691,12 @@ describe('ReactFlight', () => {
 consttransport=ReactNoopFlightServer.render(
 <Clientvalue={{[Symbol.iterator]: {}}}/>,
 );
-assertConsoleErrorDev(
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-],
-{withoutStack: true},
-);
+assertConsoleErrorDev([
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
+]);
 
 ReactNoopFlightClient.read(transport);
 
@@ -1744,13 +1720,10 @@ describe('ReactFlight', () => {
 ReactNoopFlightClient.read(transport);
 
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Objects with symbol properties like Symbol.iterator are not supported.\n'+
-' <... value={{}}>\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Objects with symbol properties like Symbol.iterator are not supported.\n'+
+' <... value={{}}>\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Objects with symbol properties like Symbol.iterator are not supported.\n'+
 ' <... value={{}}>\n'+
@@ -1769,13 +1742,10 @@ describe('ReactFlight', () => {
 );
 ReactNoopFlightClient.read(transport);
 assertConsoleErrorDev([
-[
-'Only plain objects can be passed to Client Components from Server Components. '+
-'Math objects are not supported.\n'+
-' [..., Math, <h1/>]\n'+
-' ^^^^',
-{withoutStack: true},
-],
+'Only plain objects can be passed to Client Components from Server Components. '+
+'Math objects are not supported.\n'+
+' [..., Math, <h1/>]\n'+
+' ^^^^',
 'Only plain objects can be passed to Client Components from Server Components. '+
 'Math objects are not supported.\n'+
 ' [..., Math, <h1/>]\n'+