Skip to content

Commit b5efd8d

Browse files
committed
Remove experimental.reactOwnerStack
1 parent fdac31b commit b5efd8d

File tree

27 files changed

+173
-913
lines changed

27 files changed

+173
-913
lines changed

packages/next/src/build/webpack/plugins/define-env-plugin.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,6 @@ export function getDefineEnv({
293293
: undefined),
294294
'process.env.__NEXT_EXPERIMENTAL_NEW_DEV_OVERLAY':
295295
config.experimental.newDevOverlay || false,
296-
'process.env.__NEXT_REACT_OWNER_STACK':
297-
config.experimental.reactOwnerStack ?? false,
298296
}
299297

300298
const userDefines = config.compiler?.define ?? {}

packages/next/src/client/components/errors/stitched-error.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ const REACT_ERROR_STACK_BOTTOM_FRAME_REGEX = new RegExp(
88
)
99

1010
export function getReactStitchedError<T = unknown>(err: T): Error | T {
11-
if (!process.env.__NEXT_REACT_OWNER_STACK) {
12-
return err
13-
}
1411
const isErrorInstance = isError(err)
1512
const originStack = isErrorInstance ? err.stack || '' : ''
1613
const originMessage = isErrorInstance ? err.message : ''
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import type { NextConfig } from '../server/config-shared'
22

33
export function needsExperimentalReact(config: NextConfig) {
4-
const { ppr, taint, reactOwnerStack, viewTransition } =
5-
config.experimental || {}
6-
return Boolean(ppr || taint || reactOwnerStack || viewTransition)
4+
const { ppr, taint, viewTransition } = config.experimental || {}
5+
return Boolean(ppr || taint || viewTransition)
76
}

packages/next/src/server/config-schema.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() =>
333333
.readonly()
334334
.optional(),
335335
taint: z.boolean().optional(),
336-
reactOwnerStack: z.boolean().optional(),
337336
prerenderEarlyExit: z.boolean().optional(),
338337
proxyTimeout: z.number().gte(0).optional(),
339338
scrollRestoration: z.boolean().optional(),

packages/next/src/server/config-shared.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -472,12 +472,6 @@ export interface ExperimentalConfig {
472472
*/
473473
taint?: boolean
474474

475-
/**
476-
* Enables leveraging experimental captureOwnerStack API in React,
477-
* to create a better stack trace for React errors.
478-
*/
479-
reactOwnerStack?: boolean
480-
481475
serverActions?: {
482476
/**
483477
* Allows adjusting body parser size limit for server actions.
@@ -1235,7 +1229,6 @@ export const defaultConfig: NextConfig = {
12351229
process.env.__NEXT_EXPERIMENTAL_PPR === 'true'
12361230
),
12371231
authInterrupts: false,
1238-
reactOwnerStack: false,
12391232
webpackBuildWorker: undefined,
12401233
webpackMemoryOptimizations: false,
12411234
optimizeServerReact: true,

packages/next/src/server/config.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -921,14 +921,9 @@ function assignDefaults(
921921
}
922922

923923
// TODO(jiwon): remove once we've made new UI default
924-
// Enable reactOwnerStack when newDevOverlay is enabled to have
925-
// better call stack output in the new UI.
926924
if (process.env.__NEXT_EXPERIMENTAL_NEW_DEV_OVERLAY === 'false') {
927925
result.experimental.newDevOverlay = false
928926
}
929-
if (result.experimental.newDevOverlay) {
930-
result.experimental.reactOwnerStack = true
931-
}
932927

933928
result.experimental.optimizePackageImports = [
934929
...new Set([

test/development/acceptance-app/hydration-error.test.ts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ import path from 'path'
55
import { outdent } from 'outdent'
66
import { getRedboxTotalErrorCount, retry } from 'next-test-utils'
77

8-
// https://github.com/facebook/react/blob/main/packages/react-dom/src/__tests__/ReactDOMHydrationDiff-test.js used as a reference
9-
10-
const enableOwnerStacks =
11-
process.env.__NEXT_EXPERIMENTAL_NEW_DEV_OVERLAY === 'true' ||
12-
process.env.__NEXT_EXPERIMENTAL_PPR === 'true'
13-
148
describe('Error overlay for hydration errors in App router', () => {
159
const { next, isTurbopack } = nextTestSetup({
1610
files: new FileRef(path.join(__dirname, 'fixtures', 'default-template')),
@@ -800,10 +794,7 @@ describe('Error overlay for hydration errors in App router', () => {
800794
await session.openRedbox()
801795

802796
await retry(async () => {
803-
expect(await getRedboxTotalErrorCount(browser)).toBe(
804-
// With owner stacks, we also get an error for the parent context
805-
enableOwnerStacks ? 3 : 2
806-
)
797+
expect(await getRedboxTotalErrorCount(browser)).toBe(3)
807798
})
808799

809800
const description = await session.getRedboxDescription()
@@ -874,10 +865,7 @@ describe('Error overlay for hydration errors in App router', () => {
874865
await retry(async () => {
875866
expect(await getRedboxTotalErrorCount(browser)).toBe(
876867
// One error for "Cannot render a sync or defer <script>"
877-
enableOwnerStacks
878-
? // With owner stacks, we also get an error for the parent context.
879-
3
880-
: 2
868+
3
881869
)
882870
})
883871

test/development/app-dir/capture-console-error-owner-stack/app/browser/event/page.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

test/development/app-dir/capture-console-error-owner-stack/app/browser/render-loop/page.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

test/development/app-dir/capture-console-error-owner-stack/app/browser/render/page.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)