Skip to content

Commit 2ce72e7

Browse files
lubieowocelubieowoce
committed
avoid checking flag outside of createRequest
1 parent 562c840 commit 2ce72e7

File tree

11 files changed

+30
-44
lines changed

11 files changed

+30
-44
lines changed

‎packages/react-server-dom-esm/src/server/ReactFlightDOMServerNode.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig';
1717
import type {Busboy} from 'busboy';
1818
import type {Writable} from 'stream';
1919
import type {Thenable} from 'shared/ReactTypes';
20-
import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
2120

2221
import type {Duplex} from 'stream';
2322

@@ -185,7 +184,7 @@ function renderToPipeableStream(
185184
options ? options.onError : undefined,
186185
options ? options.identifierPrefix : undefined,
187186
options ? options.temporaryReferences : undefined,
188-
enableProfilerTimer && options ? options.startTime : undefined,
187+
options ? options.startTime : undefined,
189188
__DEV__ && options ? options.environmentName : undefined,
190189
__DEV__ && options ? options.filterStackFrame : undefined,
191190
debugChannel !== undefined,
@@ -307,7 +306,7 @@ function prerenderToNodeStream(
307306
options ? options.onError : undefined,
308307
options ? options.identifierPrefix : undefined,
309308
options ? options.temporaryReferences : undefined,
310-
enableProfilerTimer && options ? options.startTime : undefined,
309+
options ? options.startTime : undefined,
311310
__DEV__ && options ? options.environmentName : undefined,
312311
__DEV__ && options ? options.filterStackFrame : undefined,
313312
false,

‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerBrowser.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import type {
1313
} from 'react-server/src/ReactFlightServer';
1414
import type {ReactFormState, Thenable} from 'shared/ReactTypes';
1515

16-
import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
17-
1816
import {
1917
preloadModule,
2018
requireModule,
@@ -132,7 +130,7 @@ export function renderToReadableStream(
132130
options ? options.onError : undefined,
133131
options ? options.identifierPrefix : undefined,
134132
options ? options.temporaryReferences : undefined,
135-
enableProfilerTimer && options ? options.startTime : undefined,
133+
options ? options.startTime : undefined,
136134
__DEV__ && options ? options.environmentName : undefined,
137135
__DEV__ && options ? options.filterStackFrame : undefined,
138136
debugChannelReadable !== undefined,
@@ -220,7 +218,7 @@ export function prerender(
220218
options ? options.onError : undefined,
221219
options ? options.identifierPrefix : undefined,
222220
options ? options.temporaryReferences : undefined,
223-
enableProfilerTimer && options ? options.startTime : undefined,
221+
options ? options.startTime : undefined,
224222
__DEV__ && options ? options.environmentName : undefined,
225223
__DEV__ && options ? options.filterStackFrame : undefined,
226224
false,

‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerEdge.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import type {
1212
ReactClientValue,
1313
} from 'react-server/src/ReactFlightServer';
1414
import type {ReactFormState, Thenable} from 'shared/ReactTypes';
15-
import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
1615

1716
import {
1817
preloadModule,
@@ -136,7 +135,7 @@ export function renderToReadableStream(
136135
options ? options.onError : undefined,
137136
options ? options.identifierPrefix : undefined,
138137
options ? options.temporaryReferences : undefined,
139-
enableProfilerTimer && options ? options.startTime : undefined,
138+
options ? options.startTime : undefined,
140139
__DEV__ && options ? options.environmentName : undefined,
141140
__DEV__ && options ? options.filterStackFrame : undefined,
142141
debugChannelReadable !== undefined,
@@ -224,7 +223,7 @@ export function prerender(
224223
options ? options.onError : undefined,
225224
options ? options.identifierPrefix : undefined,
226225
options ? options.temporaryReferences : undefined,
227-
enableProfilerTimer && options ? options.startTime : undefined,
226+
options ? options.startTime : undefined,
228227
__DEV__ && options ? options.environmentName : undefined,
229228
__DEV__ && options ? options.filterStackFrame : undefined,
230229
false,

‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerNode.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import type {Destination} from 'react-server/src/ReactServerStreamConfigNode';
1515
import type {Busboy} from 'busboy';
1616
import type {Writable} from 'stream';
1717
import type {ReactFormState, Thenable} from 'shared/ReactTypes';
18-
import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
1918
import type {
2019
ServerManifest,
2120
ServerReferenceId,
@@ -197,7 +196,7 @@ export function renderToPipeableStream(
197196
options ? options.onError : undefined,
198197
options ? options.identifierPrefix : undefined,
199198
options ? options.temporaryReferences : undefined,
200-
enableProfilerTimer && options ? options.startTime : undefined,
199+
options ? options.startTime : undefined,
201200
__DEV__ && options ? options.environmentName : undefined,
202201
__DEV__ && options ? options.filterStackFrame : undefined,
203202
debugChannel !== undefined,
@@ -355,7 +354,7 @@ export function renderToReadableStream(
355354
options ? options.onError : undefined,
356355
options ? options.identifierPrefix : undefined,
357356
options ? options.temporaryReferences : undefined,
358-
enableProfilerTimer && options ? options.startTime : undefined,
357+
options ? options.startTime : undefined,
359358
__DEV__ && options ? options.environmentName : undefined,
360359
__DEV__ && options ? options.filterStackFrame : undefined,
361360
debugChannelReadable !== undefined,
@@ -469,7 +468,7 @@ export function prerenderToNodeStream(
469468
options ? options.onError : undefined,
470469
options ? options.identifierPrefix : undefined,
471470
options ? options.temporaryReferences : undefined,
472-
enableProfilerTimer && options ? options.startTime : undefined,
471+
options ? options.startTime : undefined,
473472
__DEV__ && options ? options.environmentName : undefined,
474473
__DEV__ && options ? options.filterStackFrame : undefined,
475474
false,
@@ -532,7 +531,7 @@ export function prerender(
532531
options ? options.onError : undefined,
533532
options ? options.identifierPrefix : undefined,
534533
options ? options.temporaryReferences : undefined,
535-
enableProfilerTimer && options ? options.startTime : undefined,
534+
options ? options.startTime : undefined,
536535
__DEV__ && options ? options.environmentName : undefined,
537536
__DEV__ && options ? options.filterStackFrame : undefined,
538537
false,

‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import type {
1212
ReactClientValue,
1313
} from 'react-server/src/ReactFlightServer';
1414
import type {Thenable} from 'shared/ReactTypes';
15-
import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
1615
import type {ClientManifest} from './ReactFlightServerConfigTurbopackBundler';
1716
import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig';
1817

@@ -128,7 +127,7 @@ function renderToReadableStream(
128127
options ? options.onError : undefined,
129128
options ? options.identifierPrefix : undefined,
130129
options ? options.temporaryReferences : undefined,
131-
enableProfilerTimer && options ? options.startTime : undefined,
130+
options ? options.startTime : undefined,
132131
__DEV__ && options ? options.environmentName : undefined,
133132
__DEV__ && options ? options.filterStackFrame : undefined,
134133
debugChannelReadable !== undefined,
@@ -217,7 +216,7 @@ function prerender(
217216
options ? options.onError : undefined,
218217
options ? options.identifierPrefix : undefined,
219218
options ? options.temporaryReferences : undefined,
220-
enableProfilerTimer && options ? options.startTime : undefined,
219+
options ? options.startTime : undefined,
221220
__DEV__ && options ? options.environmentName : undefined,
222221
__DEV__ && options ? options.filterStackFrame : undefined,
223222
false,

‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import type {
1212
ReactClientValue,
1313
} from 'react-server/src/ReactFlightServer';
1414
import type {Thenable} from 'shared/ReactTypes';
15-
import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
1615
import type {ClientManifest} from './ReactFlightServerConfigTurbopackBundler';
1716
import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig';
1817

@@ -133,7 +132,7 @@ function renderToReadableStream(
133132
options ? options.onError : undefined,
134133
options ? options.identifierPrefix : undefined,
135134
options ? options.temporaryReferences : undefined,
136-
enableProfilerTimer && options ? options.startTime : undefined,
135+
options ? options.startTime : undefined,
137136
__DEV__ && options ? options.environmentName : undefined,
138137
__DEV__ && options ? options.filterStackFrame : undefined,
139138
debugChannelReadable !== undefined,
@@ -222,7 +221,7 @@ function prerender(
222221
options ? options.onError : undefined,
223222
options ? options.identifierPrefix : undefined,
224223
options ? options.temporaryReferences : undefined,
225-
enableProfilerTimer && options ? options.startTime : undefined,
224+
options ? options.startTime : undefined,
226225
__DEV__ && options ? options.environmentName : undefined,
227226
__DEV__ && options ? options.filterStackFrame : undefined,
228227
false,

‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig';
1717
import type {Busboy} from 'busboy';
1818
import type {Writable} from 'stream';
1919
import type {Thenable} from 'shared/ReactTypes';
20-
import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
2120

2221
import type {Duplex} from 'stream';
2322

@@ -191,7 +190,7 @@ function renderToPipeableStream(
191190
options ? options.onError : undefined,
192191
options ? options.identifierPrefix : undefined,
193192
options ? options.temporaryReferences : undefined,
194-
enableProfilerTimer && options ? options.startTime : undefined,
193+
options ? options.startTime : undefined,
195194
__DEV__ && options ? options.environmentName : undefined,
196195
__DEV__ && options ? options.filterStackFrame : undefined,
197196
debugChannel !== undefined,
@@ -350,7 +349,7 @@ function renderToReadableStream(
350349
options ? options.onError : undefined,
351350
options ? options.identifierPrefix : undefined,
352351
options ? options.temporaryReferences : undefined,
353-
enableProfilerTimer && options ? options.startTime : undefined,
352+
options ? options.startTime : undefined,
354353
__DEV__ && options ? options.environmentName : undefined,
355354
__DEV__ && options ? options.filterStackFrame : undefined,
356355
debugChannelReadable !== undefined,
@@ -465,7 +464,7 @@ function prerenderToNodeStream(
465464
options ? options.onError : undefined,
466465
options ? options.identifierPrefix : undefined,
467466
options ? options.temporaryReferences : undefined,
468-
enableProfilerTimer && options ? options.startTime : undefined,
467+
options ? options.startTime : undefined,
469468
__DEV__ && options ? options.environmentName : undefined,
470469
__DEV__ && options ? options.filterStackFrame : undefined,
471470
false,
@@ -529,7 +528,7 @@ function prerender(
529528
options ? options.onError : undefined,
530529
options ? options.identifierPrefix : undefined,
531530
options ? options.temporaryReferences : undefined,
532-
enableProfilerTimer && options ? options.startTime : undefined,
531+
options ? options.startTime : undefined,
533532
__DEV__ && options ? options.environmentName : undefined,
534533
__DEV__ && options ? options.filterStackFrame : undefined,
535534
false,

‎packages/react-server-dom-unbundled/src/server/ReactFlightDOMServerNode.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig';
1717
import type {Busboy} from 'busboy';
1818
import type {Writable} from 'stream';
1919
import type {Thenable} from 'shared/ReactTypes';
20-
import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
2120

2221
import type {Duplex} from 'stream';
2322

@@ -191,7 +190,7 @@ function renderToPipeableStream(
191190
options ? options.onError : undefined,
192191
options ? options.identifierPrefix : undefined,
193192
options ? options.temporaryReferences : undefined,
194-
enableProfilerTimer && options ? options.startTime : undefined,
193+
options ? options.startTime : undefined,
195194
__DEV__ && options ? options.environmentName : undefined,
196195
__DEV__ && options ? options.filterStackFrame : undefined,
197196
debugChannelReadable !== undefined,
@@ -350,7 +349,7 @@ function renderToReadableStream(
350349
options ? options.onError : undefined,
351350
options ? options.identifierPrefix : undefined,
352351
options ? options.temporaryReferences : undefined,
353-
enableProfilerTimer && options ? options.startTime : undefined,
352+
options ? options.startTime : undefined,
354353
__DEV__ && options ? options.environmentName : undefined,
355354
__DEV__ && options ? options.filterStackFrame : undefined,
356355
debugChannelReadable !== undefined,
@@ -465,7 +464,7 @@ function prerenderToNodeStream(
465464
options ? options.onError : undefined,
466465
options ? options.identifierPrefix : undefined,
467466
options ? options.temporaryReferences : undefined,
468-
enableProfilerTimer && options ? options.startTime : undefined,
467+
options ? options.startTime : undefined,
469468
__DEV__ && options ? options.environmentName : undefined,
470469
__DEV__ && options ? options.filterStackFrame : undefined,
471470
false,
@@ -529,7 +528,7 @@ function prerender(
529528
options ? options.onError : undefined,
530529
options ? options.identifierPrefix : undefined,
531530
options ? options.temporaryReferences : undefined,
532-
enableProfilerTimer && options ? options.startTime : undefined,
531+
options ? options.startTime : undefined,
533532
__DEV__ && options ? options.environmentName : undefined,
534533
__DEV__ && options ? options.filterStackFrame : undefined,
535534
false,

‎packages/react-server-dom-webpack/src/server/ReactFlightDOMServerBrowser.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import type {Thenable} from 'shared/ReactTypes';
1515
import type {ClientManifest} from './ReactFlightServerConfigWebpackBundler';
1616
import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig';
1717

18-
import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
19-
2018
import {
2119
createRequest,
2220
createPrerenderRequest,
@@ -129,7 +127,7 @@ function renderToReadableStream(
129127
options ? options.onError : undefined,
130128
options ? options.identifierPrefix : undefined,
131129
options ? options.temporaryReferences : undefined,
132-
enableProfilerTimer && options ? options.startTime : undefined,
130+
options ? options.startTime : undefined,
133131
__DEV__ && options ? options.environmentName : undefined,
134132
__DEV__ && options ? options.filterStackFrame : undefined,
135133
debugChannelReadable !== undefined,
@@ -218,7 +216,7 @@ function prerender(
218216
options ? options.onError : undefined,
219217
options ? options.identifierPrefix : undefined,
220218
options ? options.temporaryReferences : undefined,
221-
enableProfilerTimer && options ? options.startTime : undefined,
219+
options ? options.startTime : undefined,
222220
__DEV__ && options ? options.environmentName : undefined,
223221
__DEV__ && options ? options.filterStackFrame : undefined,
224222
false,

‎packages/react-server-dom-webpack/src/server/ReactFlightDOMServerEdge.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import type {Thenable} from 'shared/ReactTypes';
1515
import type {ClientManifest} from './ReactFlightServerConfigWebpackBundler';
1616
import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig';
1717

18-
import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
19-
2018
import {ASYNC_ITERATOR} from 'shared/ReactSymbols';
2119

2220
import {
@@ -134,7 +132,7 @@ function renderToReadableStream(
134132
options ? options.onError : undefined,
135133
options ? options.identifierPrefix : undefined,
136134
options ? options.temporaryReferences : undefined,
137-
enableProfilerTimer && options ? options.startTime : undefined,
135+
options ? options.startTime : undefined,
138136
__DEV__ && options ? options.environmentName : undefined,
139137
__DEV__ && options ? options.filterStackFrame : undefined,
140138
debugChannelReadable !== undefined,
@@ -223,7 +221,7 @@ function prerender(
223221
options ? options.onError : undefined,
224222
options ? options.identifierPrefix : undefined,
225223
options ? options.temporaryReferences : undefined,
226-
enableProfilerTimer && options ? options.startTime : undefined,
224+
options ? options.startTime : undefined,
227225
__DEV__ && options ? options.environmentName : undefined,
228226
__DEV__ && options ? options.filterStackFrame : undefined,
229227
false,

0 commit comments

Comments
 (0)