From c1dd4d403e17d0ccdcc44d6c0ff0dc8bad7c15be Mon Sep 17 00:00:00 2001 From: Baptiste Arnaud Date: Sun, 18 Sep 2022 09:46:42 +0200 Subject: [PATCH] :construction_worker: Transpile components for better DX --- .../contexts/TypebotContext/actions/blocks.ts | 22 +- apps/builder/libs/google-sheets.ts | 3 +- apps/builder/next.config.js | 9 +- apps/builder/package.json | 2 +- apps/builder/pages/api/credentials.ts | 4 +- .../pages/api/credentials/[credentialsId].ts | 2 +- .../api/credentials/google-sheets/callback.ts | 2 +- apps/builder/pages/api/customDomains.ts | 2 +- .../pages/api/customDomains/[domain].ts | 2 +- apps/builder/pages/api/folders.ts | 2 +- apps/builder/pages/api/folders/[id].ts | 2 +- .../api/integrations/email/test-config.ts | 2 +- .../google-sheets/spreadsheets.ts | 2 +- .../google-sheets/spreadsheets/[id]/sheets.ts | 8 +- .../pages/api/mock/webhook-easy-config.ts | 2 +- apps/builder/pages/api/mock/webhook.ts | 2 +- apps/builder/pages/api/publicTypebots.ts | 2 +- apps/builder/pages/api/publicTypebots/[id].ts | 2 +- apps/builder/pages/api/storage/upload-url.ts | 2 +- .../pages/api/stripe/billing-portal.ts | 2 +- apps/builder/pages/api/stripe/invoices.ts | 2 +- apps/builder/pages/api/stripe/subscription.ts | 4 +- apps/builder/pages/api/stripe/webhook.ts | 2 +- apps/builder/pages/api/typebots.ts | 7 +- .../builder/pages/api/typebots/[typebotId].ts | 2 +- .../pages/api/typebots/[typebotId]/blocks.ts | 2 +- .../api/typebots/[typebotId]/collaborators.ts | 2 +- .../[typebotId]/collaborators/[userId].ts | 2 +- .../api/typebots/[typebotId]/invitations.ts | 8 +- .../[typebotId]/invitations/[email].ts | 2 +- .../pages/api/typebots/[typebotId]/results.ts | 2 +- .../[typebotId]/results/[resultId]/logs.ts | 2 +- .../[typebotId]/results/answers/count.ts | 2 +- .../api/typebots/[typebotId]/results/stats.ts | 2 +- .../api/typebots/[typebotId]/webhooks.ts | 2 +- apps/builder/pages/api/users/[userId].ts | 2 +- .../pages/api/users/[userId]/api-tokens.ts | 3 +- .../users/[userId]/api-tokens/[tokenId].ts | 2 +- .../builder/pages/api/webhooks/[webhookId].ts | 2 +- apps/builder/pages/api/workspaces.ts | 2 +- .../pages/api/workspaces/[workspaceId].ts | 2 +- .../workspaces/[workspaceId]/invitations.ts | 9 +- .../[workspaceId]/invitations/[id].ts | 2 +- .../api/workspaces/[workspaceId]/members.ts | 2 +- .../workspaces/[workspaceId]/members/[id].ts | 2 +- .../api/workspaces/[workspaceId]/usage.ts | 2 +- apps/builder/playwright/services/database.ts | 3 +- apps/builder/services/api/dbRules.ts | 3 +- apps/landing-page/next.config.js | 94 ++--- apps/landing-page/package.json | 7 +- apps/viewer/libs/google-sheets.ts | 3 +- apps/viewer/next.config.js | 9 +- apps/viewer/package.json | 1 - .../[spreadsheetId]/sheets/[sheetId].ts | 3 +- .../stripe/createPaymentIntent.ts | 2 +- apps/viewer/pages/api/mock/fail.ts | 2 +- apps/viewer/pages/api/mock/success.ts | 2 +- .../pages/api/publicTypebots/[typebotId].ts | 2 +- apps/viewer/pages/api/typebots.ts | 2 +- .../blocks/[blockId]/executeWebhook.ts | 10 +- .../blocks/[blockId]/sampleResult.ts | 2 +- .../steps/[stepId]/executeWebhook.ts | 3 +- .../[blockId]/steps/[stepId]/sampleResult.ts | 2 +- .../steps/[stepId]/subscribeWebhook.ts | 3 +- .../steps/[stepId]/unsubscribeWebhook.ts | 3 +- .../blocks/[blockId]/storage/upload-url.ts | 7 +- .../blocks/[blockId]/subscribeWebhook.ts | 3 +- .../blocks/[blockId]/unsubscribeWebhook.ts | 3 +- .../[typebotId]/integrations/email.ts | 11 +- .../pages/api/typebots/[typebotId]/results.ts | 10 +- .../[typebotId]/results/[resultId].ts | 2 +- .../[typebotId]/results/[resultId]/answers.ts | 3 +- .../api/typebots/[typebotId]/webhookBlocks.ts | 3 +- .../api/typebots/[typebotId]/webhookSteps.ts | 3 +- apps/viewer/pages/api/users/me.ts | 3 +- apps/viewer/playwright/services/database.ts | 3 +- package.json | 4 +- packages/bot-engine/package.json | 3 +- packages/bot-engine/tsconfig.json | 2 +- packages/db/package.json | 2 +- packages/models/{src => }/answer.ts | 0 packages/models/{src => }/credentials.ts | 0 packages/models/{src => }/index.ts | 0 packages/models/package.json | 15 +- packages/models/{src => }/publicTypebot.ts | 0 packages/models/{src => }/result.ts | 0 packages/models/rollup.config.js | 38 -- .../models/{src => }/typebot/blocks/blocks.ts | 0 .../{src => }/typebot/blocks/bubble/bubble.ts | 0 .../{src => }/typebot/blocks/bubble/embed.ts | 0 .../{src => }/typebot/blocks/bubble/image.ts | 0 .../{src => }/typebot/blocks/bubble/index.ts | 0 .../{src => }/typebot/blocks/bubble/text.ts | 0 .../{src => }/typebot/blocks/bubble/video.ts | 0 .../models/{src => }/typebot/blocks/index.ts | 0 .../{src => }/typebot/blocks/input/choice.ts | 0 .../{src => }/typebot/blocks/input/date.ts | 0 .../{src => }/typebot/blocks/input/email.ts | 0 .../{src => }/typebot/blocks/input/file.ts | 0 .../{src => }/typebot/blocks/input/index.ts | 0 .../{src => }/typebot/blocks/input/input.ts | 0 .../{src => }/typebot/blocks/input/number.ts | 0 .../{src => }/typebot/blocks/input/payment.ts | 0 .../{src => }/typebot/blocks/input/phone.ts | 0 .../{src => }/typebot/blocks/input/rating.ts | 0 .../{src => }/typebot/blocks/input/text.ts | 0 .../{src => }/typebot/blocks/input/url.ts | 0 .../blocks/integration/googleAnalytics.ts | 0 .../blocks/integration/googleSheets.ts | 0 .../typebot/blocks/integration/index.ts | 0 .../typebot/blocks/integration/integration.ts | 0 .../typebot/blocks/integration/makeCom.ts | 0 .../blocks/integration/pabblyConnect.ts | 0 .../typebot/blocks/integration/sendEmail.ts | 0 .../typebot/blocks/integration/webhook.ts | 0 .../typebot/blocks/integration/zapier.ts | 0 .../models/{src => }/typebot/blocks/item.ts | 0 .../{src => }/typebot/blocks/logic/code.ts | 0 .../typebot/blocks/logic/condition.ts | 0 .../{src => }/typebot/blocks/logic/index.ts | 0 .../{src => }/typebot/blocks/logic/logic.ts | 0 .../typebot/blocks/logic/redirect.ts | 0 .../typebot/blocks/logic/setVariable.ts | 0 .../typebot/blocks/logic/typebotLink.ts | 0 .../models/{src => }/typebot/blocks/shared.ts | 0 packages/models/{src => }/typebot/index.ts | 0 packages/models/{src => }/typebot/settings.ts | 0 packages/models/{src => }/typebot/theme.ts | 0 packages/models/{src => }/typebot/typebot.ts | 0 packages/models/{src => }/typebot/variable.ts | 0 packages/models/{src => }/utils.ts | 0 packages/models/{src => }/webhooks.ts | 0 packages/utils/{src => api}/encryption.ts | 0 packages/utils/{src => }/api/index.ts | 1 + .../{src => }/api/sendEmailNotification.ts | 0 packages/utils/{src => }/api/storage.ts | 0 packages/utils/{src => }/api/utils.ts | 0 packages/utils/{src => }/index.ts | 2 - packages/utils/package.json | 16 +- packages/utils/{src => }/playwright.ts | 0 packages/utils/{src => }/pricing.ts | 0 packages/utils/{src => }/results.ts | 0 packages/utils/rollup.config.js | 38 -- .../utils/{src => }/typebotConversions.ts | 0 packages/utils/{src => }/utils.ts | 0 pnpm-lock.yaml | 346 ++++++++---------- turbo.json | 5 +- 147 files changed, 343 insertions(+), 485 deletions(-) rename packages/models/{src => }/answer.ts (100%) rename packages/models/{src => }/credentials.ts (100%) rename packages/models/{src => }/index.ts (100%) rename packages/models/{src => }/publicTypebot.ts (100%) rename packages/models/{src => }/result.ts (100%) delete mode 100644 packages/models/rollup.config.js rename packages/models/{src => }/typebot/blocks/blocks.ts (100%) rename packages/models/{src => }/typebot/blocks/bubble/bubble.ts (100%) rename packages/models/{src => }/typebot/blocks/bubble/embed.ts (100%) rename packages/models/{src => }/typebot/blocks/bubble/image.ts (100%) rename packages/models/{src => }/typebot/blocks/bubble/index.ts (100%) rename packages/models/{src => }/typebot/blocks/bubble/text.ts (100%) rename packages/models/{src => }/typebot/blocks/bubble/video.ts (100%) rename packages/models/{src => }/typebot/blocks/index.ts (100%) rename packages/models/{src => }/typebot/blocks/input/choice.ts (100%) rename packages/models/{src => }/typebot/blocks/input/date.ts (100%) rename packages/models/{src => }/typebot/blocks/input/email.ts (100%) rename packages/models/{src => }/typebot/blocks/input/file.ts (100%) rename packages/models/{src => }/typebot/blocks/input/index.ts (100%) rename packages/models/{src => }/typebot/blocks/input/input.ts (100%) rename packages/models/{src => }/typebot/blocks/input/number.ts (100%) rename packages/models/{src => }/typebot/blocks/input/payment.ts (100%) rename packages/models/{src => }/typebot/blocks/input/phone.ts (100%) rename packages/models/{src => }/typebot/blocks/input/rating.ts (100%) rename packages/models/{src => }/typebot/blocks/input/text.ts (100%) rename packages/models/{src => }/typebot/blocks/input/url.ts (100%) rename packages/models/{src => }/typebot/blocks/integration/googleAnalytics.ts (100%) rename packages/models/{src => }/typebot/blocks/integration/googleSheets.ts (100%) rename packages/models/{src => }/typebot/blocks/integration/index.ts (100%) rename packages/models/{src => }/typebot/blocks/integration/integration.ts (100%) rename packages/models/{src => }/typebot/blocks/integration/makeCom.ts (100%) rename packages/models/{src => }/typebot/blocks/integration/pabblyConnect.ts (100%) rename packages/models/{src => }/typebot/blocks/integration/sendEmail.ts (100%) rename packages/models/{src => }/typebot/blocks/integration/webhook.ts (100%) rename packages/models/{src => }/typebot/blocks/integration/zapier.ts (100%) rename packages/models/{src => }/typebot/blocks/item.ts (100%) rename packages/models/{src => }/typebot/blocks/logic/code.ts (100%) rename packages/models/{src => }/typebot/blocks/logic/condition.ts (100%) rename packages/models/{src => }/typebot/blocks/logic/index.ts (100%) rename packages/models/{src => }/typebot/blocks/logic/logic.ts (100%) rename packages/models/{src => }/typebot/blocks/logic/redirect.ts (100%) rename packages/models/{src => }/typebot/blocks/logic/setVariable.ts (100%) rename packages/models/{src => }/typebot/blocks/logic/typebotLink.ts (100%) rename packages/models/{src => }/typebot/blocks/shared.ts (100%) rename packages/models/{src => }/typebot/index.ts (100%) rename packages/models/{src => }/typebot/settings.ts (100%) rename packages/models/{src => }/typebot/theme.ts (100%) rename packages/models/{src => }/typebot/typebot.ts (100%) rename packages/models/{src => }/typebot/variable.ts (100%) rename packages/models/{src => }/utils.ts (100%) rename packages/models/{src => }/webhooks.ts (100%) rename packages/utils/{src => api}/encryption.ts (100%) rename packages/utils/{src => }/api/index.ts (75%) rename packages/utils/{src => }/api/sendEmailNotification.ts (100%) rename packages/utils/{src => }/api/storage.ts (100%) rename packages/utils/{src => }/api/utils.ts (100%) rename packages/utils/{src => }/index.ts (67%) rename packages/utils/{src => }/playwright.ts (100%) rename packages/utils/{src => }/pricing.ts (100%) rename packages/utils/{src => }/results.ts (100%) delete mode 100644 packages/utils/rollup.config.js rename packages/utils/{src => }/typebotConversions.ts (100%) rename packages/utils/{src => }/utils.ts (100%) diff --git a/apps/builder/contexts/TypebotContext/actions/blocks.ts b/apps/builder/contexts/TypebotContext/actions/blocks.ts index 9fd204636..be26c4ab8 100644 --- a/apps/builder/contexts/TypebotContext/actions/blocks.ts +++ b/apps/builder/contexts/TypebotContext/actions/blocks.ts @@ -138,16 +138,26 @@ const duplicateBlockDraft = (groupId: string) => (block: Block): Block => { const blockId = cuid() + if (blockHasItems(block)) + return { + ...block, + groupId, + id: blockId, + items: block.items.map(duplicateItemDraft(blockId)), + outgoingEdgeId: undefined, + } as Block + if (isWebhookBlock(block)) + return { + ...block, + groupId, + id: blockId, + webhookId: cuid(), + outgoingEdgeId: undefined, + } return { ...block, groupId, id: blockId, - items: blockHasItems(block) - ? block.items.map(duplicateItemDraft(blockId)) - : undefined, - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - //@ts-ignore - webhookId: isWebhookBlock(block) ? cuid() : undefined, outgoingEdgeId: undefined, } } diff --git a/apps/builder/libs/google-sheets.ts b/apps/builder/libs/google-sheets.ts index 9d751d360..163696b9d 100644 --- a/apps/builder/libs/google-sheets.ts +++ b/apps/builder/libs/google-sheets.ts @@ -1,7 +1,8 @@ import { Credentials as CredentialsFromDb } from 'db' import { OAuth2Client, Credentials } from 'google-auth-library' import { GoogleSheetsCredentialsData } from 'models' -import { decrypt, encrypt, isDefined } from 'utils' +import { isDefined } from 'utils' +import { decrypt, encrypt } from 'utils/api' import prisma from './prisma' export const oauth2Client = new OAuth2Client( diff --git a/apps/builder/next.config.js b/apps/builder/next.config.js index 95ab13a86..0f2b4b9bd 100644 --- a/apps/builder/next.config.js +++ b/apps/builder/next.config.js @@ -1,6 +1,7 @@ /* eslint-disable @typescript-eslint/no-var-requires */ const { withSentryConfig } = require('@sentry/nextjs') const path = require('path') +const withTM = require('next-transpile-modules')(['utils', 'models']) /** @type {import('next').NextConfig} */ const nextConfig = { @@ -15,6 +16,8 @@ const sentryWebpackPluginOptions = { silent: true, } -module.exports = process.env.SENTRY_AUTH_TOKEN - ? withSentryConfig(nextConfig, sentryWebpackPluginOptions) - : nextConfig +module.exports = withTM( + process.env.SENTRY_AUTH_TOKEN + ? withSentryConfig(nextConfig, sentryWebpackPluginOptions) + : nextConfig +) diff --git a/apps/builder/package.json b/apps/builder/package.json index b8fdbe6b3..6d2d8f463 100644 --- a/apps/builder/package.json +++ b/apps/builder/package.json @@ -3,7 +3,6 @@ "version": "0.1.0", "license": "AGPL-3.0-or-later", "scripts": { - "dx": "pnpm dev", "dev": "ENVSH_ENV=.env.local bash ../../env.sh next dev -p 3000", "build": "next build", "start": "next start", @@ -108,6 +107,7 @@ "eslint-config-next": "12.3.0", "eslint-plugin-react": "^7.31.8", "models": "workspace:*", + "next-transpile-modules": "^9.0.0", "typescript": "^4.8.3", "utils": "workspace:*" } diff --git a/apps/builder/pages/api/credentials.ts b/apps/builder/pages/api/credentials.ts index 090aac934..74cad8117 100644 --- a/apps/builder/pages/api/credentials.ts +++ b/apps/builder/pages/api/credentials.ts @@ -5,11 +5,11 @@ import { NextApiRequest, NextApiResponse } from 'next' import { getAuthenticatedUser } from 'services/api/utils' import { badRequest, - encrypt, forbidden, methodNotAllowed, notAuthenticated, -} from 'utils' + encrypt, +} from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/credentials/[credentialsId].ts b/apps/builder/pages/api/credentials/[credentialsId].ts index 34668793a..20028aaea 100644 --- a/apps/builder/pages/api/credentials/[credentialsId].ts +++ b/apps/builder/pages/api/credentials/[credentialsId].ts @@ -2,7 +2,7 @@ import { withSentry } from '@sentry/nextjs' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { getAuthenticatedUser } from 'services/api/utils' -import { badRequest, methodNotAllowed, notAuthenticated } from 'utils' +import { badRequest, methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/credentials/google-sheets/callback.ts b/apps/builder/pages/api/credentials/google-sheets/callback.ts index 0aa55a321..1a1b58821 100644 --- a/apps/builder/pages/api/credentials/google-sheets/callback.ts +++ b/apps/builder/pages/api/credentials/google-sheets/callback.ts @@ -4,7 +4,7 @@ import prisma from 'libs/prisma' import { googleSheetsScopes } from './consent-url' import { stringify } from 'querystring' import { CredentialsType } from 'models' -import { badRequest, encrypt, notAuthenticated } from 'utils' +import { badRequest, encrypt, notAuthenticated } from 'utils/api' import { oauth2Client } from 'libs/google-sheets' import { withSentry } from '@sentry/nextjs' import { getAuthenticatedUser } from 'services/api/utils' diff --git a/apps/builder/pages/api/customDomains.ts b/apps/builder/pages/api/customDomains.ts index cdd7d862d..0394f626c 100644 --- a/apps/builder/pages/api/customDomains.ts +++ b/apps/builder/pages/api/customDomains.ts @@ -9,7 +9,7 @@ import { forbidden, methodNotAllowed, notAuthenticated, -} from 'utils' +} from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/customDomains/[domain].ts b/apps/builder/pages/api/customDomains/[domain].ts index 9961abc48..31b7b7362 100644 --- a/apps/builder/pages/api/customDomains/[domain].ts +++ b/apps/builder/pages/api/customDomains/[domain].ts @@ -1,7 +1,7 @@ import { withSentry } from '@sentry/nextjs' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' -import { badRequest, methodNotAllowed, notAuthenticated } from 'utils' +import { badRequest, methodNotAllowed, notAuthenticated } from 'utils/api' import { got } from 'got' import { getAuthenticatedUser } from 'services/api/utils' diff --git a/apps/builder/pages/api/folders.ts b/apps/builder/pages/api/folders.ts index 279b03aaa..d3508a6e7 100644 --- a/apps/builder/pages/api/folders.ts +++ b/apps/builder/pages/api/folders.ts @@ -3,7 +3,7 @@ import { DashboardFolder, WorkspaceRole } from 'db' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { getAuthenticatedUser } from 'services/api/utils' -import { badRequest, methodNotAllowed, notAuthenticated } from 'utils' +import { badRequest, methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/folders/[id].ts b/apps/builder/pages/api/folders/[id].ts index 27711df28..1c642ede1 100644 --- a/apps/builder/pages/api/folders/[id].ts +++ b/apps/builder/pages/api/folders/[id].ts @@ -3,7 +3,7 @@ import { DashboardFolder } from 'db' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/integrations/email/test-config.ts b/apps/builder/pages/api/integrations/email/test-config.ts index 1f71cdb61..c8ccb8487 100644 --- a/apps/builder/pages/api/integrations/email/test-config.ts +++ b/apps/builder/pages/api/integrations/email/test-config.ts @@ -3,7 +3,7 @@ import { SmtpCredentialsData } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { createTransport } from 'nodemailer' import { getAuthenticatedUser } from 'services/api/utils' -import { notAuthenticated } from 'utils' +import { notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/integrations/google-sheets/spreadsheets.ts b/apps/builder/pages/api/integrations/google-sheets/spreadsheets.ts index 31bc5e980..722cb8855 100644 --- a/apps/builder/pages/api/integrations/google-sheets/spreadsheets.ts +++ b/apps/builder/pages/api/integrations/google-sheets/spreadsheets.ts @@ -1,7 +1,7 @@ import { NextApiRequest, NextApiResponse } from 'next' import { drive } from '@googleapis/drive' import { getAuthenticatedGoogleClient } from 'libs/google-sheets' -import { badRequest, methodNotAllowed, notAuthenticated } from 'utils' +import { badRequest, methodNotAllowed, notAuthenticated } from 'utils/api' import { setUser, withSentry } from '@sentry/nextjs' import { getAuthenticatedUser } from 'services/api/utils' diff --git a/apps/builder/pages/api/integrations/google-sheets/spreadsheets/[id]/sheets.ts b/apps/builder/pages/api/integrations/google-sheets/spreadsheets/[id]/sheets.ts index e12d36526..d7dc380a2 100644 --- a/apps/builder/pages/api/integrations/google-sheets/spreadsheets/[id]/sheets.ts +++ b/apps/builder/pages/api/integrations/google-sheets/spreadsheets/[id]/sheets.ts @@ -1,12 +1,8 @@ import { NextApiRequest, NextApiResponse } from 'next' import { GoogleSpreadsheet } from 'google-spreadsheet' import { getAuthenticatedGoogleClient } from 'libs/google-sheets' -import { - badRequest, - isDefined, - methodNotAllowed, - notAuthenticated, -} from 'utils' +import { isDefined } from 'utils' +import { badRequest, methodNotAllowed, notAuthenticated } from 'utils/api' import { withSentry, setUser } from '@sentry/nextjs' import { getAuthenticatedUser } from 'services/api/utils' diff --git a/apps/builder/pages/api/mock/webhook-easy-config.ts b/apps/builder/pages/api/mock/webhook-easy-config.ts index 824e0f095..1f73bf98a 100644 --- a/apps/builder/pages/api/mock/webhook-easy-config.ts +++ b/apps/builder/pages/api/mock/webhook-easy-config.ts @@ -1,6 +1,6 @@ import { withSentry } from '@sentry/nextjs' import { NextApiRequest, NextApiResponse } from 'next' -import { methodNotAllowed } from 'utils' +import { methodNotAllowed } from 'utils/api' const handler = (req: NextApiRequest, res: NextApiResponse) => { if (req.method === 'POST') { diff --git a/apps/builder/pages/api/mock/webhook.ts b/apps/builder/pages/api/mock/webhook.ts index ce4a696ff..3629a08ce 100644 --- a/apps/builder/pages/api/mock/webhook.ts +++ b/apps/builder/pages/api/mock/webhook.ts @@ -1,6 +1,6 @@ import { withSentry } from '@sentry/nextjs' import { NextApiRequest, NextApiResponse } from 'next' -import { methodNotAllowed } from 'utils' +import { methodNotAllowed } from 'utils/api' const handler = (req: NextApiRequest, res: NextApiResponse) => { if (req.method === 'POST') { diff --git a/apps/builder/pages/api/publicTypebots.ts b/apps/builder/pages/api/publicTypebots.ts index ff6115926..3ffcefdd5 100644 --- a/apps/builder/pages/api/publicTypebots.ts +++ b/apps/builder/pages/api/publicTypebots.ts @@ -4,7 +4,7 @@ import { InputBlockType, PublicTypebot } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { canPublishFileInput } from 'services/api/dbRules' import { getAuthenticatedUser } from 'services/api/utils' -import { badRequest, methodNotAllowed, notAuthenticated } from 'utils' +import { badRequest, methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/publicTypebots/[id].ts b/apps/builder/pages/api/publicTypebots/[id].ts index 5ee34c574..c40b371c8 100644 --- a/apps/builder/pages/api/publicTypebots/[id].ts +++ b/apps/builder/pages/api/publicTypebots/[id].ts @@ -4,7 +4,7 @@ import { InputBlockType, PublicTypebot } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { canPublishFileInput } from 'services/api/dbRules' import { getAuthenticatedUser } from 'services/api/utils' -import { badRequest, methodNotAllowed, notAuthenticated } from 'utils' +import { badRequest, methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/storage/upload-url.ts b/apps/builder/pages/api/storage/upload-url.ts index ea595ff57..fffd655bc 100644 --- a/apps/builder/pages/api/storage/upload-url.ts +++ b/apps/builder/pages/api/storage/upload-url.ts @@ -6,7 +6,7 @@ import { generatePresignedUrl, methodNotAllowed, notAuthenticated, -} from 'utils' +} from 'utils/api' const handler = async ( req: NextApiRequest, diff --git a/apps/builder/pages/api/stripe/billing-portal.ts b/apps/builder/pages/api/stripe/billing-portal.ts index ea6730843..fcba0f1f9 100644 --- a/apps/builder/pages/api/stripe/billing-portal.ts +++ b/apps/builder/pages/api/stripe/billing-portal.ts @@ -4,7 +4,7 @@ import { forbidden, methodNotAllowed, notAuthenticated, -} from 'utils' +} from 'utils/api' import Stripe from 'stripe' import { withSentry } from '@sentry/nextjs' import { getAuthenticatedUser } from 'services/api/utils' diff --git a/apps/builder/pages/api/stripe/invoices.ts b/apps/builder/pages/api/stripe/invoices.ts index de8ab82aa..ecf6f0e9c 100644 --- a/apps/builder/pages/api/stripe/invoices.ts +++ b/apps/builder/pages/api/stripe/invoices.ts @@ -4,7 +4,7 @@ import { forbidden, methodNotAllowed, notAuthenticated, -} from 'utils' +} from 'utils/api' import Stripe from 'stripe' import { withSentry } from '@sentry/nextjs' import { getAuthenticatedUser } from 'services/api/utils' diff --git a/apps/builder/pages/api/stripe/subscription.ts b/apps/builder/pages/api/stripe/subscription.ts index d4d309f46..00e0517c1 100644 --- a/apps/builder/pages/api/stripe/subscription.ts +++ b/apps/builder/pages/api/stripe/subscription.ts @@ -1,11 +1,11 @@ import { NextApiRequest, NextApiResponse } from 'next' +import { isDefined } from 'utils' import { badRequest, forbidden, - isDefined, methodNotAllowed, notAuthenticated, -} from 'utils' +} from 'utils/api' import Stripe from 'stripe' import { withSentry } from '@sentry/nextjs' import { getAuthenticatedUser } from 'services/api/utils' diff --git a/apps/builder/pages/api/stripe/webhook.ts b/apps/builder/pages/api/stripe/webhook.ts index c73cd0aa4..89dfaa561 100644 --- a/apps/builder/pages/api/stripe/webhook.ts +++ b/apps/builder/pages/api/stripe/webhook.ts @@ -1,5 +1,5 @@ import { NextApiRequest, NextApiResponse } from 'next' -import { methodNotAllowed } from 'utils' +import { methodNotAllowed } from 'utils/api' import Stripe from 'stripe' import Cors from 'micro-cors' import { buffer } from 'micro' diff --git a/apps/builder/pages/api/typebots.ts b/apps/builder/pages/api/typebots.ts index c931b9e5a..155320b9b 100644 --- a/apps/builder/pages/api/typebots.ts +++ b/apps/builder/pages/api/typebots.ts @@ -4,7 +4,12 @@ import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { getAuthenticatedUser } from 'services/api/utils' import { parseNewTypebot } from 'services/typebots/typebots' -import { badRequest, methodNotAllowed, notAuthenticated, notFound } from 'utils' +import { + badRequest, + methodNotAllowed, + notAuthenticated, + notFound, +} from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/typebots/[typebotId].ts b/apps/builder/pages/api/typebots/[typebotId].ts index d4b227785..39c8d359e 100644 --- a/apps/builder/pages/api/typebots/[typebotId].ts +++ b/apps/builder/pages/api/typebots/[typebotId].ts @@ -4,7 +4,7 @@ import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { canReadTypebot, canWriteTypebot } from 'services/api/dbRules' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/typebots/[typebotId]/blocks.ts b/apps/builder/pages/api/typebots/[typebotId]/blocks.ts index 46012cdae..84403fcb4 100644 --- a/apps/builder/pages/api/typebots/[typebotId]/blocks.ts +++ b/apps/builder/pages/api/typebots/[typebotId]/blocks.ts @@ -3,7 +3,7 @@ import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { canReadTypebot } from 'services/api/dbRules' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated, notFound } from 'utils' +import { methodNotAllowed, notAuthenticated, notFound } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/typebots/[typebotId]/collaborators.ts b/apps/builder/pages/api/typebots/[typebotId]/collaborators.ts index cc57c28c6..9a7523fa5 100644 --- a/apps/builder/pages/api/typebots/[typebotId]/collaborators.ts +++ b/apps/builder/pages/api/typebots/[typebotId]/collaborators.ts @@ -3,7 +3,7 @@ import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { canReadTypebot } from 'services/api/dbRules' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/typebots/[typebotId]/collaborators/[userId].ts b/apps/builder/pages/api/typebots/[typebotId]/collaborators/[userId].ts index 092204815..e526693a0 100644 --- a/apps/builder/pages/api/typebots/[typebotId]/collaborators/[userId].ts +++ b/apps/builder/pages/api/typebots/[typebotId]/collaborators/[userId].ts @@ -3,7 +3,7 @@ import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { canEditGuests } from 'services/api/dbRules' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/typebots/[typebotId]/invitations.ts b/apps/builder/pages/api/typebots/[typebotId]/invitations.ts index b01fdb671..caa8604fb 100644 --- a/apps/builder/pages/api/typebots/[typebotId]/invitations.ts +++ b/apps/builder/pages/api/typebots/[typebotId]/invitations.ts @@ -4,15 +4,15 @@ import { CollaborationType, WorkspaceRole } from 'db' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { canReadTypebot, canWriteTypebot } from 'services/api/dbRules' -import { sendEmailNotification } from 'utils' -import { getAuthenticatedUser } from 'services/api/utils' import { + sendEmailNotification, badRequest, - env, forbidden, methodNotAllowed, notAuthenticated, -} from 'utils' +} from 'utils/api' +import { getAuthenticatedUser } from 'services/api/utils' +import { env } from 'utils' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/typebots/[typebotId]/invitations/[email].ts b/apps/builder/pages/api/typebots/[typebotId]/invitations/[email].ts index 9baf47ae6..efd6130c5 100644 --- a/apps/builder/pages/api/typebots/[typebotId]/invitations/[email].ts +++ b/apps/builder/pages/api/typebots/[typebotId]/invitations/[email].ts @@ -4,7 +4,7 @@ import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { canEditGuests } from 'services/api/dbRules' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/typebots/[typebotId]/results.ts b/apps/builder/pages/api/typebots/[typebotId]/results.ts index ca8d3f984..0224f26c0 100644 --- a/apps/builder/pages/api/typebots/[typebotId]/results.ts +++ b/apps/builder/pages/api/typebots/[typebotId]/results.ts @@ -10,7 +10,7 @@ import { forbidden, methodNotAllowed, notAuthenticated, -} from 'utils' +} from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/typebots/[typebotId]/results/[resultId]/logs.ts b/apps/builder/pages/api/typebots/[typebotId]/results/[resultId]/logs.ts index b1597a5f4..b1cc42e58 100644 --- a/apps/builder/pages/api/typebots/[typebotId]/results/[resultId]/logs.ts +++ b/apps/builder/pages/api/typebots/[typebotId]/results/[resultId]/logs.ts @@ -3,7 +3,7 @@ import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { canReadTypebot } from 'services/api/dbRules' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/typebots/[typebotId]/results/answers/count.ts b/apps/builder/pages/api/typebots/[typebotId]/results/answers/count.ts index 440c56ea0..8a123988b 100644 --- a/apps/builder/pages/api/typebots/[typebotId]/results/answers/count.ts +++ b/apps/builder/pages/api/typebots/[typebotId]/results/answers/count.ts @@ -1,7 +1,7 @@ import { PublicTypebot } from 'models' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' import { withSentry } from '@sentry/nextjs' import { getAuthenticatedUser } from 'services/api/utils' import { canReadTypebot } from 'services/api/dbRules' diff --git a/apps/builder/pages/api/typebots/[typebotId]/results/stats.ts b/apps/builder/pages/api/typebots/[typebotId]/results/stats.ts index 47e5709aa..6085e019b 100644 --- a/apps/builder/pages/api/typebots/[typebotId]/results/stats.ts +++ b/apps/builder/pages/api/typebots/[typebotId]/results/stats.ts @@ -4,7 +4,7 @@ import { Stats } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { canReadTypebot } from 'services/api/dbRules' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/typebots/[typebotId]/webhooks.ts b/apps/builder/pages/api/typebots/[typebotId]/webhooks.ts index 4c668ddef..d650bc5e2 100644 --- a/apps/builder/pages/api/typebots/[typebotId]/webhooks.ts +++ b/apps/builder/pages/api/typebots/[typebotId]/webhooks.ts @@ -4,7 +4,7 @@ import { defaultWebhookAttributes } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { canWriteTypebot } from 'services/api/dbRules' import { getAuthenticatedUser } from 'services/api/utils' -import { forbidden, methodNotAllowed, notAuthenticated } from 'utils' +import { forbidden, methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/users/[userId].ts b/apps/builder/pages/api/users/[userId].ts index a190f6627..df2d0d317 100644 --- a/apps/builder/pages/api/users/[userId].ts +++ b/apps/builder/pages/api/users/[userId].ts @@ -2,7 +2,7 @@ import { withSentry } from '@sentry/nextjs' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/users/[userId]/api-tokens.ts b/apps/builder/pages/api/users/[userId]/api-tokens.ts index 0626ac12f..d496522f2 100644 --- a/apps/builder/pages/api/users/[userId]/api-tokens.ts +++ b/apps/builder/pages/api/users/[userId]/api-tokens.ts @@ -2,7 +2,8 @@ import { withSentry } from '@sentry/nextjs' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { getAuthenticatedUser } from 'services/api/utils' -import { generateId, methodNotAllowed, notAuthenticated } from 'utils' +import { generateId } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/users/[userId]/api-tokens/[tokenId].ts b/apps/builder/pages/api/users/[userId]/api-tokens/[tokenId].ts index c49251620..baf4a688c 100644 --- a/apps/builder/pages/api/users/[userId]/api-tokens/[tokenId].ts +++ b/apps/builder/pages/api/users/[userId]/api-tokens/[tokenId].ts @@ -2,7 +2,7 @@ import { withSentry } from '@sentry/nextjs' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/webhooks/[webhookId].ts b/apps/builder/pages/api/webhooks/[webhookId].ts index 687f3eeb2..044066940 100644 --- a/apps/builder/pages/api/webhooks/[webhookId].ts +++ b/apps/builder/pages/api/webhooks/[webhookId].ts @@ -8,7 +8,7 @@ import { forbidden, methodNotAllowed, notAuthenticated, -} from 'utils' +} from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/workspaces.ts b/apps/builder/pages/api/workspaces.ts index a651cf496..1705b4352 100644 --- a/apps/builder/pages/api/workspaces.ts +++ b/apps/builder/pages/api/workspaces.ts @@ -3,7 +3,7 @@ import { Plan, Workspace } from 'db' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/workspaces/[workspaceId].ts b/apps/builder/pages/api/workspaces/[workspaceId].ts index 2848ad172..325889447 100644 --- a/apps/builder/pages/api/workspaces/[workspaceId].ts +++ b/apps/builder/pages/api/workspaces/[workspaceId].ts @@ -3,7 +3,7 @@ import { Workspace, WorkspaceRole } from 'db' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/workspaces/[workspaceId]/invitations.ts b/apps/builder/pages/api/workspaces/[workspaceId]/invitations.ts index 78c61f292..17faae42e 100644 --- a/apps/builder/pages/api/workspaces/[workspaceId]/invitations.ts +++ b/apps/builder/pages/api/workspaces/[workspaceId]/invitations.ts @@ -3,15 +3,14 @@ import { workspaceMemberInvitationEmail } from 'assets/emails/workspaceMemberInv import { Workspace, WorkspaceInvitation, WorkspaceRole } from 'db' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' -import { sendEmailNotification } from 'utils' -import { getAuthenticatedUser } from 'services/api/utils' import { - env, + sendEmailNotification, forbidden, methodNotAllowed, notAuthenticated, - seatsLimit, -} from 'utils' +} from 'utils/api' +import { getAuthenticatedUser } from 'services/api/utils' +import { env, seatsLimit } from 'utils' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/workspaces/[workspaceId]/invitations/[id].ts b/apps/builder/pages/api/workspaces/[workspaceId]/invitations/[id].ts index 21fd71706..5d0f3c411 100644 --- a/apps/builder/pages/api/workspaces/[workspaceId]/invitations/[id].ts +++ b/apps/builder/pages/api/workspaces/[workspaceId]/invitations/[id].ts @@ -3,7 +3,7 @@ import { WorkspaceInvitation, WorkspaceRole } from 'db' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/workspaces/[workspaceId]/members.ts b/apps/builder/pages/api/workspaces/[workspaceId]/members.ts index 7e9c3ed78..d46af8503 100644 --- a/apps/builder/pages/api/workspaces/[workspaceId]/members.ts +++ b/apps/builder/pages/api/workspaces/[workspaceId]/members.ts @@ -2,7 +2,7 @@ import { withSentry } from '@sentry/nextjs' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated, notFound } from 'utils' +import { methodNotAllowed, notAuthenticated, notFound } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/workspaces/[workspaceId]/members/[id].ts b/apps/builder/pages/api/workspaces/[workspaceId]/members/[id].ts index ac36b5226..dd3ab09e5 100644 --- a/apps/builder/pages/api/workspaces/[workspaceId]/members/[id].ts +++ b/apps/builder/pages/api/workspaces/[workspaceId]/members/[id].ts @@ -3,7 +3,7 @@ import { MemberInWorkspace, WorkspaceRole } from 'db' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/pages/api/workspaces/[workspaceId]/usage.ts b/apps/builder/pages/api/workspaces/[workspaceId]/usage.ts index 4aa59cef2..4db59ae32 100644 --- a/apps/builder/pages/api/workspaces/[workspaceId]/usage.ts +++ b/apps/builder/pages/api/workspaces/[workspaceId]/usage.ts @@ -2,7 +2,7 @@ import { withSentry } from '@sentry/nextjs' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { getAuthenticatedUser } from 'services/api/utils' -import { methodNotAllowed, notAuthenticated } from 'utils' +import { methodNotAllowed, notAuthenticated } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await getAuthenticatedUser(req) diff --git a/apps/builder/playwright/services/database.ts b/apps/builder/playwright/services/database.ts index d41fe4fb9..173b33319 100644 --- a/apps/builder/playwright/services/database.ts +++ b/apps/builder/playwright/services/database.ts @@ -18,7 +18,8 @@ import { Workspace, } from 'db' import { readFileSync } from 'fs' -import { encrypt, createFakeResults } from 'utils' +import { createFakeResults } from 'utils' +import { encrypt } from 'utils/api' import Stripe from 'stripe' const prisma = new PrismaClient() diff --git a/apps/builder/services/api/dbRules.ts b/apps/builder/services/api/dbRules.ts index 0a5c818fc..dee5517cc 100644 --- a/apps/builder/services/api/dbRules.ts +++ b/apps/builder/services/api/dbRules.ts @@ -1,7 +1,8 @@ import { CollaborationType, Plan, Prisma, User, WorkspaceRole } from 'db' import prisma from 'libs/prisma' import { NextApiResponse } from 'next' -import { env, forbidden, isNotEmpty } from 'utils' +import { env, isNotEmpty } from 'utils' +import { forbidden } from 'utils/api' const parseWhereFilter = ( typebotIds: string[] | string, diff --git a/apps/landing-page/next.config.js b/apps/landing-page/next.config.js index 300555833..b2aa628d4 100644 --- a/apps/landing-page/next.config.js +++ b/apps/landing-page/next.config.js @@ -1,56 +1,60 @@ -// eslint-disable-next-line @typescript-eslint/no-var-requires +/* eslint-disable @typescript-eslint/no-var-requires */ const withBundleAnalyzer = require('@next/bundle-analyzer')({ enabled: process.env.ANALYZE === 'true', }) +const withTM = require('next-transpile-modules')(['utils', 'models']) const pages = ['pricing', 'privacy-policies', 'terms-of-service', 'about'] -module.exports = withBundleAnalyzer({ - async redirects() { - return [ - { - source: '/typebot-lib', - destination: - 'https://unpkg.com/typebot-js@2.0.21/dist/index.umd.min.js', - permanent: true, - }, - { - source: '/typebot-lib/v2', - destination: 'https://unpkg.com/typebot-js@2.1.3/dist/index.umd.min.js', - permanent: true, - }, - ] - }, - async rewrites() { - return { - beforeFiles: [ +module.exports = withTM( + withBundleAnalyzer({ + async redirects() { + return [ { - source: '/_next/static/:static*', + source: '/typebot-lib', destination: - process.env.NEXT_PUBLIC_VIEWER_URL + '/_next/static/:static*', - has: [ - { - type: 'header', - key: 'referer', - value: - process.env.LANDING_PAGE_HOST + - '/(?!' + - pages.join('|') + - '|\\?).+', - }, - ], - }, - ], - fallback: [ - { - source: '/:typebotId*', - destination: process.env.NEXT_PUBLIC_VIEWER_URL + '/:typebotId*', + 'https://unpkg.com/typebot-js@2.0.21/dist/index.umd.min.js', + permanent: true, }, { - source: '/api/:path*', - destination: process.env.NEXT_PUBLIC_VIEWER_URL + '/api/:path*', + source: '/typebot-lib/v2', + destination: + 'https://unpkg.com/typebot-js@2.1.3/dist/index.umd.min.js', + permanent: true, }, - ], - } - }, -}) + ] + }, + async rewrites() { + return { + beforeFiles: [ + { + source: '/_next/static/:static*', + destination: + process.env.NEXT_PUBLIC_VIEWER_URL + '/_next/static/:static*', + has: [ + { + type: 'header', + key: 'referer', + value: + process.env.LANDING_PAGE_HOST + + '/(?!' + + pages.join('|') + + '|\\?).+', + }, + ], + }, + ], + fallback: [ + { + source: '/:typebotId*', + destination: process.env.NEXT_PUBLIC_VIEWER_URL + '/:typebotId*', + }, + { + source: '/api/:path*', + destination: process.env.NEXT_PUBLIC_VIEWER_URL + '/api/:path*', + }, + ], + } + }, + }) +) diff --git a/apps/landing-page/package.json b/apps/landing-page/package.json index fdc1b098d..e2dd5f5c1 100644 --- a/apps/landing-page/package.json +++ b/apps/landing-page/package.json @@ -13,14 +13,14 @@ "@emotion/react": "11.10.4", "@emotion/styled": "11.10.4", "aos": "^2.3.4", - "bot-engine": "*", + "bot-engine": "workspace:*", "focus-visible": "^5.2.0", "framer-motion": "7.3.2", - "models": "*", + "models": "workspace:*", "next": "12.3.0", "react": "18.2.0", "react-dom": "18.2.0", - "utils": "*" + "utils": "workspace:*" }, "devDependencies": { "@babel/core": "7.19.0", @@ -36,6 +36,7 @@ "eslint": "8.23.0", "eslint-config-next": "12.3.0", "eslint-plugin-react": "^7.31.8", + "next-transpile-modules": "^9.0.0", "postcss": "8.4.16", "prettier": "2.7.1", "typescript": "^4.8.3" diff --git a/apps/viewer/libs/google-sheets.ts b/apps/viewer/libs/google-sheets.ts index 3fec04c0a..1226ee548 100644 --- a/apps/viewer/libs/google-sheets.ts +++ b/apps/viewer/libs/google-sheets.ts @@ -1,7 +1,8 @@ import { Credentials as CredentialsFromDb } from 'db' import { OAuth2Client, Credentials } from 'google-auth-library' import { GoogleSheetsCredentialsData } from 'models' -import { decrypt, encrypt, isDefined } from 'utils' +import { isDefined } from 'utils' +import { decrypt, encrypt } from 'utils/api' import prisma from './prisma' export const getAuthenticatedGoogleClient = async ( diff --git a/apps/viewer/next.config.js b/apps/viewer/next.config.js index 95ab13a86..0f2b4b9bd 100644 --- a/apps/viewer/next.config.js +++ b/apps/viewer/next.config.js @@ -1,6 +1,7 @@ /* eslint-disable @typescript-eslint/no-var-requires */ const { withSentryConfig } = require('@sentry/nextjs') const path = require('path') +const withTM = require('next-transpile-modules')(['utils', 'models']) /** @type {import('next').NextConfig} */ const nextConfig = { @@ -15,6 +16,8 @@ const sentryWebpackPluginOptions = { silent: true, } -module.exports = process.env.SENTRY_AUTH_TOKEN - ? withSentryConfig(nextConfig, sentryWebpackPluginOptions) - : nextConfig +module.exports = withTM( + process.env.SENTRY_AUTH_TOKEN + ? withSentryConfig(nextConfig, sentryWebpackPluginOptions) + : nextConfig +) diff --git a/apps/viewer/package.json b/apps/viewer/package.json index 89d767886..1381362bf 100644 --- a/apps/viewer/package.json +++ b/apps/viewer/package.json @@ -3,7 +3,6 @@ "license": "AGPL-3.0-or-later", "version": "0.1.0", "scripts": { - "dx": "pnpm dev", "dev": "ENVSH_ENV=.env.local bash ../../env.sh next dev -p 3001", "build": "next build", "start": "next start", diff --git a/apps/viewer/pages/api/integrations/google-sheets/spreadsheets/[spreadsheetId]/sheets/[sheetId].ts b/apps/viewer/pages/api/integrations/google-sheets/spreadsheets/[spreadsheetId]/sheets/[sheetId].ts index 79db93a08..127f782e6 100644 --- a/apps/viewer/pages/api/integrations/google-sheets/spreadsheets/[spreadsheetId]/sheets/[sheetId].ts +++ b/apps/viewer/pages/api/integrations/google-sheets/spreadsheets/[spreadsheetId]/sheets/[sheetId].ts @@ -1,5 +1,6 @@ import { NextApiRequest, NextApiResponse } from 'next' -import { badRequest, initMiddleware, methodNotAllowed, hasValue } from 'utils' +import { badRequest, initMiddleware, methodNotAllowed } from 'utils/api' +import { hasValue } from 'utils' import { GoogleSpreadsheet } from 'google-spreadsheet' import { getAuthenticatedGoogleClient } from 'libs/google-sheets' import { Cell } from 'models' diff --git a/apps/viewer/pages/api/integrations/stripe/createPaymentIntent.ts b/apps/viewer/pages/api/integrations/stripe/createPaymentIntent.ts index 5a7a1afef..ed00400f3 100644 --- a/apps/viewer/pages/api/integrations/stripe/createPaymentIntent.ts +++ b/apps/viewer/pages/api/integrations/stripe/createPaymentIntent.ts @@ -5,7 +5,7 @@ import { forbidden, initMiddleware, methodNotAllowed, -} from 'utils' +} from 'utils/api' import Stripe from 'stripe' import Cors from 'cors' diff --git a/apps/viewer/pages/api/mock/fail.ts b/apps/viewer/pages/api/mock/fail.ts index 70b453873..94dd4b7f0 100644 --- a/apps/viewer/pages/api/mock/fail.ts +++ b/apps/viewer/pages/api/mock/fail.ts @@ -1,6 +1,6 @@ import { withSentry } from '@sentry/nextjs' import { NextApiRequest, NextApiResponse } from 'next' -import { methodNotAllowed } from 'utils' +import { methodNotAllowed } from 'utils/api' const handler = (req: NextApiRequest, res: NextApiResponse) => { if (req.method === 'POST') { diff --git a/apps/viewer/pages/api/mock/success.ts b/apps/viewer/pages/api/mock/success.ts index ffcebc311..273989e66 100644 --- a/apps/viewer/pages/api/mock/success.ts +++ b/apps/viewer/pages/api/mock/success.ts @@ -1,6 +1,6 @@ import { withSentry } from '@sentry/nextjs' import { NextApiRequest, NextApiResponse } from 'next' -import { methodNotAllowed } from 'utils' +import { methodNotAllowed } from 'utils/api' const handler = (req: NextApiRequest, res: NextApiResponse) => { if (req.method === 'POST') { diff --git a/apps/viewer/pages/api/publicTypebots/[typebotId].ts b/apps/viewer/pages/api/publicTypebots/[typebotId].ts index 34efcdff2..edb322486 100644 --- a/apps/viewer/pages/api/publicTypebots/[typebotId].ts +++ b/apps/viewer/pages/api/publicTypebots/[typebotId].ts @@ -2,7 +2,7 @@ import { withSentry } from '@sentry/nextjs' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import Cors from 'cors' -import { initMiddleware, methodNotAllowed, notFound } from 'utils' +import { initMiddleware, methodNotAllowed, notFound } from 'utils/api' const cors = initMiddleware(Cors()) diff --git a/apps/viewer/pages/api/typebots.ts b/apps/viewer/pages/api/typebots.ts index 304786200..6d24de722 100644 --- a/apps/viewer/pages/api/typebots.ts +++ b/apps/viewer/pages/api/typebots.ts @@ -2,7 +2,7 @@ import { withSentry } from '@sentry/nextjs' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' import { authenticateUser } from 'services/api/utils' -import { methodNotAllowed } from 'utils' +import { methodNotAllowed } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { if (req.method === 'GET') { diff --git a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/executeWebhook.ts b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/executeWebhook.ts index 857ca0250..82d811719 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/executeWebhook.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/executeWebhook.ts @@ -15,14 +15,8 @@ import { import { parseVariables } from 'bot-engine' import { NextApiRequest, NextApiResponse } from 'next' import got, { Method, Headers, HTTPError } from 'got' -import { - byId, - initMiddleware, - methodNotAllowed, - notFound, - omit, - parseAnswers, -} from 'utils' +import { byId, omit, parseAnswers } from 'utils' +import { initMiddleware, methodNotAllowed, notFound } from 'utils/api' import { stringify } from 'qs' import { withSentry } from '@sentry/nextjs' import Cors from 'cors' diff --git a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/sampleResult.ts b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/sampleResult.ts index 04eec817c..2c4e617d8 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/sampleResult.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/sampleResult.ts @@ -3,7 +3,7 @@ import { Typebot } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { authenticateUser, getLinkedTypebots } from 'services/api/utils' import { parseSampleResult } from 'services/api/webhooks' -import { methodNotAllowed } from 'utils' +import { methodNotAllowed } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await authenticateUser(req) diff --git a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/executeWebhook.ts b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/executeWebhook.ts index 5aef0a817..a035cad6e 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/executeWebhook.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/executeWebhook.ts @@ -9,7 +9,8 @@ import { WebhookBlock, } from 'models' import { NextApiRequest, NextApiResponse } from 'next' -import { byId, initMiddleware, methodNotAllowed, notFound } from 'utils' +import { initMiddleware, methodNotAllowed, notFound } from 'utils/api' +import { byId } from 'utils' import { withSentry } from '@sentry/nextjs' import Cors from 'cors' import { executeWebhook } from '../../executeWebhook' diff --git a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/sampleResult.ts b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/sampleResult.ts index 7f3abe7c5..c0efd5eb1 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/sampleResult.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/sampleResult.ts @@ -3,7 +3,7 @@ import { Typebot } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { authenticateUser, getLinkedTypebots } from 'services/api/utils' import { parseSampleResult } from 'services/api/webhooks' -import { methodNotAllowed } from 'utils' +import { methodNotAllowed } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await authenticateUser(req) diff --git a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/subscribeWebhook.ts b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/subscribeWebhook.ts index 28c1e476c..532122035 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/subscribeWebhook.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/subscribeWebhook.ts @@ -3,7 +3,8 @@ import prisma from 'libs/prisma' import { Typebot, WebhookBlock } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { authenticateUser } from 'services/api/utils' -import { byId, methodNotAllowed } from 'utils' +import { methodNotAllowed } from 'utils/api' +import { byId } from 'utils' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await authenticateUser(req) diff --git a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/unsubscribeWebhook.ts b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/unsubscribeWebhook.ts index 47aafd9cd..de761002f 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/unsubscribeWebhook.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/unsubscribeWebhook.ts @@ -3,7 +3,8 @@ import prisma from 'libs/prisma' import { Typebot, WebhookBlock } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { authenticateUser } from 'services/api/utils' -import { byId, methodNotAllowed } from 'utils' +import { methodNotAllowed } from 'utils/api' +import { byId } from 'utils' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await authenticateUser(req) diff --git a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/storage/upload-url.ts b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/storage/upload-url.ts index c385a9154..8b60b944d 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/storage/upload-url.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/storage/upload-url.ts @@ -9,12 +9,9 @@ import { badRequest, generatePresignedUrl, methodNotAllowed, - byId, - getStorageLimit, sendEmailNotification, - isDefined, - env, -} from 'utils' +} from 'utils/api' +import { byId, getStorageLimit, isDefined, env } from 'utils' const LIMIT_EMAIL_TRIGGER_PERCENT = 0.8 diff --git a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/subscribeWebhook.ts b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/subscribeWebhook.ts index 97640bf50..0e4dd3efb 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/subscribeWebhook.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/subscribeWebhook.ts @@ -3,7 +3,8 @@ import prisma from 'libs/prisma' import { Typebot, WebhookBlock } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { authenticateUser } from 'services/api/utils' -import { byId, methodNotAllowed } from 'utils' +import { byId } from 'utils' +import { methodNotAllowed } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await authenticateUser(req) diff --git a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/unsubscribeWebhook.ts b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/unsubscribeWebhook.ts index 143cf7d37..39ffd73f4 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/unsubscribeWebhook.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/unsubscribeWebhook.ts @@ -3,7 +3,8 @@ import prisma from 'libs/prisma' import { Typebot, WebhookBlock } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { authenticateUser } from 'services/api/utils' -import { byId, methodNotAllowed } from 'utils' +import { byId } from 'utils' +import { methodNotAllowed } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { const user = await authenticateUser(req) diff --git a/apps/viewer/pages/api/typebots/[typebotId]/integrations/email.ts b/apps/viewer/pages/api/typebots/[typebotId]/integrations/email.ts index a7f29614d..efe0ac5d7 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/integrations/email.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/integrations/email.ts @@ -7,15 +7,8 @@ import { } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { createTransport, getTestMessageUrl } from 'nodemailer' -import { - decrypt, - initMiddleware, - isEmpty, - isNotDefined, - methodNotAllowed, - omit, - parseAnswers, -} from 'utils' +import { isEmpty, isNotDefined, omit, parseAnswers } from 'utils' +import { methodNotAllowed, initMiddleware, decrypt } from 'utils/api' import Cors from 'cors' import { withSentry } from '@sentry/nextjs' diff --git a/apps/viewer/pages/api/typebots/[typebotId]/results.ts b/apps/viewer/pages/api/typebots/[typebotId]/results.ts index f7f6ad23c..8ec0501f1 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/results.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/results.ts @@ -5,14 +5,8 @@ import prisma from 'libs/prisma' import { ResultWithAnswers } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { authenticateUser } from 'services/api/utils' -import { - env, - getChatsLimit, - isDefined, - methodNotAllowed, - parseNumberWithCommas, - sendEmailNotification, -} from 'utils' +import { env, getChatsLimit, isDefined, parseNumberWithCommas } from 'utils' +import { sendEmailNotification, methodNotAllowed } from 'utils/api' const LIMIT_EMAIL_TRIGGER_PERCENT = 0.8 diff --git a/apps/viewer/pages/api/typebots/[typebotId]/results/[resultId].ts b/apps/viewer/pages/api/typebots/[typebotId]/results/[resultId].ts index d1f289c38..fd11b70bd 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/results/[resultId].ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/results/[resultId].ts @@ -2,7 +2,7 @@ import { withSentry } from '@sentry/nextjs' import prisma from 'libs/prisma' import { Result } from 'models' import { NextApiRequest, NextApiResponse } from 'next' -import { methodNotAllowed } from 'utils' +import { methodNotAllowed } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { if (req.method === 'PATCH') { diff --git a/apps/viewer/pages/api/typebots/[typebotId]/results/[resultId]/answers.ts b/apps/viewer/pages/api/typebots/[typebotId]/results/[resultId]/answers.ts index f3e9f7408..de42cf84f 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/results/[resultId]/answers.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/results/[resultId]/answers.ts @@ -3,7 +3,8 @@ import { Answer } from 'db' import { got } from 'got' import prisma from 'libs/prisma' import { NextApiRequest, NextApiResponse } from 'next' -import { isNotDefined, methodNotAllowed } from 'utils' +import { isNotDefined } from 'utils' +import { methodNotAllowed } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { if (req.method === 'PUT') { diff --git a/apps/viewer/pages/api/typebots/[typebotId]/webhookBlocks.ts b/apps/viewer/pages/api/typebots/[typebotId]/webhookBlocks.ts index 58fc4c6d4..12762082e 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/webhookBlocks.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/webhookBlocks.ts @@ -3,7 +3,8 @@ import prisma from 'libs/prisma' import { Group, WebhookBlock } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { authenticateUser } from 'services/api/utils' -import { byId, isWebhookBlock, methodNotAllowed } from 'utils' +import { byId, isWebhookBlock } from 'utils' +import { methodNotAllowed } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { if (req.method === 'GET') { diff --git a/apps/viewer/pages/api/typebots/[typebotId]/webhookSteps.ts b/apps/viewer/pages/api/typebots/[typebotId]/webhookSteps.ts index f1ff248eb..d619fa385 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/webhookSteps.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/webhookSteps.ts @@ -3,7 +3,8 @@ import prisma from 'libs/prisma' import { Group, WebhookBlock } from 'models' import { NextApiRequest, NextApiResponse } from 'next' import { authenticateUser } from 'services/api/utils' -import { byId, isNotDefined, isWebhookBlock, methodNotAllowed } from 'utils' +import { byId, isNotDefined, isWebhookBlock } from 'utils' +import { methodNotAllowed } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { if (req.method === 'GET') { diff --git a/apps/viewer/pages/api/users/me.ts b/apps/viewer/pages/api/users/me.ts index 6361c26d3..5e119310d 100644 --- a/apps/viewer/pages/api/users/me.ts +++ b/apps/viewer/pages/api/users/me.ts @@ -1,7 +1,8 @@ import { withSentry } from '@sentry/nextjs' import { NextApiRequest, NextApiResponse } from 'next' import { authenticateUser } from 'services/api/utils' -import { isNotDefined, methodNotAllowed } from 'utils' +import { isNotDefined } from 'utils' +import { methodNotAllowed } from 'utils/api' const handler = async (req: NextApiRequest, res: NextApiResponse) => { if (req.method === 'GET') { diff --git a/apps/viewer/playwright/services/database.ts b/apps/viewer/playwright/services/database.ts index 43180523b..4ab7f6f9d 100644 --- a/apps/viewer/playwright/services/database.ts +++ b/apps/viewer/playwright/services/database.ts @@ -10,7 +10,8 @@ import { } from 'models' import { GraphNavigation, Plan, PrismaClient, WorkspaceRole } from 'db' import { readFileSync } from 'fs' -import { createFakeResults, encrypt } from 'utils' +import { createFakeResults } from 'utils' +import { encrypt } from 'utils/api' const prisma = new PrismaClient() diff --git a/package.json b/package.json index 5d2aa457c..cd9338ef3 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ "docker:up": "docker compose -f docker-compose.dev.yml up -d", "docker:nuke": "docker compose -f docker-compose.dev.yml down --volumes --remove-orphans", "dev:prepare": "turbo run build --scope=bot-engine --no-deps --include-dependencies && turbo run build --scope=typebot-js --no-deps", - "dev": "pnpm docker:up && pnpm dev:prepare && NEXT_PUBLIC_E2E_TEST=false turbo run dx --parallel", - "dev:mocking": "pnpm docker:up && pnpm dev:prepare && NEXT_PUBLIC_E2E_TEST=true turbo run dx --parallel", + "dev": "pnpm docker:up && pnpm dev:prepare && NEXT_PUBLIC_E2E_TEST=false turbo run dev --filter=builder --filter=viewer --parallel --no-cache", + "dev:mocking": "pnpm docker:up && pnpm dev:prepare && NEXT_PUBLIC_E2E_TEST=true turbo run dev --filter=builder --filter=viewer --parallel --no-cache", "build": "pnpm docker:up && turbo run build", "build:builder": "cp apps/builder/.env.docker apps/builder/.env.production && ENVSH_ENV=./apps/builder/.env.production ENVSH_OUTPUT=./apps/builder/public/__env.js bash env.sh pnpm turbo run build --scope=builder --include-dependencies", "build:viewer": "cp apps/viewer/.env.docker apps/viewer/.env.production && ENVSH_ENV=./apps/viewer/.env.production ENVSH_OUTPUT=./apps/viewer/public/__env.js bash env.sh pnpm turbo run build --scope=viewer --include-dependencies", diff --git a/packages/bot-engine/package.json b/packages/bot-engine/package.json index 71ef32672..bb0878f4a 100644 --- a/packages/bot-engine/package.json +++ b/packages/bot-engine/package.json @@ -7,7 +7,7 @@ "types": "dist/index.d.ts", "scripts": { "build": "pnpm rollup -c", - "dx": "pnpm rollup -c --watch", + "dev": "pnpm rollup -c --watch", "lint": "eslint --fix -c ./.eslintrc.js \"./src/**/*.ts*\"" }, "dependencies": { @@ -26,6 +26,7 @@ "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^14.0.1", "@rollup/plugin-typescript": "8.5.0", + "@types/node": "18.7.16", "@types/qs": "^6.9.7", "@types/react": "18.0.19", "@types/react-phone-number-input": "^3.0.14", diff --git a/packages/bot-engine/tsconfig.json b/packages/bot-engine/tsconfig.json index 589035122..8a0c8a8a3 100644 --- a/packages/bot-engine/tsconfig.json +++ b/packages/bot-engine/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "lib": ["ES2015", "DOM"], + "lib": ["ES2017", "DOM"], "target": "es5", "esModuleInterop": true, "forceConsistentCasingInFileNames": true, diff --git a/packages/db/package.json b/packages/db/package.json index 0c07ecc41..b453f316d 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -5,7 +5,7 @@ "main": "./index.ts", "types": "./index.ts", "scripts": { - "dx": "dotenv -e ../../apps/builder/.env.local prisma db push && pnpm generate:schema && pnpm start:sutdio ", + "dev": "dotenv -e ../../apps/builder/.env.local prisma db push && pnpm generate:schema && pnpm start:sutdio ", "build": "pnpm generate:schema", "start:sutdio": "dotenv -e ../../apps/builder/.env.local -v BROWSER=none prisma studio", "generate:schema": "dotenv -e ../../apps/builder/.env.local prisma generate", diff --git a/packages/models/src/answer.ts b/packages/models/answer.ts similarity index 100% rename from packages/models/src/answer.ts rename to packages/models/answer.ts diff --git a/packages/models/src/credentials.ts b/packages/models/credentials.ts similarity index 100% rename from packages/models/src/credentials.ts rename to packages/models/credentials.ts diff --git a/packages/models/src/index.ts b/packages/models/index.ts similarity index 100% rename from packages/models/src/index.ts rename to packages/models/index.ts diff --git a/packages/models/package.json b/packages/models/package.json index 0a62f4deb..f4bbc57de 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,26 +1,15 @@ { "name": "models", "version": "1.0.0", - "main": "dist/cjs/index.js", - "module": "dist/esm/index.js", - "types": "dist/index.d.ts", + "main": "./index.ts", + "types": "./index.ts", "license": "AGPL-3.0-or-later", "private": true, - "scripts": { - "build": "pnpm rollup -c", - "dx": "pnpm rollup -c --watch" - }, "dependencies": { "zod": "^3.19.0" }, "devDependencies": { "typescript": "^4.8.3", - "@rollup/plugin-commonjs": "22.0.2", - "@rollup/plugin-node-resolve": "^14.0.1", - "@rollup/plugin-typescript": "8.5.0", - "rollup": "2.79.0", - "rollup-plugin-dts": "^4.2.2", - "rollup-plugin-peer-deps-external": "^2.2.4", "next": "12.3.0", "db": "workspace:*" }, diff --git a/packages/models/src/publicTypebot.ts b/packages/models/publicTypebot.ts similarity index 100% rename from packages/models/src/publicTypebot.ts rename to packages/models/publicTypebot.ts diff --git a/packages/models/src/result.ts b/packages/models/result.ts similarity index 100% rename from packages/models/src/result.ts rename to packages/models/result.ts diff --git a/packages/models/rollup.config.js b/packages/models/rollup.config.js deleted file mode 100644 index 55c779ede..000000000 --- a/packages/models/rollup.config.js +++ /dev/null @@ -1,38 +0,0 @@ -import resolve from '@rollup/plugin-node-resolve' -import commonjs from '@rollup/plugin-commonjs' -import typescript from '@rollup/plugin-typescript' -import dts from 'rollup-plugin-dts' -import peerDepsExternal from 'rollup-plugin-peer-deps-external' - -const packageJson = require('./package.json') - -export default [ - { - input: 'src/index.ts', - output: [ - { - file: packageJson.main, - format: 'cjs', - sourcemap: true, - inlineDynamicImports: true, - }, - { - file: packageJson.module, - format: 'esm', - sourcemap: true, - inlineDynamicImports: true, - }, - ], - plugins: [ - peerDepsExternal(), - resolve(), - commonjs(), - typescript({ tsconfig: './tsconfig.json' }), - ], - }, - { - input: 'dist/esm/index.d.ts', - output: [{ file: 'dist/index.d.ts', format: 'esm' }], - plugins: [dts()], - }, -] diff --git a/packages/models/src/typebot/blocks/blocks.ts b/packages/models/typebot/blocks/blocks.ts similarity index 100% rename from packages/models/src/typebot/blocks/blocks.ts rename to packages/models/typebot/blocks/blocks.ts diff --git a/packages/models/src/typebot/blocks/bubble/bubble.ts b/packages/models/typebot/blocks/bubble/bubble.ts similarity index 100% rename from packages/models/src/typebot/blocks/bubble/bubble.ts rename to packages/models/typebot/blocks/bubble/bubble.ts diff --git a/packages/models/src/typebot/blocks/bubble/embed.ts b/packages/models/typebot/blocks/bubble/embed.ts similarity index 100% rename from packages/models/src/typebot/blocks/bubble/embed.ts rename to packages/models/typebot/blocks/bubble/embed.ts diff --git a/packages/models/src/typebot/blocks/bubble/image.ts b/packages/models/typebot/blocks/bubble/image.ts similarity index 100% rename from packages/models/src/typebot/blocks/bubble/image.ts rename to packages/models/typebot/blocks/bubble/image.ts diff --git a/packages/models/src/typebot/blocks/bubble/index.ts b/packages/models/typebot/blocks/bubble/index.ts similarity index 100% rename from packages/models/src/typebot/blocks/bubble/index.ts rename to packages/models/typebot/blocks/bubble/index.ts diff --git a/packages/models/src/typebot/blocks/bubble/text.ts b/packages/models/typebot/blocks/bubble/text.ts similarity index 100% rename from packages/models/src/typebot/blocks/bubble/text.ts rename to packages/models/typebot/blocks/bubble/text.ts diff --git a/packages/models/src/typebot/blocks/bubble/video.ts b/packages/models/typebot/blocks/bubble/video.ts similarity index 100% rename from packages/models/src/typebot/blocks/bubble/video.ts rename to packages/models/typebot/blocks/bubble/video.ts diff --git a/packages/models/src/typebot/blocks/index.ts b/packages/models/typebot/blocks/index.ts similarity index 100% rename from packages/models/src/typebot/blocks/index.ts rename to packages/models/typebot/blocks/index.ts diff --git a/packages/models/src/typebot/blocks/input/choice.ts b/packages/models/typebot/blocks/input/choice.ts similarity index 100% rename from packages/models/src/typebot/blocks/input/choice.ts rename to packages/models/typebot/blocks/input/choice.ts diff --git a/packages/models/src/typebot/blocks/input/date.ts b/packages/models/typebot/blocks/input/date.ts similarity index 100% rename from packages/models/src/typebot/blocks/input/date.ts rename to packages/models/typebot/blocks/input/date.ts diff --git a/packages/models/src/typebot/blocks/input/email.ts b/packages/models/typebot/blocks/input/email.ts similarity index 100% rename from packages/models/src/typebot/blocks/input/email.ts rename to packages/models/typebot/blocks/input/email.ts diff --git a/packages/models/src/typebot/blocks/input/file.ts b/packages/models/typebot/blocks/input/file.ts similarity index 100% rename from packages/models/src/typebot/blocks/input/file.ts rename to packages/models/typebot/blocks/input/file.ts diff --git a/packages/models/src/typebot/blocks/input/index.ts b/packages/models/typebot/blocks/input/index.ts similarity index 100% rename from packages/models/src/typebot/blocks/input/index.ts rename to packages/models/typebot/blocks/input/index.ts diff --git a/packages/models/src/typebot/blocks/input/input.ts b/packages/models/typebot/blocks/input/input.ts similarity index 100% rename from packages/models/src/typebot/blocks/input/input.ts rename to packages/models/typebot/blocks/input/input.ts diff --git a/packages/models/src/typebot/blocks/input/number.ts b/packages/models/typebot/blocks/input/number.ts similarity index 100% rename from packages/models/src/typebot/blocks/input/number.ts rename to packages/models/typebot/blocks/input/number.ts diff --git a/packages/models/src/typebot/blocks/input/payment.ts b/packages/models/typebot/blocks/input/payment.ts similarity index 100% rename from packages/models/src/typebot/blocks/input/payment.ts rename to packages/models/typebot/blocks/input/payment.ts diff --git a/packages/models/src/typebot/blocks/input/phone.ts b/packages/models/typebot/blocks/input/phone.ts similarity index 100% rename from packages/models/src/typebot/blocks/input/phone.ts rename to packages/models/typebot/blocks/input/phone.ts diff --git a/packages/models/src/typebot/blocks/input/rating.ts b/packages/models/typebot/blocks/input/rating.ts similarity index 100% rename from packages/models/src/typebot/blocks/input/rating.ts rename to packages/models/typebot/blocks/input/rating.ts diff --git a/packages/models/src/typebot/blocks/input/text.ts b/packages/models/typebot/blocks/input/text.ts similarity index 100% rename from packages/models/src/typebot/blocks/input/text.ts rename to packages/models/typebot/blocks/input/text.ts diff --git a/packages/models/src/typebot/blocks/input/url.ts b/packages/models/typebot/blocks/input/url.ts similarity index 100% rename from packages/models/src/typebot/blocks/input/url.ts rename to packages/models/typebot/blocks/input/url.ts diff --git a/packages/models/src/typebot/blocks/integration/googleAnalytics.ts b/packages/models/typebot/blocks/integration/googleAnalytics.ts similarity index 100% rename from packages/models/src/typebot/blocks/integration/googleAnalytics.ts rename to packages/models/typebot/blocks/integration/googleAnalytics.ts diff --git a/packages/models/src/typebot/blocks/integration/googleSheets.ts b/packages/models/typebot/blocks/integration/googleSheets.ts similarity index 100% rename from packages/models/src/typebot/blocks/integration/googleSheets.ts rename to packages/models/typebot/blocks/integration/googleSheets.ts diff --git a/packages/models/src/typebot/blocks/integration/index.ts b/packages/models/typebot/blocks/integration/index.ts similarity index 100% rename from packages/models/src/typebot/blocks/integration/index.ts rename to packages/models/typebot/blocks/integration/index.ts diff --git a/packages/models/src/typebot/blocks/integration/integration.ts b/packages/models/typebot/blocks/integration/integration.ts similarity index 100% rename from packages/models/src/typebot/blocks/integration/integration.ts rename to packages/models/typebot/blocks/integration/integration.ts diff --git a/packages/models/src/typebot/blocks/integration/makeCom.ts b/packages/models/typebot/blocks/integration/makeCom.ts similarity index 100% rename from packages/models/src/typebot/blocks/integration/makeCom.ts rename to packages/models/typebot/blocks/integration/makeCom.ts diff --git a/packages/models/src/typebot/blocks/integration/pabblyConnect.ts b/packages/models/typebot/blocks/integration/pabblyConnect.ts similarity index 100% rename from packages/models/src/typebot/blocks/integration/pabblyConnect.ts rename to packages/models/typebot/blocks/integration/pabblyConnect.ts diff --git a/packages/models/src/typebot/blocks/integration/sendEmail.ts b/packages/models/typebot/blocks/integration/sendEmail.ts similarity index 100% rename from packages/models/src/typebot/blocks/integration/sendEmail.ts rename to packages/models/typebot/blocks/integration/sendEmail.ts diff --git a/packages/models/src/typebot/blocks/integration/webhook.ts b/packages/models/typebot/blocks/integration/webhook.ts similarity index 100% rename from packages/models/src/typebot/blocks/integration/webhook.ts rename to packages/models/typebot/blocks/integration/webhook.ts diff --git a/packages/models/src/typebot/blocks/integration/zapier.ts b/packages/models/typebot/blocks/integration/zapier.ts similarity index 100% rename from packages/models/src/typebot/blocks/integration/zapier.ts rename to packages/models/typebot/blocks/integration/zapier.ts diff --git a/packages/models/src/typebot/blocks/item.ts b/packages/models/typebot/blocks/item.ts similarity index 100% rename from packages/models/src/typebot/blocks/item.ts rename to packages/models/typebot/blocks/item.ts diff --git a/packages/models/src/typebot/blocks/logic/code.ts b/packages/models/typebot/blocks/logic/code.ts similarity index 100% rename from packages/models/src/typebot/blocks/logic/code.ts rename to packages/models/typebot/blocks/logic/code.ts diff --git a/packages/models/src/typebot/blocks/logic/condition.ts b/packages/models/typebot/blocks/logic/condition.ts similarity index 100% rename from packages/models/src/typebot/blocks/logic/condition.ts rename to packages/models/typebot/blocks/logic/condition.ts diff --git a/packages/models/src/typebot/blocks/logic/index.ts b/packages/models/typebot/blocks/logic/index.ts similarity index 100% rename from packages/models/src/typebot/blocks/logic/index.ts rename to packages/models/typebot/blocks/logic/index.ts diff --git a/packages/models/src/typebot/blocks/logic/logic.ts b/packages/models/typebot/blocks/logic/logic.ts similarity index 100% rename from packages/models/src/typebot/blocks/logic/logic.ts rename to packages/models/typebot/blocks/logic/logic.ts diff --git a/packages/models/src/typebot/blocks/logic/redirect.ts b/packages/models/typebot/blocks/logic/redirect.ts similarity index 100% rename from packages/models/src/typebot/blocks/logic/redirect.ts rename to packages/models/typebot/blocks/logic/redirect.ts diff --git a/packages/models/src/typebot/blocks/logic/setVariable.ts b/packages/models/typebot/blocks/logic/setVariable.ts similarity index 100% rename from packages/models/src/typebot/blocks/logic/setVariable.ts rename to packages/models/typebot/blocks/logic/setVariable.ts diff --git a/packages/models/src/typebot/blocks/logic/typebotLink.ts b/packages/models/typebot/blocks/logic/typebotLink.ts similarity index 100% rename from packages/models/src/typebot/blocks/logic/typebotLink.ts rename to packages/models/typebot/blocks/logic/typebotLink.ts diff --git a/packages/models/src/typebot/blocks/shared.ts b/packages/models/typebot/blocks/shared.ts similarity index 100% rename from packages/models/src/typebot/blocks/shared.ts rename to packages/models/typebot/blocks/shared.ts diff --git a/packages/models/src/typebot/index.ts b/packages/models/typebot/index.ts similarity index 100% rename from packages/models/src/typebot/index.ts rename to packages/models/typebot/index.ts diff --git a/packages/models/src/typebot/settings.ts b/packages/models/typebot/settings.ts similarity index 100% rename from packages/models/src/typebot/settings.ts rename to packages/models/typebot/settings.ts diff --git a/packages/models/src/typebot/theme.ts b/packages/models/typebot/theme.ts similarity index 100% rename from packages/models/src/typebot/theme.ts rename to packages/models/typebot/theme.ts diff --git a/packages/models/src/typebot/typebot.ts b/packages/models/typebot/typebot.ts similarity index 100% rename from packages/models/src/typebot/typebot.ts rename to packages/models/typebot/typebot.ts diff --git a/packages/models/src/typebot/variable.ts b/packages/models/typebot/variable.ts similarity index 100% rename from packages/models/src/typebot/variable.ts rename to packages/models/typebot/variable.ts diff --git a/packages/models/src/utils.ts b/packages/models/utils.ts similarity index 100% rename from packages/models/src/utils.ts rename to packages/models/utils.ts diff --git a/packages/models/src/webhooks.ts b/packages/models/webhooks.ts similarity index 100% rename from packages/models/src/webhooks.ts rename to packages/models/webhooks.ts diff --git a/packages/utils/src/encryption.ts b/packages/utils/api/encryption.ts similarity index 100% rename from packages/utils/src/encryption.ts rename to packages/utils/api/encryption.ts diff --git a/packages/utils/src/api/index.ts b/packages/utils/api/index.ts similarity index 75% rename from packages/utils/src/api/index.ts rename to packages/utils/api/index.ts index d59e20a80..86e3cf459 100644 --- a/packages/utils/src/api/index.ts +++ b/packages/utils/api/index.ts @@ -1,3 +1,4 @@ export * from './utils' export * from './storage' export * from './sendEmailNotification' +export * from './encryption' diff --git a/packages/utils/src/api/sendEmailNotification.ts b/packages/utils/api/sendEmailNotification.ts similarity index 100% rename from packages/utils/src/api/sendEmailNotification.ts rename to packages/utils/api/sendEmailNotification.ts diff --git a/packages/utils/src/api/storage.ts b/packages/utils/api/storage.ts similarity index 100% rename from packages/utils/src/api/storage.ts rename to packages/utils/api/storage.ts diff --git a/packages/utils/src/api/utils.ts b/packages/utils/api/utils.ts similarity index 100% rename from packages/utils/src/api/utils.ts rename to packages/utils/api/utils.ts diff --git a/packages/utils/src/index.ts b/packages/utils/index.ts similarity index 67% rename from packages/utils/src/index.ts rename to packages/utils/index.ts index 06c7a0f30..776507bac 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/index.ts @@ -1,6 +1,4 @@ export * from './utils' -export * from './api' -export * from './encryption' export * from './results' export * from './pricing' export * from './playwright' diff --git a/packages/utils/package.json b/packages/utils/package.json index 5fcee4532..230b28d33 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -3,27 +3,15 @@ "version": "1.0.0", "license": "AGPL-3.0-or-later", "private": true, - "main": "dist/cjs/index.js", - "module": "dist/esm/index.js", - "types": "dist/index.d.ts", - "scripts": { - "build": "pnpm rollup -c", - "dx": "pnpm rollup -c --watch" - }, + "main": "./index.ts", + "types": "./index.ts", "devDependencies": { - "@rollup/plugin-commonjs": "22.0.2", - "@rollup/plugin-node-resolve": "^14.0.1", - "@rollup/plugin-typescript": "8.5.0", "@types/nodemailer": "6.4.5", "aws-sdk": "2.1213.0", "db": "workspace:*", "models": "workspace:*", "next": "12.3.0", "nodemailer": "^6.7.8", - "rollup": "2.79.0", - "rollup-plugin-dts": "^4.2.2", - "rollup-plugin-peer-deps-external": "^2.2.4", - "tslib": "^2.4.0", "typescript": "^4.8.3" }, "peerDependencies": { diff --git a/packages/utils/src/playwright.ts b/packages/utils/playwright.ts similarity index 100% rename from packages/utils/src/playwright.ts rename to packages/utils/playwright.ts diff --git a/packages/utils/src/pricing.ts b/packages/utils/pricing.ts similarity index 100% rename from packages/utils/src/pricing.ts rename to packages/utils/pricing.ts diff --git a/packages/utils/src/results.ts b/packages/utils/results.ts similarity index 100% rename from packages/utils/src/results.ts rename to packages/utils/results.ts diff --git a/packages/utils/rollup.config.js b/packages/utils/rollup.config.js deleted file mode 100644 index 55c779ede..000000000 --- a/packages/utils/rollup.config.js +++ /dev/null @@ -1,38 +0,0 @@ -import resolve from '@rollup/plugin-node-resolve' -import commonjs from '@rollup/plugin-commonjs' -import typescript from '@rollup/plugin-typescript' -import dts from 'rollup-plugin-dts' -import peerDepsExternal from 'rollup-plugin-peer-deps-external' - -const packageJson = require('./package.json') - -export default [ - { - input: 'src/index.ts', - output: [ - { - file: packageJson.main, - format: 'cjs', - sourcemap: true, - inlineDynamicImports: true, - }, - { - file: packageJson.module, - format: 'esm', - sourcemap: true, - inlineDynamicImports: true, - }, - ], - plugins: [ - peerDepsExternal(), - resolve(), - commonjs(), - typescript({ tsconfig: './tsconfig.json' }), - ], - }, - { - input: 'dist/esm/index.d.ts', - output: [{ file: 'dist/index.d.ts', format: 'esm' }], - plugins: [dts()], - }, -] diff --git a/packages/utils/src/typebotConversions.ts b/packages/utils/typebotConversions.ts similarity index 100% rename from packages/utils/src/typebotConversions.ts rename to packages/utils/typebotConversions.ts diff --git a/packages/utils/src/utils.ts b/packages/utils/utils.ts similarity index 100% rename from packages/utils/src/utils.ts rename to packages/utils/utils.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e5860bbea..66917303e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -87,6 +87,7 @@ importers: models: workspace:* next: 12.3.0 next-auth: 4.10.3 + next-transpile-modules: ^9.0.0 nodemailer: ^6.7.8 nprogress: ^0.2.0 papaparse: ^5.3.2 @@ -111,7 +112,7 @@ importers: dependencies: '@chakra-ui/css-reset': 2.0.7_gyryel6m34lsxtsejhafetjriq '@chakra-ui/react': 2.3.2_uwd2kxpyhtmqlclhf6n5c2gfau - '@codemirror/lang-css': 6.0.0_2js663f52tgwrrbokpneg22gyy + '@codemirror/lang-css': 6.0.0 '@codemirror/lang-html': 6.1.1 '@codemirror/lang-javascript': 6.0.2 '@codemirror/lang-json': 6.0.0 @@ -140,7 +141,7 @@ importers: bot-engine: link:../../packages/bot-engine browser-image-compression: 2.0.0 canvas-confetti: 1.5.1 - codemirror: 6.0.1_@lezer+common@1.0.0 + codemirror: 6.0.1 cuid: 2.1.8 deep-object-diff: 1.1.7 dequal: 2.0.3 @@ -204,6 +205,7 @@ importers: eslint-config-next: 12.3.0_itqs5654cmlnjraw6gjzqacppi eslint-plugin-react: 7.31.8_eslint@8.23.0 models: link:../../packages/models + next-transpile-modules: 9.0.0 typescript: 4.8.3 utils: link:../../packages/utils @@ -260,21 +262,22 @@ importers: '@typescript-eslint/parser': 5.36.2 aos: ^2.3.4 autoprefixer: 10.4.8 - bot-engine: '*' + bot-engine: workspace:* cross-env: ^7.0.3 eslint: 8.23.0 eslint-config-next: 12.3.0 eslint-plugin-react: ^7.31.8 focus-visible: ^5.2.0 framer-motion: 7.3.2 - models: '*' + models: workspace:* next: 12.3.0 + next-transpile-modules: ^9.0.0 postcss: 8.4.16 prettier: 2.7.1 react: 18.2.0 react-dom: 18.2.0 typescript: ^4.8.3 - utils: '*' + utils: workspace:* dependencies: '@chakra-ui/icon': 3.0.9_t3ehvuuqn76q3rgsqchbz6ue7u '@chakra-ui/react': 2.3.2_uwd2kxpyhtmqlclhf6n5c2gfau @@ -303,6 +306,7 @@ importers: eslint: 8.23.0 eslint-config-next: 12.3.0_itqs5654cmlnjraw6gjzqacppi eslint-plugin-react: 7.31.8_eslint@8.23.0 + next-transpile-modules: 9.0.0 postcss: 8.4.16 prettier: 2.7.1 typescript: 4.8.3 @@ -400,6 +404,7 @@ importers: '@rollup/plugin-typescript': 8.5.0 '@stripe/react-stripe-js': 1.10.0 '@stripe/stripe-js': 1.36.0 + '@types/node': 18.7.16 '@types/qs': ^6.9.7 '@types/react': 18.0.19 '@types/react-phone-number-input': ^3.0.14 @@ -450,6 +455,7 @@ importers: '@rollup/plugin-json': 4.1.0_rollup@2.79.0 '@rollup/plugin-node-resolve': 14.0.1_rollup@2.79.0 '@rollup/plugin-typescript': 8.5.0_tznp6w7csbjledp5nresoxoky4 + '@types/node': 18.7.16 '@types/qs': 6.9.7 '@types/react': 18.0.19 '@types/react-phone-number-input': 3.0.14 @@ -474,7 +480,7 @@ importers: rollup-plugin-peer-deps-external: 2.2.4_rollup@2.79.0 rollup-plugin-postcss: 4.0.2_postcss@8.4.16 rollup-plugin-terser: 7.0.2_rollup@2.79.0 - tailwindcss: 3.1.8_postcss@8.4.16 + tailwindcss: 3.1.8 tslib: 2.4.0 typescript: 4.8.3 utils: link:../utils @@ -494,27 +500,15 @@ importers: packages/models: specifiers: - '@rollup/plugin-commonjs': 22.0.2 - '@rollup/plugin-node-resolve': ^14.0.1 - '@rollup/plugin-typescript': 8.5.0 db: workspace:* next: 12.3.0 - rollup: 2.79.0 - rollup-plugin-dts: ^4.2.2 - rollup-plugin-peer-deps-external: ^2.2.4 typescript: ^4.8.3 zod: ^3.19.0 dependencies: zod: 3.19.0 devDependencies: - '@rollup/plugin-commonjs': 22.0.2_rollup@2.79.0 - '@rollup/plugin-node-resolve': 14.0.1_rollup@2.79.0 - '@rollup/plugin-typescript': 8.5.0_ihkqvyh37tzxtjmovjyy2yrv7m db: link:../db next: 12.3.0_biqbaboplfbrettd7655fr4n2y - rollup: 2.79.0 - rollup-plugin-dts: 4.2.2_ihkqvyh37tzxtjmovjyy2yrv7m - rollup-plugin-peer-deps-external: 2.2.4_rollup@2.79.0 typescript: 4.8.3 packages/scripts: @@ -573,34 +567,20 @@ importers: packages/utils: specifiers: - '@rollup/plugin-commonjs': 22.0.2 - '@rollup/plugin-node-resolve': ^14.0.1 - '@rollup/plugin-typescript': 8.5.0 '@types/nodemailer': 6.4.5 aws-sdk: 2.1213.0 db: workspace:* models: workspace:* next: 12.3.0 nodemailer: ^6.7.8 - rollup: 2.79.0 - rollup-plugin-dts: ^4.2.2 - rollup-plugin-peer-deps-external: ^2.2.4 - tslib: ^2.4.0 typescript: ^4.8.3 devDependencies: - '@rollup/plugin-commonjs': 22.0.2_rollup@2.79.0 - '@rollup/plugin-node-resolve': 14.0.1_rollup@2.79.0 - '@rollup/plugin-typescript': 8.5.0_tznp6w7csbjledp5nresoxoky4 '@types/nodemailer': 6.4.5 aws-sdk: 2.1213.0 db: link:../db models: link:../models next: 12.3.0_biqbaboplfbrettd7655fr4n2y nodemailer: 6.7.8 - rollup: 2.79.0 - rollup-plugin-dts: 4.2.2_ihkqvyh37tzxtjmovjyy2yrv7m - rollup-plugin-peer-deps-external: 2.2.4_rollup@2.79.0 - tslib: 2.4.0 typescript: 4.8.3 packages/wordpress: @@ -767,6 +747,7 @@ packages: /@babel/code-frame/7.18.6: resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==} engines: {node: '>=6.9.0'} + requiresBuild: true dependencies: '@babel/highlight': 7.18.6 @@ -855,6 +836,7 @@ packages: '@babel/types': 7.18.10 '@jridgewell/gen-mapping': 0.3.2 jsesc: 2.5.2 + dev: false /@babel/generator/7.18.13: resolution: {integrity: sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==} @@ -901,7 +883,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/helper-explode-assignable-expression': 7.18.6 - '@babel/types': 7.18.10 + '@babel/types': 7.19.0 /@babel/helper-compilation-targets/7.18.9_@babel+core@7.18.9: resolution: {integrity: sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==} @@ -996,6 +978,18 @@ packages: '@babel/core': 7.19.0 '@babel/helper-annotate-as-pure': 7.18.6 regexpu-core: 5.1.0 + dev: false + + /@babel/helper-create-regexp-features-plugin/7.19.0_@babel+core@7.18.9: + resolution: {integrity: sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.18.9 + '@babel/helper-annotate-as-pure': 7.18.6 + regexpu-core: 5.1.0 + dev: false /@babel/helper-create-regexp-features-plugin/7.19.0_@babel+core@7.19.0: resolution: {integrity: sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==} @@ -1071,7 +1065,7 @@ packages: resolution: {integrity: sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.18.10 + '@babel/types': 7.19.0 /@babel/helper-function-name/7.18.6: resolution: {integrity: sha512-0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw==} @@ -1111,7 +1105,7 @@ packages: resolution: {integrity: sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.18.10 + '@babel/types': 7.19.0 /@babel/helper-module-imports/7.18.6: resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==} @@ -1196,7 +1190,7 @@ packages: '@babel/helper-annotate-as-pure': 7.18.6 '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-wrap-function': 7.18.11 - '@babel/types': 7.18.10 + '@babel/types': 7.19.0 transitivePeerDependencies: - supports-color dev: false @@ -1211,7 +1205,7 @@ packages: '@babel/helper-annotate-as-pure': 7.18.6 '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-wrap-function': 7.18.11 - '@babel/types': 7.18.10 + '@babel/types': 7.19.0 transitivePeerDependencies: - supports-color @@ -1234,8 +1228,8 @@ packages: '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-member-expression-to-functions': 7.18.9 '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/traverse': 7.18.11 - '@babel/types': 7.18.10 + '@babel/traverse': 7.19.0 + '@babel/types': 7.19.0 transitivePeerDependencies: - supports-color @@ -1280,10 +1274,10 @@ packages: resolution: {integrity: sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-function-name': 7.18.9 + '@babel/helper-function-name': 7.19.0 '@babel/template': 7.18.10 - '@babel/traverse': 7.18.11 - '@babel/types': 7.18.10 + '@babel/traverse': 7.19.0 + '@babel/types': 7.19.0 transitivePeerDependencies: - supports-color @@ -1364,7 +1358,7 @@ packages: '@babel/core': ^7.0.0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/7.18.6_@babel+core@7.19.0: @@ -1374,7 +1368,7 @@ packages: '@babel/core': ^7.0.0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/7.18.6_@babel+core@7.18.9: resolution: {integrity: sha512-Udgu8ZRgrBrttVz6A0EVL0SJ1z+RLbIeqsu632SA1hf0awEppD6TvdznoH+orIF8wtFFAV/Enmw9Y+9oV8TQcw==} @@ -1476,7 +1470,7 @@ packages: dependencies: '@babel/core': 7.18.9 '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.18.9 transitivePeerDependencies: - supports-color @@ -1490,7 +1484,7 @@ packages: dependencies: '@babel/core': 7.19.0 '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.19.0 transitivePeerDependencies: - supports-color @@ -1502,7 +1496,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.18.9 dev: false @@ -1513,7 +1507,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.19.0 /@babel/plugin-proposal-export-namespace-from/7.18.6_@babel+core@7.18.9: @@ -1544,7 +1538,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.9 dev: false @@ -1555,7 +1549,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.19.0 /@babel/plugin-proposal-logical-assignment-operators/7.18.6_@babel+core@7.18.9: @@ -1607,7 +1601,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.9 dev: false @@ -1618,7 +1612,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.19.0 /@babel/plugin-proposal-object-rest-spread/7.12.1_@babel+core@7.12.9: @@ -1666,7 +1660,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.9 dev: false @@ -1677,7 +1671,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.19.0 /@babel/plugin-proposal-optional-chaining/7.18.6_@babel+core@7.18.9: @@ -1711,7 +1705,7 @@ packages: dependencies: '@babel/core': 7.18.9 '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 transitivePeerDependencies: - supports-color dev: false @@ -1724,7 +1718,7 @@ packages: dependencies: '@babel/core': 7.19.0 '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 transitivePeerDependencies: - supports-color @@ -1737,7 +1731,7 @@ packages: '@babel/core': 7.18.9 '@babel/helper-annotate-as-pure': 7.18.6 '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.18.9 transitivePeerDependencies: - supports-color @@ -1752,7 +1746,7 @@ packages: '@babel/core': 7.19.0 '@babel/helper-annotate-as-pure': 7.18.6 '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.19.0 transitivePeerDependencies: - supports-color @@ -1764,8 +1758,8 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-create-regexp-features-plugin': 7.18.6_@babel+core@7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-create-regexp-features-plugin': 7.19.0_@babel+core@7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-proposal-unicode-property-regex/7.18.6_@babel+core@7.19.0: @@ -1775,8 +1769,8 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-create-regexp-features-plugin': 7.18.6_@babel+core@7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-create-regexp-features-plugin': 7.19.0_@babel+core@7.19.0 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.18.9: resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} @@ -1784,7 +1778,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.19.0: @@ -1793,7 +1787,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.19.0: resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==} @@ -1810,7 +1804,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.19.0: @@ -1819,7 +1813,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.18.9: resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==} @@ -1828,7 +1822,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.19.0: @@ -1838,7 +1832,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.18.9: resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==} @@ -1846,7 +1840,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.19.0: @@ -1855,7 +1849,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.18.9: resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==} @@ -1863,7 +1857,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.19.0: @@ -1872,7 +1866,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-syntax-flow/7.18.6_@babel+core@7.19.0: resolution: {integrity: sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==} @@ -1891,7 +1885,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-syntax-import-assertions/7.18.6_@babel+core@7.19.0: @@ -1901,7 +1895,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.19.0: resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} @@ -1918,7 +1912,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.19.0: @@ -1927,7 +1921,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-syntax-jsx/7.12.1_@babel+core@7.12.9: resolution: {integrity: sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==} @@ -1963,7 +1957,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.19.0: @@ -1972,7 +1966,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.18.9: resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} @@ -1997,7 +1991,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.19.0: @@ -2006,7 +2000,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.12.9: resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} @@ -2014,7 +2008,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.12.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.18.9: @@ -2023,7 +2017,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.19.0: @@ -2032,7 +2026,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.18.9: resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} @@ -2040,7 +2034,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.19.0: @@ -2049,7 +2043,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.18.9: resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} @@ -2075,7 +2069,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.19.0: @@ -2085,7 +2079,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.18.9: resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} @@ -2094,7 +2088,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.19.0: @@ -2104,7 +2098,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-syntax-typescript/7.18.6_@babel+core@7.18.9: resolution: {integrity: sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==} @@ -2132,7 +2126,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-transform-arrow-functions/7.18.6_@babel+core@7.19.0: @@ -2142,7 +2136,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-transform-async-to-generator/7.18.6_@babel+core@7.18.9: resolution: {integrity: sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==} @@ -2152,7 +2146,7 @@ packages: dependencies: '@babel/core': 7.18.9 '@babel/helper-module-imports': 7.18.6 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/helper-remap-async-to-generator': 7.18.9_@babel+core@7.18.9 transitivePeerDependencies: - supports-color @@ -2166,7 +2160,7 @@ packages: dependencies: '@babel/core': 7.19.0 '@babel/helper-module-imports': 7.18.6 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/helper-remap-async-to-generator': 7.18.9_@babel+core@7.19.0 transitivePeerDependencies: - supports-color @@ -2178,7 +2172,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-transform-block-scoped-functions/7.18.6_@babel+core@7.19.0: @@ -2188,7 +2182,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-transform-block-scoping/7.18.6_@babel+core@7.18.9: resolution: {integrity: sha512-pRqwb91C42vs1ahSAWJkxOxU1RHWDn16XAa6ggQ72wjLlWyYeAcLvTtE0aM8ph3KNydy9CQF2nLYcjq1WysgxQ==} @@ -2321,8 +2315,8 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-create-regexp-features-plugin': 7.18.6_@babel+core@7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-create-regexp-features-plugin': 7.19.0_@babel+core@7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-transform-dotall-regex/7.18.6_@babel+core@7.19.0: @@ -2332,8 +2326,8 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-create-regexp-features-plugin': 7.18.6_@babel+core@7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-create-regexp-features-plugin': 7.19.0_@babel+core@7.19.0 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-transform-duplicate-keys/7.18.6_@babel+core@7.18.9: resolution: {integrity: sha512-NJU26U/208+sxYszf82nmGYqVF9QN8py2HFTblPT9hbawi8+1C5a9JubODLTGFuT0qlkqVinmkwOD13s0sZktg==} @@ -2362,7 +2356,7 @@ packages: dependencies: '@babel/core': 7.18.9 '@babel/helper-builder-binary-assignment-operator-visitor': 7.18.6 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-transform-exponentiation-operator/7.18.6_@babel+core@7.19.0: @@ -2373,7 +2367,7 @@ packages: dependencies: '@babel/core': 7.19.0 '@babel/helper-builder-binary-assignment-operator-visitor': 7.18.6 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-transform-flow-strip-types/7.18.9_@babel+core@7.19.0: resolution: {integrity: sha512-+G6rp2zRuOAInY5wcggsx4+QVao1qPM0osC9fTUVlAV3zOrzTCnrMAFVnR6+a3T8wz1wFIH7KhYMcMB3u1n80A==} @@ -2393,7 +2387,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-transform-for-of/7.18.8_@babel+core@7.19.0: @@ -2403,7 +2397,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-transform-function-name/7.18.6_@babel+core@7.18.9: resolution: {integrity: sha512-kJha/Gbs5RjzIu0CxZwf5e3aTTSlhZnHMT8zPWnJMjNpLOUgqevg+PN5oMH68nMCXnfiMo4Bhgxqj59KHTlAnA==} @@ -2454,7 +2448,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-transform-member-expression-literals/7.18.6_@babel+core@7.19.0: @@ -2464,7 +2458,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-transform-modules-amd/7.18.6_@babel+core@7.18.9: resolution: {integrity: sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==} @@ -2473,8 +2467,8 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-module-transforms': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-module-transforms': 7.19.0 + '@babel/helper-plugin-utils': 7.19.0 babel-plugin-dynamic-import-node: 2.3.3 transitivePeerDependencies: - supports-color @@ -2487,8 +2481,8 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-module-transforms': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-module-transforms': 7.19.0 + '@babel/helper-plugin-utils': 7.19.0 babel-plugin-dynamic-import-node: 2.3.3 transitivePeerDependencies: - supports-color @@ -2576,8 +2570,8 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-module-transforms': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-module-transforms': 7.19.0 + '@babel/helper-plugin-utils': 7.19.0 transitivePeerDependencies: - supports-color dev: false @@ -2589,8 +2583,8 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-module-transforms': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-module-transforms': 7.19.0 + '@babel/helper-plugin-utils': 7.19.0 transitivePeerDependencies: - supports-color @@ -2633,7 +2627,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-transform-new-target/7.18.6_@babel+core@7.19.0: @@ -2643,7 +2637,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-transform-object-super/7.18.6_@babel+core@7.18.9: resolution: {integrity: sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==} @@ -2652,7 +2646,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/helper-replace-supers': 7.18.9 transitivePeerDependencies: - supports-color @@ -2665,7 +2659,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/helper-replace-supers': 7.18.9 transitivePeerDependencies: - supports-color @@ -2677,7 +2671,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.12.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-transform-parameters/7.18.8_@babel+core@7.18.9: @@ -2687,7 +2681,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-transform-parameters/7.18.8_@babel+core@7.19.0: @@ -2697,7 +2691,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-transform-property-literals/7.18.6_@babel+core@7.18.9: resolution: {integrity: sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==} @@ -2706,7 +2700,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-transform-property-literals/7.18.6_@babel+core@7.19.0: @@ -2716,7 +2710,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-transform-react-constant-elements/7.18.6_@babel+core@7.18.9: resolution: {integrity: sha512-4g5H1bonF1dqgMe+wQ2fvDlRZ/mN/KwArk13teDv+xxn+pUDEiiDluQd6D2B30MJcL1u3qr0WZpfq0mw9/zSqA==} @@ -2825,7 +2819,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 regenerator-transform: 0.15.0 dev: false @@ -2836,7 +2830,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 regenerator-transform: 0.15.0 /@babel/plugin-transform-reserved-words/7.18.6_@babel+core@7.18.9: @@ -2846,7 +2840,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-transform-reserved-words/7.18.6_@babel+core@7.19.0: @@ -2856,7 +2850,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-transform-runtime/7.18.6_@babel+core@7.19.0: resolution: {integrity: sha512-8uRHk9ZmRSnWqUgyae249EJZ94b0yAGLBIqzZzl+0iEdbno55Pmlt/32JZsHwXD9k/uZj18Aqqk35wBX4CBTXA==} @@ -2882,7 +2876,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-transform-shorthand-properties/7.18.6_@babel+core@7.19.0: @@ -2892,7 +2886,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-transform-spread/7.18.6_@babel+core@7.18.9: resolution: {integrity: sha512-ayT53rT/ENF8WWexIRg9AiV9h0aIteyWn5ptfZTZQrjk/+f3WdrJGCY4c9wcgl2+MKkKPhzbYp97FTsquZpDCw==} @@ -2933,7 +2927,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-transform-sticky-regex/7.18.6_@babel+core@7.19.0: @@ -2943,7 +2937,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 /@babel/plugin-transform-template-literals/7.18.6_@babel+core@7.18.9: resolution: {integrity: sha512-UuqlRrQmT2SWRvahW46cGSany0uTlcj8NYOS5sRGYi8FxPYPoLd5DDmMd32ZXEj2Jq+06uGVQKHxa/hJx2EzKw==} @@ -3037,8 +3031,8 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-create-regexp-features-plugin': 7.18.6_@babel+core@7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-create-regexp-features-plugin': 7.19.0_@babel+core@7.18.9 + '@babel/helper-plugin-utils': 7.19.0 dev: false /@babel/plugin-transform-unicode-regex/7.18.6_@babel+core@7.19.0: @@ -3048,8 +3042,8 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-create-regexp-features-plugin': 7.18.6_@babel+core@7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-create-regexp-features-plugin': 7.19.0_@babel+core@7.19.0 + '@babel/helper-plugin-utils': 7.19.0 /@babel/preset-env/7.18.10_@babel+core@7.19.0: resolution: {integrity: sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==} @@ -3326,10 +3320,10 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.9 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/plugin-proposal-unicode-property-regex': 7.18.6_@babel+core@7.18.9 '@babel/plugin-transform-dotall-regex': 7.18.6_@babel+core@7.18.9 - '@babel/types': 7.18.10 + '@babel/types': 7.19.0 esutils: 2.0.3 dev: false @@ -3339,10 +3333,10 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.19.0 - '@babel/helper-plugin-utils': 7.18.9 + '@babel/helper-plugin-utils': 7.19.0 '@babel/plugin-proposal-unicode-property-regex': 7.18.6_@babel+core@7.19.0 '@babel/plugin-transform-dotall-regex': 7.18.6_@babel+core@7.19.0 - '@babel/types': 7.18.10 + '@babel/types': 7.19.0 esutils: 2.0.3 /@babel/preset-react/7.18.6_@babel+core@7.18.9: @@ -3462,6 +3456,7 @@ packages: globals: 11.12.0 transitivePeerDependencies: - supports-color + dev: false /@babel/traverse/7.18.13: resolution: {integrity: sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==} @@ -4553,27 +4548,8 @@ packages: react: 18.2.0 dev: false - /@codemirror/autocomplete/6.1.0_cb7ocycrcgpxsqrosocw3o7ksu: + /@codemirror/autocomplete/6.1.0: resolution: {integrity: sha512-wtO4O5WDyXhhCd4q4utDIDZxnQfmJ++3dGBCG9LMtI79+92OcA1DVk/n7BEupKmjIr8AzvptDz7YQ9ud6OkU+A==} - peerDependencies: - '@codemirror/language': ^6.0.0 - '@codemirror/state': ^6.0.0 - '@codemirror/view': ^6.0.0 - '@lezer/common': ^1.0.0 - dependencies: - '@codemirror/language': 6.2.0 - '@codemirror/state': 6.1.1 - '@codemirror/view': 6.1.0 - '@lezer/common': 1.0.0 - dev: false - - /@codemirror/autocomplete/6.1.0_pzmb3em2q4wphwjkkiip7qfhga: - resolution: {integrity: sha512-wtO4O5WDyXhhCd4q4utDIDZxnQfmJ++3dGBCG9LMtI79+92OcA1DVk/n7BEupKmjIr8AzvptDz7YQ9ud6OkU+A==} - peerDependencies: - '@codemirror/language': ^6.0.0 - '@codemirror/state': ^6.0.0 - '@codemirror/view': ^6.0.0 - '@lezer/common': ^1.0.0 dependencies: '@codemirror/language': 6.2.0 '@codemirror/state': 6.1.1 @@ -4590,23 +4566,20 @@ packages: '@lezer/common': 1.0.0 dev: false - /@codemirror/lang-css/6.0.0_2js663f52tgwrrbokpneg22gyy: + /@codemirror/lang-css/6.0.0: resolution: {integrity: sha512-jBqc+BTuwhNOTlrimFghLlSrN6iFuE44HULKWoR4qKYObhOIl9Lci1iYj6zMIte1XTQmZguNvjXMyr43LUKwSw==} dependencies: - '@codemirror/autocomplete': 6.1.0_pzmb3em2q4wphwjkkiip7qfhga + '@codemirror/autocomplete': 6.1.0 '@codemirror/language': 6.2.0 '@codemirror/state': 6.1.1 '@lezer/css': 1.0.0 - transitivePeerDependencies: - - '@codemirror/view' - - '@lezer/common' dev: false /@codemirror/lang-html/6.1.1: resolution: {integrity: sha512-+hV1kVZySmr7GxCgSVM+BodaVlsgD98laEJbj/GALhgIrfnHTSiRuTz2EPTjNCKeq5uEQXeOKFY711/CxJbYrg==} dependencies: - '@codemirror/autocomplete': 6.1.0_pzmb3em2q4wphwjkkiip7qfhga - '@codemirror/lang-css': 6.0.0_2js663f52tgwrrbokpneg22gyy + '@codemirror/autocomplete': 6.1.0 + '@codemirror/lang-css': 6.0.0 '@codemirror/lang-javascript': 6.0.2 '@codemirror/language': 6.2.0 '@codemirror/state': 6.1.1 @@ -4618,7 +4591,7 @@ packages: /@codemirror/lang-javascript/6.0.2: resolution: {integrity: sha512-BZRJ9u/zl16hLkSpDAWm73mrfIR7HJrr0lvnhoSOCQVea5BglguWI/slxexhvUb0CB5cXgKWuo2bM+N9EhIaZw==} dependencies: - '@codemirror/autocomplete': 6.1.0_cb7ocycrcgpxsqrosocw3o7ksu + '@codemirror/autocomplete': 6.1.0 '@codemirror/language': 6.2.0 '@codemirror/lint': 6.0.0 '@codemirror/state': 6.1.1 @@ -6571,23 +6544,6 @@ packages: sucrase: 3.25.0 dev: false - /@rollup/plugin-typescript/8.5.0_ihkqvyh37tzxtjmovjyy2yrv7m: - resolution: {integrity: sha512-wMv1/scv0m/rXx21wD2IsBbJFba8wGF3ErJIr6IKRfRj49S85Lszbxb4DCo8iILpluTjk2GAAu9CoZt4G3ppgQ==} - engines: {node: '>=8.0.0'} - peerDependencies: - rollup: ^2.14.0 - tslib: '*' - typescript: '>=3.7.0' - peerDependenciesMeta: - tslib: - optional: true - dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.79.0 - resolve: 1.22.1 - rollup: 2.79.0 - typescript: 4.8.3 - dev: true - /@rollup/plugin-typescript/8.5.0_tznp6w7csbjledp5nresoxoky4: resolution: {integrity: sha512-wMv1/scv0m/rXx21wD2IsBbJFba8wGF3ErJIr6IKRfRj49S85Lszbxb4DCo8iILpluTjk2GAAu9CoZt4G3ppgQ==} engines: {node: '>=8.0.0'} @@ -8320,10 +8276,8 @@ packages: indent-string: 4.0.0 dev: false - /ajv-formats/2.1.1_ajv@8.11.0: + /ajv-formats/2.1.1: resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} - peerDependencies: - ajv: ^8.0.0 peerDependenciesMeta: ajv: optional: true @@ -9602,18 +9556,16 @@ packages: engines: {node: '>=0.10.0'} dev: false - /codemirror/6.0.1_@lezer+common@1.0.0: + /codemirror/6.0.1: resolution: {integrity: sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==} dependencies: - '@codemirror/autocomplete': 6.1.0_cb7ocycrcgpxsqrosocw3o7ksu + '@codemirror/autocomplete': 6.1.0 '@codemirror/commands': 6.0.1 '@codemirror/language': 6.2.0 '@codemirror/lint': 6.0.0 '@codemirror/search': 6.0.0 '@codemirror/state': 6.1.1 '@codemirror/view': 6.1.0 - transitivePeerDependencies: - - '@lezer/common' dev: false /collapse-white-space/1.0.6: @@ -17209,12 +17161,6 @@ packages: /react-dev-utils/12.0.1_kb3egcnme7w23lfa5xodfjfhge: resolution: {integrity: sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==} engines: {node: '>=14'} - peerDependencies: - typescript: '>=2.7' - webpack: '>=4' - peerDependenciesMeta: - typescript: - optional: true dependencies: '@babel/code-frame': 7.18.6 address: 1.2.0 @@ -17245,7 +17191,9 @@ packages: transitivePeerDependencies: - eslint - supports-color + - typescript - vue-template-compiler + - webpack dev: false /react-dom/17.0.2_react@17.0.2: @@ -18227,7 +18175,7 @@ packages: dependencies: '@types/json-schema': 7.0.11 ajv: 8.11.0 - ajv-formats: 2.1.1_ajv@8.11.0 + ajv-formats: 2.1.1 ajv-keywords: 5.1.0_ajv@8.11.0 dev: false @@ -19117,12 +19065,10 @@ packages: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} dev: true - /tailwindcss/3.1.8_postcss@8.4.16: + /tailwindcss/3.1.8: resolution: {integrity: sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==} engines: {node: '>=12.13.0'} hasBin: true - peerDependencies: - postcss: ^8.0.9 dependencies: arg: 5.0.2 chokidar: 3.5.3 diff --git a/turbo.json b/turbo.json index 19afd0774..dea0de79e 100644 --- a/turbo.json +++ b/turbo.json @@ -13,13 +13,10 @@ "outputs": [] }, "dev": { - "cache": false + "dependsOn": ["^dev"] }, "db#build": { "cache": false - }, - "dx": { - "cache": false } } }