♻️ (builder) Remove barrel export and flatten folder arch

apps/builder/src/features/dashboard/api/getAppVersionProcedure.ts

@@ -1,4 +1,4 @@
-import { publicProcedure } from '@/utils/server/trpc'
+import { publicProcedure } from '@/helpers/server/trpc'
 
 export const getAppVersionProcedure = publicProcedure.query(async () => {
   return { commitSha: process.env.VERCEL_GIT_COMMIT_SHA }

apps/builder/src/features/dashboard/components/DashboardHeader.tsx

@@ -2,13 +2,14 @@ import React from 'react'
 import { HStack, Flex, Button, useDisclosure } from '@chakra-ui/react'
 import { HardDriveIcon, SettingsIcon } from '@/components/icons'
 import { signOut } from 'next-auth/react'
-import { useUser } from '@/features/account'
-import { useWorkspace, WorkspaceDropdown } from '@/features/workspace'
+import { useUser } from '@/features/account/hooks/useUser'
 import { isNotDefined } from '@typebot.io/lib'
 import Link from 'next/link'
-import { WorkspaceSettingsModal } from '@/features/workspace'
 import { EmojiOrImageIcon } from '@/components/EmojiOrImageIcon'
 import { useScopedI18n } from '@/locales'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
+import { WorkspaceDropdown } from '@/features/workspace/components/WorkspaceDropdown'
+import { WorkspaceSettingsModal } from '@/features/workspace/components/WorkspaceSettingsModal'
 
 export const DashboardHeader = () => {
   const scopedT = useScopedI18n('dashboard.header')

apps/builder/src/features/dashboard/components/DashboardPage.tsx

@@ -1,12 +1,10 @@
 import { Seo } from '@/components/Seo'
-import { useUser } from '@/features/account'
+import { useUser } from '@/features/account/hooks/useUser'
 import {
   PreCheckoutModal,
   PreCheckoutModalProps,
 } from '@/features/billing/components/PreCheckoutModal'
-import { TypebotDndProvider, FolderContent } from '@/features/folders'
-import { ParentModalProvider } from '@/features/graph'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { useScopedI18n } from '@/locales'
 import { Stack, VStack, Spinner, Text } from '@chakra-ui/react'
 import { Plan } from '@typebot.io/prisma'
@@ -14,6 +12,9 @@ import { useRouter } from 'next/router'
 import { useState, useEffect } from 'react'
 import { guessIfUserIsEuropean } from '@typebot.io/lib/pricing'
 import { DashboardHeader } from './DashboardHeader'
+import { FolderContent } from '@/features/folders/components/FolderContent'
+import { TypebotDndProvider } from '@/features/folders/TypebotDndProvider'
+import { ParentModalProvider } from '@/features/graph/providers/ParentModalProvider'
 
 export const DashboardPage = () => {
   const scopedT = useScopedI18n('dashboard')

apps/builder/src/features/dashboard/components/OnboardingModal.tsx

@@ -1,6 +1,6 @@
 import { chakra, useColorModeValue } from '@chakra-ui/react'
 import { Popup } from '@typebot.io/react'
-import { useUser } from '@/features/account'
+import { useUser } from '@/features/account/hooks/useUser'
 import { Typebot } from '@typebot.io/schemas'
 import React, { useEffect, useRef, useState } from 'react'
 import { sendRequest } from '@typebot.io/lib'

apps/builder/src/features/dashboard/index.ts

@@ -1,11 +0,0 @@
-export { DashboardPage } from './components/DashboardPage'
-export { DashboardHeader } from './components/DashboardHeader'
-export { parseNewTypebot } from './api/parseNewTypebot'
-export {
-  createTypebotQuery,
-  importTypebotQuery,
-  getTypebotQuery,
-  deleteTypebotQuery,
-} from './queries'
-export type { TypebotInDashboard } from './types'
-export { useTypebots } from './hooks/useTypebots'

apps/builder/src/features/dashboard/queries/importTypebotQuery.ts

@@ -1,4 +1,3 @@
-import { duplicateWebhookQuery } from '@/features/blocks/integrations/webhook'
 import { createId } from '@paralleldrive/cuid2'
 import { Plan, Prisma } from '@typebot.io/prisma'
 import {
@@ -14,6 +13,7 @@ import {
   isWebhookBlock,
   sendRequest,
 } from '@typebot.io/lib'
+import { duplicateWebhookQuery } from '@/features/blocks/integrations/webhook/queries/duplicateWebhookQuery'
 
 export const importTypebotQuery = async (typebot: Typebot, userPlan: Plan) => {
   const { typebot: newTypebot, webhookIdsMapping } = duplicateTypebot(

apps/builder/src/features/dashboard/queries/index.ts

@@ -1,4 +0,0 @@
-export * from './createTypebotQuery'
-export * from './deleteTypebotQuery'
-export * from './getTypebotQuery'
-export * from './importTypebotQuery'