Skip to content

Commit aa9f1e7

Browse files
committed
Remove Error: prefix
These don't really make sense to add to the message string since these prefixes are typically printed when the errors are printed anyway and are part of .stack. So prefixing just leads to duplicate prefixes.
1 parent d875c0c commit aa9f1e7

File tree

5 files changed

+16
-20
lines changed

5 files changed

+16
-20
lines changed

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -799,12 +799,12 @@ describe('ReactFlight', () => {
799799
<Throw value={new TypeError('This is a real Error.')} />
800800
</div>
801801
</ClientErrorBoundary>
802-
<ClientErrorBoundary expectedMessage="Error: This is a string error.">
802+
<ClientErrorBoundary expectedMessage="This is a string error.">
803803
<div>
804804
<Throw value="This is a string error." />
805805
</div>
806806
</ClientErrorBoundary>
807-
<ClientErrorBoundary expectedMessage="Error: {message: ..., extra: ..., nested: ...}">
807+
<ClientErrorBoundary expectedMessage="{message: ..., extra: ..., nested: ...}">
808808
<div>
809809
<Throw
810810
value={{
@@ -816,9 +816,7 @@ describe('ReactFlight', () => {
816816
</div>
817817
</ClientErrorBoundary>
818818
<ClientErrorBoundary
819-
expectedMessage={
820-
'Error: {message: "Short", extra: ..., nested: ...}'
821-
}>
819+
expectedMessage={'{message: "Short", extra: ..., nested: ...}'}>
822820
<div>
823821
<Throw
824822
value={{
@@ -829,32 +827,32 @@ describe('ReactFlight', () => {
829827
/>
830828
</div>
831829
</ClientErrorBoundary>
832-
<ClientErrorBoundary expectedMessage="Error: Symbol(hello)">
830+
<ClientErrorBoundary expectedMessage="Symbol(hello)">
833831
<div>
834832
<Throw value={Symbol('hello')} />
835833
</div>
836834
</ClientErrorBoundary>
837-
<ClientErrorBoundary expectedMessage="Error: 123">
835+
<ClientErrorBoundary expectedMessage="123">
838836
<div>
839837
<Throw value={123} />
840838
</div>
841839
</ClientErrorBoundary>
842-
<ClientErrorBoundary expectedMessage="Error: undefined">
840+
<ClientErrorBoundary expectedMessage="undefined">
843841
<div>
844842
<Throw value={undefined} />
845843
</div>
846844
</ClientErrorBoundary>
847-
<ClientErrorBoundary expectedMessage="Error: <div/>">
845+
<ClientErrorBoundary expectedMessage="<div/>">
848846
<div>
849847
<Throw value={<div />} />
850848
</div>
851849
</ClientErrorBoundary>
852-
<ClientErrorBoundary expectedMessage="Error: function Foo() {}">
850+
<ClientErrorBoundary expectedMessage="function Foo() {}">
853851
<div>
854852
<Throw value={function Foo() {}} />
855853
</div>
856854
</ClientErrorBoundary>
857-
<ClientErrorBoundary expectedMessage={'Error: ["array"]'}>
855+
<ClientErrorBoundary expectedMessage={'["array"]'}>
858856
<div>
859857
<Throw value={['array']} />
860858
</div>
@@ -874,7 +872,7 @@ describe('ReactFlight', () => {
874872
} else if (typeof x === 'object' && x !== null) {
875873
return `digest({})`;
876874
}
877-
return `digest(Error: ${String(x)})`;
875+
return `digest(${String(x)})`;
878876
},
879877
});
880878

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -919,9 +919,7 @@ describe('ReactFlightDOM', () => {
919919
abort('for reasons');
920920
});
921921
if (__DEV__) {
922-
expect(container.innerHTML).toBe(
923-
'<p>Error: for reasons + a dev digest</p>',
924-
);
922+
expect(container.innerHTML).toBe('<p>for reasons + a dev digest</p>');
925923
} else {
926924
expect(container.innerHTML).toBe('<p>digest("for reasons")</p>');
927925
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ describe('ReactFlightDOMBrowser', () => {
583583
controller.abort('for reasons');
584584
});
585585
const expectedValue = __DEV__
586-
? '<p>Error: for reasons + a dev digest</p>'
586+
? '<p>for reasons + a dev digest</p>'
587587
: '<p>digest("for reasons")</p>';
588588
expect(container.innerHTML).toBe(expectedValue);
589589

packages/react-server/src/ReactFizzServer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -823,10 +823,10 @@ function encodeErrorForBoundary(
823823
// eslint-disable-next-line react-internal/safe-string-coercion
824824
message = String(error.message);
825825
} else if (typeof error === 'object' && error !== null) {
826-
message = 'Error: ' + describeObjectForErrorMessage(error);
826+
message = describeObjectForErrorMessage(error);
827827
} else {
828828
// eslint-disable-next-line react-internal/safe-string-coercion
829-
message = 'Error: ' + String(error);
829+
message = String(error);
830830
}
831831

832832
boundary.errorMessage = message;

packages/react-server/src/ReactFlightServer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1678,10 +1678,10 @@ function emitErrorChunk(
16781678
// eslint-disable-next-line react-internal/safe-string-coercion
16791679
stack = String(error.stack);
16801680
} else if (typeof error === 'object' && error !== null) {
1681-
message = 'Error: ' + describeObjectForErrorMessage(error);
1681+
message = describeObjectForErrorMessage(error);
16821682
} else {
16831683
// eslint-disable-next-line react-internal/safe-string-coercion
1684-
message = 'Error: ' + String(error);
1684+
message = String(error);
16851685
}
16861686
} catch (x) {
16871687
message = 'An error occurred but serializing the error message failed.';

0 commit comments

Comments
 (0)