[Flight] Remove superfluous whitespace when console method is called with non-strings (facebook#33953)

Author: eps1lon

packages/react-client/src/ReactClientConsoleConfigBrowser.js

@@ -8,7 +8,7 @@
  */
 
 // Keep in sync with ReactServerConsoleConfig
-const badgeFormat = '%c%s%c ';
+const badgeFormat = '%c%s%c';
 // Same badge styling as DevTools.
 const badgeStyle =
   // We use a fixed background if light-dark is not supported, otherwise
@@ -49,7 +49,7 @@ export function bindToConsole(
     newArgs.splice(
       offset,
       1,
-      badgeFormat + newArgs[offset],
+      badgeFormat + ' ' + newArgs[offset],
       badgeStyle,
       pad + badgeName + pad,
       resetStyle,

packages/react-client/src/ReactClientConsoleConfigPlain.js

@@ -8,7 +8,7 @@
  */
 
 // Keep in sync with ReactServerConsoleConfig
-const badgeFormat = '[%s] ';
+const badgeFormat = '[%s]';
 const pad = ' ';
 
 const bind = Function.prototype.bind;
@@ -39,7 +39,7 @@ export function bindToConsole(
     newArgs.splice(
       offset,
       1,
-      badgeFormat + newArgs[offset],
+      badgeFormat + ' ' + newArgs[offset],
       pad + badgeName + pad,
     );
   } else {

packages/react-client/src/ReactClientConsoleConfigServer.js

@@ -9,7 +9,7 @@
 
 // Keep in sync with ReactServerConsoleConfig
 // This flips color using ANSI, then sets a color styling, then resets.
-const badgeFormat = '\x1b[0m\x1b[7m%c%s\x1b[0m%c ';
+const badgeFormat = '\x1b[0m\x1b[7m%c%s\x1b[0m%c';
 // Same badge styling as DevTools.
 const badgeStyle =
   // We use a fixed background if light-dark is not supported, otherwise
@@ -50,7 +50,7 @@ export function bindToConsole(
     newArgs.splice(
       offset,
       1,
-      badgeFormat + newArgs[offset],
+      badgeFormat + ' ' + newArgs[offset],
       badgeStyle,
       pad + badgeName + pad,
       resetStyle,

packages/react-server/src/ReactServerConsoleConfigBrowser.js

@@ -8,7 +8,7 @@
  */
 
 // Keep in sync with ReactClientConsoleConfig
-const badgeFormat = '%c%s%c ';
+const badgeFormat = '%c%s%c';
 // Same badge styling as DevTools.
 const badgeStyle =
   // We use a fixed background if light-dark is not supported, otherwise
@@ -54,7 +54,12 @@ export function unbadgeConsole(
     typeof badge === 'string'
   ) {
     // Remove our badging from the arguments.
-    args.splice(offset, 4, format.slice(badgeFormat.length));
+    let unbadgedFormat = format.slice(badgeFormat.length);
+    if (unbadgedFormat[0] === ' ') {
+      // Spacing added on the Client if the original argument was a string.
+      unbadgedFormat = unbadgedFormat.slice(1);
+    }
+    args.splice(offset, 4, unbadgedFormat);
     return badge.slice(padLength, badge.length - padLength);
   }
   return null;

packages/react-server/src/ReactServerConsoleConfigPlain.js

@@ -8,7 +8,7 @@
  */
 
 // Keep in sync with ReactClientConsoleConfig
-const badgeFormat = '[%s] ';
+const badgeFormat = '[%s]';
 const padLength = 1;
 const pad = ' ';
 
@@ -45,7 +45,12 @@ export function unbadgeConsole(
     badge.endsWith(pad)
   ) {
     // Remove our badging from the arguments.
-    args.splice(offset, 2, format.slice(badgeFormat.length));
+    let unbadgedFormat = format.slice(badgeFormat.length);
+    if (unbadgedFormat[0] === ' ') {
+      // Spacing added on the Client if the original argument was a string.
+      unbadgedFormat = unbadgedFormat.slice(1);
+    }
+    args.splice(offset, 4, unbadgedFormat);
     return badge.slice(padLength, badge.length - padLength);
   }
   return null;

packages/react-server/src/ReactServerConsoleConfigServer.js

@@ -8,7 +8,7 @@
  */
 
 // Keep in sync with ReactClientConsoleConfig
-const badgeFormat = '\x1b[0m\x1b[7m%c%s\x1b[0m%c ';
+const badgeFormat = '\x1b[0m\x1b[7m%c%s\x1b[0m%c';
 // Same badge styling as DevTools.
 const badgeStyle =
   // We use a fixed background if light-dark is not supported, otherwise
@@ -53,7 +53,12 @@ export function unbadgeConsole(
     typeof badge === 'string'
   ) {
     // Remove our badging from the arguments.
-    args.splice(offset, 4, format.slice(badgeFormat.length));
+    let unbadgedFormat = format.slice(badgeFormat.length);
+    if (unbadgedFormat[0] === ' ') {
+      // Spacing added on the Client if the original argument was a string.
+      unbadgedFormat = unbadgedFormat.slice(1);
+    }
+    args.splice(offset, 4, unbadgedFormat);
     return badge.slice(padLength, badge.length - padLength);
   }
   return null;