Skip to content

Commit 060505e

Browse files
gnoffgnoff
authored
Fix misapplying prod error opt-out (#24688)
The eslint-disable-next-line opt out for prod error minification was not properly working. In the build a replacable error was output even though it was not failing the build. This change refactors the code to avoid the erroneous behavior but a fix for the lint may be better
1 parent 4794414 commit 060505e

2 files changed

Lines changed: 22 additions & 16 deletions

File tree

‎packages/react-reconciler/src/ReactFiberBeginWork.new.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2593,14 +2593,17 @@ function updateDehydratedSuspenseComponent(
25932593
({digest} = getSuspenseInstanceFallbackErrorDetails(suspenseInstance));
25942594
}
25952595

2596-
const error = message
2597-
? // eslint-disable-next-line react-internal/prod-error-codes
2598-
new Error(message)
2599-
: new Error(
2600-
'The server could not finish this Suspense boundary, likely ' +
2601-
'due to an error during server rendering. Switched to ' +
2602-
'client rendering.',
2603-
);
2596+
let error;
2597+
if (message) {
2598+
// eslint-disable-next-line react-internal/prod-error-codes
2599+
error = new Error(message);
2600+
} else {
2601+
error = new Error(
2602+
'The server could not finish this Suspense boundary, likely ' +
2603+
'due to an error during server rendering. Switched to ' +
2604+
'client rendering.',
2605+
);
2606+
}
26042607
const capturedValue = createCapturedValue(error, digest, stack);
26052608
return retrySuspenseComponentWithoutHydrating(
26062609
current,

‎packages/react-reconciler/src/ReactFiberBeginWork.old.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2593,14 +2593,17 @@ function updateDehydratedSuspenseComponent(
25932593
({digest} = getSuspenseInstanceFallbackErrorDetails(suspenseInstance));
25942594
}
25952595

2596-
const error = message
2597-
? // eslint-disable-next-line react-internal/prod-error-codes
2598-
new Error(message)
2599-
: new Error(
2600-
'The server could not finish this Suspense boundary, likely ' +
2601-
'due to an error during server rendering. Switched to ' +
2602-
'client rendering.',
2603-
);
2596+
let error;
2597+
if (message) {
2598+
// eslint-disable-next-line react-internal/prod-error-codes
2599+
error = new Error(message);
2600+
} else {
2601+
error = new Error(
2602+
'The server could not finish this Suspense boundary, likely ' +
2603+
'due to an error during server rendering. Switched to ' +
2604+
'client rendering.',
2605+
);
2606+
}
26042607
const capturedValue = createCapturedValue(error, digest, stack);
26052608
return retrySuspenseComponentWithoutHydrating(
26062609
current,

0 commit comments

Comments
 (0)