@lookiero/checkout 0.6.0-beta.37 → 0.6.0-beta.39

package/dist/shared/logging/SentryDependencies.d.ts

@@ -1,9 +1,12 @@
+import { matchRoutes as reactRouterMatchRoutes } from "@remix-run/router";
 import { BrowserClient, Hub } from "@sentry/browser";
 import { ErrorBoundary } from "@sentry/react";
 import { ReactNativeTransportOptions } from "@sentry/react-native/dist/js/options";
 import { Transport } from "@sentry/types";
 import { Integrations, WrapComponent, WrapUseRoutes } from "./types";
 declare const transport: (options: ReactNativeTransportOptions) => Transport;
+declare const matchRoutes: typeof reactRouterMatchRoutes;
+export { matchRoutes };
 declare const integrations: Integrations;
 declare const wrapComponent: WrapComponent;
 declare const wrapUseRoutes: WrapUseRoutes;

package/dist/shared/logging/SentryDependencies.js

@@ -1,3 +1,4 @@
+import { matchRoutes as reactRouterMatchRoutes } from "@remix-run/router";
 import { BrowserClient, Hub, makeFetchTransport, defaultIntegrations } from "@sentry/browser";
 import { ErrorBoundary } from "@sentry/react";
 import { reactRouterV6Instrumentation } from "@sentry/react";
@@ -5,14 +6,13 @@ import { wrapUseRoutes as reactRouterV6WrapUseRoutes } from "@sentry/react";
 import { BrowserTracing } from "@sentry/tracing";
 import { useEffect } from "react";
 import { createRoutesFromChildren, useLocation, useNavigationType } from "react-router-native";
-import { matchRoutes } from "./matchRoutes";
+import { stripFirstSlugFromLocation } from "./location";
 const transport = (options, nativeFetch) => makeFetchTransport(options, nativeFetch);
-const integrations = () => [
-    ...defaultIntegrations,
-    new BrowserTracing({
-        routingInstrumentation: reactRouterV6Instrumentation(useEffect, useLocation, useNavigationType, createRoutesFromChildren, matchRoutes),
-    }),
-];
+// Remove the location's first path ("/checkout"). Otherwise it won't match the proper route.
+const matchRoutes = (routes, locationArg) => reactRouterMatchRoutes(routes, stripFirstSlugFromLocation(locationArg));
+export { matchRoutes };
+const routingInstrumentation = reactRouterV6Instrumentation(useEffect, useLocation, useNavigationType, createRoutesFromChildren, matchRoutes);
+const integrations = () => [...defaultIntegrations, new BrowserTracing({ routingInstrumentation })];
 const wrapComponent = (Component) => Component;
 const wrapUseRoutes = reactRouterV6WrapUseRoutes;
 export { BrowserClient as Client, Hub, ErrorBoundary, transport, integrations, wrapComponent, wrapUseRoutes };

package/dist/shared/logging/SentryDependencies.native.js

@@ -3,8 +3,7 @@ import { ReactNativeClient, Hub, ErrorBoundary, wrap as sentryWrap, ReactNativeT
 import { makeReactNativeTransport } from "@sentry/react-native/dist/js/transports/native";
 import { NATIVE } from "@sentry/react-native/dist/js/wrapper";
 import { useEffect } from "react";
-import { useLocation } from "react-router-native";
-import { matchRoutes } from "./matchRoutes";
+import { matchRoutes, useLocation } from "react-router-native";
 import { ReactRouterV6Instrumentation } from "./reactRouterV6Instrumentation/reactRouterV6Instrumentation.native";
 const transport = (options, nativeFetch) => {
     console.log("NATIVE.isNativeTransportAvailable()", NATIVE.isNativeTransportAvailable(), options, nativeFetch);

package/dist/shared/logging/location.d.ts

@@ -0,0 +1,3 @@
+import { Location } from "./types";
+declare const stripFirstSlugFromLocation: (locationArg: string | Location) => Location;
+export { stripFirstSlugFromLocation };

package/dist/shared/logging/location.js

@@ -0,0 +1,5 @@
+// Remove the location's first path ("/checkout"). Otherwise it won't match the proper route.
+const stripFirstSlugFromLocation = (locationArg) => ({
+    pathname: (typeof locationArg === "string" ? locationArg : locationArg?.pathname || "").replace(/^\/\w+/, ""),
+});
+export { stripFirstSlugFromLocation };

package/dist/shared/logging/reactRouterV6Instrumentation/reactRouterV6Instrumentation.native.d.ts

@@ -3,7 +3,7 @@ import { OnConfirmRoute, TransactionCreator } from "@sentry/react-native/dist/js
 import { BeforeNavigate } from "@sentry/react-native/dist/js/tracing/types";
 import { MatchRoutes, UseEffect, UseLocation, WrapUseRoutes } from "../types";
 /**
- * This instrumentation has been built following the actual
+ * This instrumentation has been built taking as an example the actual
  * ReactNavigationV4Instrumentation implementation as suggested in the documentation.
  *
  * (https://docs.sentry.io/platforms/react-native/performance/instrumentation/automatic-instrumentation/#custom-instrumentation)

package/dist/shared/logging/reactRouterV6Instrumentation/reactRouterV6Instrumentation.native.js

@@ -2,10 +2,11 @@
 import { RoutingInstrumentation } from "@sentry/react-native";
 import { logger } from "@sentry/utils";
 import React from "react";
+import { stripFirstSlugFromLocation } from "../location";
 import { normalizedNameAndMatchForLocation } from "./normalizedNameAndMatchForLocation";
 import { transactionContext } from "./transactionContext";
 /**
- * This instrumentation has been built following the actual
+ * This instrumentation has been built taking as an example the actual
  * ReactNavigationV4Instrumentation implementation as suggested in the documentation.
  *
  * (https://docs.sentry.io/platforms/react-native/performance/instrumentation/automatic-instrumentation/#custom-instrumentation)
@@ -58,11 +59,16 @@ class ReactRouterV6Instrumentation extends RoutingInstrumentation {
         this.prevRoute = currentRoute;
     }
     currentRouteFromLocation(location, routes) {
-        const branches = this.matchRoutes(routes, location);
+        const normalizedLocation = stripFirstSlugFromLocation(location);
+        const branches = this.matchRoutes(routes, normalizedLocation);
         if (!branches) {
             return null;
         }
-        const [normalizedName, match] = normalizedNameAndMatchForLocation({ location, routes, branches });
+        const [normalizedName, match] = normalizedNameAndMatchForLocation({
+            location: normalizedLocation,
+            routes,
+            branches,
+        });
         if (!match) {
             return {
                 name: normalizedName,
@@ -71,13 +77,11 @@ class ReactRouterV6Instrumentation extends RoutingInstrumentation {
                 hasBeenSeen: this.recentRouteKeys.includes(normalizedName),
             };
         }
-        const name = match.route.path;
-        const key = match.route.id ?? name;
         return {
-            name,
-            key,
+            name: match.route.path,
+            key: normalizedName,
             params: match.params,
-            hasBeenSeen: this.recentRouteKeys.includes(key),
+            hasBeenSeen: this.recentRouteKeys.includes(normalizedName),
         };
     }
     pushRecentRouteKey(key) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lookiero/checkout",
-  "version": "0.6.0-beta.37",
+  "version": "0.6.0-beta.39",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [