👷 Improve sentry release detection

apps/builder/next.config.js

@@ -31,6 +31,7 @@ const nextConfig = withTM({
 
 const sentryWebpackPluginOptions = {
   silent: true,
+  release: process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA + '-builder',
 }
 
 module.exports = process.env.NEXT_PUBLIC_SENTRY_DSN

apps/builder/package.json

@@ -35,7 +35,7 @@
     "@giphy/react-components": "6.5.2",
     "@googleapis/drive": "4.0.1",
     "@lezer/css": "^1.1.1",
-    "@sentry/nextjs": "7.34.0",
+    "@sentry/nextjs": "7.36.0",
     "@stripe/stripe-js": "1.46.0",
     "@tanstack/react-query": "^4.23.0",
     "@tanstack/react-table": "8.7.8",

apps/builder/sentry.client.config.js

@@ -1,23 +1,14 @@
-// This file configures the initialization of Sentry on the browser.
-// The config you add here will be used whenever a page is visited.
-// https://docs.sentry.io/platforms/javascript/guides/nextjs/
-
 import * as Sentry from '@sentry/nextjs'
 
+const SENTRY_DSN = process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN
+
 Sentry.init({
-  dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
+  dsn: SENTRY_DSN,
   ignoreErrors: ['ResizeObserver loop limit exceeded'],
-  release: process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA,
-  beforeBreadcrumb(breadcrumb, hint) {
-    try {
-      if (breadcrumb.category?.startsWith('ui')) {
-        breadcrumb.message = `${hint?.event.target.tagName.toLowerCase()}: ${
-          hint?.event.target.innerText
-        }`
-      }
-    } catch (e) {
-      /* empty */
-    }
-    return breadcrumb
+  debug: true,
+  beforeSend: (event) => {
+    console.log('[SENTRY] beforeSend event:', event)
+    return event
   },
+  release: process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA + '-builder',
 })

apps/builder/sentry.server.config.js

@@ -1,11 +1,8 @@
-// This file configures the initialization of Sentry on the browser.
-// The config you add here will be used whenever a page is visited.
-// https://docs.sentry.io/platforms/javascript/guides/nextjs/
-
 import * as Sentry from '@sentry/nextjs'
 
+const SENTRY_DSN = process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN
+
 Sentry.init({
-  dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
-  ignoreErrors: ['ResizeObserver loop limit exceeded'],
-  release: process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA,
+  dsn: SENTRY_DSN,
+  release: process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA + '-builder',
 })

apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNode.tsx

@@ -13,6 +13,7 @@ import { ItemNodeContent } from './ItemNodeContent'
 import { ItemNodeContextMenu } from './ItemNodeContextMenu'
 import { ContextMenu } from '@/components/ContextMenu'
 import { setMultipleRefs } from '@/utils/helpers'
+import { isDefined } from 'utils'
 
 type Props = {
   item: Item
@@ -39,11 +40,12 @@ export const ItemNode = ({
   const itemRef = useRef<HTMLDivElement | null>(null)
   const isPreviewing = previewingEdge?.from.itemId === item.id
   const isConnectable =
+    isDefined(typebot) &&
     !connectionDisabled &&
     !(
-      typebot?.groups[indices.groupIndex].blocks[
-        indices.blockIndex
-      ] as ChoiceInputBlock
+      typebot.groups[indices.groupIndex].blocks[indices.blockIndex] as
+        | ChoiceInputBlock
+        | undefined
     )?.options?.isMultipleChoice
   const onDrag = (position: NodePosition) => {
     if (!onMouseDown) return

apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodesList.tsx

@@ -26,6 +26,7 @@ import React, { useEffect, useRef, useState } from 'react'
 import { ItemNode } from './ItemNode'
 import { SourceEndpoint } from '../../Endpoints'
 import { PlaceholderNode } from '../PlaceholderNode'
+import { isDefined } from 'utils'
 
 type Props = {
   block: BlockWithItems
@@ -46,7 +47,8 @@ export const ItemNodesList = ({
     draggedItem !== undefined && block.items[0].type === draggedItem.type
 
   const isLastBlock =
-    typebot?.groups[groupIndex].blocks[blockIndex + 1] === undefined
+    isDefined(typebot) &&
+    typebot.groups[groupIndex].blocks[blockIndex + 1] === undefined
 
   const [position, setPosition] = useState({
     x: 0,

apps/viewer/next.config.js

@@ -18,6 +18,7 @@ const nextConfig = withTM({
 
 const sentryWebpackPluginOptions = {
   silent: true,
+  release: process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA + '-viewer',
 }
 
 module.exports = process.env.NEXT_PUBLIC_SENTRY_DSN

apps/viewer/package.json

@@ -13,7 +13,7 @@
     "test:report": "pnpm playwright show-report"
   },
   "dependencies": {
-    "@sentry/nextjs": "7.34.0",
+    "@sentry/nextjs": "7.36.0",
     "@trpc/server": "10.9.0",
     "@typebot.io/js": "workspace:*",
     "@typebot.io/react": "workspace:*",

apps/viewer/sentry.client.config.js

@@ -4,13 +4,15 @@
 
 import * as Sentry from '@sentry/nextjs'
 
+const SENTRY_DSN = process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN
+
 Sentry.init({
-  dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
+  dsn: SENTRY_DSN,
   ignoreErrors: [
     'ResizeObserver loop limit exceeded',
     'ResizeObserver loop completed with undelivered notifications.',
     'ResizeObserver is not defined',
     "Can't find variable: ResizeObserver",
   ],
-  release: process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA,
+  release: process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA + '-viewer',
 })

apps/viewer/sentry.server.config.js

@@ -4,13 +4,9 @@
 
 import * as Sentry from '@sentry/nextjs'
 
+const SENTRY_DSN = process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN
+
 Sentry.init({
-  dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
-  ignoreErrors: [
-    'ResizeObserver loop limit exceeded',
-    'ResizeObserver loop completed with undelivered notifications.',
-    'ResizeObserver is not defined',
-    "Can't find variable: ResizeObserver",
-  ],
-  release: process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA,
+  dsn: SENTRY_DSN,
+  release: process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA + '-viewer',
 })