fix: pr comments

Author: Swiftwork

packages/browser-sdk/src/client.ts

@@ -295,19 +295,7 @@ export type InitOptions = ReflagDeprecatedContext & {
    * Defaults to `StorageOverridesProvider` using local storage.
    */
   overridesProvider?: OverridesProvider;
-};
 
-/**
- * Init options for bootstrapped flags.
- */
-export type InitOptionsBootstrapped = Omit<
-  InitOptions,
-  | "fallbackFlags"
-  | "timeoutMs"
-  | "staleWhileRevalidate"
-  | "staleTimeMs"
-  | "expireTimeMs"
-> & {
   /**
    * Pre-fetched flags to be used instead of fetching them from the server.
    */
@@ -316,13 +304,9 @@ export type InitOptionsBootstrapped = Omit<
   /**
    * Pre-fetched flag overrides to be used instead of reading them from the client.
    */
-  bootstrappedOverrides: FlagOverrides;
+  bootstrappedOverrides?: FlagOverrides;
 };
 
-function isBootstrapped(opts: InitOptions): opts is InitOptionsBootstrapped {
-  return "bootstrappedFlags" in opts;
-}
-
 const defaultConfig: Config = {
   apiBaseUrl: API_BASE_URL,
   appBaseUrl: APP_BASE_URL,
@@ -418,7 +402,7 @@ export class ReflagClient {
   /**
    * Create a new ReflagClient instance.
    */
-  constructor(opts: InitOptions | InitOptionsBootstrapped) {
+  constructor(opts: InitOptions) {
     this.publishableKey = opts.publishableKey;
     this.logger =
       opts?.logger ?? loggerWithPrefix(quietConsoleLogger, "[Reflag]");
@@ -453,22 +437,17 @@ export class ReflagClient {
       this.httpClient,
       this.context,
       this.logger,
-      isBootstrapped(opts)
-        ? {
-            bootstrappedFlags: opts.bootstrappedFlags,
-            bootstrappedOverrides: opts.bootstrappedOverrides,
-            offline: this.config.offline,
-            overridesProvider: opts.overridesProvider,
-          }
-        : {
-            expireTimeMs: opts.expireTimeMs,
-            staleTimeMs: opts.staleTimeMs,
-            staleWhileRevalidate: opts.staleWhileRevalidate,
-            timeoutMs: opts.timeoutMs,
-            fallbackFlags: opts.fallbackFlags,
-            offline: this.config.offline,
-            overridesProvider: opts.overridesProvider,
-          },
+      {
+        bootstrappedFlags: opts.bootstrappedFlags,
+        bootstrappedOverrides: opts.bootstrappedOverrides,
+        expireTimeMs: opts.expireTimeMs,
+        staleTimeMs: opts.staleTimeMs,
+        staleWhileRevalidate: opts.staleWhileRevalidate,
+        timeoutMs: opts.timeoutMs,
+        fallbackFlags: opts.fallbackFlags,
+        offline: this.config.offline,
+        overridesProvider: opts.overridesProvider,
+      },
     );
 
     if (
@@ -544,7 +523,6 @@ export class ReflagClient {
           this.logger.error("error sending company", e);
         });
       }
-      this.config.bootstrapped = true;
     }
 
     this.logger.info(

packages/browser-sdk/src/index.ts

@@ -3,7 +3,6 @@ export type {
   Flag,
   FlagRemoteConfig,
   InitOptions,
-  InitOptionsBootstrapped,
   ToolbarOptions,
 } from "./client";
 export { ReflagClient } from "./client";

packages/react-sdk/dev/nextjs-bootstrap-demo/app/client.ts

@@ -35,6 +35,7 @@ export async function getServerClient() {
 
 /**
  * Get flag overrides from the NextJS cookies.
+ * This requires the overrides provider to be set in the client.
  * @returns The parsed overrides object
  */
 export async function getFlagOverrides(): Promise<

packages/react-sdk/dev/nextjs-bootstrap-demo/app/page.tsx

@@ -1,7 +1,7 @@
 import Image from "next/image";
 import { Flags } from "@/components/Flags";
 
-export default function Home() {
+export default async function Home() {
   return (
     <main className="flex min-h-screen flex-col items-center justify-between p-24">
       <div className="z-10 w-full max-w-5xl items-center justify-between font-mono text-sm lg:flex">

packages/react-sdk/src/index.tsx

@@ -14,7 +14,6 @@ import {
   CompanyContext,
   FlagOverrides,
   InitOptions,
-  InitOptionsBootstrapped,
   RawFlags,
   ReflagClient,
   ReflagContext,
@@ -143,10 +142,7 @@ const reflagClients = new Map<string, ReflagClient>();
  * Only creates a new ReflagClient is not already created or if it hook is run on the server.
  * @internal
  */
-function useReflagClient(
-  initOptions: InitOptions | InitOptionsBootstrapped,
-  debug = false,
-) {
+function useReflagClient(initOptions: InitOptions, debug = false) {
   const isServer = typeof window === "undefined";
   if (isServer || !reflagClients.has(initOptions.publishableKey)) {
     const client = new ReflagClient({
@@ -283,9 +279,10 @@ export function ReflagProvider({
  * Props for the ReflagBootstrappedProvider.
  */
 export type ReflagBootstrappedProps = Omit<
-  InitOptionsBootstrapped,
+  InitOptions,
   | "user"
   | "company"
+  | "other"
   | "otherContext"
   | "bootstrappedFlags"
   | "bootstrappedOverrides"