\n- \n- <\/div>,\n- {\n- signal: controller.signal,\n- onError(x) {\n- errors.push(x.message);\n- },\n- },\n- ),\n- );\n-\n- await jest.runAllTimers();\n-\n- const theReason = new Error('aborted for reasons');\n- controller.abort(theReason);\n-\n- let caughtError = null;\n- try {\n- await promise;\n- } catch (error) {\n- caughtError = error;\n- }\n- expect(caughtError).toBe(theReason);\n- expect(errors).toEqual(['aborted for reasons']);\n- });\n-\n- \/\/ @gate enableHalt\n it('should resolve an empty prelude if aborting before the shell is complete', async () => {\n const errors = [];\n const controller = new AbortController();\n@@ -403,59 +369,12 @@ describe('ReactDOMFizzStaticBrowser', () => {\n ),\n );\n \n- if (gate(flags => flags.enableHalt)) {\n- const {prelude} = await streamPromise;\n- const content = await readContent(prelude);\n- expect(errors).toEqual(['This operation was aborted']);\n- expect(content).toBe('');\n- } else {\n- let caughtError = null;\n- try {\n- await streamPromise;\n- } catch (error) {\n- caughtError = error;\n- }\n- expect(caughtError.message).toBe('This operation was aborted');\n- expect(errors).toEqual(['This operation was aborted']);\n- }\n- });\n-\n- \/\/ @gate !enableHalt\n- it('should reject if passing an already aborted signal and enableHalt is disabled', async () => {\n- const errors = [];\n- const controller = new AbortController();\n- const theReason = new Error('aborted for reasons');\n- controller.abort(theReason);\n-\n- const promise = serverAct(() =>\n- ReactDOMFizzStatic.prerender(\n-

\n- Loading<\/div>}>\n- \n- <\/Suspense>\n- <\/div>,\n- {\n- signal: controller.signal,\n- onError(x) {\n- errors.push(x.message);\n- },\n- },\n- ),\n- );\n-\n- \/\/ Technically we could still continue rendering the shell but currently the\n- \/\/ semantics mean that we also abort any pending CPU work.\n- let caughtError = null;\n- try {\n- await promise;\n- } catch (error) {\n- caughtError = error;\n- }\n- expect(caughtError).toBe(theReason);\n- expect(errors).toEqual(['aborted for reasons']);\n+ const {prelude} = await streamPromise;\n+ const content = await readContent(prelude);\n+ expect(errors).toEqual(['This operation was aborted']);\n+ expect(content).toBe('');\n });\n \n- \/\/ @gate enableHalt\n it('should resolve an empty prelude if passing an already aborted signal', async () => {\n const errors = [];\n const controller = new AbortController();\n@@ -593,16 +512,13 @@ describe('ReactDOMFizzStaticBrowser', () => {\n onError,\n }),\n );\n- expect(prerendered.postponed).toBe(\n- gate(flags => flags.enableHalt) ? null : undefined,\n- );\n+ expect(prerendered.postponed).toBe(null);\n expect(errors).toEqual(['bad onHeaders']);\n \n await readIntoContainer(prerendered.prelude);\n expect(getVisibleChildren(container)).toEqual(

hello<\/div>);\n });\n \n- \/\/ @gate enableHalt\n it('can resume render of a prerender', async () => {\n const errors = [];\n \n@@ -689,7 +605,6 @@ describe('ReactDOMFizzStaticBrowser', () => {\n expect(getVisibleChildren(container)).toEqual(

Hello<\/div>);\n });\n \n- \/\/ @gate enableHalt\n it('can prerender a preamble', async () => {\n const errors = [];\n \n@@ -850,7 +765,6 @@ describe('ReactDOMFizzStaticBrowser', () => {\n expect(errors).toEqual(['boom']);\n });\n \n- \/\/ @gate enableHalt\n it('will render fallback Document when erroring a boundary above the body', async () => {\n let isPrerendering = true;\n const promise = new Promise(() => {});\n@@ -927,7 +841,6 @@ describe('ReactDOMFizzStaticBrowser', () => {\n );\n });\n \n- \/\/ @gate enableHalt\n it('can omit a preamble with an empty shell if no preamble is ready when prerendering finishes', async () => {\n const errors = [];\n \n@@ -1027,7 +940,7 @@ describe('ReactDOMFizzStaticBrowser', () => {\n );\n });\n \n- \/\/ @gate enableHalt && enableSuspenseList\n+ \/\/ @gate enableSuspenseList\n it('can resume a partially prerendered SuspenseList', async () => {\n const errors = [];\n \n@@ -1112,7 +1025,7 @@ describe('ReactDOMFizzStaticBrowser', () => {\n );\n });\n \n- \/\/ @gate enableHalt && enableOptimisticKey\n+ \/\/ @gate enableOptimisticKey\n it('can resume an optimistic keyed slot', async () => {\n const errors = [];\n \ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzStaticNode-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzStaticNode-test.js\nindex cf98658f93..83bc6cb5d3 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzStaticNode-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzStaticNode-test.js\n@@ -56,7 +56,6 @@ describe('ReactDOMFizzStaticNode', () => {\n }\n }\n \n- \/\/ @gate enableHalt\n it('should call prerenderToNodeStream', async () => {\n const result = await ReactDOMFizzStatic.prerenderToNodeStream(\n

hello world<\/div>,\n@@ -65,14 +64,12 @@ describe('ReactDOMFizzStaticNode', () => {\n expect(prelude).toMatchInlineSnapshot(`\"

hello world<\/div>\"`);\n });\n \n- \/\/ @gate enableHalt\n it('should suppport web streams', async () => {\n const result = await ReactDOMFizzStatic.prerender(

hello world<\/div>);\n const prelude = await readContentWeb(result.prelude);\n expect(prelude).toMatchInlineSnapshot(`\"

hello world<\/div>\"`);\n });\n \n- \/\/ @gate enableHalt\n it('should emit DOCTYPE at the root of the document', async () => {\n const result = await ReactDOMFizzStatic.prerenderToNodeStream(\n \n@@ -91,7 +88,6 @@ describe('ReactDOMFizzStaticNode', () => {\n }\n });\n \n- \/\/ @gate enableHalt\n it('should emit bootstrap script src at the end', async () => {\n const result = await ReactDOMFizzStatic.prerenderToNodeStream(\n

hello world<\/div>,\n@@ -107,7 +103,6 @@ describe('ReactDOMFizzStaticNode', () => {\n );\n });\n \n- \/\/ @gate enableHalt\n it('emits all HTML as one unit', async () => {\n let hasLoaded = false;\n let resolve;\n@@ -137,7 +132,6 @@ describe('ReactDOMFizzStaticNode', () => {\n expect(prelude).toMatchInlineSnapshot(`\"

Done<\/div>\"`);\n });\n \n- \/\/ @gate enableHalt\n it('should reject the promise when an error is thrown at the root', async () => {\n const reportedErrors = [];\n let caughtError = null;\n@@ -159,7 +153,6 @@ describe('ReactDOMFizzStaticNode', () => {\n expect(reportedErrors).toEqual([theError]);\n });\n \n- \/\/ @gate enableHalt\n it('should reject the promise when an error is thrown inside a fallback', async () => {\n const reportedErrors = [];\n let caughtError = null;\n@@ -183,7 +176,6 @@ describe('ReactDOMFizzStaticNode', () => {\n expect(reportedErrors).toEqual([theError]);\n });\n \n- \/\/ @gate enableHalt\n it('should not error the stream when an error is thrown inside suspense boundary', async () => {\n const reportedErrors = [];\n const result = await ReactDOMFizzStatic.prerenderToNodeStream(\n@@ -204,7 +196,6 @@ describe('ReactDOMFizzStaticNode', () => {\n expect(reportedErrors).toEqual([theError]);\n });\n \n- \/\/ @gate enableHalt\n it('should be able to complete by aborting even if the promise never resolves', async () => {\n const errors = [];\n const controller = new AbortController();\n@@ -234,39 +225,6 @@ describe('ReactDOMFizzStaticNode', () => {\n expect(errors).toEqual(['This operation was aborted']);\n });\n \n- \/\/ @gate enableHalt\n- \/\/ @gate !enableHalt\n- it('should reject if aborting before the shell is complete and enableHalt is disabled', async () => {\n- const errors = [];\n- const controller = new AbortController();\n- const promise = ReactDOMFizzStatic.prerenderToNodeStream(\n-

\n- \n- <\/div>,\n- {\n- signal: controller.signal,\n- onError(x) {\n- errors.push(x.message);\n- },\n- },\n- );\n-\n- await jest.runAllTimers();\n-\n- const theReason = new Error('aborted for reasons');\n- controller.abort(theReason);\n-\n- let caughtError = null;\n- try {\n- await promise;\n- } catch (error) {\n- caughtError = error;\n- }\n- expect(caughtError).toBe(theReason);\n- expect(errors).toEqual(['aborted for reasons']);\n- });\n-\n- \/\/ @gate enableHalt\n it('should resolve an empty shell if aborting before the shell is complete', async () => {\n const errors = [];\n const controller = new AbortController();\n@@ -300,7 +258,6 @@ describe('ReactDOMFizzStaticNode', () => {\n expect(content).toBe('');\n });\n \n- \/\/ @gate enableHalt\n it('should be able to abort before something suspends', async () => {\n const errors = [];\n const controller = new AbortController();\n@@ -324,58 +281,12 @@ describe('ReactDOMFizzStaticNode', () => {\n },\n );\n \n- if (gate(flags => flags.enableHalt)) {\n- const {prelude} = await streamPromise;\n- const content = await readContent(prelude);\n- expect(errors).toEqual(['This operation was aborted']);\n- expect(content).toBe('');\n- } else {\n- let caughtError = null;\n- try {\n- await streamPromise;\n- } catch (error) {\n- caughtError = error;\n- }\n- expect(caughtError.message).toBe('This operation was aborted');\n- expect(errors).toEqual(['This operation was aborted']);\n- }\n- });\n-\n- \/\/ @gate enableHalt\n- \/\/ @gate !enableHalt\n- it('should reject if passing an already aborted signal and enableHalt is disabled', async () => {\n- const errors = [];\n- const controller = new AbortController();\n- const theReason = new Error('aborted for reasons');\n- controller.abort(theReason);\n-\n- const promise = ReactDOMFizzStatic.prerenderToNodeStream(\n-

\n- Loading<\/div>}>\n- \n- <\/Suspense>\n- <\/div>,\n- {\n- signal: controller.signal,\n- onError(x) {\n- errors.push(x.message);\n- },\n- },\n- );\n-\n- \/\/ Technically we could still continue rendering the shell but currently the\n- \/\/ semantics mean that we also abort any pending CPU work.\n- let caughtError = null;\n- try {\n- await promise;\n- } catch (error) {\n- caughtError = error;\n- }\n- expect(caughtError).toBe(theReason);\n- expect(errors).toEqual(['aborted for reasons']);\n+ const {prelude} = await streamPromise;\n+ const content = await readContent(prelude);\n+ expect(errors).toEqual(['This operation was aborted']);\n+ expect(content).toBe('');\n });\n \n- \/\/ @gate enableHalt\n it('should resolve with an empty prelude if passing an already aborted signal', async () => {\n const errors = [];\n const controller = new AbortController();\n@@ -412,7 +323,6 @@ describe('ReactDOMFizzStaticNode', () => {\n expect(content).toBe('');\n });\n \n- \/\/ @gate enableHalt\n it('supports custom abort reasons with a string', async () => {\n const promise = new Promise(r => {});\n function Wait() {\n@@ -454,7 +364,6 @@ describe('ReactDOMFizzStaticNode', () => {\n expect(errors).toEqual(['foobar', 'foobar']);\n });\n \n- \/\/ @gate enableHalt\n it('supports custom abort reasons with an Error', async () => {\n const promise = new Promise(r => {});\n function Wait() {\ndiff --git a\/packages\/react-dom\/src\/server\/ReactDOMFizzStaticBrowser.js b\/packages\/react-dom\/src\/server\/ReactDOMFizzStaticBrowser.js\nindex ba0e24c187..c1024ea3f4 100644\n--- a\/packages\/react-dom\/src\/server\/ReactDOMFizzStaticBrowser.js\n+++ b\/packages\/react-dom\/src\/server\/ReactDOMFizzStaticBrowser.js\n@@ -34,8 +34,6 @@ import {\n createRootFormatContext,\n } from 'react-dom-bindings\/src\/server\/ReactFizzConfigDOM';\n \n-import {enableHalt} from 'shared\/ReactFeatureFlags';\n-\n import {ensureCorrectIsomorphicReactVersion} from '..\/shared\/ensureCorrectIsomorphicReactVersion';\n ensureCorrectIsomorphicReactVersion();\n \n@@ -89,14 +87,10 @@ function prerender(\n {highWaterMark: 0},\n );\n \n- const result: StaticResult = enableHalt\n- ? {\n- postponed: getPostponedState(request),\n- prelude: stream,\n- }\n- : ({\n- prelude: stream,\n- }: any);\n+ const result: StaticResult = {\n+ postponed: getPostponedState(request),\n+ prelude: stream,\n+ };\n resolve(result);\n }\n \ndiff --git a\/packages\/react-dom\/src\/server\/ReactDOMFizzStaticEdge.js b\/packages\/react-dom\/src\/server\/ReactDOMFizzStaticEdge.js\nindex 785a8b2f2a..002c4c51b4 100644\n--- a\/packages\/react-dom\/src\/server\/ReactDOMFizzStaticEdge.js\n+++ b\/packages\/react-dom\/src\/server\/ReactDOMFizzStaticEdge.js\n@@ -34,8 +34,6 @@ import {\n createRootFormatContext,\n } from 'react-dom-bindings\/src\/server\/ReactFizzConfigDOM';\n \n-import {enableHalt} from 'shared\/ReactFeatureFlags';\n-\n import {ensureCorrectIsomorphicReactVersion} from '..\/shared\/ensureCorrectIsomorphicReactVersion';\n ensureCorrectIsomorphicReactVersion();\n \n@@ -89,14 +87,10 @@ function prerender(\n {highWaterMark: 0},\n );\n \n- const result: StaticResult = enableHalt\n- ? {\n- postponed: getPostponedState(request),\n- prelude: stream,\n- }\n- : ({\n- prelude: stream,\n- }: any);\n+ const result: StaticResult = {\n+ postponed: getPostponedState(request),\n+ prelude: stream,\n+ };\n resolve(result);\n }\n \ndiff --git a\/packages\/react-dom\/src\/server\/ReactDOMFizzStaticNode.js b\/packages\/react-dom\/src\/server\/ReactDOMFizzStaticNode.js\nindex 60c602cc2a..73abcadeb7 100644\n--- a\/packages\/react-dom\/src\/server\/ReactDOMFizzStaticNode.js\n+++ b\/packages\/react-dom\/src\/server\/ReactDOMFizzStaticNode.js\n@@ -36,8 +36,6 @@ import {\n createRootFormatContext,\n } from 'react-dom-bindings\/src\/server\/ReactFizzConfigDOM';\n \n-import {enableHalt} from 'shared\/ReactFeatureFlags';\n-\n import {textEncoder} from 'react-server\/src\/ReactServerStreamConfigNode';\n \n import {ensureCorrectIsomorphicReactVersion} from '..\/shared\/ensureCorrectIsomorphicReactVersion';\n@@ -130,14 +128,10 @@ function prerenderToNodeStream(\n });\n const writable = createFakeWritableFromReadable(readable);\n \n- const result: StaticResult = enableHalt\n- ? {\n- postponed: getPostponedState(request),\n- prelude: readable,\n- }\n- : ({\n- prelude: readable,\n- }: any);\n+ const result: StaticResult = {\n+ postponed: getPostponedState(request),\n+ prelude: readable,\n+ };\n resolve(result);\n }\n const resumableState = createResumableState(\n@@ -215,14 +209,10 @@ function prerender(\n {highWaterMark: 0},\n );\n \n- const result = enableHalt\n- ? {\n- postponed: getPostponedState(request),\n- prelude: stream,\n- }\n- : ({\n- prelude: stream,\n- }: any);\n+ const result = {\n+ postponed: getPostponedState(request),\n+ prelude: stream,\n+ };\n resolve(result);\n }\n \ndiff --git a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOM-test.js b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOM-test.js\nindex 7070f39cea..94a5ac9454 100644\n--- a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOM-test.js\n+++ b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOM-test.js\n@@ -2878,7 +2878,6 @@ describe('ReactFlightDOM', () => {\n );\n });\n \n- \/\/ @gate enableHalt\n it('can prerender', async () => {\n let resolveGreeting;\n const greetingPromise = new Promise(resolve => {\n@@ -2940,7 +2939,6 @@ describe('ReactFlightDOM', () => {\n expect(getMeaningfulChildren(container)).toEqual(

hello world<\/div>);\n });\n \n- \/\/ @gate enableHalt\n it('does not propagate abort reasons errors when aborting a prerender', async () => {\n let resolveGreeting;\n const greetingPromise = new Promise(resolve => {\n@@ -3023,8 +3021,6 @@ describe('ReactFlightDOM', () => {\n expect(getMeaningfulChildren(container)).toEqual(

loading...<\/div>);\n });\n \n- \/\/ This could be a bug. Discovered while making enableAsyncDebugInfo dynamic for www.\n- \/\/ @gate enableHalt || (enableAsyncDebugInfo && __DEV__)\n it('will leave async iterables in an incomplete state when halting', async () => {\n let resolve;\n const wait = new Promise(r => (resolve = r));\n@@ -3083,7 +3079,6 @@ describe('ReactFlightDOM', () => {\n expect(await race).toBe('timeout');\n });\n \n- \/\/ @gate enableHalt\n it('will halt unfinished chunks inside Suspense when aborting a prerender', async () => {\n const controller = new AbortController();\n function ComponentThatAborts() {\ndiff --git a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMBrowser-test.js b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMBrowser-test.js\nindex 412ec0c9ca..1399effbc1 100644\n--- a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMBrowser-test.js\n+++ b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMBrowser-test.js\n@@ -2389,7 +2389,6 @@ describe('ReactFlightDOMBrowser', () => {\n expect(errors).toEqual([reason]);\n });\n \n- \/\/ @gate enableHalt\n it('can prerender', async () => {\n let resolveGreeting;\n const greetingPromise = new Promise(resolve => {\n@@ -2438,7 +2437,6 @@ describe('ReactFlightDOMBrowser', () => {\n expect(container.innerHTML).toBe('

hello world<\/div>');\n });\n \n- \/\/ @gate enableHalt\n it('does not propagate abort reasons errors when aborting a prerender', async () => {\n let resolveGreeting;\n const greetingPromise = new Promise(resolve => {\n@@ -675,7 +673,6 @@ describe('ReactFlightDOMNode', () => {\n expect(result).toContain('loading...');\n });\n \n- \/\/ @gate enableHalt\n it('includes source locations in component and owner stacks for halted components', async () => {\n async function Component() {\n await new Promise(() => {});\n@@ -810,7 +807,6 @@ describe('ReactFlightDOMNode', () => {\n }\n });\n \n- \/\/ @gate enableHalt\n it('includes source locations in component and owner stacks for halted Client components', async () => {\n function SharedComponent({p1, p2, p3}) {\n use(p1);\n@@ -959,17 +955,16 @@ describe('ReactFlightDOMNode', () => {\n \/\/ The concrete location may change as this test is updated.\n \/\/ Just make sure they still point at React.use(p2)\n (gate(flags => flags.enableAsyncDebugInfo)\n- ? '\\n at SharedComponent (.\/ReactFlightDOMNode-test.js:817:7)'\n+ ? '\\n at SharedComponent (.\/ReactFlightDOMNode-test.js:813:7)'\n : '') +\n- '\\n at ServerComponent (file:\/\/.\/ReactFlightDOMNode-test.js:839:26)' +\n- '\\n at App (file:\/\/.\/ReactFlightDOMNode-test.js:856:25)',\n+ '\\n at ServerComponent (file:\/\/.\/ReactFlightDOMNode-test.js:835:26)' +\n+ '\\n at App (file:\/\/.\/ReactFlightDOMNode-test.js:852:25)',\n );\n } else {\n expect(ownerStack).toBeNull();\n }\n });\n \n- \/\/ @gate enableHalt\n it('includes deeper location for aborted stacks', async () => {\n async function getData() {\n const signal = ReactServer.cacheSignal();\n@@ -1127,8 +1122,6 @@ describe('ReactFlightDOMNode', () => {\n }\n });\n \n- \/\/ @gate enableHalt\n- \/\/ @gate enableHalt\n it('can handle an empty prelude when prerendering', async () => {\n function App() {\n return null;\n@@ -1549,12 +1542,12 @@ describe('ReactFlightDOMNode', () => {\n '\\n' +\n ' in Dynamic' +\n (gate(flags => flags.enableAsyncDebugInfo)\n- ? ' (file:\/\/ReactFlightDOMNode-test.js:1423:27)\\n'\n+ ? ' (file:\/\/ReactFlightDOMNode-test.js:1416:27)\\n'\n : '\\n') +\n ' in body\\n' +\n ' in html\\n' +\n- ' in App (file:\/\/ReactFlightDOMNode-test.js:1436:25)\\n' +\n- ' in ClientRoot (ReactFlightDOMNode-test.js:1511:16)',\n+ ' in App (file:\/\/ReactFlightDOMNode-test.js:1429:25)\\n' +\n+ ' in ClientRoot (ReactFlightDOMNode-test.js:1504:16)',\n );\n } else {\n expect(\n@@ -1563,7 +1556,7 @@ describe('ReactFlightDOMNode', () => {\n '\\n' +\n ' in body\\n' +\n ' in html\\n' +\n- ' in ClientRoot (ReactFlightDOMNode-test.js:1511:16)',\n+ ' in ClientRoot (ReactFlightDOMNode-test.js:1504:16)',\n );\n }\n \n@@ -1573,8 +1566,8 @@ describe('ReactFlightDOMNode', () => {\n normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),\n ).toBe(\n '\\n' +\n- ' in Dynamic (file:\/\/ReactFlightDOMNode-test.js:1423:27)\\n' +\n- ' in App (file:\/\/ReactFlightDOMNode-test.js:1436:25)',\n+ ' in Dynamic (file:\/\/ReactFlightDOMNode-test.js:1416:27)\\n' +\n+ ' in App (file:\/\/ReactFlightDOMNode-test.js:1429:25)',\n );\n } else {\n expect(\n@@ -1582,7 +1575,7 @@ describe('ReactFlightDOMNode', () => {\n ).toBe(\n '' +\n '\\n' +\n- ' in App (file:\/\/ReactFlightDOMNode-test.js:1436:25)',\n+ ' in App (file:\/\/ReactFlightDOMNode-test.js:1429:25)',\n );\n }\n } else {\ndiff --git a\/packages\/react-server\/src\/ReactFizzServer.js b\/packages\/react-server\/src\/ReactFizzServer.js\nindex 920e368674..d06d967b1f 100644\n--- a\/packages\/react-server\/src\/ReactFizzServer.js\n+++ b\/packages\/react-server\/src\/ReactFizzServer.js\n@@ -178,7 +178,6 @@ import {\n disableLegacyContext,\n disableLegacyContextForFunctionComponents,\n enableScopeAPI,\n- enableHalt,\n enableAsyncIterableChildren,\n enableViewTransition,\n enableFizzBlockingRender,\n@@ -4643,11 +4642,7 @@ function abortTask(task: Task, request: Request, error: mixed): void {\n if (replay === null) {\n \/\/ We didn't complete the root so we have nothing to show. We can close\n \/\/ the request;\n- if (\n- enableHalt &&\n- request.trackedPostpones !== null &&\n- segment !== null\n- ) {\n+ if (request.trackedPostpones !== null && segment !== null) {\n const trackedPostpones = request.trackedPostpones;\n \/\/ We are aborting a prerender and must treat the shell as halted\n \/\/ We log the error but we still resolve the prerender\n@@ -4693,20 +4688,18 @@ function abortTask(task: Task, request: Request, error: mixed): void {\n \/\/ boundary the message is referring to\n const trackedPostpones = request.trackedPostpones;\n if (boundary.status !== CLIENT_RENDERED) {\n- if (enableHalt) {\n- if (trackedPostpones !== null && segment !== null) {\n- \/\/ We are aborting a prerender and must halt this boundary.\n- \/\/ We treat this like other postpones during prerendering\n- logRecoverableError(request, error, errorInfo, task.debugTask);\n- trackPostpone(request, trackedPostpones, task, segment);\n- \/\/ If this boundary was still pending then we haven't already cancelled its fallbacks.\n- \/\/ We'll need to abort the fallbacks, which will also error that parent boundary.\n- boundary.fallbackAbortableTasks.forEach(fallbackTask =>\n- abortTask(fallbackTask, request, error),\n- );\n- boundary.fallbackAbortableTasks.clear();\n- return finishedTask(request, boundary, task.row, segment);\n- }\n+ if (trackedPostpones !== null && segment !== null) {\n+ \/\/ We are aborting a prerender and must halt this boundary.\n+ \/\/ We treat this like other postpones during prerendering\n+ logRecoverableError(request, error, errorInfo, task.debugTask);\n+ trackPostpone(request, trackedPostpones, task, segment);\n+ \/\/ If this boundary was still pending then we haven't already cancelled its fallbacks.\n+ \/\/ We'll need to abort the fallbacks, which will also error that parent boundary.\n+ boundary.fallbackAbortableTasks.forEach(fallbackTask =>\n+ abortTask(fallbackTask, request, error),\n+ );\n+ boundary.fallbackAbortableTasks.clear();\n+ return finishedTask(request, boundary, task.row, segment);\n }\n boundary.status = CLIENT_RENDERED;\n \/\/ We are aborting a render or resume which should put boundaries\n@@ -5110,11 +5103,7 @@ function retryRenderTask(\n ? request.fatalError\n : thrownValue;\n \n- if (\n- enableHalt &&\n- request.status === ABORTING &&\n- request.trackedPostpones !== null\n- ) {\n+ if (request.status === ABORTING && request.trackedPostpones !== null) {\n \/\/ We are aborting a prerender and need to halt this task.\n const trackedPostpones = request.trackedPostpones;\n const thrownInfo = getThrownInfo(task.componentStack);\ndiff --git a\/packages\/react-server\/src\/ReactFlightServer.js b\/packages\/react-server\/src\/ReactFlightServer.js\nindex 80d5f3e5c0..3bafdcf40b 100644\n--- a\/packages\/react-server\/src\/ReactFlightServer.js\n+++ b\/packages\/react-server\/src\/ReactFlightServer.js\n@@ -12,7 +12,6 @@ import type {Chunk, BinaryChunk, Destination} from '.\/ReactServerStreamConfig';\n import type {TemporaryReferenceSet} from '.\/ReactFlightServerTemporaryReferences';\n \n import {\n- enableHalt,\n enableTaint,\n enableProfilerTimer,\n enableComponentPerformanceTrack,\n@@ -1083,7 +1082,7 @@ function serializeThenable(\n if (request.status === ABORTING) {\n \/\/ We can no longer accept any resolved values\n request.abortableTasks.delete(newTask);\n- if (enableHalt && request.type === PRERENDER) {\n+ if (request.type === PRERENDER) {\n haltTask(newTask, request);\n finishHaltedTask(newTask, request);\n } else {\n@@ -1245,7 +1244,7 @@ function serializeReadableStream(\n const signal = request.cacheController.signal;\n signal.removeEventListener('abort', abortStream);\n const reason = signal.reason;\n- if (enableHalt && request.type === PRERENDER) {\n+ if (request.type === PRERENDER) {\n request.abortableTasks.delete(streamTask);\n haltTask(streamTask, request);\n finishHaltedTask(streamTask, request);\n@@ -1379,7 +1378,7 @@ function serializeAsyncIterable(\n const signal = request.cacheController.signal;\n signal.removeEventListener('abort', abortIterable);\n const reason = signal.reason;\n- if (enableHalt && request.type === PRERENDER) {\n+ if (request.type === PRERENDER) {\n request.abortableTasks.delete(streamTask);\n haltTask(streamTask, request);\n finishHaltedTask(streamTask, request);\n@@ -3322,7 +3321,7 @@ function serializeBlob(request: Request, blob: Blob): string {\n const signal = request.cacheController.signal;\n signal.removeEventListener('abort', abortBlob);\n const reason = signal.reason;\n- if (enableHalt && request.type === PRERENDER) {\n+ if (request.type === PRERENDER) {\n request.abortableTasks.delete(newTask);\n haltTask(newTask, request);\n finishHaltedTask(newTask, request);\n@@ -3383,7 +3382,7 @@ function renderModel(\n \n if (request.status === ABORTING) {\n task.status = ABORTED;\n- if (enableHalt && request.type === PRERENDER) {\n+ if (request.type === PRERENDER) {\n \/\/ This will create a new task and refer to it in this slot\n \/\/ the new task won't be retried because we are aborting\n return outlineHaltedTask(request, task, wasReactNode);\n@@ -5814,7 +5813,7 @@ function retryTask(request: Request, task: Task): void {\n if (request.status === ABORTING) {\n request.abortableTasks.delete(task);\n task.status = PENDING;\n- if (enableHalt && request.type === PRERENDER) {\n+ if (request.type === PRERENDER) {\n \/\/ When aborting a prerener with halt semantics we don't emit\n \/\/ anything into the slot for a task that aborts, it remains unresolved\n haltTask(task, request);\n@@ -6251,7 +6250,7 @@ export function abort(request: Request, reason: mixed): void {\n request.cacheController.abort(reason);\n const abortableTasks = request.abortableTasks;\n if (abortableTasks.size > 0) {\n- if (enableHalt && request.type === PRERENDER) {\n+ if (request.type === PRERENDER) {\n \/\/ When prerendering with halt semantics we simply halt the task\n \/\/ and leave the reference unfulfilled.\n abortableTasks.forEach(task => haltTask(task, request));\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 282b0ac8ec..be13ab9e5d 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -78,8 +78,6 @@ export const enableAsyncIterableChildren = __EXPERIMENTAL__;\n \n export const enableTaint = __EXPERIMENTAL__;\n \n-export const enableHalt: boolean = true;\n-\n export const enableViewTransition: boolean = true;\n \n export const enableGestureTransition = __EXPERIMENTAL__;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\nindex eeabe40d33..a587e42570 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n@@ -46,7 +46,6 @@ export const enableCPUSuspense: boolean = true;\n export const enableCreateEventHandleAPI: boolean = false;\n export const enableMoveBefore: boolean = true;\n export const enableFizzExternalRuntime: boolean = true;\n-export const enableHalt: boolean = true;\n export const enableInfiniteRenderLoopDetection: boolean = false;\n export const enableLegacyCache: boolean = false;\n export const enableLegacyFBSupport: boolean = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex 415b479b7c..72904e251c 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -30,7 +30,6 @@ export const enableCPUSuspense: boolean = false;\n export const enableCreateEventHandleAPI: boolean = false;\n export const enableMoveBefore: boolean = true;\n export const enableFizzExternalRuntime: boolean = true;\n-export const enableHalt: boolean = true;\n export const enableHiddenSubtreeInsertionEffectCleanup: boolean = false;\n export const enableInfiniteRenderLoopDetection: boolean = false;\n export const enableLegacyCache: boolean = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\nindex 5c1ece8108..afa71d5754 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n@@ -21,7 +21,6 @@ export const enableUpdaterTracking: boolean = false;\n export const enableLegacyCache: boolean = __EXPERIMENTAL__;\n export const enableAsyncIterableChildren: boolean = false;\n export const enableTaint: boolean = true;\n-export const enableHalt: boolean = true;\n export const disableCommentsAsDOMContainers: boolean = true;\n export const disableInputAttributeSyncing: boolean = false;\n export const enableScopeAPI: boolean = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\nindex a2e623ff52..a81f67ee94 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n@@ -25,7 +25,6 @@ export const enableCPUSuspense = true;\n export const enableCreateEventHandleAPI = false;\n export const enableMoveBefore = false;\n export const enableFizzExternalRuntime = true;\n-export const enableHalt = true;\n export const enableInfiniteRenderLoopDetection = false;\n export const enableHiddenSubtreeInsertionEffectCleanup = true;\n export const enableLegacyCache = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex 4751ffb49b..d819bd275e 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -21,7 +21,6 @@ export const enableUpdaterTracking: boolean = false;\n export const enableLegacyCache: boolean = true;\n export const enableAsyncIterableChildren: boolean = false;\n export const enableTaint: boolean = true;\n-export const enableHalt: boolean = true;\n export const disableCommentsAsDOMContainers: boolean = true;\n export const disableInputAttributeSyncing: boolean = false;\n export const enableScopeAPI: boolean = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\nindex d32d8fe08b..0c8ec7f25a 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n@@ -74,8 +74,6 @@ export const enableAsyncIterableChildren: boolean = false;\n \n export const enableTaint: boolean = false;\n \n-export const enableHalt: boolean = true;\n-\n \/\/ TODO: www currently relies on this feature. It's disabled in open source.\n \/\/ Need to remove it.\n export const disableCommentsAsDOMContainers: boolean = false;\n"}

dillon1000/react

Files changed