@shopgate/pwa-common 7.32.2-alpha.6 → 7.32.2-alpha.8

package/actions/app/handleLink.js

@@ -39,7 +39,9 @@ export default function handleLink(payload, allowExternalLinks = false) {
           pathname
         } = new URL(link));
       } catch (linkParseError) {
-        logger.error(`Could not parse link ${link}`, linkParseError);
+        // The error is sent to Sentry. Query string and hash can contain tokens, so they are
+        // left out, and so is the error of the browser, which can contain the whole link.
+        logger.error(new Error(`Could not parse link ${link.split(/[?#]/)[0]}`));
       }
     } else {
       // Remove the deeplink protocol from the link.

package/components/ErrorBoundary/index.js

@@ -1,6 +1,7 @@
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import { PureComponent } from 'react';
 import PropTypes from 'prop-types';
+import { toError } from '@shopgate/pwa-core/helpers/error';
 import connector from "./connector";
 
 /**
@@ -35,9 +36,9 @@ let ErrorBoundary = /*#__PURE__*/function (_PureComponent) {
   };
   var _proto = ErrorBoundary.prototype;
   _proto.componentDidCatch = function componentDidCatch(error, errorInfo) {
-    // eslint-disable-next-line no-param-reassign
-    error.stack = errorInfo.componentStack;
-    this.props.appError(error);
+    this.props.appError(toError(error, {
+      componentStack: errorInfo.componentStack
+    }));
   }
 
   /**

package/components/Portal/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../components/Portal/index.jsx"],"names":[],"mappings":";AAOA;;GAEG;AACH;IACE;;;;MAIE;IAEF;;;MAGE;IAEF;;;OAGG;IACH,mBAFW,MAAM,EAUhB;IALC;;MAEC;IAED,kBAAsD;IAGxD;;;;OAIG;IACH,yBAHW,KAAK,QACL,MAAM,QAKhB;IAED;;;;OAIG;IACH,wBAAyB,OAHd,MAGmB,WAa5B;IAEF;;;;OAIG;IACH,sBAAuB,MAHZ,MAGgB,WA0CzB;IAEF;;;OAGG;IACH,UAFY,GAAG,CAiCd;CACF;kBAvJ8C,OAAO;sBAChC,YAAY"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../components/Portal/index.jsx"],"names":[],"mappings":";AAQA;;GAEG;AACH;IACE;;;;MAIE;IAEF;;;MAGE;IAEF;;;OAGG;IACH,mBAFW,MAAM,EAUhB;IALC;;MAEC;IAED,kBAAsD;IAGxD;;;;OAIG;IACH,yBAHW,KAAK,QACL,MAAM,QAKhB;IAED;;;;OAIG;IACH,wBAAyB,OAHd,MAGmB,WAa5B;IAEF;;;;OAIG;IACH,sBAAuB,MAHZ,MAGgB,WA0CzB;IAEF;;;OAGG;IACH,UAFY,GAAG,CAiCd;CACF;kBAxJ8C,OAAO;sBAChC,YAAY"}

package/components/Portal/index.js

@@ -2,6 +2,7 @@ import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import React, { PureComponent, Suspense } from 'react';
 import PropTypes from 'prop-types';
 import { logger } from '@shopgate/pwa-core/helpers';
+import { toError } from '@shopgate/pwa-core/helpers/error';
 import Loading from "../Loading";
 import portalCollection from "../../helpers/portals/portalCollection";
 import { componentsConfig } from "../../helpers/config";
@@ -104,7 +105,9 @@ let Portal = /*#__PURE__*/function (_PureComponent) {
     this.setState({
       hasError: true
     });
-    logger.error(error, info);
+    logger.error(toError(error, {
+      componentStack: info.componentStack
+    }));
   };
   /**
    * Renders the component.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopgate/pwa-common",
-  "version": "7.32.2-alpha.6",
+  "version": "7.32.2-alpha.8",
   "description": "Common library for the Shopgate Connect PWA.",
   "license": "Apache-2.0",
   "author": "Shopgate <support@shopgate.com>",
@@ -43,7 +43,7 @@
     "swiper": "12.2.0"
   },
   "devDependencies": {
-    "@shopgate/pwa-core": "7.32.2-alpha.6",
+    "@shopgate/pwa-core": "7.32.2-alpha.8",
     "@types/lodash": "^4.17.25",
     "@types/react-portal": "^3.0.9",
     "lodash": "^4.18.1",

package/subscriptions/error.js

@@ -1,9 +1,10 @@
 import { isAvailable } from '@shopgate/native-modules';
-import { init, addBreadcrumb, setTags, captureException, captureMessage, captureEvent, withScope } from '@sentry/browser';
+import { init, addBreadcrumb, setTags, captureException, captureEvent, withScope } from '@sentry/browser';
 import { router } from '@virtuous/conductor';
 import { EBIGAPI, emitter, errorManager, ETIMEOUT, ENETUNREACH, EUNKNOWN, EFAVORITE } from '@shopgate/pwa-core';
 import { hasWebBridge } from '@shopgate/engage/core';
 import { SOURCE_TRACKING, SOURCE_CONSOLE, Severity } from '@shopgate/pwa-core/constants/ErrorManager';
+import { describeValue } from '@shopgate/pwa-core/helpers/error';
 import { main$ } from "../streams/main";
 import {
 // eslint-disable-next-line import/no-named-default
@@ -13,10 +14,11 @@ import { transformGeneralPipelineError, getDisplayErrorMessage } from "./helpers
 import { historyPop } from "../actions/router";
 import showModal from "../actions/modal/showModal";
 import { clientInformationDidUpdate$ } from "../streams/client";
-import { appWillInit$, appWillStart$, appDidStart$ } from "../streams/app";
+import { appWillInit$, appWillStart$ } from "../streams/app";
 import { appError$, pipelineError$ } from "../streams/error";
 import { getRouterStack } from "../selectors/router";
 import { MODAL_PIPELINE_ERROR } from "../constants/ModalTypes";
+import { APP_ERROR } from "../constants/ActionTypes";
 import ToastProvider from "../providers/toast";
 
 // Generic, translated fallback shown when a backend error carries no code we can map to a message.
@@ -272,21 +274,32 @@ export default subscribe => {
       isReactNativeApp: isAvailable(),
       merchantCode: appConfig.omniMerchantCode
     });
-    emitter.addListener(SOURCE_TRACKING, error => {
+    emitter.addListener(SOURCE_CONSOLE, args => {
+      const error = args.find(arg => arg instanceof Error);
+      const texts = args.filter(arg => arg !== error).map(describeValue);
+      if (!error) {
+        addBreadcrumb({
+          category: 'logger',
+          message: texts.join(' '),
+          level: 'error'
+        });
+        return;
+      }
       withScope(scope => {
-        if (error.context) {
+        scope.setLevel('error');
+        scope.setTag('source', SOURCE_CONSOLE);
+        if (texts.length > 0) {
+          scope.setExtra('details', texts);
+        }
+        if (error.source === SOURCE_TRACKING && error.context) {
           scope.setExtra('trackerName', error.context);
         }
+        if (error.componentStack) {
+          scope.setExtra('componentStack', error.componentStack);
+        }
         captureException(error);
       });
     });
-    emitter.addListener(SOURCE_CONSOLE, args => {
-      withScope(scope => {
-        scope.setLevel('error');
-        scope.setExtra('error', args.map(arg => arg instanceof Error ? arg.message : String(arg)));
-        captureMessage('Console error');
-      });
-    });
   });
   subscribe(main$, ({
     action
@@ -312,21 +325,16 @@ export default subscribe => {
     });
   });
 
-  // Add app start event for debugging
-  subscribe(appDidStart$, () => {
-    withScope(scope => {
-      scope.setLevel('debug');
-      captureMessage('App did start');
-    });
-  });
-
   // Add some stack trace and log to sentry
   subscribe(appError$, ({
     action
   }) => {
+    if (!(action.error instanceof Error)) {
+      return;
+    }
     withScope(scope => {
-      if (action.error.stack) {
-        scope.setExtra('stack', action.error.stack);
+      if (action.error.componentStack) {
+        scope.setExtra('componentStack', action.error.componentStack);
       }
       captureException(action.error);
     });
@@ -342,6 +350,9 @@ export default subscribe => {
     const {
       code
     } = error;
+    if (action.type === APP_ERROR && error instanceof Error) {
+      return;
+    }
     withScope(scope => {
       scope.setTag('error', 'E_USER');
       scope.setTag('errorCode', code);