Skip to content

Commit

Permalink
⬆️ Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@baptisteArno
baptisteArno committed Jul 15, 2023
1 parent de08179 commit 81bc074
Show file tree
Hide file tree
Showing 30 changed files with 4,094 additions and 1,810 deletions.
78 changes: 38 additions & 40 deletions apps/builder/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@
},
"dependencies": {
"@chakra-ui/anatomy": "^2.1.1",
"@chakra-ui/react": "2.6.1",
"@chakra-ui/theme-tools": "^2.0.16",
"@chakra-ui/react": "2.7.1",
"@chakra-ui/theme-tools": "^2.0.18",
"@dnd-kit/core": "6.0.8",
"@dnd-kit/sortable": "7.0.2",
"@dnd-kit/utilities": "3.2.1",
"@emotion/react": "11.11.0",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@faire/mjml-react": "3.3.0",
"@giphy/js-fetch-api": "4.9.1",
"@giphy/js-types": "4.4.0",
"@giphy/react-components": "6.9.3",
"@googleapis/drive": "5.1.0",
"@paralleldrive/cuid2": "2.2.0",
"@sentry/nextjs": "7.53.1",
"@stripe/stripe-js": "1.53.0",
"@tanstack/react-query": "^4.29.7",
"@tanstack/react-table": "8.9.1",
"@trpc/client": "10.27.3",
"@trpc/next": "10.27.3",
"@trpc/react-query": "10.27.3",
"@trpc/server": "10.27.3",
"@giphy/react-components": "7.1.0",
"@googleapis/drive": "8.0.0",
"@paralleldrive/cuid2": "2.2.1",
"@sentry/nextjs": "7.58.1",
"@stripe/stripe-js": "1.54.1",
"@tanstack/react-query": "^4.29.19",
"@tanstack/react-table": "8.9.3",
"@trpc/client": "10.34.0",
"@trpc/next": "10.34.0",
"@trpc/react-query": "10.34.0",
"@trpc/server": "10.34.0",
"@typebot.io/emails": "workspace:*",
"@typebot.io/js": "workspace:*",
"@typebot.io/react": "workspace:*",
Expand All @@ -45,14 +45,14 @@
"@udecode/plate-serializer-html": "21.1.5",
"@udecode/plate-ui-link": "21.2.0",
"@udecode/plate-ui-toolbar": "21.1.5",
"@uiw/codemirror-extensions-langs": "^4.20.2",
"@uiw/codemirror-theme-github": "^4.20.2",
"@uiw/codemirror-theme-tokyo-night": "^4.20.2",
"@uiw/react-codemirror": "^4.20.2",
"@uiw/codemirror-extensions-langs": "^4.21.7",
"@uiw/codemirror-theme-github": "^4.21.7",
"@uiw/codemirror-theme-tokyo-night": "^4.21.7",
"@uiw/react-codemirror": "^4.21.7",
"@upstash/ratelimit": "^0.4.3",
"@upstash/redis": "^1.21.0",
"@upstash/redis": "^1.22.0",
"@use-gesture/react": "^10.2.27",
"aws-sdk": "2.1384.0",
"aws-sdk": "2.1415.0",
"browser-image-compression": "2.0.2",
"canvas-confetti": "1.6.0",
"codemirror": "6.0.1",
Expand All @@ -61,20 +61,20 @@
"emojilib": "3.0.10",
"focus-visible": "5.2.0",
"framer-motion": "10.3.0",
"google-auth-library": "8.8.0",
"google-spreadsheet": "3.3.0",
"google-auth-library": "8.9.0",
"google-spreadsheet": "4.0.2",
"got": "12.6.0",
"immer": "10.0.2",
"js-video-url-parser": "0.5.1",
"jsonwebtoken": "9.0.0",
"jsonwebtoken": "9.0.1",
"micro": "10.0.1",
"micro-cors": "0.1.1",
"minio": "7.1.1",
"next": "13.4.3",
"next": "13.4.9",
"next-auth": "4.22.1",
"next-international": "^0.4.1",
"next-international": "0.5.3",
"nextjs-cors": "^2.1.2",
"nodemailer": "6.9.2",
"nodemailer": "6.9.3",
"nprogress": "0.2.0",
"papaparse": "5.4.1",
"posthog-node": "3.1.1",
Expand All @@ -86,40 +86,38 @@
"slate-history": "0.93.0",
"slate-hyperscript": "0.77.0",
"slate-react": "0.94.2",
"stripe": "12.6.0",
"styled-components": "5.3.10",
"stripe": "12.13.0",
"svg-round-corners": "0.4.1",
"swr": "2.1.5",
"swr": "2.2.0",
"tinycolor2": "1.6.0",
"trpc-openapi": "1.2.0",
"unsplash-js": "^7.0.18",
"use-debounce": "9.0.4"
},
"devDependencies": {
"@chakra-ui/styled-system": "2.9.0",
"@playwright/test": "1.34.3",
"@chakra-ui/styled-system": "2.9.1",
"@playwright/test": "1.36.0",
"@typebot.io/lib": "workspace:*",
"@typebot.io/prisma": "workspace:*",
"@typebot.io/schemas": "workspace:*",
"@typebot.io/tsconfig": "workspace:*",
"@types/canvas-confetti": "1.6.0",
"@types/google-spreadsheet": "3.3.2",
"@types/jsonwebtoken": "9.0.2",
"@types/micro-cors": "0.1.3",
"@types/minio": "7.1.0",
"@types/node": "20.2.3",
"@types/minio": "7.1.1",
"@types/node": "20.4.2",
"@types/nodemailer": "6.4.8",
"@types/nprogress": "0.2.0",
"@types/papaparse": "5.3.7",
"@types/prettier": "2.7.2",
"@types/prettier": "2.7.3",
"@types/qs": "6.9.7",
"@types/react": "18.2.7",
"@types/react": "18.2.15",
"@types/tinycolor2": "1.4.3",
"dotenv": "16.0.3",
"eslint": "8.41.0",
"dotenv": "16.3.1",
"eslint": "8.44.0",
"eslint-config-custom": "workspace:*",
"superjson": "^1.12.3",
"typescript": "5.0.4",
"superjson": "^1.12.4",
"typescript": "5.1.6",
"zod": "3.21.4"
}
}
2 changes: 1 addition & 1 deletion apps/builder/src/features/blocks/bubbles/video/video.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ test.describe.parallel('Video bubble block', () => {

await page.goto(`/typebots/${typebotId}/edit`)
await page.click('text=Preview')
await expect(page.locator('video > source').nth(1)).toHaveAttribute(
await expect(page.locator('video').nth(1)).toHaveAttribute(
'src',
videoSrc
)
Expand Down
2 changes: 1 addition & 1 deletion apps/builder/src/features/blocks/integrations/webhook/webhook.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ test.describe('Builder', () => {
)
await page.click('text=Test the request')
await expect(page.locator('div[role="textbox"] >> nth=-1')).toContainText(
`"Group #1": "answer value", "Group #2": "20", "Group #2 (1)": "Yes"`
`"Group #1": "answer value", "Group #2": "20", "Group #2 (1)": "Yes"`, {timeout: 10000}
)
})

Expand Down
2 changes: 0 additions & 2 deletions apps/builder/src/features/folders/components/CreateBotButton.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ export const CreateBotButton = ({

return (
<Button
mr={{ sm: 6 }}
mb={6}
style={{ width: '225px', height: '270px' }}
onClick={handleClick}
paddingX={6}
Expand Down
2 changes: 0 additions & 2 deletions apps/builder/src/features/folders/components/FolderButton.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,6 @@ export const FolderButton = ({
export const ButtonSkeleton = () => (
<Button
as={VStack}
mr={{ sm: 6 }}
mb={6}
style={{ width: '225px', height: '270px' }}
paddingX={6}
whiteSpace={'normal'}
Expand Down
2 changes: 0 additions & 2 deletions apps/builder/src/features/folders/components/TypebotButton.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ export const TypebotButton = ({
variant="outline"
w="225px"
h="270px"
mr={{ sm: 6 }}
mb={6}
rounded="lg"
whiteSpace="normal"
opacity={draggedTypebot?.id === typebot.id ? 0.2 : 1}
Expand Down
29 changes: 1 addition & 28 deletions apps/builder/src/features/settings/settings.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import test, { expect } from '@playwright/test'
import { createId } from '@paralleldrive/cuid2'
import { defaultTextInputOptions } from '@typebot.io/schemas'
import { importTypebotInDatabase } from '@typebot.io/lib/playwright/databaseActions'
import { freeWorkspaceId } from '@typebot.io/lib/playwright/databaseSetup'

test.describe.parallel('Settings page', () => {
test.describe('General', () => {
Expand All @@ -13,12 +12,7 @@ test.describe.parallel('Settings page', () => {
id: typebotId,
})
await page.goto(`/typebots/${typebotId}/settings`)
await expect(
page.locator('a:has-text("Made with Typebot")')
).toHaveAttribute('href', 'https://www.typebot.io/?utm_source=litebadge')
await page.click('text="Typebot.io branding"')
await expect(page.locator('a:has-text("Made with Typebot")')).toBeHidden()


await page.click('text="Remember user"')

await expect(page.getByPlaceholder('Type your answer...')).toHaveValue(
Expand Down Expand Up @@ -103,25 +97,4 @@ test.describe.parallel('Settings page', () => {
)
})
})

test.describe('Free workspace', () => {
test("can't remove branding", async ({ page }) => {
const typebotId = createId()
await importTypebotInDatabase(getTestAsset('typebots/settings.json'), {
id: typebotId,
workspaceId: freeWorkspaceId,
})
await page.goto(`/typebots/${typebotId}/settings`)
await expect(page.locator('text="What\'s your name?"')).toBeVisible()
await expect(
page.locator('[data-testid="starter-lock-tag"]')
).toBeVisible()
await page.click('text=Typebot.io branding')
await expect(
page.locator(
'text="You need to upgrade your plan in order to remove branding"'
)
).toBeVisible()
})
})
})
32 changes: 31 additions & 1 deletion apps/builder/src/features/theme/theme.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { getTestAsset } from '@/test/utils/playwright'
import test, { expect } from '@playwright/test'
import { createId } from '@paralleldrive/cuid2'
import { importTypebotInDatabase } from '@typebot.io/lib/playwright/databaseActions'
import { freeWorkspaceId } from '@typebot.io/lib/playwright/databaseSetup'

const hostAvatarUrl =
'https://images.unsplash.com/photo-1535713875002-d1d0cf377fde?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1760&q=80'
Expand All @@ -20,8 +21,15 @@ test.describe.parallel('Theme page', () => {
await page.goto(`/typebots/${typebotId}/theme`)
await expect(page.getByRole('button', { name: 'Go' })).toBeVisible()

// Branding
await page.getByRole('button', { name: 'Global' }).click()
await expect(
page.locator('a:has-text("Made with Typebot")')
).toHaveAttribute('href', 'https://www.typebot.io/?utm_source=litebadge')
await page.click('text="Show Typebot brand"')
await expect(page.locator('a:has-text("Made with Typebot")')).toBeHidden()

// Font
await page.getByRole('button', { name: 'Font & Background' }).click()
await page.getByRole('textbox').fill('Roboto Slab')
await expect(page.locator('.typebot-container')).toHaveCSS(
'font-family',
Expand Down Expand Up @@ -252,3 +260,25 @@ test.describe.parallel('Theme page', () => {
})
})
})

test.describe('Free workspace', () => {
test("can't remove branding", async ({ page }) => {
const typebotId = createId()
await importTypebotInDatabase(getTestAsset('typebots/settings.json'), {
id: typebotId,
workspaceId: freeWorkspaceId,
})
await page.goto(`/typebots/${typebotId}/theme`)
await expect(page.locator('text="What\'s your name?"')).toBeVisible()
await page.getByRole('button', { name: 'Global' }).click()
await expect(
page.locator('[data-testid="starter-lock-tag"]')
).toBeVisible()
await page.click('text=Show Typebot brand')
await expect(
page.locator(
'text="You need to upgrade your plan in order to remove branding"'
)
).toBeVisible()
})
})
3 changes: 1 addition & 2 deletions apps/builder/src/pages/api/integrations/google-sheets/spreadsheets/[id]/sheets.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
const credentialsId = req.query.credentialsId as string | undefined
if (!credentialsId) return badRequest(res)
const spreadsheetId = req.query.id as string
const doc = new GoogleSpreadsheet(spreadsheetId)
const auth = await getAuthenticatedGoogleClient(user.id, credentialsId)
if (!auth)
return res
.status(404)
.send({ message: "Couldn't find credentials in database" })
doc.useOAuth2Client(auth.client)
const doc = new GoogleSpreadsheet(spreadsheetId, auth.client)
await doc.loadInfo()
return res.send({
sheets: (
Expand Down
26 changes: 13 additions & 13 deletions apps/landing-page/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,37 @@
},
"dependencies": {
"@chakra-ui/icon": "3.0.15",
"@chakra-ui/react": "2.6.1",
"@emotion/react": "11.11.0",
"@chakra-ui/react": "2.7.1",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@vercel/analytics": "1.0.1",
"@typebot.io/react": "workspace:*",
"@typebot.io/js": "workspace:*",
"aos": "2.3.4",
"@typebot.io/prisma": "workspace:*",
"focus-visible": "5.2.0",
"framer-motion": "10.3.0",
"framer-motion": "10.12.20",
"@typebot.io/schemas": "workspace:*",
"next": "13.4.3",
"next": "13.4.9",
"react": "18.2.0",
"react-dom": "18.2.0",
"@typebot.io/lib": "workspace:*"
},
"devDependencies": {
"@babel/core": "7.21.8",
"@chakra-ui/styled-system": "2.9.0",
"@next/bundle-analyzer": "13.4.3",
"@babel/core": "7.22.9",
"@chakra-ui/styled-system": "2.9.1",
"@next/bundle-analyzer": "13.4.9",
"@types/aos": "3.0.4",
"@types/node": "20.2.3",
"@types/react": "18.2.7",
"@types/node": "20.4.2",
"@types/react": "18.2.15",
"autoprefixer": "10.4.14",
"cross-env": "7.0.3",
"eslint": "8.41.0",
"eslint": "8.44.0",
"eslint-config-custom": "workspace:*",
"next-transpile-modules": "10.0.0",
"postcss": "8.4.23",
"prettier": "2.8.8",
"postcss": "8.4.26",
"prettier": "3.0.0",
"@typebot.io/tsconfig": "workspace:*",
"typescript": "5.0.4"
"typescript": "5.1.6"
}
}
Loading

0 comments on commit 81bc074

Please sign in to comment.