@lookiero/checkout 0.6.0-beta.2 → 0.6.0-beta.20

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

@@ -1,6 +1,7 @@
 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";
@@ -8,7 +9,7 @@ interface RootFunctionArgs {
     readonly Messaging: MessagingRoot;
     readonly I18n: I18n;
     readonly development?: boolean;
-    readonly sentry?: SentryLoggerFunctionArgs;
+    readonly sentry: SentryLoggerFunctionArgs;
     readonly getAuthToken: () => Promise<string>;
 }
 interface RootFunction {
@@ -22,6 +23,7 @@ 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,21 +1,20 @@
 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 }) => {
+    const Root = ({ basePath, locale = "en", customer, menu, tabBar, onNotAccessible, useRedirect, useRoutes = reactRouterUseRoutes, }) => {
         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, 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, useRoutes: useRoutes, onI18nError: development ? undefined : handleOnI18nError, onNotAccessible: onNotAccessible })));
     };
-    return sentry
-        ? sentryLogger({
-            publicKey: sentry.publicKey,
-            environment: sentry.environment,
-            release: sentry.release,
-            project: sentry.project,
-        })(Root)
-        : Root;
+    return sentryLogger({
+        publicKey: sentry.publicKey,
+        environment: sentry.environment,
+        release: sentry.release,
+        project: sentry.project,
+    })(Root);
 };
 export { root };

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

@@ -1,5 +1,6 @@
 import { I18n } from "@lookiero/i18n-react";
 import { FC } from "react";
+import { useRoutes as reactRouterUseRoutes } from "react-router-native";
 import { Customer } from "../../../projection/shared/customer";
 import { Menu, TabBar } from "../views/navigation/Navigation";
 interface RoutingProps {
@@ -13,6 +14,7 @@ interface RoutingProps {
     readonly onNotAccessible: () => void;
     readonly onI18nError?: (err: Error) => void;
     readonly useRedirect: () => Record<string, string>;
+    readonly useRoutes: typeof reactRouterUseRoutes;
 }
 declare const Routing: FC<RoutingProps>;
 export { Routing };

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

@@ -1,5 +1,5 @@
 import React, { lazy, Suspense } from "react";
-import { Navigate, Outlet, useRoutes } from "react-router-native";
+import { Navigate, Outlet } 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,7 +12,7 @@ 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, }) => {
+const Routing = ({ basePath = "", customer, locale, I18n, menu, tabBar, getAuthToken, onI18nError, onNotAccessible, useRedirect, useRoutes, }) => {
     const routes = useRoutes([
         {
             path: "",

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

@@ -4,14 +4,8 @@ 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 a = true;
-const App = ({ customerId, menu, tabBar, children }) => {
-    if (a) {
-        throw new Error("This is my first Sentry error");
-    }
-    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))));
-};
+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))));
 export { App };

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

@@ -0,0 +1,9 @@
+import { BrowserClient, Hub } from "@sentry/browser";
+import { ErrorBoundary } from "@sentry/react";
+import { ReactNativeTransportOptions } from "@sentry/react-native/dist/js/options";
+import { Transport, Integration } from "@sentry/types";
+import { ComponentType } from "react";
+declare const transport: (options: ReactNativeTransportOptions) => Transport;
+declare const integrations: 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

@@ -0,0 +1,22 @@
+import { BrowserClient, Hub, makeFetchTransport, defaultIntegrations } from "@sentry/browser";
+import { ErrorBoundary, reactRouterV6Instrumentation } from "@sentry/react";
+import { BrowserTracing } from "@sentry/tracing";
+import { useEffect } from "react";
+import { createRoutesFromChildren, matchRoutes, useLocation, useNavigationType } from "react-router-native";
+const transport = (options, nativeFetch) => makeFetchTransport(options, nativeFetch);
+const integrations = [
+    ...defaultIntegrations,
+    new BrowserTracing({
+        routingInstrumentation: reactRouterV6Instrumentation(useEffect, useLocation, useNavigationType, createRoutesFromChildren, matchRoutes),
+        beforeNavigate: (context) => {
+            console.log("beforeNavigate", context);
+            return context;
+        },
+        shouldCreateSpanForRequest: (url) => {
+            console.log(url);
+            return true;
+        },
+    }),
+];
+const wrap = (Component) => Component;
+export { BrowserClient as Client, Hub, ErrorBoundary, transport, integrations, wrap };

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

@@ -0,0 +1,8 @@
+import { ReactNativeClient, Hub, ErrorBoundary } from "@sentry/react-native";
+import { ReactNativeTransportOptions } from "@sentry/react-native/dist/js/options";
+import { Transport, Integration } from "@sentry/types";
+import { ComponentType } from "react";
+declare const transport: (options: ReactNativeTransportOptions) => Transport;
+declare const integrations: 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

@@ -0,0 +1,8 @@
+import { makeFetchTransport } from "@sentry/browser";
+import { ReactNativeClient, Hub, ErrorBoundary, wrap as sentryWrap } from "@sentry/react-native";
+import { makeReactNativeTransport } from "@sentry/react-native/dist/js/transports/native";
+import { NATIVE } from "@sentry/react-native/dist/js/wrapper";
+const transport = (options, nativeFetch) => NATIVE.isNativeTransportAvailable() ? makeReactNativeTransport(options) : makeFetchTransport(options, nativeFetch);
+const integrations = [];
+const wrap = (Component) => sentryWrap(Component);
+export { ReactNativeClient as Client, Hub, ErrorBoundary, transport, integrations, wrap };

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

@@ -1,4 +1,3 @@
-import "@sentry/tracing";
 import { ComponentType } from "react";
 import { Platform } from "react-native";
 interface SentryLoggerFunctionArgs {
@@ -7,9 +6,14 @@ interface SentryLoggerFunctionArgs {
     readonly release: string;
     readonly project: string;
 }
+interface SentryLoggerHOCProps {
+    readonly customer: {
+        readonly customerId: string;
+    } | undefined;
+}
 interface SentryLoggerFunction {
-    (args: SentryLoggerFunctionArgs): <P>(Component: ComponentType<P>) => ComponentType<P & JSX.IntrinsicAttributes>;
+    (args: SentryLoggerFunctionArgs): <P extends SentryLoggerHOCProps>(Component: ComponentType<P>) => ComponentType<P & JSX.IntrinsicAttributes>;
 }
 declare const sentryLogger: SentryLoggerFunction;
-export type { SentryLoggerFunctionArgs };
+export type { SentryLoggerFunctionArgs, SentryLoggerHOCProps };
 export { sentryLogger };

package/dist/shared/logging/SentryLogger.js

@@ -1,41 +1,106 @@
+import { defaultStackParser } from "@sentry/browser";
 import { makeMain } from "@sentry/core";
-import * as Sentry from "@sentry/react-native";
-import "@sentry/tracing";
+import { wrapUseRoutes } from "@sentry/react";
 import React, { useEffect } from "react";
 import { Platform } from "react-native";
+import { useRoutes as reactRouterUseRoutes } from "react-router-native";
+import { Client, Hub, ErrorBoundary, transport, integrations, wrap } from "./SentryDependencies";
 const sentryLogger = ({ publicKey, environment, release, project }) => {
     let mainHub;
-    /**
-     * TS complains about not providing 'transport' and 'stackParser' implementations
-     * although 'ReactNativeClient' defaults to its own implementation for those options.
-     */
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    const client = new Sentry.ReactNativeClient({
+    const client = new Client({
         environment,
         release,
         dsn: `https://${publicKey}@o179049.ingest.sentry.io/${project}`,
-        integrations: [new Sentry.ReactNativeTracing()],
+        integrations,
         tracesSampleRate: 1.0,
         debug: true,
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
         enableNative: Platform.OS !== "web",
+        stackParser: defaultStackParser,
+        transport,
+        // This configuration is obtained from
+        // https://docs.sentry.io/clients/javascript/tips/#decluttering-sentry
+        ignoreErrors: [
+            // 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",
+        ],
+        denyUrls: [
+            // 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,
+        ],
+        beforeSend: (event) => {
+            console.log(event);
+            return event;
+        },
+        beforeSendTransaction: (event) => {
+            console.log(event);
+            return event;
+        },
     });
-    const hub = new Sentry.Hub(client);
-    hub.bindClient(client);
-    const switchMainHub = () => {
-        mainHub = makeMain(hub);
+    const hub = new Hub(client);
+    const onMount = (customerId) => {
+        if (!mainHub) {
+            hub.setUser({ id: customerId });
+            hub.startSession();
+            mainHub = makeMain(hub);
+        }
     };
-    const revertMainHub = () => {
+    const onUnMount = () => {
+        hub.setUser(null);
+        hub.endSession();
         makeMain(mainHub);
     };
     return (Component) => {
-        switchMainHub();
-        const WrappedComponent = Sentry.wrap(Component);
-        // eslint-disable-next-line react/display-name
-        return (props) => {
-            useEffect(() => revertMainHub, []);
-            return React.createElement(WrappedComponent, { ...props });
+        const WrappedComponent = wrap(Component);
+        const useRoutes = wrapUseRoutes(reactRouterUseRoutes);
+        const SentryLogger = (props) => {
+            const { customer } = props;
+            useEffect(() => {
+                onMount(customer?.customerId);
+                return onUnMount;
+            }, [customer?.customerId]);
+            return (React.createElement(ErrorBoundary, null,
+                React.createElement(WrappedComponent, { ...props, useRoutes: useRoutes })));
         };
+        return SentryLogger;
     };
 };
 export { sentryLogger };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lookiero/checkout",
-  "version": "0.6.0-beta.2",
+  "version": "0.6.0-beta.20",
   "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.12.0",
+    "@sentry/react-native": "^4.13.0",
     "inline-style-prefixer": "6.0.1",
     "react-native-safe-area-context": "^4.4.1",
     "react-native-svg": "^12.1.1",