From 2c4a074ceda3fcf21a538ae7350af3c065f13ab1 Mon Sep 17 00:00:00 2001
From: Josh Story <story@hey.com>
Date: Tue, 31 May 2022 14:18:28 -0700
Subject: [PATCH] default to empty string identifier prefix

---
 packages/react-server/src/ReactFlightHooks.js  | 5 +----
 packages/react-server/src/ReactFlightServer.js | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/react-server/src/ReactFlightHooks.js b/packages/react-server/src/ReactFlightHooks.js
index ebc71cc82324..5b10d8c7a1f6 100644
--- a/packages/react-server/src/ReactFlightHooks.js
+++ b/packages/react-server/src/ReactFlightHooks.js
@@ -107,10 +107,7 @@ function useId(): string {
   if (currentRequest === null) {
     throw new Error('useId can only be used while React is rendering');
   }
-  const prefix = currentRequest.identifierPrefix
-    ? currentRequest.identifierPrefix
-    : '';
   const id = currentRequest.identifierCount++;
   // use 'S' for Flight components to distinguish from 'R' and 'r' in Fizz/Client
-  return ':' + prefix + 'S' + id.toString(32) + ':';
+  return ':' + currentRequest.identifierPrefix + 'S' + id.toString(32) + ':';
 }
diff --git a/packages/react-server/src/ReactFlightServer.js b/packages/react-server/src/ReactFlightServer.js
index f1253f046da8..d1399ce63ae8 100644
--- a/packages/react-server/src/ReactFlightServer.js
+++ b/packages/react-server/src/ReactFlightServer.js
@@ -108,7 +108,7 @@ export type Request = {
   writtenSymbols: Map<Symbol, number>,
   writtenModules: Map<ModuleKey, number>,
   writtenProviders: Map<string, number>,
-  identifierPrefix?: string,
+  identifierPrefix: string,
   identifierCount: number,
   onError: (error: mixed) => void,
   toJSON: (key: string, value: ReactModel) => ReactJSONValue,
@@ -148,7 +148,7 @@ export function createRequest(
     writtenSymbols: new Map(),
     writtenModules: new Map(),
     writtenProviders: new Map(),
-    identifierPrefix,
+    identifierPrefix: identifierPrefix || '',
     identifierCount: 1,
     onError: onError === undefined ? defaultErrorHandler : onError,
     toJSON: function(key: string, value: ReactModel): ReactJSONValue {