{"patch":"diff --git a\/packages\/react-client\/src\/ReactFlightClient.js b\/packages\/react-client\/src\/ReactFlightClient.js\nindex 7c424d45b3..288d6b7c1d 100644\n--- a\/packages\/react-client\/src\/ReactFlightClient.js\n+++ b\/packages\/react-client\/src\/ReactFlightClient.js\n@@ -45,7 +45,6 @@ import type {TemporaryReferenceSet} from '.\/ReactFlightTemporaryReferences';\n import {\n enablePostpone,\n enableOwnerStacks,\n- enableServerComponentLogs,\n enableProfilerTimer,\n enableComponentPerformanceTrack,\n } from 'shared\/ReactFeatureFlags';\n@@ -2139,34 +2138,22 @@ function resolveErrorDev(\n }\n \n let error;\n- if (!enableOwnerStacks && !enableServerComponentLogs) {\n- \/\/ Executing Error within a native stack isn't really limited to owner stacks\n- \/\/ but we gate it behind the same flag for now while iterating.\n- \/\/ eslint-disable-next-line react-internal\/prod-error-codes\n- error = Error(\n+ const callStack = buildFakeCallStack(\n+ response,\n+ stack,\n+ env,\n+ \/\/ $FlowFixMe[incompatible-use]\n+ Error.bind(\n+ null,\n message ||\n 'An error occurred in the Server Components render but no message was provided',\n- );\n- \/\/ For backwards compat we use the V8 formatting when the flag is off.\n- error.stack = formatV8Stack(error.name, error.message, stack);\n+ ),\n+ );\n+ const rootTask = getRootTask(response, env);\n+ if (rootTask != null) {\n+ error = rootTask.run(callStack);\n } else {\n- const callStack = buildFakeCallStack(\n- response,\n- stack,\n- env,\n- \/\/ $FlowFixMe[incompatible-use]\n- Error.bind(\n- null,\n- message ||\n- 'An error occurred in the Server Components render but no message was provided',\n- ),\n- );\n- const rootTask = getRootTask(response, env);\n- if (rootTask != null) {\n- error = rootTask.run(callStack);\n- } else {\n- error = callStack();\n- }\n+ error = callStack();\n }\n \n (error: any).environmentName = env;\n@@ -2699,11 +2686,6 @@ function resolveConsoleEntry(\n const env = payload[3];\n const args = payload.slice(4);\n \n- if (!enableOwnerStacks && !enableServerComponentLogs) {\n- bindToConsole(methodName, args, env)();\n- return;\n- }\n-\n replayConsoleWithCallStackInDEV(\n response,\n methodName,\ndiff --git a\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js b\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js\nindex 980dbbf0e1..e11c112614 100644\n--- a\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js\n+++ b\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js\n@@ -1377,26 +1377,14 @@ describe('ReactFlight', () => {\n errors: [\n {\n message: 'This is an error',\n- stack: gate(\n- flags =>\n- flags.enableOwnerStacks || flags.enableServerComponentLogs,\n- )\n- ? expect.stringContaining(\n- 'Error: This is an error\\n' +\n- ' at eval (eval at testFunction (inspected-page.html:29:11),%20%3Canonymous%3E:1:35)\\n' +\n- ' at ServerComponentError (file:\/\/~\/(some)(really)(exotic-directory)\/ReactFlight-test.js:1166:19)\\n' +\n- ' at (file:\/\/\/testing.js:42:3)\\n' +\n- ' at (file:\/\/\/testing.js:42:3)\\n' +\n- ' at div (',\n- )\n- : expect.stringContaining(\n- 'Error: This is an error\\n' +\n- ' at eval (eval at testFunction (inspected-page.html:29:11),%20%3Canonymous%3E:1:10)\\n' +\n- ' at ServerComponentError (file:\/\/~\/(some)(really)(exotic-directory)\/ReactFlight-test.js:1166:19)\\n' +\n- ' at file:\/\/\/testing.js:42:3\\n' +\n- ' at file:\/\/\/testing.js:42:3\\n' +\n- ' at div (',\n- ),\n+ stack: expect.stringContaining(\n+ 'Error: This is an error\\n' +\n+ ' at eval (eval at testFunction (inspected-page.html:29:11),%20%3Canonymous%3E:1:35)\\n' +\n+ ' at ServerComponentError (file:\/\/~\/(some)(really)(exotic-directory)\/ReactFlight-test.js:1166:19)\\n' +\n+ ' at (file:\/\/\/testing.js:42:3)\\n' +\n+ ' at (file:\/\/\/testing.js:42:3)\\n' +\n+ ' at div (',\n+ ),\n digest: 'a dev digest',\n environmentName: 'Server',\n },\n@@ -1415,18 +1403,16 @@ describe('ReactFlight', () => {\n ['', 'Server'],\n [__filename, 'Server'],\n ]\n- : gate(flags => flags.enableServerComponentLogs)\n- ? [\n- \/\/ TODO: What should we request here? The outer () or the inner (inspected-page.html)?\n- ['inspected-page.html:29:11), ', 'Server'],\n- [\n- 'file:\/\/~\/(some)(really)(exotic-directory)\/ReactFlight-test.js',\n- 'Server',\n- ],\n- ['file:\/\/\/testing.js', 'Server'],\n- ['', 'Server'],\n- ]\n- : [],\n+ : [\n+ \/\/ TODO: What should we request here? The outer () or the inner (inspected-page.html)?\n+ ['inspected-page.html:29:11), ', 'Server'],\n+ [\n+ 'file:\/\/~\/(some)(really)(exotic-directory)\/ReactFlight-test.js',\n+ 'Server',\n+ ],\n+ ['file:\/\/\/testing.js', 'Server'],\n+ ['', 'Server'],\n+ ],\n });\n } else {\n expect(errors.map(getErrorForJestMatcher)).toEqual([\n@@ -3312,14 +3298,7 @@ describe('ReactFlight', () => {\n .split('\\n')\n .slice(0, 4)\n .join('\\n')\n- .replaceAll(\n- ' (\/',\n- gate(\n- flags => flags.enableOwnerStacks || flags.enableServerComponentLogs,\n- )\n- ? ' (file:\/\/\/'\n- : ' (\/',\n- ); \/\/ The eval will end up normalizing these\n+ .replaceAll(' (\/', ' (file:\/\/\/'); \/\/ The eval will end up normalizing these\n \n let sawReactPrefix = false;\n const environments = [];\n@@ -3352,7 +3331,7 @@ describe('ReactFlight', () => {\n 'third-party',\n 'third-party',\n ]);\n- } else if (__DEV__ && gate(flags => flags.enableServerComponentLogs)) {\n+ } else if (__DEV__) {\n expect(environments.slice(0, 3)).toEqual([\n 'third-party',\n 'third-party',\n@@ -3412,7 +3391,7 @@ describe('ReactFlight', () => {\n expect(ReactNoop).toMatchRenderedOutput(

hi<\/div>);\n });\n \n- \/\/ @gate enableServerComponentLogs && __DEV__ && enableOwnerStacks\n+ \/\/ @gate __DEV__ && enableOwnerStacks\n it('replays logs, but not onError logs', async () => {\n function foo() {\n return 'hello';\n@@ -3493,7 +3472,7 @@ describe('ReactFlight', () => {\n expect(ownerStacks).toEqual(['\\n in App (at **)']);\n });\n \n- \/\/ @gate enableServerComponentLogs && __DEV__\n+ \/\/ @gate __DEV__\n it('replays logs with cyclic objects', async () => {\n const cyclic = {cycle: null};\n cyclic.cycle = cyclic;\n@@ -3764,7 +3743,7 @@ describe('ReactFlight', () => {\n );\n });\n \n- \/\/ @gate (enableOwnerStacks && enableServerComponentLogs) || !__DEV__\n+ \/\/ @gate (enableOwnerStacks) || !__DEV__\n it('should include only one component stack in replayed logs (if DevTools or polyfill adds them)', () => {\n class MyError extends Error {\n toJSON() {\ndiff --git a\/packages\/react-server\/src\/ReactFlightServer.js b\/packages\/react-server\/src\/ReactFlightServer.js\nindex 5a27f00617..67ae695ca0 100644\n--- a\/packages\/react-server\/src\/ReactFlightServer.js\n+++ b\/packages\/react-server\/src\/ReactFlightServer.js\n@@ -17,7 +17,6 @@ import {\n enablePostpone,\n enableHalt,\n enableTaint,\n- enableServerComponentLogs,\n enableOwnerStacks,\n enableProfilerTimer,\n enableComponentPerformanceTrack,\n@@ -234,12 +233,7 @@ function patchConsole(consoleInst: typeof console, methodName: string) {\n }\n }\n \n-if (\n- enableServerComponentLogs &&\n- __DEV__ &&\n- typeof console === 'object' &&\n- console !== null\n-) {\n+if (__DEV__ && typeof console === 'object' && console !== null) {\n \/\/ Instrument console to capture logs for replaying on the client.\n patchConsole(console, 'assert');\n patchConsole(console, 'debug');\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex f1332a2bfd..a8ab441361 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -128,8 +128,6 @@ export const alwaysThrottleRetries = true;\n \n export const passChildrenWhenCloningPersistedNodes = false;\n \n-export const enableServerComponentLogs = true;\n-\n \/**\n * Enables a new Fiber flag used in persisted mode to reduce the number\n * of cloned host components.\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\nindex ed06661eed..7fd4fd7dfe 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n@@ -66,7 +66,6 @@ export const enableRetryLaneExpiration = false;\n export const enableSchedulingProfiler = __PROFILE__;\n export const enableComponentPerformanceTrack = false;\n export const enableScopeAPI = false;\n-export const enableServerComponentLogs = true;\n export const enableSuspenseAvoidThisFallback = false;\n export const enableSuspenseCallback = true;\n export const enableTaint = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex 2220891b7b..8a74a9e9dd 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -52,7 +52,6 @@ export const enableRetryLaneExpiration = false;\n export const enableSchedulingProfiler = __PROFILE__;\n export const enableComponentPerformanceTrack = false;\n export const enableScopeAPI = false;\n-export const enableServerComponentLogs = true;\n export const enableShallowPropDiffing = false;\n export const enableSuspenseAvoidThisFallback = false;\n export const enableSuspenseCallback = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\nindex 2c5bc8f297..7156814474 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n@@ -61,7 +61,6 @@ export const passChildrenWhenCloningPersistedNodes = false;\n export const enablePersistedModeClonedFlag = false;\n export const disableClientCache = true;\n \n-export const enableServerComponentLogs = true;\n export const enableInfiniteRenderLoopDetection = false;\n \n export const renameElementSymbol = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\nindex 1c2fbb4847..1777671e4e 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n@@ -49,7 +49,6 @@ export const enableRetryLaneExpiration = false;\n export const enableSchedulingProfiler = __PROFILE__;\n export const enableComponentPerformanceTrack = false;\n export const enableScopeAPI = false;\n-export const enableServerComponentLogs = true;\n export const enableShallowPropDiffing = false;\n export const enableSuspenseAvoidThisFallback = false;\n export const enableSuspenseCallback = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex 8e96038f44..ab2dd11939 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -63,7 +63,6 @@ export const passChildrenWhenCloningPersistedNodes = false;\n export const enablePersistedModeClonedFlag = false;\n export const disableClientCache = true;\n \n-export const enableServerComponentLogs = true;\n export const enableInfiniteRenderLoopDetection = false;\n \n export const enableReactTestRendererWarning = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\nindex 658443aea1..6403d3592b 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n@@ -104,8 +104,6 @@ export const enablePersistedModeClonedFlag = false;\n export const enableAsyncDebugInfo = false;\n export const disableClientCache = true;\n \n-export const enableServerComponentLogs = true;\n-\n export const enableReactTestRendererWarning = false;\n \n export const disableLegacyMode = true;\n","parents":["3b009b4cd58d382cfde2a72232c87df1a34d56d5"],"commit":{"subject":"[flags] Remove enableServerComponentLogs (#31772)","shortRevision":"f42f8c0635","revision":"f42f8c0635775c3cb8beb5252aa777ff7d468ae5","authoredAt":"2025-01-03T12:53:19-05:00","authorName":"Ricky","authorEmail":"rickhanlonii@gmail.com"},"files":[{"path":"packages\/react-client\/src\/ReactFlightClient.js","status":"M"},{"path":"packages\/react-client\/src\/__tests__\/ReactFlight-test.js","status":"M"},{"path":"packages\/react-server\/src\/ReactFlightServer.js","status":"M"},{"path":"packages\/shared\/ReactFeatureFlags.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.native-fb.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.native-oss.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.www.js","status":"M"}],"body":"This has landed everywhere."}

dillon1000/react

Files changed