@lookiero/checkout 0.6.0-beta.27 → 0.6.0-beta.29

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

@@ -4,6 +4,6 @@ import { ReactNativeTransportOptions } from "@sentry/react-native/dist/js/option
 import { Transport, Integration } from "@sentry/types";
 import { ComponentType } from "react";
 declare const transport: (options: ReactNativeTransportOptions) => Transport;
-declare const integrations: Integration[];
+declare const integrations: (basename: string) => Integration[];
 declare const wrap: <P>(Component: ComponentType<P>) => ComponentType<P>;
 export { BrowserClient as Client, Hub, ErrorBoundary, transport, integrations, wrap };

package/dist/shared/logging/SentryDependencies.js

@@ -1,13 +1,15 @@
 import { BrowserClient, Hub, makeFetchTransport, defaultIntegrations } from "@sentry/browser";
-import { ErrorBoundary, reactRouterV6Instrumentation } from "@sentry/react";
+import { ErrorBoundary } from "@sentry/react";
+import { reactRouterV6Instrumentation } from "@sentry/react";
 import { BrowserTracing } from "@sentry/tracing";
 import { useEffect } from "react";
-import { createRoutesFromChildren, matchRoutes, useLocation, useNavigationType } from "react-router-native";
+import { createRoutesFromChildren, useLocation, useNavigationType } from "react-router-native";
+import { matchRoutesForBasename } from "./matchRoutes";
 const transport = (options, nativeFetch) => makeFetchTransport(options, nativeFetch);
-const integrations = [
+const integrations = (basename) => [
     ...defaultIntegrations,
     new BrowserTracing({
-        routingInstrumentation: reactRouterV6Instrumentation(useEffect, useLocation, useNavigationType, createRoutesFromChildren, matchRoutes),
+        routingInstrumentation: reactRouterV6Instrumentation(useEffect, useLocation, useNavigationType, createRoutesFromChildren, matchRoutesForBasename(basename)),
     }),
 ];
 const wrap = (Component) => Component;

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

@@ -3,6 +3,6 @@ import { ReactNativeTransportOptions } from "@sentry/react-native/dist/js/option
 import { Transport, Integration } from "@sentry/types";
 import { ComponentType } from "react";
 declare const transport: (options: ReactNativeTransportOptions) => Transport;
-declare const integrations: Integration[];
+declare const integrations: (basename: string) => Integration[];
 declare const wrap: <P>(Component: ComponentType<P>) => ComponentType<P>;
 export { ReactNativeClient as Client, Hub, ErrorBoundary, transport, integrations, wrap };

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

@@ -1,8 +1,16 @@
 import { makeFetchTransport } from "@sentry/browser";
-import { ReactNativeClient, Hub, ErrorBoundary, wrap as sentryWrap } from "@sentry/react-native";
+import { ReactNativeClient, Hub, ErrorBoundary, wrap as sentryWrap, ReactNativeTracing } from "@sentry/react-native";
 import { makeReactNativeTransport } from "@sentry/react-native/dist/js/transports/native";
 import { NATIVE } from "@sentry/react-native/dist/js/wrapper";
+import { useEffect } from "react";
+import { createRoutesFromChildren, useLocation, useNavigationType } from "react-router-native";
+import { matchRoutesForBasename } from "./matchRoutes";
+import { ReactRouterV6Instrumentation } from "./reactRouterV6Instrumentation.native";
 const transport = (options, nativeFetch) => NATIVE.isNativeTransportAvailable() ? makeReactNativeTransport(options) : makeFetchTransport(options, nativeFetch);
-const integrations = [];
+const integrations = (basename) => [
+    new ReactNativeTracing({
+        routingInstrumentation: new ReactRouterV6Instrumentation(useEffect, useLocation, useNavigationType, createRoutesFromChildren, matchRoutesForBasename(basename)),
+    }),
+];
 const wrap = (Component) => sentryWrap(Component);
 export { ReactNativeClient as Client, Hub, ErrorBoundary, transport, integrations, wrap };

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

@@ -1,6 +1,7 @@
 import { ComponentType } from "react";
 import { Platform } from "react-native";
 interface SentryLoggerFunctionArgs {
+    readonly routerBasename: string;
     readonly publicKey: string;
     readonly environment: `${typeof Platform.OS}-${"DEV" | "PROD"}`;
     readonly release: string;

package/dist/shared/logging/SentryLogger.js

@@ -5,13 +5,13 @@ import React, { useEffect } from "react";
 import { Platform } from "react-native";
 import { Routes as ReactRouterRoutes } from "react-router-native";
 import { Client, Hub, ErrorBoundary, transport, integrations, wrap } from "./SentryDependencies";
-const sentryLogger = ({ publicKey, environment, release, project }) => {
+const sentryLogger = ({ routerBasename, publicKey, environment, release, project }) => {
     let mainHub;
     const client = new Client({
         environment,
         release,
         dsn: `https://${publicKey}@o179049.ingest.sentry.io/${project}`,
-        integrations,
+        integrations: integrations(routerBasename),
         tracesSampleRate: 1.0,
         debug: true,
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment

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

@@ -0,0 +1,6 @@
+import { matchRoutes } from "@remix-run/router";
+interface MatchRoutesForBasenameFunction {
+    (basename: string): typeof matchRoutes;
+}
+declare const matchRoutesForBasename: MatchRoutesForBasenameFunction;
+export { matchRoutesForBasename };

package/dist/shared/logging/matchRoutes.js

@@ -0,0 +1,7 @@
+import { matchRoutes } from "@remix-run/router";
+const matchRoutesForBasename = (basename) => (routes, locationArg) => {
+    // Remove the location's first path ("/checkout"). Otherwise it won't match the proper route.
+    const location = (typeof locationArg === "string" ? locationArg : locationArg?.pathname || "").replace(/^\/\w+/, "");
+    return matchRoutes(routes, location, basename);
+};
+export { matchRoutesForBasename };

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

@@ -0,0 +1,14 @@
+import { RoutingInstrumentation } from "@sentry/react-native";
+import { useEffect } from "react";
+import { matchRoutes } from "react-router-native";
+import { createRoutesFromChildren, useLocation, useNavigationType } from "react-router-native";
+type UseEffect = typeof useEffect;
+type UseLocation = typeof useLocation;
+type UseNavigationType = typeof useNavigationType;
+type CreateRoutesFromChildren = typeof createRoutesFromChildren;
+type MatchRoutes = typeof matchRoutes;
+declare class ReactRouterV6Instrumentation extends RoutingInstrumentation {
+    static instrumentationName: string;
+    constructor(useEffect: UseEffect, useLocation: UseLocation, useNavigationType: UseNavigationType, createRoutesFromChildren: CreateRoutesFromChildren, matchRoutes: MatchRoutes);
+}
+export { ReactRouterV6Instrumentation };

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

@@ -0,0 +1,10 @@
+import { reactRouterV6Instrumentation as origReactRouterV6Instrumentation } from "@sentry/react";
+import { RoutingInstrumentation } from "@sentry/react-native";
+class ReactRouterV6Instrumentation extends RoutingInstrumentation {
+    static instrumentationName = "react-router-v6";
+    constructor(useEffect, useLocation, useNavigationType, createRoutesFromChildren, matchRoutes) {
+        super();
+        origReactRouterV6Instrumentation(useEffect, useLocation, useNavigationType, createRoutesFromChildren, matchRoutes);
+    }
+}
+export { ReactRouterV6Instrumentation };

package/package.json

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