{"body":"","commit":{"subject":"Fix plurals (#21106)","shortRevision":"556644e237","revision":"556644e2372bf275a498006fc17dff14d324d6be","authorName":"Sebastian Markbåge","authorEmail":"sema@fb.com","authoredAt":"2021-03-25T22:21:41-04:00"},"parents":["8b741437b12a3faad1b742274af8fcc456e71958"],"patch":"diff --git a\/packages\/react-server\/src\/ReactFizzServer.js b\/packages\/react-server\/src\/ReactFizzServer.js\nindex 71821638f0..c4b795d24f 100644\n--- a\/packages\/react-server\/src\/ReactFizzServer.js\n+++ b\/packages\/react-server\/src\/ReactFizzServer.js\n@@ -62,7 +62,7 @@ type SuspenseBoundary = {\n pendingTasks: number, \/\/ when it reaches zero we can show this boundary's content\n completedSegments: Array, \/\/ completed but not yet flushed segments.\n byteSize: number, \/\/ used to determine whether to inline children boundaries.\n- fallbackAbortableTask: Set, \/\/ used to cancel task on the fallback if the boundary completes or gets canceled.\n+ fallbackAbortableTasks: Set, \/\/ used to cancel task on the fallback if the boundary completes or gets canceled.\n };\n \n type Task = {\n@@ -107,8 +107,8 @@ type Request = {\n allPendingTasks: number, \/\/ when it reaches zero, we can close the connection.\n pendingRootTasks: number, \/\/ when this reaches zero, we've finished at least the root boundary.\n completedRootSegment: null | Segment, \/\/ Completed but not yet flushed root segments.\n- abortableTask: Set,\n- pingedTask: Array,\n+ abortableTasks: Set,\n+ pingedTasks: Array,\n \/\/ Queues to flush in order of priority\n clientRenderedBoundaries: Array, \/\/ Errored or client rendered but not yet flushed.\n completedBoundaries: Array, \/\/ Completed but not yet fully flushed boundaries to show.\n@@ -151,7 +151,7 @@ export function createRequest(\n onCompleteAll: () => void = noop,\n onReadyToStream: () => void = noop,\n ): Request {\n- const pingedTask = [];\n+ const pingedTasks = [];\n const abortSet: Set = new Set();\n const request = {\n destination,\n@@ -162,8 +162,8 @@ export function createRequest(\n allPendingTasks: 0,\n pendingRootTasks: 0,\n completedRootSegment: null,\n- abortableTask: abortSet,\n- pingedTask: pingedTask,\n+ abortableTasks: abortSet,\n+ pingedTasks: pingedTasks,\n clientRenderedBoundaries: [],\n completedBoundaries: [],\n partialBoundaries: [],\n@@ -184,21 +184,21 @@ export function createRequest(\n rootContext,\n null,\n );\n- pingedTask.push(rootTask);\n+ pingedTasks.push(rootTask);\n return request;\n }\n \n function pingTask(request: Request, task: Task): void {\n- const pingedTask = request.pingedTask;\n- pingedTask.push(task);\n- if (pingedTask.length === 1) {\n+ const pingedTasks = request.pingedTasks;\n+ pingedTasks.push(task);\n+ if (pingedTasks.length === 1) {\n scheduleWork(() => performWork(request));\n }\n }\n \n function createSuspenseBoundary(\n request: Request,\n- fallbackAbortableTask: Set,\n+ fallbackAbortableTasks: Set,\n ): SuspenseBoundary {\n return {\n id: createSuspenseBoundaryID(request.responseState),\n@@ -208,7 +208,7 @@ function createSuspenseBoundary(\n forceClientRender: false,\n completedSegments: [],\n byteSize: 0,\n- fallbackAbortableTask,\n+ fallbackAbortableTasks,\n };\n }\n \n@@ -385,7 +385,7 @@ function renderNode(request: Request, task: Task, node: ReactNodeList): void {\n \/\/ no parent segment so there's nothing to wait on.\n contentRootSegment.parentFlushed = true;\n \n- \/\/ Currently this is running synchronously. We could instead schedule this to pingedTask.\n+ \/\/ Currently this is running synchronously. We could instead schedule this to pingedTasks.\n \/\/ I suspect that there might be some efficiency benefits from not creating the suspended task\n \/\/ and instead just using the stack if possible.\n \/\/ TODO: Call this directly instead of messing with saving and restoring contexts.\n@@ -430,7 +430,7 @@ function renderNode(request: Request, task: Task, node: ReactNodeList): void {\n );\n \/\/ TODO: This should be queued at a separate lower priority queue so that we only task\n \/\/ on preparing fallbacks if we don't have any more main content to task on.\n- request.pingedTask.push(suspendedFallbackTask);\n+ request.pingedTasks.push(suspendedFallbackTask);\n } else {\n throw new Error('Not yet implemented element type.');\n }\n@@ -501,8 +501,8 @@ function abortTask(task: Task): void {\n \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.fallbackAbortableTask.forEach(abortTask, request);\n- boundary.fallbackAbortableTask.clear();\n+ boundary.fallbackAbortableTasks.forEach(abortTask, request);\n+ boundary.fallbackAbortableTasks.clear();\n \n if (!boundary.forceClientRender) {\n boundary.forceClientRender = true;\n@@ -541,8 +541,8 @@ function finishedTask(\n } else if (boundary.pendingTasks === 0) {\n \/\/ This must have been the last segment we were waiting on. This boundary is now complete.\n \/\/ We can now cancel any pending task on the fallback since we won't need to show it anymore.\n- boundary.fallbackAbortableTask.forEach(abortTaskSoft, request);\n- boundary.fallbackAbortableTask.clear();\n+ boundary.fallbackAbortableTasks.forEach(abortTaskSoft, request);\n+ boundary.fallbackAbortableTasks.clear();\n if (segment.parentFlushed) {\n \/\/ Our parent segment already flushed, so we need to schedule this segment to be emitted.\n boundary.completedSegments.push(segment);\n@@ -625,13 +625,13 @@ function performWork(request: Request): void {\n ReactCurrentDispatcher.current = Dispatcher;\n \n try {\n- const pingedTask = request.pingedTask;\n+ const pingedTasks = request.pingedTasks;\n let i;\n- for (i = 0; i < pingedTask.length; i++) {\n- const task = pingedTask[i];\n+ for (i = 0; i < pingedTasks.length; i++) {\n+ const task = pingedTasks[i];\n retryTask(request, task);\n }\n- pingedTask.splice(0, i);\n+ pingedTasks.splice(0, i);\n if (request.status === FLOWING) {\n flushCompletedQueues(request);\n }\n@@ -953,14 +953,14 @@ function flushCompletedQueues(request: Request): void {\n flushBuffered(destination);\n if (\n request.allPendingTasks === 0 &&\n- request.pingedTask.length === 0 &&\n+ request.pingedTasks.length === 0 &&\n request.clientRenderedBoundaries.length === 0 &&\n request.completedBoundaries.length === 0\n \/\/ We don't need to check any partially completed segments because\n \/\/ either they have pending task or they're complete.\n ) {\n if (__DEV__) {\n- if (request.abortableTask.size !== 0) {\n+ if (request.abortableTasks.size !== 0) {\n console.error(\n 'There was still abortable task at the root when we closed. This is a bug in React.',\n );\n@@ -992,9 +992,9 @@ export function startFlowing(request: Request): void {\n \/\/ This is called to early terminate a request. It puts all pending boundaries in client rendered state.\n export function abort(request: Request): void {\n try {\n- const abortableTask = request.abortableTask;\n- abortableTask.forEach(abortTask, request);\n- abortableTask.clear();\n+ const abortableTasks = request.abortableTasks;\n+ abortableTasks.forEach(abortTask, request);\n+ abortableTasks.clear();\n if (request.status === FLOWING) {\n flushCompletedQueues(request);\n }\n","files":[{"path":"packages\/react-server\/src\/ReactFizzServer.js","status":"M"}]}

dillon1000/react

Files changed