nits and errors

facebook · Aug 12, 2022 · 3d56c0e · 3d56c0e
1 parent 8e69ca1
commit 3d56c0e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 32 deletions.
diff --git a/packages/react-dom/src/server/ReactDOMServerFormatConfig.js b/packages/react-dom/src/server/ReactDOMServerFormatConfig.js
@@ -243,26 +243,6 @@ export function getChildFormatContext(
   return parentContext;
 }
 
-function isPreambleInsertion(type: string): boolean {
-  switch (type) {
-    case 'html':
-    case 'head': {
-      return true;
-    }
-  }
-  return false;
-}
-
-function isPostambleInsertion(type: string): boolean {
-  switch (type) {
-    case 'body':
-    case 'html': {
-      return true;
-    }
-  }
-  return false;
-}
-
 export type SuspenseBoundaryID = null | PrecomputedChunk;
 
 export const UNINITIALIZED_SUSPENSE_BOUNDARY_ID: SuspenseBoundaryID = null;
@@ -1264,7 +1244,7 @@ function pushStartHead(
   responseState: ResponseState,
 ): ReactNodeList {
   // Preamble type is nullable for feature off cases but is guaranteed when feature is on
-  target = enableFloat && isPreambleInsertion(tag) ? (preamble: any) : target;
+  target = enableFloat ? (preamble: any) : target;
 
   return pushStartGenericElement(target, props, tag, responseState);
 }
@@ -1278,7 +1258,7 @@ function pushStartHtml(
   responseState: ResponseState,
 ): ReactNodeList {
   // Preamble type is nullable for feature off cases but is guaranteed when feature is on
-  target = enableFloat && isPreambleInsertion(tag) ? (preamble: any) : target;
+  target = enableFloat ? (preamble: any) : target;
 
   if (formatContext.insertionMode === ROOT_HTML_MODE) {
     // If we're rendering the html tag and we're at the root (i.e. not in foreignObject)
@@ -1657,8 +1637,7 @@ export function pushEndInstance(
     case 'body':
     case 'html':
       // Preamble type is nullable for feature off cases but is guaranteed when feature is on
-      target =
-        enableFloat && isPostambleInsertion(type) ? (postamble: any) : target;
+      target = enableFloat ? (postamble: any) : target;
     // Intentional fallthrough
     default: {
       target.push(endTag1, stringToChunk(type), endTag2);

diff --git a/packages/react-server/src/ReactFizzServer.js b/packages/react-server/src/ReactFizzServer.js
@@ -2081,7 +2081,6 @@ function flushCompletedQueues(
             // we expect the preamble to be tiny and will ignore backpressure
             writeChunk(destination, preamble[i]);
           }
-          preamble.length = 0;
         }
 
         flushSegment(request, destination, completedRootSegment);
@@ -2159,7 +2158,6 @@ function flushCompletedQueues(
     }
     largeBoundaries.splice(0, i);
   } finally {
-    let allComplete = false;
     if (
       request.allPendingTasks === 0 &&
       request.pingedTasks.length === 0 &&
@@ -2168,20 +2166,16 @@ function flushCompletedQueues(
       // We don't need to check any partially completed segments because
       // either they have pending task or they're complete.
     ) {
-      allComplete = true;
       if (enableFloat) {
         const postamble: Array<
           Chunk | PrecomputedChunk,
         > = (request.postamble: any);
         for (let i = 0; i < postamble.length; i++) {
           writeChunk(destination, postamble[i]);
         }
-        postamble.length = 0;
       }
-    }
-    completeWriting(destination);
-    flushBuffered(destination);
-    if (allComplete) {
+      completeWriting(destination);
+      flushBuffered(destination);
       if (__DEV__) {
         if (request.abortableTasks.size !== 0) {
           console.error(
@@ -2191,6 +2185,9 @@ function flushCompletedQueues(
       }
       // We're done.
       close(destination);
+    } else {
+      completeWriting(destination);
+      flushBuffered(destination);
     }
   }
 }