From 2c66c59dfce448aaa5d04a43c3df8c4a7921c92e Mon Sep 17 00:00:00 2001 From: Baptiste Arnaud Date: Wed, 2 Nov 2022 19:45:46 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=A6=20Upgrade=20packages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/auto-move-project-card.yml | 13 - .github/workflows/playwright.yml | 41 - .github/workflows/publish_docker_images.yml | 56 +- apps/builder/components/auth/AuthSwitcher.tsx | 11 +- apps/builder/components/auth/SignInForm.tsx | 8 +- .../components/dashboard/DashboardHeader.tsx | 10 +- .../dashboard/FolderContent/BackButton.tsx | 4 +- .../BillingContent/BillingContent.tsx | 10 +- .../BillingContent/InvoicesList.tsx | 6 +- .../components/nextChakra/NextChakraLink.tsx | 47 - .../results/ResultsTable/ResultsTable.tsx | 3 +- .../shared/ChangePlanForm/ChangePlanForm.tsx | 10 +- .../GoogleSheetsConnectModal.tsx | 4 +- .../PaymentSettings/StripeConfigModal.tsx | 13 +- .../TypebotsDropdown.tsx | 4 +- apps/builder/components/shared/TextLink.tsx | 37 + .../shared/TypebotHeader/TypebotHeader.tsx | 14 +- apps/builder/package.json | 69 +- .../pages/typebots/[typebotId]/results.tsx | 6 +- apps/builder/playwright.config.ts | 37 +- .../typebots/results/submissionHeader.json | 8 +- apps/builder/playwright/global-setup.ts | 14 - .../playwright/services/databaseActions.ts | 2 +- .../playwright/tests/accountSettings.spec.ts | 2 +- .../playwright/tests/analytics.spec.ts | 6 +- apps/builder/playwright/tests/billing.spec.ts | 2 +- .../playwright/tests/bubbles/image.spec.ts | 2 +- .../playwright/tests/inputs/payment.spec.ts | 11 +- .../tests/integrations/sendEmail.spec.ts | 6 +- .../tests/integrations/webhook.spec.ts | 4 +- apps/builder/playwright/tests/results.spec.ts | 286 +- .../builder/playwright/tests/settings.spec.ts | 19 +- .../playwright/tests/workspaces.spec.ts | 2 +- apps/docs/package.json | 10 +- .../Homepage/Testimonials/Testimonial.tsx | 4 +- apps/landing-page/package.json | 30 +- apps/viewer/package.json | 33 +- apps/viewer/playwright.config.ts | 41 +- apps/viewer/playwright/.env.example | 4 - .../playwright/services/databaseActions.ts | 4 +- .../playwright/tests/fileUpload.spec.ts | 18 +- .../viewer/playwright/tests/hugeBlock.spec.ts | 2 +- .../viewer/playwright/tests/sendEmail.spec.ts | 13 +- .../playwright/tests/typebotLink.spec.ts | 31 +- apps/viewer/playwright/tests/webhook.spec.ts | 18 +- package.json | 15 +- packages/bot-engine/package.json | 24 +- .../ChatGroup/ChatBlock/InputChatBlock.tsx | 4 +- packages/configs/package.json | 14 + packages/configs/playwright/baseConfig.ts | 47 + .../configs/playwright/globalSetup.ts | 0 packages/configs/playwright/index.ts | 1 + packages/configs/tsconfig.json | 6 + packages/db/package.json | 6 +- packages/emails/package.json | 8 +- packages/models/package.json | 2 +- packages/scripts/package.json | 16 +- packages/typebot-js/package.json | 14 +- packages/utils/package.json | 4 +- packages/utils/playwright/databaseActions.ts | 20 +- packages/wordpress/package.json | 2 +- pnpm-lock.yaml | 4496 ++++++++--------- should-vercel-deploy.sh | 12 - turbo.json | 10 +- 64 files changed, 2518 insertions(+), 3158 deletions(-) delete mode 100644 .github/workflows/auto-move-project-card.yml delete mode 100644 .github/workflows/playwright.yml delete mode 100644 apps/builder/components/nextChakra/NextChakraLink.tsx create mode 100644 apps/builder/components/shared/TextLink.tsx delete mode 100644 apps/builder/playwright/global-setup.ts delete mode 100644 apps/viewer/playwright/.env.example create mode 100644 packages/configs/package.json create mode 100644 packages/configs/playwright/baseConfig.ts rename apps/viewer/playwright/global-setup.ts => packages/configs/playwright/globalSetup.ts (100%) create mode 100644 packages/configs/playwright/index.ts create mode 100644 packages/configs/tsconfig.json delete mode 100644 should-vercel-deploy.sh diff --git a/.github/workflows/auto-move-project-card.yml b/.github/workflows/auto-move-project-card.yml deleted file mode 100644 index 34114971f..000000000 --- a/.github/workflows/auto-move-project-card.yml +++ /dev/null @@ -1,13 +0,0 @@ -on: - pull_request: - types: [opened, edited, ready_for_review, synchronize] - -jobs: - move-linked-issues: - runs-on: ubuntu-latest - name: Move linked issues to In Review column - steps: - - uses: rharter/github-move-linked-project-cards@v0.1.0 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - column: Reviewing 👀 diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml deleted file mode 100644 index 3c01f7d14..000000000 --- a/.github/workflows/playwright.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Playwright Tests - -on: - deployment_status: - -jobs: - test-builder: - timeout-minutes: 60 - runs-on: ubuntu-latest - if: ${{ github.event.deployment_status.state == 'success' && contains(github.event.deployment_status.environment, 'builder')}} - steps: - - name: Log Info - run: echo ${{ github.event.deployment_status.target_url }} && echo ${{ github.event.deployment }} && echo ${{ github.event.deployment_status.environment }} - - uses: actions/checkout@v2 - - uses: pnpm/action-setup@v2.2.2 - - name: Install dependencies - run: pnpm i --frozen-lockfile - - name: Build dependencies - run: pnpm turbo run build --filter="builder^..." - - name: Install Playwright - run: npx playwright install --with-deps - - name: Run tests - working-directory: ./apps/builder - run: pnpm test - env: - PLAYWRIGHT_BUILDER_TEST_BASE_URL: ${{ github.event.deployment_status.target_url }} - DATABASE_URL: ${{ secrets.TEST_DATABASE_URL }} - SMTP_HOST: smtp.ethereal.email - SMTP_PORT: 587 - SMTP_SECURE: false - SMTP_USERNAME: tobin.tillman65@ethereal.email - SMTP_PASSWORD: Ty9BcwCBrK6w8AG2hx - STRIPE_TEST_PUBLIC_KEY: pk_test_fYwf5fyL66hiRIkFVcpStukl00K1MTPPmG - STRIPE_TEST_SECRET_KEY: ${{ secrets.STRIPE_TEST_SECRET_KEY }} - ENCRYPTION_SECRET: ${{ secrets.ENCRYPTION_SECRET }} - - name: Upload test results - if: always() - uses: actions/upload-artifact@v2 - with: - name: playwright-results - path: ./apps/builder/playwright-report diff --git a/.github/workflows/publish_docker_images.yml b/.github/workflows/publish_docker_images.yml index 4375ebd25..45a33b49e 100644 --- a/.github/workflows/publish_docker_images.yml +++ b/.github/workflows/publish_docker_images.yml @@ -1,4 +1,4 @@ -name: Publish Docker images +name: Build Docker images on: create: @@ -9,32 +9,34 @@ 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: . @@ -42,38 +44,4 @@ jobs: 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 }} diff --git a/apps/builder/components/auth/AuthSwitcher.tsx b/apps/builder/components/auth/AuthSwitcher.tsx index c090c01af..b80e7ddd8 100644 --- a/apps/builder/components/auth/AuthSwitcher.tsx +++ b/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' ? ( Don't have an account?{' '} - - Sign up for free - + Sign up for free ) : ( - Already have an account?{' '} - - Sign in - + Already have an account? Sign in )} diff --git a/apps/builder/components/auth/SignInForm.tsx b/apps/builder/components/auth/SignInForm.tsx index dc78eccf4..09ce6966a 100644 --- a/apps/builder/components/auth/SignInForm.tsx +++ b/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 ( You need to{' '} - configure at least one auth provider - {' '} + {' '} (Email, Google, GitHub, Facebook or Azure AD). ) diff --git a/apps/builder/components/dashboard/DashboardHeader.tsx b/apps/builder/components/dashboard/DashboardHeader.tsx index f4800c509..ba11a09d5 100644 --- a/apps/builder/components/dashboard/DashboardHeader.tsx +++ b/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" > - + - + {user && workspace && ( { @@ -17,7 +17,7 @@ export const BackButton = ({ id }: { id: string | null }) => { const handleMouseLeave = () => setMouseOverFolderId(undefined) return ( {typebot?.publishedTypebotId && (