📦 Upgrade packages

.github/workflows/publish_docker_images.yml

@@ -1,4 +1,4 @@
-name: Publish Docker images
+name: Build Docker images
 
 on:
  create:
@@ -9,71 +9,39 @@ on:
  branches: [main]
 
 jobs:
- push_builder:
- name: Builder
+ build:
  runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ app: ['builder', 'viewer']
  steps:
  - name: Check out the repo
  uses: actions/checkout@v3
 
- - name: Extract Builder meta
- id: builder-meta
+ - name: Extract existing image metadata
+ id: ${{ matrix.app }}-meta
  uses: docker/metadata-action@v4
  with:
- images: baptistearno/typebot-builder
+ images: baptistearno/typebot-${{ matrix.app }}
  tags: |
  type=ref,event=branch
  type=semver,pattern={{version}}
  type=semver,pattern={{major}}.{{minor}}
  type=semver,pattern={{major}}
 
- - name: Log in to Docker Hub
- if: github.event_name != 'pull_request'
+ - if: github.event_name != 'pull_request'
+ name: Log in to Docker Hub
  uses: docker/login-action@v2
  with:
  username: ${{ secrets.DOCKER_USERNAME }}
  password: ${{ secrets.DOCKER_PASSWORD }}
 
- - name: Build and push builder image
+ - name: Build image
  uses: docker/build-push-action@v3
  with:
  context: .
  push: ${{ github.event_name != 'pull_request' }}
  tags: ${{ steps.builder-meta.outputs.tags }}
  labels: ${{ steps.builder-meta.outputs.labels }}
  build-args: |
- SCOPE=builder
- push_viewer:
- name: Viewer
- runs-on: ubuntu-latest
- steps:
- - name: Check out the repo
- uses: actions/checkout@v3
-
- - name: Extract Viewer meta
- id: viewer-meta
- uses: docker/metadata-action@v4
- with:
- images: baptistearno/typebot-viewer
- tags: |
- type=ref,event=branch
- type=semver,pattern={{version}}
- type=semver,pattern={{major}}.{{minor}}
- type=semver,pattern={{major}}
-
- - name: Log in to Docker Hub
- if: github.event_name != 'pull_request'
- uses: docker/login-action@v2
- with:
- username: ${{ secrets.DOCKER_USERNAME }}
- password: ${{ secrets.DOCKER_PASSWORD }}
-
- - name: Build and push viewer image
- uses: docker/build-push-action@v3
- with:
- context: .
- push: ${{ github.event_name != 'pull_request' }}
- tags: ${{ steps.viewer-meta.outputs.tags }}
- labels: ${{ steps.viewer-meta.outputs.labels }}
- build-args: |
- SCOPE=viewer
+ SCOPE=${{ matrix.app }}

apps/builder/components/auth/AuthSwitcher.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
-import { NextChakraLink } from '../nextChakra/NextChakraLink'
 import { Text } from '@chakra-ui/react'
+import { TextLink } from 'components/shared/TextLink'
 
 type Props = {
  type: 'register' | 'signin'
@@ -10,16 +10,11 @@ export const AuthSwitcher = ({ type }: Props) => (
  {type === 'signin' ? (
  <Text>
  Don't have an account?{' '}
- <NextChakraLink href="/register" color="blue.500" textDecor="underline">
- Sign up for free
- </NextChakraLink>
+ <TextLink href="/register">Sign up for free</TextLink>
  </Text>
  ) : (
  <Text>
- Already have an account?{' '}
- <NextChakraLink href="/signin" color="blue.500" textDecor="underline">
- Sign in
- </NextChakraLink>
+ Already have an account? <TextLink href="/signin">Sign in</TextLink>
  </Text>
  )}
  </>

apps/builder/components/auth/SignInForm.tsx

@@ -19,9 +19,9 @@ import {
 import { DividerWithText } from './DividerWithText'
 import { SocialLoginButtons } from './SocialLoginButtons'
 import { useRouter } from 'next/router'
-import { NextChakraLink } from 'components/nextChakra/NextChakraLink'
 import { BuiltInProviderType } from 'next-auth/providers'
 import { useToast } from 'components/shared/hooks/useToast'
+import { TextLink } from 'components/shared/TextLink'
 
 type Props = {
  defaultEmail?: string
@@ -76,14 +76,12 @@ export const SignInForm = ({
  return (
  <Text>
  You need to{' '}
- <NextChakraLink
+ <TextLink
  href="https://docs.typebot.io/self-hosting/configuration"
  isExternal
- color="blue.400"
- textDecor="underline"
  >
  configure at least one auth provider
- </NextChakraLink>{' '}
+ </TextLink>{' '}
  (Email, Google, GitHub, Facebook or Azure AD).
  </Text>
  )

apps/builder/components/dashboard/DashboardHeader.tsx

@@ -12,7 +12,6 @@ import {
  useDisclosure,
 } from '@chakra-ui/react'
 import { TypebotLogo } from 'assets/logos'
-import { NextChakraLink } from 'components/nextChakra/NextChakraLink'
 import {
  ChevronLeftIcon,
  HardDriveIcon,
@@ -27,6 +26,7 @@ import { EmojiOrImageIcon } from 'components/shared/EmojiOrImageIcon'
 import { WorkspaceSettingsModal } from './WorkspaceSettingsModal'
 import { isNotDefined } from 'utils'
 import { PlanTag } from 'components/shared/PlanTag'
+import Link from 'next/link'
 
 export const DashboardHeader = () => {
  const { user } = useUser()
@@ -52,13 +52,9 @@ export const DashboardHeader = () => {
  maxW="1000px"
  flex="1"
  >
- <NextChakraLink
- className="w-24"
- href="/typebots"
- data-testid="typebot-logo"
- >
+ <Link href="/typebots" data-testid="typebot-logo">
  <TypebotLogo w="30px" />
- </NextChakraLink>
+ </Link>
  <HStack>
  {user && workspace && (
  <WorkspaceSettingsModal

apps/builder/components/dashboard/FolderContent/BackButton.tsx

@@ -1,7 +1,7 @@
 import { Button } from '@chakra-ui/react'
 import { ChevronLeftIcon } from 'assets/icons'
-import { NextChakraLink } from 'components/nextChakra/NextChakraLink'
 import { useTypebotDnd } from 'contexts/TypebotDndContext'
+import Link from 'next/link'
 import React, { useMemo } from 'react'
 
 export const BackButton = ({ id }: { id: string | null }) => {
@@ -17,7 +17,7 @@ export const BackButton = ({ id }: { id: string | null }) => {
  const handleMouseLeave = () => setMouseOverFolderId(undefined)
  return (
  <Button
- as={NextChakraLink}
+ as={Link}
  href={id ? `/typebots/folders/${id}` : '/typebots'}
  leftIcon={<ChevronLeftIcon />}
  variant={'outline'}

apps/builder/components/dashboard/WorkspaceSettingsModal/BillingContent/BillingContent.tsx

@@ -1,7 +1,7 @@
 import { HStack, Stack, Text } from '@chakra-ui/react'
 import { StripeClimateLogo } from 'assets/logos/StripeClimateLogo'
-import { NextChakraLink } from 'components/nextChakra/NextChakraLink'
 import { ChangePlanForm } from 'components/shared/ChangePlanForm'
+import { TextLink } from 'components/shared/TextLink'
 import { useWorkspace } from 'contexts/WorkspaceContext'
 import { Plan } from 'db'
 import React from 'react'
@@ -33,13 +33,9 @@ export const BillingContent = () => {
  <Text fontSize="xs" color="gray.500">
  Typebot is contributing 1% of your subscription to remove CO₂ from
  the atmosphere.{' '}
- <NextChakraLink
- href="https://climate.stripe.com/5VCRAq"
- isExternal
- textDecor="underline"
- >
+ <TextLink href="https://climate.stripe.com/5VCRAq" isExternal>
  More info.
- </NextChakraLink>
+ </TextLink>
  </Text>
  </HStack>
  {workspace.plan !== Plan.CUSTOM &&

apps/builder/components/dashboard/WorkspaceSettingsModal/BillingContent/InvoicesList.tsx

@@ -14,8 +14,8 @@ import {
  Text,
 } from '@chakra-ui/react'
 import { DownloadIcon, FileIcon } from 'assets/icons'
-import { NextChakraLink } from 'components/nextChakra/NextChakraLink'
 import { Workspace } from 'db'
+import Link from 'next/link'
 import React from 'react'
 import { useInvoicesQuery } from './queries/useInvoicesQuery'
 
@@ -54,12 +54,12 @@ export const InvoicesList = ({ workspace }: Props) => {
  <Td>{getFormattedPrice(invoice.amount, invoice.currency)}</Td>
  <Td>
  <IconButton
- as={NextChakraLink}
+ as={Link}
  size="xs"
  icon={<DownloadIcon />}
  variant="outline"
  href={invoice.url}
- isExternal
+ target="_blank"
  aria-label={'Download invoice'}
  />
  </Td>

apps/builder/components/results/ResultsTable/ResultsTable.tsx

@@ -248,10 +248,9 @@ const IndeterminateCheckbox = React.forwardRef(
  const resolvedRef: any = ref || defaultRef
 
  return (
- <Flex justify="center" data-testid="checkbox">
+ <Flex justify="center" data-testid="checkbox" {...rest}>
  <Checkbox
  ref={resolvedRef}
- {...rest}
  isIndeterminate={indeterminate}
  isChecked={checked}
  />

apps/builder/components/shared/ChangePlanForm/ChangePlanForm.tsx

@@ -1,9 +1,9 @@
 import { Stack, HStack, Text } from '@chakra-ui/react'
-import { NextChakraLink } from 'components/nextChakra/NextChakraLink'
 import { useUser } from 'contexts/UserContext'
 import { useWorkspace } from 'contexts/WorkspaceContext'
 import { Plan } from 'db'
 import { useToast } from '../hooks/useToast'
+import { TextLink } from '../TextLink'
 import { ProPlanContent } from './ProPlanContent'
 import { pay } from './queries/updatePlan'
 import { useCurrentSubscriptionInfo } from './queries/useCurrentSubscriptionInfo'
@@ -89,13 +89,9 @@ export const ChangePlanForm = () => {
  </HStack>
  <Text color="gray.500">
  Need custom limits? Specific features?{' '}
- <NextChakraLink
- href={'https://typebot.io/enterprise-lead-form'}
- isExternal
- textDecor="underline"
- >
+ <TextLink href={'https://typebot.io/enterprise-lead-form'} isExternal>
  Let's chat!
- </NextChakraLink>
+ </TextLink>
  </Text>
  </Stack>
  )