@vtex/faststore-plugin-buyer-portal 1.1.98 → 1.1.99

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vtex/faststore-plugin-buyer-portal",
-	"version": "1.1.98",
+	"version": "1.1.99",
 	"description": "A plugin for faststore with buyer portal",
 	"main": "index.js",
 	"scripts": {

package/src/features/shared/components/ErrorBoundary/ErrorBoundary.tsx

@@ -3,6 +3,7 @@
 import React, { Component, type ReactNode } from "react";
 
 import { ErrorTabsLayout } from "../../layouts/ErrorTabsLayout/ErrorTabsLayout";
+import { isPluginError } from "../../utils/isPluginError";
 
 interface Props {
   children: ReactNode;
@@ -26,11 +27,15 @@ export class ErrorBoundary extends Component<Props, State> {
   }
 
   static getDerivedStateFromError(error: Error): State {
-    return { hasError: true, error };
+    if (isPluginError(error)) {
+      return { hasError: true, error };
+    }
+
+    return { hasError: false };
   }
 
   componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
-    if (this.props.onError) {
+    if (isPluginError(error) && this.props.onError) {
       this.props.onError(error, errorInfo);
     }
   }

package/src/features/shared/utils/index.ts

@@ -33,5 +33,7 @@ export {
 } from "./search";
 export { toQueryParams } from "./toQueryParams";
 export { getValidPage } from "./getValidPage";
+export { isPluginError } from "./isPluginError";
+export { useRouteTabsLayoutWithRetry } from "./routeLayoutMapping";
 export { withLoaderErrorBoundary } from "./withLoaderErrorBoundary";
 export { withClientErrorBoundary } from "./withClientErrorBoundary";

package/src/features/shared/utils/isPluginError.ts

@@ -0,0 +1,22 @@
+/**
+ * Checks if an error originates from the plugin's source files
+ * @param error - The error object to check
+ * @returns {boolean} True if the error comes from plugin source files, false otherwise
+ */
+export function isPluginError(error: Error): boolean {
+  if (!error.stack) {
+    return false;
+  }
+
+  const stackLines = error.stack.split("\n");
+
+  const pluginSourcePattern = /\/src\//;
+
+  for (const line of stackLines) {
+    if (pluginSourcePattern.test(line)) {
+      return true;
+    }
+  }
+
+  return false;
+}

package/src/features/shared/utils/routeLayoutMapping.ts

@@ -105,64 +105,138 @@ export const ROUTE_TABS_LAYOUT_MAPPING: Record<string, RouteTabsLayoutConfig> =
 export function getTabsLayoutConfigFromRoute(
   pathname: string
 ): RouteTabsLayoutConfig | null {
-  const normalizedPath = pathname.split("?")[0].split("#")[0];
+  try {
+    if (!pathname) {
+      return null;
+    }
 
-  if (ROUTE_TABS_LAYOUT_MAPPING[normalizedPath]) {
-    return ROUTE_TABS_LAYOUT_MAPPING[normalizedPath];
-  }
+    const normalizedPath = pathname.split("?")[0].split("#")[0];
 
-  for (const [routePattern, config] of Object.entries(
-    ROUTE_TABS_LAYOUT_MAPPING
-  )) {
-    if (matchesRoutePattern(normalizedPath, routePattern)) {
-      return config;
+    if (ROUTE_TABS_LAYOUT_MAPPING[normalizedPath]) {
+      return ROUTE_TABS_LAYOUT_MAPPING[normalizedPath];
+    }
+
+    for (const [routePattern, config] of Object.entries(
+      ROUTE_TABS_LAYOUT_MAPPING
+    )) {
+      if (matchesRoutePattern(normalizedPath, routePattern)) {
+        return config;
+      }
     }
-  }
 
-  return null;
+    return null;
+  } catch (error) {
+    console.warn(
+      `Failed to get tabs layout config for pathname "${pathname}":`,
+      error
+    );
+    return null;
+  }
 }
 
 function matchesRoutePattern(pathname: string, pattern: string): boolean {
-  const regexPattern = pattern
-    .replace(/\[([^\]]+)\]/g, "([^/]+)")
-    .replace(/\//g, "\\/");
+  try {
+    if (!pathname || !pattern) {
+      return false;
+    }
 
-  const regex = new RegExp(`^${regexPattern}$`);
-  return regex.test(pathname);
+    const regexPattern = pattern
+      .replace(/\[([^\]]+)\]/g, "([^/]+)")
+      .replace(/\//g, "\\/");
+
+    const regex = new RegExp(`^${regexPattern}$`);
+    return regex.test(pathname);
+  } catch (error) {
+    console.warn(
+      `Failed to match route pattern "${pattern}" with pathname "${pathname}":`,
+      error
+    );
+    return false;
+  }
 }
 
 export function extractRouteParams(pathname: string): Record<string, string> {
   const params: Record<string, string> = {};
 
-  const normalizedPath = pathname.split("?")[0].split("#")[0];
-
-  for (const [routePattern] of Object.entries(ROUTE_TABS_LAYOUT_MAPPING)) {
-    if (matchesRoutePattern(normalizedPath, routePattern)) {
-      const paramNames =
-        routePattern.match(/\[([^\]]+)\]/g)?.map((p) => p.slice(1, -1)) || [];
-
-      const regexPattern = routePattern
-        .replace(/\[([^\]]+)\]/g, "([^/]+)")
-        .replace(/\//g, "\\/");
-      const regex = new RegExp(`^${regexPattern}$`);
+  try {
+    if (!pathname) {
+      return params;
+    }
 
-      const match = normalizedPath.match(regex);
-      if (match) {
-        paramNames.forEach((name, index) => {
-          params[name] = match[index + 1];
-        });
+    const normalizedPath = pathname.split("?")[0].split("#")[0];
+
+    for (const [routePattern] of Object.entries(ROUTE_TABS_LAYOUT_MAPPING)) {
+      if (matchesRoutePattern(normalizedPath, routePattern)) {
+        const paramNames =
+          routePattern.match(/\[([^\]]+)\]/g)?.map((p) => p.slice(1, -1)) || [];
+
+        try {
+          const regexPattern = routePattern
+            .replace(/\[([^\]]+)\]/g, "([^/]+)")
+            .replace(/\//g, "\\/");
+          const regex = new RegExp(`^${regexPattern}$`);
+
+          const match = normalizedPath.match(regex);
+          if (match) {
+            paramNames.forEach((name, index) => {
+              params[name] = match[index + 1];
+            });
+          }
+        } catch (regexError) {
+          console.warn(
+            `Failed to create regex for pattern "${routePattern}":`,
+            regexError
+          );
+          continue;
+        }
+        break;
       }
-      break;
     }
+  } catch (error) {
+    console.warn(
+      `Failed to extract route params from pathname "${pathname}":`,
+      error
+    );
   }
 
   return params;
 }
 
 export function useRouteTabsLayout(pathname: string) {
-  const config = getTabsLayoutConfigFromRoute(pathname);
+  try {
+    if (!pathname) {
+      return {
+        hasTabsLayout: false,
+        layoutType: null,
+        layoutConfig: null,
+        routeParams: {},
+      };
+    }
+
+    const config = getTabsLayoutConfigFromRoute(pathname);
+
+    if (!config) {
+      return {
+        hasTabsLayout: false,
+        layoutType: null,
+        layoutConfig: null,
+        routeParams: {},
+      };
+    }
+
+    const params = extractRouteParams(pathname);
 
-  if (!config) {
+    return {
+      hasTabsLayout: true,
+      layoutType: config.layout,
+      layoutConfig: config,
+      routeParams: params,
+    };
+  } catch (error) {
+    console.warn(
+      `Failed to get route tabs layout for pathname "${pathname}":`,
+      error
+    );
     return {
       hasTabsLayout: false,
       layoutType: null,
@@ -170,13 +244,4 @@ export function useRouteTabsLayout(pathname: string) {
       routeParams: {},
     };
   }
-
-  const params = extractRouteParams(pathname);
-
-  return {
-    hasTabsLayout: true,
-    layoutType: config.layout,
-    layoutConfig: config,
-    routeParams: params,
-  };
 }