@ops-ai/react-router-toggly 1.2.0 → 1.2.1

package/dist/client.js

@@ -319,7 +319,7 @@ function createBrowserTelemetry(config) {
 
 // src/client/sdk-identity.ts
 var SDK_ID = "react-router";
-var SDK_VERSION = "1.2.0";
+var SDK_VERSION = "1.2.1";
 function appendSdkQueryParams(params) {
   params.set("sdk", SDK_ID);
   params.set("sdkVersion", SDK_VERSION);
@@ -1059,27 +1059,19 @@ function RouterTogglyProvider({
   config,
   ...props
 }) {
-  let serverContext;
-  try {
-    if (routeId) {
-      const routeData = useRouteLoaderData(routeId);
-      serverContext = routeData?.[TOGGLY_LOADER_KEY];
-    } else {
-      const loaderData = useLoaderData();
-      serverContext = loaderData?.[TOGGLY_LOADER_KEY];
-    }
-  } catch {
-    serverContext = fallbackContext;
-  }
-  serverContext = serverContext ?? fallbackContext;
-  const mergedConfig = config ?? (serverContext ? {
-    appKey: serverContext.appKey,
-    environment: serverContext.environment
+  const routeData = useRouteLoaderData(routeId ?? "");
+  const loaderData = useLoaderData();
+  const data = routeId ? routeData : loaderData;
+  const serverContext = data?.[TOGGLY_LOADER_KEY];
+  const resolvedServerContext = serverContext ?? fallbackContext;
+  const mergedConfig = config ?? (resolvedServerContext ? {
+    appKey: resolvedServerContext.appKey,
+    environment: resolvedServerContext.environment
   } : void 0);
   return /* @__PURE__ */ jsx(
     TogglyProvider,
     {
-      serverContext,
+      serverContext: resolvedServerContext,
       config: mergedConfig,
       ...props,
       children