@lookiero/checkout 0.6.0-beta.42 → 0.6.0-beta.5

package/dist/infrastructure/ui/Root.d.ts

@@ -1,7 +1,6 @@
 import { I18n } from "@lookiero/i18n-react";
 import { MessagingRoot } from "@lookiero/messaging-react/bootstrap";
 import { ComponentType } from "react";
-import { useRoutes as reactRouterUseRoutes } from "react-router-native";
 import { Customer } from "../../projection/shared/customer";
 import { SentryLoggerFunctionArgs } from "../../shared/logging/SentryLogger";
 import { Menu, TabBar } from "./views/navigation/Navigation";
@@ -9,7 +8,7 @@ interface RootFunctionArgs {
     readonly Messaging: MessagingRoot;
     readonly I18n: I18n;
     readonly development?: boolean;
-    readonly sentry: SentryLoggerFunctionArgs;
+    readonly sentry?: SentryLoggerFunctionArgs;
     readonly getAuthToken: () => Promise<string>;
 }
 interface RootFunction {
@@ -23,7 +22,6 @@ interface RootProps {
     readonly tabBar: TabBar;
     readonly onNotAccessible: () => void;
     readonly useRedirect: () => Record<string, string>;
-    readonly useRoutes: typeof reactRouterUseRoutes;
 }
 declare const root: RootFunction;
 export type { RootProps };

package/dist/infrastructure/ui/Root.js

@@ -1,15 +1,21 @@
 import React, { useCallback } from "react";
 import { Platform } from "react-native";
-import { useRoutes as reactRouterUseRoutes } from "react-router-native";
 import { sentryLogger } from "../../shared/logging/SentryLogger";
 import { Routing } from "./routing/Routing";
 const root = ({ Messaging, I18n, getAuthToken, development, sentry }) => {
     // eslint-disable-next-line react/display-name, react/prop-types
-    const Root = ({ basePath, locale = "en", customer, menu, tabBar, onNotAccessible, useRedirect, useRoutes = reactRouterUseRoutes, }) => {
+    const Root = ({ basePath, locale = "en", customer, menu, tabBar, onNotAccessible, useRedirect }) => {
         const handleOnI18nError = useCallback(() => void 0, []);
         return (React.createElement(Messaging, { includeReactQueryDevTools: Platform.OS === "web" },
-            React.createElement(Routing, { I18n: I18n, basePath: basePath, customer: customer, getAuthToken: getAuthToken, locale: locale, menu: menu, tabBar: tabBar, useRedirect: useRedirect, useRoutes: useRoutes, onI18nError: development ? undefined : handleOnI18nError, onNotAccessible: onNotAccessible })));
+            React.createElement(Routing, { I18n: I18n, basePath: basePath, customer: customer, getAuthToken: getAuthToken, locale: locale, menu: menu, tabBar: tabBar, useRedirect: useRedirect, onI18nError: development ? undefined : handleOnI18nError, onNotAccessible: onNotAccessible })));
     };
-    return sentryLogger(sentry)(Root);
+    return sentry
+        ? sentryLogger({
+            publicKey: sentry.publicKey,
+            environment: sentry.environment,
+            release: sentry.release,
+            project: sentry.project,
+        })(Root)
+        : Root;
 };
 export { root };

package/dist/infrastructure/ui/routing/CheckoutAccessibilityMiddleware.js

@@ -11,7 +11,7 @@ const CheckoutAccessibilityMiddleware = ({ customerId, onNotAccessible, loader =
         if (notAccessible) {
             onNotAccessibleRef.current();
         }
-    }, [notAccessible]);
+    }, [notAccessible, onNotAccessible]);
     return accessible === undefined && [QueryStatus.IDLE, QueryStatus.LOADING].includes(status)
         ? loader
         : accessible

package/dist/infrastructure/ui/routing/Routing.d.ts

@@ -1,6 +1,5 @@
 import { I18n } from "@lookiero/i18n-react";
-import React from "react";
-import { useRoutes as reactRouterUseRoutes } from "react-router-native";
+import { FC } from "react";
 import { Customer } from "../../../projection/shared/customer";
 import { Menu, TabBar } from "../views/navigation/Navigation";
 interface RoutingProps {
@@ -14,13 +13,6 @@ interface RoutingProps {
     readonly onNotAccessible: () => void;
     readonly onI18nError?: (err: Error) => void;
     readonly useRedirect: () => Record<string, string>;
-    readonly useRoutes: typeof reactRouterUseRoutes;
 }
-/**
- * Provided useRoutes is not stable (when integrated with Sentry) as it's rendering a different component tree.
- *
- * https://github.com/getsentry/sentry-javascript/blob/master/packages/react/src/reactrouterv6.tsx#L221
- * (SentryRoutes is a new component after each re-render)
- */
-declare const MemoizedRouting: React.NamedExoticComponent<RoutingProps>;
-export { MemoizedRouting as Routing };
+declare const Routing: FC<RoutingProps>;
+export { Routing };

package/dist/infrastructure/ui/routing/Routing.js

@@ -1,5 +1,5 @@
-import React, { lazy, memo, Suspense } from "react";
-import { Navigate, Outlet, useRoutes as reactRouterUseRoutes } from "react-router-native";
+import React, { lazy, Suspense } from "react";
+import { Navigate, Outlet, useRoutes } from "react-router-native";
 import { Spinner } from "../../../shared/ui/components/atoms/spinner/Spinner";
 import { App } from "../views/App";
 import { CheckoutPaymentModal } from "../views/checkout/components/checkoutPaymentModal/CheckoutPaymentModal";
@@ -12,10 +12,9 @@ const Item = lazy(() => import("../views/item/Item").then((module) => ({ default
 const Summary = lazy(() => import("../views/summary/Summary").then((module) => ({ default: module.Summary })));
 const Checkout = lazy(() => import("../views/checkout/Checkout").then((module) => ({ default: module.Checkout })));
 const Feedback = lazy(() => import("../views/feedback/Feedback").then((module) => ({ default: module.Feedback })));
-const Routing = ({ basePath = "", customer, locale, I18n, menu, tabBar, getAuthToken, onI18nError, onNotAccessible, useRedirect, useRoutes = reactRouterUseRoutes, }) => {
-    return useRoutes([
+const Routing = ({ basePath = "", customer, locale, I18n, menu, tabBar, getAuthToken, onI18nError, onNotAccessible, useRedirect, }) => {
+    const routes = useRoutes([
         {
-            id: "root",
             path: "",
             element: (React.createElement(BasePathProvider, { basePath: basePath },
                 React.createElement(CheckoutAccessibilityMiddleware, { customerId: customer?.customerId, onNotAccessible: onNotAccessible },
@@ -25,63 +24,49 @@ const Routing = ({ basePath = "", customer, locale, I18n, menu, tabBar, getAuthT
                                 React.createElement(Outlet, null))))))),
             children: [
                 {
-                    id: Routes.INTRO,
                     path: Routes.INTRO,
                     element: (React.createElement(Suspense, { fallback: React.createElement(Spinner, null) },
                         React.createElement(Intro, { customerId: customer?.customerId }))),
                 },
                 {
-                    id: Routes.ITEM,
                     path: Routes.ITEM,
                     element: (React.createElement(Suspense, { fallback: React.createElement(Spinner, null) },
                         React.createElement(Item, { country: customer?.country, customerId: customer?.customerId }))),
                 },
                 {
-                    id: Routes.ITEM_DETAIL,
                     path: Routes.ITEM_DETAIL,
                     element: (React.createElement(Suspense, { fallback: React.createElement(Spinner, null) },
                         React.createElement(Item, { country: customer?.country, customerId: customer?.customerId }))),
                 },
                 {
-                    id: Routes.SUMMARY,
                     path: Routes.SUMMARY,
                     element: (React.createElement(Suspense, { fallback: React.createElement(Spinner, null) },
                         React.createElement(Summary, { country: customer?.country, customerId: customer?.customerId }))),
                 },
                 {
-                    id: Routes.CHECKOUT,
                     path: Routes.CHECKOUT,
                     element: (React.createElement(Suspense, { fallback: React.createElement(Spinner, null) },
                         React.createElement(Checkout, { country: customer?.country, customerId: customer?.customerId, useRedirect: useRedirect },
                             React.createElement(Outlet, null)))),
                     children: [
                         {
-                            id: Routes.CHECKOUT_PAYMENT,
                             path: Routes.CHECKOUT_PAYMENT,
                             element: React.createElement(CheckoutPaymentModal, { customerId: customer?.customerId, getAuthToken: getAuthToken }),
                         },
                     ],
                 },
                 {
-                    id: Routes.FEEDBACK,
                     path: Routes.FEEDBACK,
                     element: (React.createElement(Suspense, { fallback: React.createElement(Spinner, null) },
                         React.createElement(Feedback, { customerId: customer?.customerId }))),
                 },
                 {
-                    id: "not-found-home-redirect",
                     path: "*",
                     element: React.createElement(Navigate, { to: `${Routes.HOME}`, replace: true }),
                 },
             ],
         },
     ]);
+    return routes;
 };
-/**
- * Provided useRoutes is not stable (when integrated with Sentry) as it's rendering a different component tree.
- *
- * https://github.com/getsentry/sentry-javascript/blob/master/packages/react/src/reactrouterv6.tsx#L221
- * (SentryRoutes is a new component after each re-render)
- */
-const MemoizedRouting = memo(Routing);
-export { MemoizedRouting as Routing };
+export { Routing };

package/dist/infrastructure/ui/views/App.js

@@ -4,8 +4,14 @@ import { SafeAreaProvider } from "react-native-safe-area-context";
 import { Notifications } from "../../../shared/notifications/infrastructure/ui/views/Notifications";
 import { MESSAGING_CONTEXT_ID } from "../../delivery/baseBootstrap";
 import { Navigation } from "./navigation/Navigation";
-const App = ({ customerId, menu, tabBar, children }) => (React.createElement(SafeAreaProvider, null,
-    React.createElement(Notifications, { contextId: MESSAGING_CONTEXT_ID }),
-    React.createElement(Navigation, { customerId: customerId, menu: menu, tabBar: tabBar },
-        React.createElement(PortalProvider, null, children))));
+const a = true;
+const App = ({ customerId, menu, tabBar, children }) => {
+    if (a) {
+        throw new Error("This is an error (integrated in UAF)");
+    }
+    return (React.createElement(SafeAreaProvider, null,
+        React.createElement(Notifications, { contextId: MESSAGING_CONTEXT_ID }),
+        React.createElement(Navigation, { customerId: customerId, menu: menu, tabBar: tabBar },
+            React.createElement(PortalProvider, null, children))));
+};
 export { App };

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

@@ -1,19 +1,15 @@
+import "@sentry/tracing";
 import { ComponentType } from "react";
 import { Platform } from "react-native";
 interface SentryLoggerFunctionArgs {
     readonly publicKey: string;
-    readonly environment: `${typeof Platform.OS}-${"DEV" | "PROD" | "EXPO"}`;
+    readonly environment: `${typeof Platform.OS}-${"DEV" | "PROD"}`;
     readonly release: string;
     readonly project: string;
 }
-interface SentryLoggerHOCProps {
-    readonly customer: {
-        readonly customerId: string;
-    } | undefined;
-}
 interface SentryLoggerFunction {
-    (args: SentryLoggerFunctionArgs): <P extends SentryLoggerHOCProps>(Component: ComponentType<P>) => ComponentType<P & JSX.IntrinsicAttributes>;
+    (args: SentryLoggerFunctionArgs): <P>(Component: ComponentType<P>) => ComponentType<P & JSX.IntrinsicAttributes>;
 }
 declare const sentryLogger: SentryLoggerFunction;
-export type { SentryLoggerFunctionArgs, SentryLoggerHOCProps };
+export type { SentryLoggerFunctionArgs };
 export { sentryLogger };

package/dist/shared/logging/SentryLogger.js

@@ -1,123 +1,58 @@
-import { defaultStackParser } from "@sentry/browser";
+import { defaultStackParser, makeFetchTransport } from "@sentry/browser";
 import { makeMain } from "@sentry/core";
+import * as Sentry from "@sentry/react-native";
+import { makeReactNativeTransport } from "@sentry/react-native/dist/js/transports/native";
+import { NATIVE } from "@sentry/react-native/dist/js/wrapper";
+import "@sentry/tracing";
 import React, { useEffect } from "react";
 import { Platform } from "react-native";
-import { useRoutes as reactRouterUseRoutes } from "react-router-native";
-import { Client, Hub, ErrorBoundary, transport, integrations, wrapComponent, wrapUseRoutes, } from "./SentryDependencies";
-// This configuration is obtained from
-// https://docs.sentry.io/clients/javascript/tips/#decluttering-sentry
-const IGNORED_ERRORS = [
-    // Random plugins/extensions
-    "top.GLOBALS",
-    // See: http://blog.errorception.com/2012/03/tale-of-unfindable-js-error.html
-    "originalCreateNotification",
-    "canvas.contentDocument",
-    "MyApp_RemoveAllHighlights",
-    "http://tt.epicplay.com",
-    "Can't find variable: ZiteReader",
-    "jigsaw is not defined",
-    "ComboSearch is not defined",
-    "http://loading.retry.widdit.com/",
-    "atomicFindClose",
-    // Facebook borked
-    "fb_xd_fragment",
-    // ISP "optimizing" proxy - `Cache-Control: no-transform` seems to reduce this. (thanks @acdha)
-    // See http://stackoverflow.com/questions/4113268/how-to-stop-javascript-injection-from-vodafone-proxy
-    "bmi_SafeAddOnload",
-    "EBCallBackMessageReceived",
-    // See http://toolbar.conduit.com/Developer/HtmlAndGadget/Methods/JSInjection.aspx
-    "conduitPage",
-    // Generic error code from errors outside the security sandbox
-    // You can delete this if using raven.js > 1.0, which ignores these automatically.
-    "Script error.",
-    // Avast extension error
-    "_avast_submit",
-];
-const DENIED_URLS = [
-    // Google Adsense
-    /pagead\/js/i,
-    // Facebook flakiness
-    /graph\.facebook\.com/i,
-    // Facebook blocked
-    /connect\.facebook\.net\/en_US\/all\.js/i,
-    // Woopra flakiness
-    /eatdifferent\.com\.woopra-ns\.com/i,
-    /static\.woopra\.com\/js\/woopra\.js/i,
-    // Chrome extensions
-    /extensions\//i,
-    /^chrome:\/\//i,
-    // Other plugins
-    /127\.0\.0\.1:4001\/isrunning/i,
-    /webappstoolbarba\.texthelp\.com\//i,
-    /metrics\.itunes\.apple\.com\.edgesuite\.net\//i,
-];
+const defaultTransport = (options, nativeFetch) => {
+    if (NATIVE.isNativeTransportAvailable()) {
+        return makeReactNativeTransport(options);
+    }
+    return makeFetchTransport(options, nativeFetch);
+};
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 const sentryLogger = ({ publicKey, environment, release, project }) => {
-    let globalHub;
-    let currentHub;
-    const initHub = () => {
-        const client = new Client({
-            environment,
-            release,
-            dsn: `https://${publicKey}@o179049.ingest.sentry.io/${project}`,
-            integrations: integrations(),
-            tracesSampleRate: 1.0,
-            debug: true,
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            enableNative: Platform.OS !== "web",
-            autoInitializeNativeSdk: Platform.OS !== "web",
-            stackParser: defaultStackParser,
-            transport,
-            ignoreErrors: IGNORED_ERRORS,
-            denyUrls: DENIED_URLS,
-        });
-        return new Hub(client);
-    };
+    let mainHub;
     /**
-     * BrowserClient must be initialized before wrapUseRoutes is used.
-     *
-     * ReactNativeClient cannot be initialized until actual component is rendered.
-     * Its initialization will trigger the native sdk setup with the provided settings,
-     * but by the time an event will be sent to Sentry, the host project (UAF)
-     * will have overrided its configuration (dsn, etc) after initializing it
-     * so we have to initialize it on the component mount.
+     * TS complains about not providing 'transport' and 'stackParser' implementations
+     * although 'ReactNativeClient' defaults to its own implementation for those options.
      */
-    if (Platform.OS === "web") {
-        currentHub = initHub();
-    }
-    const onMount = (customerId) => {
-        // currentHub won't be initialized in native until this time
-        currentHub = currentHub ?? initHub();
-        currentHub.setUser({ id: customerId });
-        currentHub.startSession();
-        if (!globalHub) {
-            globalHub = makeMain(currentHub);
-        }
+    const client = new Sentry.ReactNativeClient({
+        environment,
+        release,
+        dsn: `https://${publicKey}@o179049.ingest.sentry.io/${project}`,
+        integrations: [
+            new Sentry.ReactNativeTracing({
+                enableAppStartTracking: true,
+            }),
+        ],
+        tracesSampleRate: 1.0,
+        debug: true,
+        enableNative: Platform.OS !== "web",
+        stackParser: defaultStackParser,
+        transport: defaultTransport,
+    });
+    const hub = new Sentry.Hub(client);
+    const switchMainHub = () => {
+        console.log("switchMainHub");
+        mainHub = makeMain(hub);
     };
-    const onUnMount = () => {
-        if (currentHub) {
-            currentHub.setUser(null);
-            currentHub.endSession();
-        }
-        if (globalHub) {
-            makeMain(globalHub);
-            globalHub = null;
-        }
+    const revertMainHub = () => {
+        console.log("revertMainHub");
+        makeMain(mainHub);
     };
-    const useRoutes = wrapUseRoutes(reactRouterUseRoutes);
     return (Component) => {
-        const WrappedComponent = wrapComponent(Component);
-        const SentryLogger = (props) => {
-            const { customer } = props;
-            useEffect(() => {
-                onMount(customer?.customerId);
-                return onUnMount;
-                // eslint-disable-next-line react-hooks/exhaustive-deps
-            }, []);
-            return (React.createElement(ErrorBoundary, null,
-                React.createElement(WrappedComponent, { ...props, useRoutes: useRoutes })));
+        switchMainHub();
+        const WrappedComponent = Sentry.wrap(Component);
+        // eslint-disable-next-line react/display-name
+        return (props) => {
+            useEffect(() => revertMainHub, []);
+            return (React.createElement(Sentry.ErrorBoundary, null,
+                React.createElement(WrappedComponent, { ...props })));
         };
-        return SentryLogger;
     };
 };
 export { sentryLogger };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lookiero/checkout",
-  "version": "0.6.0-beta.42",
+  "version": "0.6.0-beta.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -33,7 +33,7 @@
     "@lookiero/messaging": "^8.0.0",
     "@lookiero/messaging-react": "^8.0.0",
     "@react-spring/native": "^9.5.5",
-    "@sentry/react-native": "^4.13.0",
+    "@sentry/react-native": "^4.12.0",
     "inline-style-prefixer": "6.0.1",
     "react-native-safe-area-context": "^4.4.1",
     "react-native-svg": "^12.1.1",

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

@@ -1,10 +0,0 @@
-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 { wrapUseRoutes } from "./reactRouterV6Instrumentation/reactRouterV6Instrumentation";
-import { Integrations, WrapComponent } from "./types";
-declare const transport: (options: ReactNativeTransportOptions) => Transport;
-declare const integrations: Integrations;
-declare const wrapComponent: WrapComponent;
-export { BrowserClient as Client, Hub, ErrorBoundary, transport, integrations, wrapComponent, wrapUseRoutes };

package/dist/shared/logging/SentryDependencies.js

@@ -1,17 +0,0 @@
-import { BrowserClient, Hub, makeFetchTransport, defaultIntegrations } from "@sentry/browser";
-import { ErrorBoundary } from "@sentry/react";
-import { BrowserTracing } from "@sentry/tracing";
-import { useEffect } from "react";
-import { useLocation, useNavigationType, matchRoutes } from "react-router-native";
-import { reactRouterV6Instrumentation, wrapUseRoutes, } from "./reactRouterV6Instrumentation/reactRouterV6Instrumentation";
-const transport = (options, nativeFetch) => makeFetchTransport(options, nativeFetch);
-/**
- * BrowserTracing must be initialized before the BrowserClient
- * so we instantiate it before the integrations function is called
- */
-const browserTracing = new BrowserTracing({
-    routingInstrumentation: reactRouterV6Instrumentation(useEffect, useLocation, useNavigationType, matchRoutes),
-});
-const integrations = () => [...defaultIntegrations, browserTracing];
-const wrapComponent = (Component) => Component;
-export { BrowserClient as Client, Hub, ErrorBoundary, transport, integrations, wrapComponent, wrapUseRoutes };

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

@@ -1,9 +0,0 @@
-import { ReactNativeClient, Hub, ErrorBoundary } from "@sentry/react-native";
-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 integrations: Integrations;
-declare const wrapComponent: WrapComponent;
-declare const wrapUseRoutes: WrapUseRoutes;
-export { ReactNativeClient as Client, Hub, ErrorBoundary, transport, integrations, wrapComponent, wrapUseRoutes };

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

@@ -1,15 +0,0 @@
-import { makeFetchTransport } from "@sentry/browser";
-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 { matchRoutes, useLocation } from "react-router-native";
-import { ReactRouterV6Instrumentation } from "./reactRouterV6Instrumentation/reactRouterV6Instrumentation.native";
-const transport = (options, nativeFetch) => NATIVE.isNativeTransportAvailable() ? makeReactNativeTransport(options) : makeFetchTransport(options, nativeFetch);
-const routingInstrumentation = new ReactRouterV6Instrumentation(useEffect, useLocation, matchRoutes);
-// ReactNativeTracing's instantiation must be delayed so we wrap it in a function
-// that's going to be called when the Client is instantiated
-const integrations = () => [new ReactNativeTracing({ routingInstrumentation })];
-const wrapComponent = (Component) => sentryWrap(Component);
-const wrapUseRoutes = routingInstrumentation.wrapUseRoutes.bind(routingInstrumentation);
-export { ReactNativeClient as Client, Hub, ErrorBoundary, transport, integrations, wrapComponent, wrapUseRoutes };

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

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

package/dist/shared/logging/location.js

@@ -1,5 +0,0 @@
-// 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/matchRoutes.d.ts

@@ -1,3 +0,0 @@
-import { matchRoutes as reactRouterMatchRoutes } from "@remix-run/router";
-declare const matchRoutes: typeof reactRouterMatchRoutes;
-export { matchRoutes };

package/dist/shared/logging/matchRoutes.js

@@ -1,7 +0,0 @@
-import { matchRoutes as reactRouterMatchRoutes } from "@remix-run/router";
-const matchRoutes = (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 reactRouterMatchRoutes(routes, location);
-};
-export { matchRoutes };

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

@@ -1,12 +0,0 @@
-import { RouteMatch, RouteObject } from "react-router-native";
-import { Location } from "../types";
-interface NormalizedNameAndMatchForLocationFunctionArgs {
-    readonly routes: RouteObject[];
-    readonly location: Location;
-    readonly branches: RouteMatch[];
-}
-interface NormalizedNameAndMatchForLocationFunction {
-    (args: NormalizedNameAndMatchForLocationFunctionArgs): [string, RouteMatch | null];
-}
-declare const normalizedNameAndMatchForLocation: NormalizedNameAndMatchForLocationFunction;
-export { normalizedNameAndMatchForLocation };

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

@@ -1,34 +0,0 @@
-import { getNumberOfUrlSegments } from "@sentry/utils";
-const normalizedNameAndMatchForLocation = ({ routes, location, branches, }) => {
-    if (!routes || routes.length === 0) {
-        return [location.pathname, null];
-    }
-    let pathBuilder = "";
-    if (branches) {
-        // eslint-disable-next-line @typescript-eslint/prefer-for-of
-        for (let x = 0; x < branches.length; x++) {
-            const branch = branches[x];
-            const route = branch.route;
-            if (route) {
-                // Early return if index route
-                if (route.index) {
-                    return [branch.pathname, branch];
-                }
-                const path = route.path;
-                if (path) {
-                    const newPath = path[0] === "/" || pathBuilder[pathBuilder.length - 1] === "/" ? path : `/${path}`;
-                    pathBuilder += newPath;
-                    if (branch.pathname === location.pathname) {
-                        if (getNumberOfUrlSegments(pathBuilder) !== getNumberOfUrlSegments(branch.pathname) &&
-                            pathBuilder.slice(-2) !== "/*") {
-                            return [newPath, branch];
-                        }
-                        return [pathBuilder, branch];
-                    }
-                }
-            }
-        }
-    }
-    return [location.pathname, null];
-};
-export { normalizedNameAndMatchForLocation };

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

@@ -1,5 +0,0 @@
-import { Transaction, TransactionContext } from "@sentry/types";
-import { MatchRoutes, UseEffect, UseLocation, UseNavigationType, WrapUseRoutes } from "../types";
-declare const reactRouterV6Instrumentation: (useEffect: UseEffect, useLocation: UseLocation, useNavigationType: UseNavigationType, matchRoutes: MatchRoutes) => (customStartTransaction: (context: TransactionContext) => Transaction | undefined, startTransactionOnPageLoad?: boolean, startTransactionOnLocationChange?: boolean) => void;
-declare const wrapUseRoutes: WrapUseRoutes;
-export { reactRouterV6Instrumentation, wrapUseRoutes };

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

@@ -1,103 +0,0 @@
-import { WINDOW } from "@sentry/browser";
-import { logger } from "@sentry/utils";
-import React from "react";
-import { stripFirstSlugFromLocation } from "../location";
-import { normalizedNameAndMatchForLocation } from "./normalizedNameAndMatchForLocation";
-/**
- * "@sentry/react"'s reactRouterV6Instrumentation has a bug and we have to patch its implementation.
- * (regarding location and matchRoutes)
- */
-let activeTransaction;
-/* eslint-disable @typescript-eslint/naming-convention */
-let _useEffect;
-let _useLocation;
-let _useNavigationType;
-let _matchRoutes;
-let _customStartTransaction;
-let _startTransactionOnLocationChange;
-/* eslint-enable @typescript-eslint/naming-convention */
-const SENTRY_TAGS = {
-    ["routing.instrumentation"]: "react-router-v6",
-};
-const reactRouterV6Instrumentation = (useEffect, useLocation, useNavigationType, matchRoutes) => {
-    return (customStartTransaction, startTransactionOnPageLoad = true, startTransactionOnLocationChange = true) => {
-        const initPathName = WINDOW && WINDOW.location && WINDOW.location.pathname;
-        if (startTransactionOnPageLoad && initPathName) {
-            activeTransaction = customStartTransaction({
-                name: initPathName,
-                op: "pageload",
-                tags: SENTRY_TAGS,
-                metadata: {
-                    source: "url",
-                },
-            });
-        }
-        _useEffect = useEffect;
-        _useLocation = useLocation;
-        _useNavigationType = useNavigationType;
-        _matchRoutes = matchRoutes;
-        _customStartTransaction = customStartTransaction;
-        _startTransactionOnLocationChange = startTransactionOnLocationChange;
-    };
-};
-const updatePageloadTransaction = (location, routes) => {
-    const normalizedLocation = stripFirstSlugFromLocation(location);
-    const branches = _matchRoutes(routes, normalizedLocation);
-    if (activeTransaction && branches) {
-        const [name, match] = normalizedNameAndMatchForLocation({ routes, location: normalizedLocation, branches });
-        const source = match ? "route" : "url";
-        activeTransaction.setName(match?.route.path ?? name, source);
-    }
-};
-const handleNavigation = (location, routes, navigationType) => {
-    const normalizedLocation = stripFirstSlugFromLocation(location);
-    const branches = _matchRoutes(routes, normalizedLocation);
-    if (_startTransactionOnLocationChange && (navigationType === "PUSH" || navigationType === "POP") && branches) {
-        if (activeTransaction) {
-            activeTransaction.finish();
-        }
-        const [name, match] = normalizedNameAndMatchForLocation({ routes, location: normalizedLocation, branches });
-        const source = match ? "route" : "url";
-        activeTransaction = _customStartTransaction({
-            name: match?.route.path ?? name,
-            op: "navigation",
-            tags: SENTRY_TAGS,
-            metadata: {
-                source,
-            },
-        });
-    }
-};
-const wrapUseRoutes = (origUseRoutes) => {
-    if (!_useEffect || !_useLocation || !_useNavigationType || !_matchRoutes || !_customStartTransaction) {
-        __DEBUG_BUILD__ &&
-            logger.warn("reactRouterV6Instrumentation was unable to wrap `useRoutes` because of one or more missing parameters.");
-        return origUseRoutes;
-    }
-    let isMountRenderPass = true;
-    // eslint-disable-next-line react/display-name
-    return (routes, locationArg) => {
-        const SentryRoutes = () => {
-            const Routes = origUseRoutes(routes, locationArg);
-            const location = _useLocation();
-            const navigationType = _useNavigationType();
-            // A value with stable identity to either pick `locationArg` if available or `location` if not
-            const stableLocationParam = typeof locationArg === "string" || (locationArg && locationArg.pathname)
-                ? locationArg
-                : location;
-            _useEffect(() => {
-                const normalizedLocation = typeof stableLocationParam === "string" ? { pathname: stableLocationParam } : stableLocationParam;
-                if (isMountRenderPass) {
-                    updatePageloadTransaction(normalizedLocation, routes);
-                    isMountRenderPass = false;
-                }
-                else {
-                    handleNavigation(normalizedLocation, routes, navigationType);
-                }
-            }, [navigationType, stableLocationParam]);
-            return Routes;
-        };
-        return React.createElement(SentryRoutes, null);
-    };
-};
-export { reactRouterV6Instrumentation, wrapUseRoutes };

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

@@ -1,29 +0,0 @@
-import { RoutingInstrumentation } from "@sentry/react-native";
-import { OnConfirmRoute, TransactionCreator } from "@sentry/react-native/dist/js/tracing/routingInstrumentation";
-import { BeforeNavigate } from "@sentry/react-native/dist/js/tracing/types";
-import { MatchRoutes, UseEffect, UseLocation, WrapUseRoutes } from "../types";
-/**
- * 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)
- * (https://github.com/getsentry/sentry-react-native/blob/211ec081b6bf8d7d29541afe9d800040f61e3c4e/src/js/tracing/reactnavigationv4.ts)
- */
-declare class ReactRouterV6Instrumentation extends RoutingInstrumentation {
-    static instrumentationName: string;
-    private useEffect;
-    private useLocation;
-    private matchRoutes;
-    private prevRoute?;
-    private recentRouteKeys;
-    private latestTransaction?;
-    private readonly maxRecentRouteLen;
-    constructor(useEffect: UseEffect, useLocation: UseLocation, matchRoutes: MatchRoutes);
-    registerRoutingInstrumentation(listener: TransactionCreator, beforeNavigate: BeforeNavigate, onConfirmRoute: OnConfirmRoute): void;
-    private onRouteChange;
-    private currentRouteFromLocation;
-    private pushRecentRouteKey;
-    private onBeforeNavigateNotSampled;
-    wrapUseRoutes: WrapUseRoutes;
-}
-export { ReactRouterV6Instrumentation };

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

@@ -1,134 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
-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 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)
- * (https://github.com/getsentry/sentry-react-native/blob/211ec081b6bf8d7d29541afe9d800040f61e3c4e/src/js/tracing/reactnavigationv4.ts)
- */
-class ReactRouterV6Instrumentation extends RoutingInstrumentation {
-    static instrumentationName = "react-router-v6";
-    useEffect;
-    useLocation;
-    matchRoutes;
-    prevRoute;
-    recentRouteKeys = [];
-    latestTransaction;
-    maxRecentRouteLen = 200;
-    constructor(useEffect, useLocation, matchRoutes) {
-        super();
-        this.useEffect = useEffect;
-        this.useLocation = useLocation;
-        this.matchRoutes = matchRoutes;
-    }
-    registerRoutingInstrumentation(listener, beforeNavigate, onConfirmRoute) {
-        super.registerRoutingInstrumentation(listener, beforeNavigate, onConfirmRoute);
-        this.latestTransaction = this.onRouteWillChange(INITIAL_TRANSACTION_CONTEXT);
-    }
-    onRouteChange(location, routes, updateLatestTransaction = false) {
-        const currentRoute = this.currentRouteFromLocation(location, routes);
-        if (!currentRoute || (this.prevRoute && currentRoute.key === this.prevRoute.key)) {
-            return;
-        }
-        const originalContext = transactionContext({
-            instrumentationName: ReactRouterV6Instrumentation.instrumentationName,
-            route: currentRoute,
-            previousRoute: this.prevRoute,
-        });
-        let finalContext = this._beforeNavigate?.(originalContext);
-        if (!finalContext) {
-            logger.error(`[ReactRouterV6Instrumentation] beforeNavigate returned ${finalContext}, return context.sampled = false to not send transaction.`);
-            finalContext = { ...originalContext, sampled: false };
-        }
-        if (finalContext.sampled === false) {
-            this.onBeforeNavigateNotSampled(finalContext.name);
-        }
-        if (updateLatestTransaction && this.latestTransaction) {
-            this.latestTransaction.updateWithContext(finalContext);
-        }
-        else {
-            this.latestTransaction = this.onRouteWillChange(finalContext);
-        }
-        this.pushRecentRouteKey(currentRoute.key);
-        this.prevRoute = currentRoute;
-    }
-    currentRouteFromLocation(location, routes) {
-        const normalizedLocation = stripFirstSlugFromLocation(location);
-        const branches = this.matchRoutes(routes, normalizedLocation);
-        if (!branches) {
-            return null;
-        }
-        const [normalizedName, match] = normalizedNameAndMatchForLocation({
-            location: normalizedLocation,
-            routes,
-            branches,
-        });
-        if (!match) {
-            return {
-                name: normalizedName,
-                key: normalizedName,
-                params: {},
-                hasBeenSeen: this.recentRouteKeys.includes(normalizedName),
-            };
-        }
-        return {
-            name: match.route.path,
-            key: normalizedName,
-            params: match.params,
-            hasBeenSeen: this.recentRouteKeys.includes(normalizedName),
-        };
-    }
-    pushRecentRouteKey(key) {
-        this.recentRouteKeys.push(key);
-        if (this.recentRouteKeys.length > this.maxRecentRouteLen) {
-            this.recentRouteKeys = this.recentRouteKeys.slice(this.recentRouteKeys.length - this.maxRecentRouteLen);
-        }
-    }
-    onBeforeNavigateNotSampled(transactionName) {
-        logger.log(`[ReactRouterV6Instrumentation] Will not send transaction "${transactionName}" due to beforeNavigate.`);
-    }
-    wrapUseRoutes = (origUseRoutes) => {
-        if (!this.useEffect || !this.useLocation || !this.matchRoutes) {
-            __DEBUG_BUILD__ &&
-                logger.warn("ReactRouterV6Instrumentation was unable to wrap `useRoutes` because of one or more missing parameters.");
-            return origUseRoutes;
-        }
-        let isMountRenderPass = true;
-        const useRoutes = (routes, locationArg) => {
-            const SentryRoutes = () => {
-                const Routes = origUseRoutes(routes, locationArg);
-                const location = this.useLocation();
-                const stableLocationParam = typeof locationArg === "string" || (locationArg && locationArg.pathname)
-                    ? locationArg
-                    : location;
-                this.useEffect(() => {
-                    const normalizedLocation = typeof stableLocationParam === "string" ? { pathname: stableLocationParam } : stableLocationParam;
-                    if (isMountRenderPass) {
-                        this.onRouteChange(normalizedLocation, routes, true);
-                        isMountRenderPass = false;
-                    }
-                    else {
-                        this.onRouteChange(normalizedLocation, routes);
-                    }
-                }, [stableLocationParam]);
-                return Routes;
-            };
-            return React.createElement(SentryRoutes, null);
-        };
-        return useRoutes;
-    };
-}
-const INITIAL_TRANSACTION_CONTEXT = {
-    name: "App Launch",
-    op: "navigation",
-    tags: {
-        ["routing.instrumentation"]: ReactRouterV6Instrumentation.instrumentationName,
-    },
-};
-export { ReactRouterV6Instrumentation };

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

@@ -1,22 +0,0 @@
-import { TransactionContext } from "@sentry/types";
-import { NavigationCurrentRoute, NavigationRoute } from "./types";
-interface NavigationTransactionContext extends TransactionContext {
-    readonly tags: {
-        readonly ["routing.instrumentation"]: string;
-        readonly ["routing.route.name"]: string;
-    };
-    readonly data: {
-        readonly route: NavigationCurrentRoute;
-        readonly previousRoute: NavigationRoute | null;
-    };
-}
-interface TransactionContextFunctionArgs {
-    readonly instrumentationName: string;
-    readonly route: NavigationCurrentRoute;
-    readonly previousRoute?: NavigationRoute;
-}
-interface TransactionContextFunction {
-    (args: TransactionContextFunctionArgs): NavigationTransactionContext;
-}
-declare const transactionContext: TransactionContextFunction;
-export { transactionContext };

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

@@ -1,15 +0,0 @@
-const transactionContext = ({ instrumentationName, route, previousRoute = null, }) => {
-    return {
-        name: route.name,
-        op: "navigation",
-        tags: {
-            ["routing.instrumentation"]: instrumentationName,
-            ["routing.route.name"]: route.name,
-        },
-        data: {
-            route,
-            previousRoute,
-        },
-    };
-};
-export { transactionContext };

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

@@ -1,9 +0,0 @@
-interface NavigationRoute {
-    readonly name: string;
-    readonly key: string;
-    readonly params: Record<string, unknown>;
-}
-interface NavigationCurrentRoute extends NavigationRoute {
-    readonly hasBeenSeen: boolean;
-}
-export type { NavigationRoute, NavigationCurrentRoute };

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

@@ -1 +0,0 @@
-export {};

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

@@ -1,27 +0,0 @@
-import { RoutingInstrumentation } from "@sentry/react-native";
-import { OnConfirmRoute, TransactionCreator } from "@sentry/react-native/dist/js/tracing/routingInstrumentation";
-import { BeforeNavigate } from "@sentry/react-native/dist/js/tracing/types";
-import { MatchRoutes, UseEffect, UseLocation, UseNavigationType, WrapUseRoutes } from "./types";
-declare class ReactRouterV6Instrumentation extends RoutingInstrumentation {
-    static instrumentationName: string;
-    private useEffect;
-    private useLocation;
-    private useNavigationType;
-    private matchRoutes;
-    private prevRoute?;
-    private recentRouteKeys;
-    private latestTransaction?;
-    private shouldUpdateLatestTransaction;
-    constructor(useEffect: UseEffect, useLocation: UseLocation, useNavigationType: UseNavigationType, matchRoutes: MatchRoutes);
-    /**
-     * Extends by calling _handleInitialState at the end.
-     */
-    registerRoutingInstrumentation(listener: TransactionCreator, beforeNavigate: BeforeNavigate, onConfirmRoute: OnConfirmRoute): void;
-    /**
-     * Starts an idle transaction for the initial state which won't get called by the router listener.
-     */
-    private handleInitialState;
-    private getTransactionContext;
-    wrapUseRoutes: WrapUseRoutes;
-}
-export { ReactRouterV6Instrumentation };

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

@@ -1,115 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
-import { RoutingInstrumentation } from "@sentry/react-native";
-import { logger } from "@sentry/utils";
-import React from "react";
-class ReactRouterV6Instrumentation extends RoutingInstrumentation {
-    static instrumentationName = "react-router-v6";
-    useEffect;
-    useLocation;
-    useNavigationType;
-    matchRoutes;
-    // @ts-ignore
-    prevRoute;
-    recentRouteKeys = [];
-    // @ts-ignore
-    latestTransaction;
-    // @ts-ignore
-    shouldUpdateLatestTransaction = false;
-    constructor(useEffect, useLocation, useNavigationType, matchRoutes) {
-        super();
-        this.useEffect = useEffect;
-        this.useLocation = useLocation;
-        this.useNavigationType = useNavigationType;
-        this.matchRoutes = matchRoutes;
-    }
-    /**
-     * Extends by calling _handleInitialState at the end.
-     */
-    registerRoutingInstrumentation(listener, beforeNavigate, onConfirmRoute) {
-        super.registerRoutingInstrumentation(listener, beforeNavigate, onConfirmRoute);
-        // Need to handle the initial state as the router patch will only attach transactions on subsequent route changes.
-        this.handleInitialState();
-    }
-    /**
-     * Starts an idle transaction for the initial state which won't get called by the router listener.
-     */
-    handleInitialState() {
-        this.latestTransaction = this.onRouteWillChange(INITIAL_TRANSACTION_CONTEXT);
-        // We set this to true so when registerAppContainer is called, the transaction gets updated with the actual route data
-        this.shouldUpdateLatestTransaction = true;
-    }
-    // @ts-ignore
-    getTransactionContext(route, previousRoute) {
-        return {
-            name: route.name,
-            op: "navigation",
-            tags: {
-                ["routing.instrumentation"]: ReactRouterV6Instrumentation.instrumentationName,
-                ["routing.route.name"]: route.name,
-            },
-            data: {
-                route: {
-                    name: route.name,
-                    key: route.key,
-                    params: route.params ?? {},
-                    hasBeenSeen: this.recentRouteKeys.includes(route.key),
-                },
-                previousRoute: previousRoute
-                    ? {
-                        name: previousRoute.name,
-                        key: previousRoute.key,
-                        params: previousRoute.params ?? {},
-                    }
-                    : null,
-            },
-        };
-    }
-    wrapUseRoutes = (origUseRoutes) => {
-        if (!this.useEffect ||
-            !this.useLocation ||
-            !this.useNavigationType ||
-            !this.matchRoutes
-        // !this._customStartTransaction
-        ) {
-            __DEBUG_BUILD__ &&
-                logger.warn("reactRouterV6Instrumentation was unable to wrap `useRoutes` because of one or more missing parameters.");
-            return origUseRoutes;
-        }
-        let isMountRenderPass = true;
-        // eslint-disable-next-line react/display-name
-        return (routes, locationArg) => {
-            const SentryRoutes = () => {
-                const Routes = origUseRoutes(routes, locationArg);
-                const location = this.useLocation();
-                const navigationType = this.useNavigationType();
-                // A value with stable identity to either pick `locationArg` if available or `location` if not
-                const stableLocationParam = typeof locationArg === "string" || (locationArg && locationArg.pathname)
-                    ? locationArg
-                    : location;
-                this.useEffect(() => {
-                    const normalizedLocation = typeof stableLocationParam === "string" ? { pathname: stableLocationParam } : stableLocationParam;
-                    if (isMountRenderPass) {
-                        console.log("updatePageloadTransaction", normalizedLocation, routes);
-                        // updatePageloadTransaction(normalizedLocation, routes);
-                        isMountRenderPass = false;
-                    }
-                    else {
-                        console.log("normalizedLocation", normalizedLocation, routes, navigationType);
-                        // handleNavigation(normalizedLocation, routes, navigationType);
-                    }
-                }, [navigationType, stableLocationParam]);
-                return Routes;
-            };
-            return React.createElement(SentryRoutes, null);
-        };
-    };
-}
-const INITIAL_TRANSACTION_CONTEXT = {
-    name: "App Launch",
-    op: "navigation",
-    tags: {
-        ["routing.instrumentation"]: ReactRouterV6Instrumentation.instrumentationName,
-    },
-    data: {},
-};
-export { ReactRouterV6Instrumentation };

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

@@ -1,22 +0,0 @@
-import { Integration } from "@sentry/types";
-import { ComponentType, useEffect } from "react";
-import { matchRoutes, RouteObject, useLocation } from "react-router-native";
-interface Location {
-    readonly pathname: string;
-}
-type UseEffect = typeof useEffect;
-type UseLocation = typeof useLocation;
-type MatchRoutes = typeof matchRoutes;
-type NavigationType = "PUSH" | "REPLACE" | "POP";
-type UseNavigationType = () => NavigationType;
-type UseRoutes = (routes: RouteObject[], locationArg?: Partial<Location> | string) => React.ReactElement | null;
-interface WrapUseRoutes {
-    (useRoutes: UseRoutes): UseRoutes;
-}
-interface WrapComponent {
-    <P>(Component: ComponentType<P>): ComponentType<P>;
-}
-interface Integrations {
-    (): Integration[];
-}
-export type { Location, Integrations, UseEffect, UseLocation, NavigationType, UseNavigationType, MatchRoutes, UseRoutes, WrapUseRoutes, WrapComponent, };

package/dist/shared/logging/types.js

@@ -1 +0,0 @@
-export {};