📦 Upgrade deps to latest version

baptisteArno · Oct 2, 2022 · a947c1c · a947c1c · vercel · Oct 2, 2022
1 parent fac70b9
commit a947c1c
Show file tree

Hide file tree

Showing 26 changed files with 1,292 additions and 3,812 deletions.
diff --git a/.npmrc b/.npmrc
@@ -1 +1,2 @@
-public-hoist-pattern[]=*prisma*
+public-hoist-pattern[]=*prisma*
+strict-peer-dependencies=false
diff --git a/.pnpmfile.cjs b/.pnpmfile.cjs
@@ -0,0 +1,18 @@
+module.exports = {
+ hooks: {
+ readPackage(pkg) {
+ // Solving weird issue: https://github.com/facebook/docusaurus/issues/6724#issuecomment-1188794031
+ if (pkg.name != 'docs') {
+ const deps = [
+ '@algolia/client-search',
+ '@docusaurus/core',
+ '@docusaurus/preset-classic',
+ '@docusaurus/theme-common',
+ '@docusaurus/theme-live-codeblock',
+ ]
+ deps.forEach((p) => delete pkg.dependencies[p])
+ }
+ return pkg
+ },
+ },
+}
diff --git a/apps/builder/components/shared/Graph/Edges/Edge.tsx b/apps/builder/components/shared/Graph/Edges/Edge.tsx
@@ -132,7 +132,7 @@ export const Edge = ({ edge }: Props) => {
  <path
  data-testid="clickable-edge"
  d={path}
- strokeWidth="12px"
+ strokeWidth="18px"
  stroke="white"
  fill="none"
  pointerEvents="stroke"
@@ -149,6 +149,7 @@ export const Edge = ({ edge }: Props) => {
  strokeWidth="2px"
  markerEnd={isPreviewing ? 'url(#blue-arrow)' : 'url(#arrow)'}
  fill="none"
+ pointerEvents="none"
  />
  <Portal>
  <EdgeMenu

diff --git a/apps/builder/package.json b/apps/builder/package.json
@@ -12,24 +12,24 @@
  },
  "dependencies": {
  "@chakra-ui/css-reset": "2.0.7",
- "@chakra-ui/react": "^2.3.2",
- "@codemirror/lang-css": "^6.0.0",
- "@codemirror/lang-html": "^6.1.1",
- "@codemirror/lang-javascript": "^6.0.2",
- "@codemirror/lang-json": "^6.0.0",
- "@codemirror/lint": "^6.0.0",
- "@codemirror/state": "6.1.1",
- "@dnd-kit/core": "^6.0.5",
- "@dnd-kit/sortable": "^7.0.1",
- "@dnd-kit/utilities": "^3.2.0",
- "@emotion/react": "^11.10.4",
- "@emotion/styled": "^11.10.4",
+ "@chakra-ui/react": "2.3.4",
+ "@codemirror/lang-css": "6.0.0",
+ "@codemirror/lang-html": "6.1.2",
+ "@codemirror/lang-javascript": "6.1.0",
+ "@codemirror/lang-json": "6.0.0",
+ "@codemirror/lint": "6.0.0",
+ "@codemirror/state": "6.1.2",
+ "@dnd-kit/core": "6.0.5",
+ "@dnd-kit/sortable": "7.0.1",
+ "@dnd-kit/utilities": "3.2.0",
+ "@emotion/react": "11.10.4",
+ "@emotion/styled": "11.10.4",
  "@giphy/js-fetch-api": "4.4.0",
- "@giphy/js-types": "^4.2.1",
- "@giphy/react-components": "6.1.1",
- "@googleapis/drive": "^3.0.1",
- "@sentry/nextjs": "7.12.1",
- "@stripe/stripe-js": "1.36.0",
+ "@giphy/js-types": "4.2.1",
+ "@giphy/react-components": "6.2.0",
+ "@googleapis/drive": "3.0.1",
+ "@sentry/nextjs": "7.14.0",
+ "@stripe/stripe-js": "1.38.1",
  "@tanstack/react-table": "8.5.13",
  "@udecode/plate-basic-marks": "16.8.0",
  "@udecode/plate-common": "^7.0.2",
@@ -38,79 +38,79 @@
  "@udecode/plate-serializer-html": "16.8.0",
  "@udecode/plate-ui-link": "16.9.0",
  "@udecode/plate-ui-toolbar": "16.8.0",
- "aws-sdk": "2.1213.0",
+ "aws-sdk": "2.1227.0",
  "bot-engine": "workspace:*",
- "browser-image-compression": "^2.0.0",
- "canvas-confetti": "^1.5.1",
- "codemirror": "^6.0.1",
- "cuid": "^2.1.8",
- "deep-object-diff": "^1.1.7",
- "dequal": "^2.0.3",
+ "browser-image-compression": "2.0.0",
+ "canvas-confetti": "1.5.1",
+ "codemirror": "6.0.1",
+ "cuid": "2.1.8",
+ "deep-object-diff": "1.1.7",
+ "dequal": "2.0.3",
  "emojilib": "3.0.7",
- "focus-visible": "^5.2.0",
- "framer-motion": "7.3.2",
- "google-auth-library": "^8.5.1",
- "google-spreadsheet": "^3.3.0",
- "got": "12.4.1",
- "htmlparser2": "^8.0.1",
- "immer": "^9.0.15",
- "js-video-url-parser": "^0.5.1",
- "jsonwebtoken": "^8.5.1",
- "kbar": "^0.1.0-beta.36",
+ "focus-visible": "5.2.0",
+ "framer-motion": "7.5.1",
+ "google-auth-library": "8.5.2",
+ "google-spreadsheet": "3.3.0",
+ "got": "12.5.1",
+ "htmlparser2": "8.0.1",
+ "immer": "9.0.15",
+ "js-video-url-parser": "0.5.1",
+ "jsonwebtoken": "8.5.1",
+ "kbar": "0.1.0-beta.36",
  "micro": "9.4.1",
- "micro-cors": "^0.1.1",
+ "micro-cors": "0.1.1",
  "minio": "7.0.32",
- "next": "12.3.0",
- "next-auth": "4.10.3",
- "nodemailer": "^6.8.0",
- "nprogress": "^0.2.0",
- "papaparse": "^5.3.2",
+ "next": "12.3.1",
+ "next-auth": "4.12.2",
+ "nodemailer": "6.8.0",
+ "nprogress": "0.2.0",
+ "papaparse": "5.3.2",
  "prettier": "2.7.1",
- "qs": "^6.11.0",
- "react": "^18.2.0",
- "react-dom": "^18.2.0",
- "react-draggable": "^4.4.5",
+ "qs": "6.11.0",
+ "react": "18.2.0",
+ "react-dom": "18.2.0",
+ "react-draggable": "4.4.5",
  "slate": "0.82.1",
- "slate-history": "^0.66.0",
- "slate-hyperscript": "^0.77.0",
- "slate-react": "0.82.2",
- "stripe": "10.8.0",
- "styled-components": "^5.3.5",
- "svg-round-corners": "^0.3.0",
- "swr": "^1.3.0",
- "tinycolor2": "^1.4.2",
+ "slate-history": "0.66.0",
+ "slate-hyperscript": "0.77.0",
+ "slate-react": "0.83.0",
+ "stripe": "10.12.0",
+ "styled-components": "5.3.6",
+ "svg-round-corners": "0.4.1",
+ "swr": "1.3.0",
+ "tinycolor2": "1.4.2",
  "typebot-js": "workspace:*",
  "use-debounce": "8.0.4",
  "emails": "workspace:*",
- "@faire/mjml-react": "^2.1.4"
+ "@faire/mjml-react": "2.1.4"
  },
  "devDependencies": {
- "@babel/core": "7.19.0",
- "@chakra-ui/styled-system": "^2.3.1",
- "@playwright/test": "1.25.2",
- "@types/canvas-confetti": "^1.4.3",
- "@types/google-spreadsheet": "^3.3.0",
+ "@babel/core": "7.19.3",
+ "@chakra-ui/styled-system": "2.3.3",
+ "@playwright/test": "1.26.1",
+ "@types/canvas-confetti": "1.4.3",
+ "@types/google-spreadsheet": "3.3.0",
  "@types/jsonwebtoken": "8.5.9",
- "@types/micro-cors": "^0.1.2",
- "@types/minio": "^7.0.13",
- "@types/node": "18.7.16",
- "@types/nodemailer": "6.4.5",
- "@types/nprogress": "^0.2.0",
+ "@types/micro-cors": "0.1.2",
+ "@types/minio": "7.0.13",
+ "@types/node": "18.7.23",
+ "@types/nodemailer": "6.4.6",
+ "@types/nprogress": "0.2.0",
  "@types/papaparse": "5.3.5",
- "@types/prettier": "2.7.0",
- "@types/qs": "^6.9.7",
- "@types/react": "^18.0.19",
- "@types/tinycolor2": "^1.4.3",
- "@typescript-eslint/eslint-plugin": "5.36.2",
- "@typescript-eslint/parser": "5.36.2",
+ "@types/prettier": "2.7.1",
+ "@types/qs": "6.9.7",
+ "@types/react": "18.0.21",
+ "@types/tinycolor2": "1.4.3",
+ "@typescript-eslint/eslint-plugin": "5.38.1",
+ "@typescript-eslint/parser": "5.38.1",
  "db": "workspace:*",
- "dotenv": "^16.0.2",
- "eslint": "8.23.0",
- "eslint-config-next": "12.3.0",
- "eslint-plugin-react": "^7.31.8",
+ "dotenv": "16.0.3",
+ "eslint": "8.24.0",
+ "eslint-config-next": "12.3.1",
+ "eslint-plugin-react": "7.31.8",
  "models": "workspace:*",
- "next-transpile-modules": "^9.0.0",
- "typescript": "^4.8.3",
+ "next-transpile-modules": "9.0.0",
+ "typescript": "4.8.4",
  "utils": "workspace:*"
  }
 }
diff --git a/apps/builder/pages/api/typebots/[typebotId].ts b/apps/builder/pages/api/typebots/[typebotId].ts
@@ -23,7 +23,6 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
  webhooks: true,
  },
  })
- console.log(typebot)
  if (!typebot) return res.send({ typebot: null })
  const { publishedTypebot, collaborators, webhooks, ...restOfTypebot } =
  typebot

diff --git a/apps/builder/playwright/tests/dashboard.spec.ts b/apps/builder/playwright/tests/dashboard.spec.ts
@@ -10,15 +10,13 @@ test('folders navigation should work', async ({ page }) => {
  await createFolderButton.click()
  await page.click('text="New folder"')
  await page.fill('input[value="New folder"]', 'My folder #1')
- await page.press('input[value="My folder #1"]', 'Enter')
- await waitForNextApiCall(page)
- await page.click('li:has-text("My folder #1")')
+ await page.press('input[value="My folder #1"]', 'Enter'),
+ await page.click('li:has-text("My folder #1")')
  await expect(page.locator('h1:has-text("My folder #1")')).toBeVisible()
  await createFolderButton.click()
  await page.click('text="New folder"')
  await page.fill('input', 'My folder #2')
  await page.press('input', 'Enter')
- await waitForNextApiCall(page)
 
  await page.click('li:has-text("My folder #2")')
  await expect(page.locator('h1 >> text="My folder #2"')).toBeVisible()
@@ -55,7 +53,6 @@ test('folders and typebots should be movable', async ({ page }) => {
  'li:has-text("Draggable typebot")',
  'li:has-text("Droppable folder")'
  )
- await waitForNextApiCall(page)
  await expect(typebotButton).toBeHidden()
  await folderButton.click()
  await expect(page).toHaveURL(new RegExp(`/folders/${droppableFolderId}`))
@@ -64,7 +61,6 @@ test('folders and typebots should be movable', async ({ page }) => {
  'li:has-text("Draggable typebot")',
  'a:has-text("Back")'
  )
- await waitForNextApiCall(page)
  await expect(typebotButton).toBeHidden()
  await page.click('a:has-text("Back")')
  await expect(typebotButton).toBeVisible()
@@ -84,6 +80,3 @@ test.describe('Free user', () => {
  ).toBeVisible()
  })
 })
-
-const waitForNextApiCall = (page: Page, path?: string) =>
- page.waitForResponse((resp) => resp.url().includes(path ?? '/api'))
diff --git a/apps/builder/playwright/tests/integrations/googleSheets.spec.ts b/apps/builder/playwright/tests/integrations/googleSheets.spec.ts
@@ -39,20 +39,22 @@ test.describe.parallel('Google sheets integration', () => {
  await typebotViewer(page)
  .locator('input[placeholder="Type your email..."]')
  .fill('[email protected]')
- await typebotViewer(page)
- .locator('input[placeholder="Type your email..."]')
- .press('Enter')
- await page.waitForResponse(
- (resp) =>
- resp
- .request()
- .url()
- .includes(
- '/api/integrations/google-sheets/spreadsheets/1k_pIDw3YHl9tlZusbBVSBRY0PeRPd2H6t4Nj7rwnOtM/sheets/0'
- ) &&
- resp.status() === 200 &&
- resp.request().method() === 'POST'
- )
+ await Promise.all([
+ page.waitForResponse(
+ (resp) =>
+ resp
+ .request()
+ .url()
+ .includes(
+ '/api/integrations/google-sheets/spreadsheets/1k_pIDw3YHl9tlZusbBVSBRY0PeRPd2H6t4Nj7rwnOtM/sheets/0'
+ ) &&
+ resp.status() === 200 &&
+ resp.request().method() === 'POST'
+ ),
+ typebotViewer(page)
+ .locator('input[placeholder="Type your email..."]')
+ .press('Enter'),
+ ])
  })
 
  test('Update row should work', async ({ page }) => {
@@ -89,20 +91,22 @@ test.describe.parallel('Google sheets integration', () => {
  await typebotViewer(page)
  .locator('input[placeholder="Type your email..."]')
  .fill('[email protected]')
- await typebotViewer(page)
- .locator('input[placeholder="Type your email..."]')
- .press('Enter')
- await page.waitForResponse(
- (resp) =>
- resp
- .request()
- .url()
- .includes(
- '/api/integrations/google-sheets/spreadsheets/1k_pIDw3YHl9tlZusbBVSBRY0PeRPd2H6t4Nj7rwnOtM/sheets/0'
- ) &&
- resp.status() === 200 &&
- resp.request().method() === 'PATCH'
- )
+ await Promise.all([
+ page.waitForResponse(
+ (resp) =>
+ resp
+ .request()
+ .url()
+ .includes(
+ '/api/integrations/google-sheets/spreadsheets/1k_pIDw3YHl9tlZusbBVSBRY0PeRPd2H6t4Nj7rwnOtM/sheets/0'
+ ) &&
+ resp.status() === 200 &&
+ resp.request().method() === 'PATCH'
+ ),
+ typebotViewer(page)
+ .locator('input[placeholder="Type your email..."]')
+ .press('Enter'),
+ ])
  })
 
  test('Get row should work', async ({ page }) => {

diff --git a/apps/builder/playwright/tests/results.spec.ts b/apps/builder/playwright/tests/results.spec.ts
@@ -45,7 +45,9 @@ test('results should be deletable', async ({ page }) => {
  ])
  await createResults({ typebotId, count: 200, isChronological: true })
  await page.goto(`/typebots/${typebotId}/results`)
- await selectFirstResults(page)
+ await expect(page.locator('text=content199')).toBeVisible()
+ await page.click('[data-testid="checkbox"] >> nth=1')
+ await page.click('[data-testid="checkbox"] >> nth=2')
  await page.click('text="Delete"')
  await deleteButtonInConfirmDialog(page).click()
  await expect(page.locator('text=content199')).toBeHidden()
@@ -87,7 +89,9 @@ test('submissions table should have infinite scroll', async ({ page }) => {
 
 test('should correctly export selection in CSV', async ({ page }) => {
  await page.goto(`/typebots/${typebotId}/results`)
- await selectFirstResults(page)
+ await expect(page.locator('text=content199')).toBeVisible()
+ await page.click('[data-testid="checkbox"] >> nth=1')
+ await page.click('[data-testid="checkbox"] >> nth=2')
  const [download] = await Promise.all([
  page.waitForEvent('download'),
  page.locator('text="Export"').click(),
@@ -181,5 +185,5 @@ const validateExportAll = (data: unknown[]) => {
 
 const selectFirstResults = async (page: Page) => {
  await page.click('[data-testid="checkbox"] >> nth=1')
- return page.click('[data-testid="checkbox"] >> nth=2')
+ await page.click('[data-testid="checkbox"] >> nth=2')
 }
diff --git a/apps/docs/package.json b/apps/docs/package.json
@@ -22,7 +22,7 @@
  "react": "17.0.2",
  "react-dom": "17.0.2",
  "@mdx-js/react": "1.6.22",
- "@svgr/webpack": "6.3.1",
+ "@svgr/webpack": "6.4.0",
  "clsx": "1.2.1",
  "file-loader": "6.2.0",
  "prism-react-renderer": "1.3.5",
@@ -42,8 +42,8 @@
  },
  "devDependencies": {
  "@algolia/client-search": "4.14.2",
- "@types/react": "18.0.19",
- "typescript": "4.8.3",
+ "@types/react": "18.0.21",
+ "typescript": "4.8.4",
  "webpack": "5.74.0"
  }
 }