Remove error handler and fix bad merge

Author: XieX

src/asyncWithLDProvider.tsx

@@ -40,7 +40,6 @@ export default async function asyncWithLDProvider(config: AsyncProviderConfig) {
       flags: {},
       unproxiedFlags: {},
       flagKeyMap: {},
-      error,
     });
 
     useEffect(() => {
@@ -70,7 +69,7 @@ export default async function asyncWithLDProvider(config: AsyncProviderConfig) {
 
     const { flags, flagKeyMap } = ldData;
 
-    return <Provider value={{ flags, flagKeyMap, ldClient }}>{children}</Provider>;
+    return <Provider value={{ flags, flagKeyMap, ldClient, error }}>{children}</Provider>;
   };
 
   return LDProvider;

src/initLDClient.test.ts

@@ -85,18 +85,4 @@ describe('initLDClient', () => {
 
     expect(flagsClient).toEqual({ flags: {}, ldClient: mockLDClient, error });
   });
-
-  test('executes error handler', async () => {
-    const error = new Error('Out of cheese');
-    mockLDClient.on = (e: string, cb: (err: Error) => void) => {
-      if (e === 'failed') {
-        cb(error);
-      }
-    };
-    const clientInitializationErrorHandler = jest.fn();
-
-    await initLDClient(clientSideID, undefined, { clientInitializationErrorHandler });
-
-    expect(clientInitializationErrorHandler).toHaveBeenCalledWith(error);
-  });
 });

src/initLDClient.ts

@@ -36,9 +36,6 @@ const initLDClient = async (
     }
     function handleFailure(error: Error) {
       cleanup();
-      if (reactOptions.clientInitializationErrorHandler) {
-        reactOptions.clientInitializationErrorHandler(error);
-      }
       resolve({ flags: {}, ldClient, error });
     }
     function handleReady() {

src/provider.tsx

@@ -109,9 +109,9 @@ class LDProvider extends Component<PropsWithChildren<ProviderConfig>, LDHocState
   }
 
   render() {
-    const { flags, flagKeyMap, ldClient } = this.state;
+    const { flags, flagKeyMap, ldClient, error } = this.state;
 
-    return <Provider value={{ flags, flagKeyMap, ldClient }}>{this.props.children}</Provider>;
+    return <Provider value={{ flags, flagKeyMap, ldClient, error }}>{this.props.children}</Provider>;
   }
 }
 

src/types.ts

@@ -22,14 +22,9 @@ export interface LDReactOptions {
    */
   useCamelCaseFlagKeys?: boolean;
 
-  /**
-   * Callback to pass a LaunchDarkly initialization error to, if one occurs.
-   */
-  clientInitializationErrorHandler?(error: Error): void;
-
   /**
    * Whether to send flag evaluation events when a flag is read from the `flags` object
-   * retured by the `useFlags` hook. This is true by default, meaning flag evaluation
+   * returned by the `useFlags` hook. This is true by default, meaning flag evaluation
    * events will be sent by default.
    */
   sendEventsOnFlagRead?: boolean;