From 80e034066b9323e57e47c806101261ef5a3090d2 Mon Sep 17 00:00:00 2001 From: Tomas Francisco <4301103+tomasfrancisco@users.noreply.github.com> Date: Tue, 5 Nov 2024 18:15:28 +0100 Subject: [PATCH 1/2] chore(next15): upgrade to next 15 and move away from vite --- apps/engine/package.json | 32 +- apps/engine/src/app/(home)/layout.tsx | 2 +- apps/engine/src/app/(home)/page.tsx | 2 +- .../src/app/_components/analytics-tracker.tsx | 15 + .../github/_components/github-card.tsx | 3 +- .../github/_components/settings-form.tsx | 12 +- .../@connections/destinations/github/page.tsx | 2 +- .../gitlab/_components/gitlab-card.tsx | 2 +- .../discord/_components/discord-card.tsx | 2 +- .../slack/_components/slack-card.tsx | 2 +- .../sources/figma/_components/figma-card.tsx | 2 +- .../sources/figma/_components/provider.tsx | 2 +- .../figma/resources/[resourceId]/page.tsx | 9 +- .../resources/_components/figma-file.tsx | 4 +- .../resources/_components/figma-form.tsx | 6 +- .../resources/_components/resources-list.tsx | 2 +- .../sources/figma/resources/page.tsx | 2 +- .../penpot/_components/penpot-card.tsx | 2 +- .../app/_actions/account-details.action.ts | 2 +- .../_components/create-api-key-dialog.tsx | 10 +- .../src/app/app/keys/_components/key-item.tsx | 4 +- .../_components/revoke-api-key-dialog.tsx | 7 +- .../releases/_components/select-releases.tsx | 2 +- apps/engine/src/app/app/releases/page.tsx | 2 +- .../src/app/auth/_components/auth-card.tsx | 8 +- .../src/app/auth/_components/auth-form.tsx | 8 +- .../app/auth/_components/error-message.tsx | 2 +- .../app/auth/error/_components/message.tsx | 2 +- apps/engine/src/app/auth/error/page.tsx | 2 +- apps/engine/src/app/auth/logout/route.ts | 2 +- .../_components/close-window-button.tsx | 2 +- apps/engine/src/app/auth/success/page.tsx | 4 +- apps/engine/src/app/layout.tsx | 20 +- .../app-navigation/app-navigation.tsx | 12 +- .../community-banner/community-banner.tsx | 2 +- .../banners/faq-banner/faq-banner.tsx | 6 +- .../get-started-banner/get-started-banner.tsx | 6 +- .../sync-figma-banner/sync-figma-banner.tsx | 10 +- .../vision-banner/_components/card.tsx | 7 +- .../banners/vision-banner/vision-banner.tsx | 8 +- apps/engine/src/components/button/button.tsx | 9 +- .../copy-to-clipboard/copy-to-clipboard.tsx | 6 +- .../src/components/diff-block/diff-block.tsx | 3 +- apps/engine/src/components/footer/footer.tsx | 13 +- apps/engine/src/components/hero/hero.tsx | 8 +- .../components/home-button/home-button.tsx | 2 +- .../home-navigation/home-navigation.tsx | 4 +- .../install-release/install-release.tsx | 2 +- .../integration-card/integration-card.tsx | 4 +- .../integration-logo/integration-logo.tsx | 6 +- .../integration-settings.tsx | 9 +- .../src/components/json-block/json-block.tsx | 4 +- apps/engine/src/components/link/link.tsx | 2 +- .../components/main-content/main-content.tsx | 6 +- .../support-button/support-button.tsx | 2 +- .../components/tooltip-info/tooltip-info.tsx | 4 +- apps/engine/src/lib/safe-action.ts | 4 +- apps/engine/src/mdx-components.tsx | 1 - .../src/modules/app-layout/acocunt-menu.tsx | 4 +- .../src/modules/app-layout/app-layout.tsx | 2 +- .../src/modules/app-layout/app-sidebar.tsx | 14 +- .../src/modules/app-layout/breadcrumb-nav.tsx | 2 +- apps/storybook/package.json | 2 +- package.json | 7 +- packages/api/src/operations/create-api-key.ts | 2 +- packages/api/src/rsc.ts | 2 +- packages/api/src/trpc.ts | 2 +- packages/auth/src/server/client.ts | 6 +- packages/auth/src/server/utils.ts | 2 +- packages/components/package.json | 83 +- .../src/{ => client}/accordion/accordion.tsx | 0 .../src/{ => client}/accordion/index.ts | 0 .../alert-dialog/alert-dialog.tsx | 4 +- .../src/{ => client}/alert-dialog/index.ts | 0 .../aspect-ratio/aspect-ratio.tsx | 0 .../src/{ => client}/aspect-ratio/index.ts | 0 .../src/{ => client}/avatar/avatar.tsx | 0 .../src/{ => client}/avatar/index.ts | 0 .../src/{ => client}/checkbox/checkbox.tsx | 0 .../src/{ => client}/checkbox/index.ts | 0 .../{ => client}/collapsible/collapsible.tsx | 0 .../src/{ => client}/collapsible/index.ts | 0 .../src/{ => client}/dialog/dialog.tsx | 0 .../src/{ => client}/dialog/index.ts | 0 .../dropdown-menu/dropdown-menu.tsx | 0 .../src/{ => client}/dropdown-menu/index.ts | 0 .../components/src/{ => client}/form/form.tsx | 19 +- .../components/src/{ => client}/form/index.ts | 0 .../src/{ => client}/hooks/use-mobile.tsx | 0 packages/components/src/client/index.ts | 22 + .../src/{ => client}/input-otp/index.ts | 0 .../src/{ => client}/input-otp/input-otp.tsx | 3 +- .../src/{ => client}/menubar/index.ts | 0 .../src/{ => client}/menubar/menubar.tsx | 2 +- .../src/{ => client}/popover/index.ts | 0 .../src/{ => client}/popover/popover.tsx | 0 .../src/{ => client}/select/index.ts | 0 .../src/{ => client}/select/select.tsx | 0 .../src/{ => client}/separator/index.ts | 0 .../src/{ => client}/separator/separator.tsx | 0 .../src/{ => client}/sheet/index.ts | 0 .../src/{ => client}/sheet/sheet.tsx | 0 .../src/{ => client}/sidebar/index.ts | 0 .../src/{ => client}/sidebar/sidebar.tsx | 14 +- .../src/{ => client}/switch/index.ts | 0 .../src/{ => client}/switch/switch.tsx | 0 .../components/src/{ => client}/tabs/index.ts | 0 .../components/src/{ => client}/tabs/tabs.tsx | 0 .../src/{ => client}/toaster/index.ts | 0 .../src/{ => client}/toaster/toast.tsx | 0 .../src/{ => client}/toaster/toaster.tsx | 2 +- .../src/{ => client}/toaster/use-toast.ts | 0 .../src/{ => client}/tooltip/index.ts | 0 .../src/{ => client}/tooltip/tooltip.tsx | 0 packages/components/src/index.ts | 34 +- .../src/{ => server}/alert/alert.tsx | 0 .../src/{ => server}/alert/index.ts | 0 .../src/{ => server}/badge/badge.tsx | 0 .../src/{ => server}/badge/index.ts | 0 .../{ => server}/breadcrumb/breadcrumb.tsx | 0 .../src/{ => server}/breadcrumb/index.ts | 0 .../src/{ => server}/button/button.tsx | 0 .../src/{ => server}/button/index.ts | 0 .../components/src/{ => server}/card/card.tsx | 2 +- .../components/src/{ => server}/card/index.ts | 0 .../src/{ => server}/icons/ds-icon.tsx | 0 .../src/{ => server}/icons/ds-logo.tsx | 0 .../src/{ => server}/icons/ds-pro-icon.tsx | 0 .../src/{ => server}/icons/figma-logo.tsx | 0 .../src/{ => server}/icons/github-logo.tsx | 0 .../src/{ => server}/icons/index.ts | 0 .../src/{ => server}/icons/penpot-logo.tsx | 0 .../src/{ => server}/icons/reddit-icon.tsx | 0 packages/components/src/server/index.ts | 13 + .../src/{ => server}/input/index.ts | 0 .../src/{ => server}/input/input.tsx | 0 .../src/{ => server}/label/index.ts | 0 .../src/{ => server}/label/label.tsx | 0 .../components/src/{ => server}/link/index.ts | 0 .../components/src/{ => server}/link/link.tsx | 0 .../src/{ => server}/navigation-menu/index.ts | 0 .../navigation-menu/navigation-menu.tsx | 0 .../src/{ => server}/skeleton/index.ts | 0 .../src/{ => server}/skeleton/skeleton.tsx | 0 .../components/src/{ => server}/text/index.ts | 0 .../components/src/{ => server}/text/text.tsx | 2 +- packages/components/src/utils/index.ts | 3 +- packages/components/tsconfig.json | 25 +- packages/components/tsup.config.ts | 13 + .../link-design-system/link-design-system.tsx | 2 +- .../src/ui/modules/project/project.ui.tsx | 7 +- pnpm-lock.yaml | 4112 +++++++++++------ pnpm-workspace.yaml | 19 +- 153 files changed, 3057 insertions(+), 1689 deletions(-) create mode 100644 apps/engine/src/app/_components/analytics-tracker.tsx rename packages/components/src/{ => client}/accordion/accordion.tsx (100%) rename packages/components/src/{ => client}/accordion/index.ts (100%) rename packages/components/src/{ => client}/alert-dialog/alert-dialog.tsx (97%) rename packages/components/src/{ => client}/alert-dialog/index.ts (100%) rename packages/components/src/{ => client}/aspect-ratio/aspect-ratio.tsx (100%) rename packages/components/src/{ => client}/aspect-ratio/index.ts (100%) rename packages/components/src/{ => client}/avatar/avatar.tsx (100%) rename packages/components/src/{ => client}/avatar/index.ts (100%) rename packages/components/src/{ => client}/checkbox/checkbox.tsx (100%) rename packages/components/src/{ => client}/checkbox/index.ts (100%) rename packages/components/src/{ => client}/collapsible/collapsible.tsx (100%) rename packages/components/src/{ => client}/collapsible/index.ts (100%) rename packages/components/src/{ => client}/dialog/dialog.tsx (100%) rename packages/components/src/{ => client}/dialog/index.ts (100%) rename packages/components/src/{ => client}/dropdown-menu/dropdown-menu.tsx (100%) rename packages/components/src/{ => client}/dropdown-menu/index.ts (100%) rename packages/components/src/{ => client}/form/form.tsx (91%) rename packages/components/src/{ => client}/form/index.ts (100%) rename packages/components/src/{ => client}/hooks/use-mobile.tsx (100%) create mode 100644 packages/components/src/client/index.ts rename packages/components/src/{ => client}/input-otp/index.ts (100%) rename packages/components/src/{ => client}/input-otp/input-otp.tsx (96%) rename packages/components/src/{ => client}/menubar/index.ts (100%) rename packages/components/src/{ => client}/menubar/menubar.tsx (99%) rename packages/components/src/{ => client}/popover/index.ts (100%) rename packages/components/src/{ => client}/popover/popover.tsx (100%) rename packages/components/src/{ => client}/select/index.ts (100%) rename packages/components/src/{ => client}/select/select.tsx (100%) rename packages/components/src/{ => client}/separator/index.ts (100%) rename packages/components/src/{ => client}/separator/separator.tsx (100%) rename packages/components/src/{ => client}/sheet/index.ts (100%) rename packages/components/src/{ => client}/sheet/sheet.tsx (100%) rename packages/components/src/{ => client}/sidebar/index.ts (100%) rename packages/components/src/{ => client}/sidebar/sidebar.tsx (98%) rename packages/components/src/{ => client}/switch/index.ts (100%) rename packages/components/src/{ => client}/switch/switch.tsx (100%) rename packages/components/src/{ => client}/tabs/index.ts (100%) rename packages/components/src/{ => client}/tabs/tabs.tsx (100%) rename packages/components/src/{ => client}/toaster/index.ts (100%) rename packages/components/src/{ => client}/toaster/toast.tsx (100%) rename packages/components/src/{ => client}/toaster/toaster.tsx (95%) rename packages/components/src/{ => client}/toaster/use-toast.ts (100%) rename packages/components/src/{ => client}/tooltip/index.ts (100%) rename packages/components/src/{ => client}/tooltip/tooltip.tsx (100%) rename packages/components/src/{ => server}/alert/alert.tsx (100%) rename packages/components/src/{ => server}/alert/index.ts (100%) rename packages/components/src/{ => server}/badge/badge.tsx (100%) rename packages/components/src/{ => server}/badge/index.ts (100%) rename packages/components/src/{ => server}/breadcrumb/breadcrumb.tsx (100%) rename packages/components/src/{ => server}/breadcrumb/index.ts (100%) rename packages/components/src/{ => server}/button/button.tsx (100%) rename packages/components/src/{ => server}/button/index.ts (100%) rename packages/components/src/{ => server}/card/card.tsx (98%) rename packages/components/src/{ => server}/card/index.ts (100%) rename packages/components/src/{ => server}/icons/ds-icon.tsx (100%) rename packages/components/src/{ => server}/icons/ds-logo.tsx (100%) rename packages/components/src/{ => server}/icons/ds-pro-icon.tsx (100%) rename packages/components/src/{ => server}/icons/figma-logo.tsx (100%) rename packages/components/src/{ => server}/icons/github-logo.tsx (100%) rename packages/components/src/{ => server}/icons/index.ts (100%) rename packages/components/src/{ => server}/icons/penpot-logo.tsx (100%) rename packages/components/src/{ => server}/icons/reddit-icon.tsx (100%) create mode 100644 packages/components/src/server/index.ts rename packages/components/src/{ => server}/input/index.ts (100%) rename packages/components/src/{ => server}/input/input.tsx (100%) rename packages/components/src/{ => server}/label/index.ts (100%) rename packages/components/src/{ => server}/label/label.tsx (100%) rename packages/components/src/{ => server}/link/index.ts (100%) rename packages/components/src/{ => server}/link/link.tsx (100%) rename packages/components/src/{ => server}/navigation-menu/index.ts (100%) rename packages/components/src/{ => server}/navigation-menu/navigation-menu.tsx (100%) rename packages/components/src/{ => server}/skeleton/index.ts (100%) rename packages/components/src/{ => server}/skeleton/skeleton.tsx (100%) rename packages/components/src/{ => server}/text/index.ts (100%) rename packages/components/src/{ => server}/text/text.tsx (98%) create mode 100644 packages/components/tsup.config.ts diff --git a/apps/engine/package.json b/apps/engine/package.json index ee20c38b..a5741060 100644 --- a/apps/engine/package.json +++ b/apps/engine/package.json @@ -26,21 +26,21 @@ "@hookform/resolvers": "^3.9.0", "@mdx-js/loader": "^3.1.0", "@mdx-js/react": "^3.1.0", - "@next/mdx": "^15.0.2", + "@next/mdx": "15.0.2", "@octokit/app": "^15.1.0", "@octokit/auth-oauth-app": "^8.1.1", "@octokit/core": "^6.1.2", - "@sentry/nextjs": "^8.30.0", - "@supabase/ssr": "^0.4.0", - "@supabase/supabase-js": "^2.45.0", + "@sentry/nextjs": "^8.36.0", + "@supabase/ssr": "^0.5.1", + "@supabase/supabase-js": "^2.46.1", "@t3-oss/env-core": "^0.11.1", "@t3-oss/env-nextjs": "^0.11.1", - "@tanstack/react-query": "^5.51.24", + "@tanstack/react-query": "^5.59.19", "@trpc/react-query": "catalog:", "@trpc/server": "catalog:", - "@vercel/flags": "^2.6.0", + "@vercel/flags": "^2.6.2", "@vercel/kv": "^2.0.0", - "@vercel/og": "^0.6.2", + "@vercel/og": "^0.6.3", "clsx": "^2.1.1", "date-fns": "^3.6.0", "design-tokens-format-module": "catalog:", @@ -50,21 +50,21 @@ "human-id": "^4.1.1", "memoize": "^10.0.0", "next": "catalog:", - "next-safe-action": "^7.8.1", - "postgres": "^3.4.4", - "posthog-js": "^1.176.0", - "rambda": "^9.2.1", + "next-safe-action": "^7.9.9", + "postgres": "^3.4.5", + "posthog-js": "^1.181.0", + "rambda": "^9.4.0", "react": "catalog:", "react-diff-viewer": "^3.1.1", "react-dom": "catalog:", - "react-hook-form": "^7.52.2", + "react-hook-form": "catalog:", "react-json-view": "^1.21.3", - "react-json-view-lite": "^1.4.0", + "react-json-view-lite": "^1.5.0", "server-only": "^0.0.1", "sharp": "^0.33.5", "standardwebhooks": "^1.0.0", "superjson": "^2.2.1", - "tailwind-merge": "^2.4.0", + "tailwind-merge": "^2.5.4", "zod": "^3.23.8", "zod-form-data": "^2.0.2" }, @@ -73,7 +73,7 @@ "@ds-project/prettier": "workspace:*", "@ds-project/services": "workspace:*", "@ds-project/typescript": "workspace:*", - "@next/env": "^14.2.13", + "@next/env": "15.0.2", "@octokit/types": "^13.5.0", "@tailwindcss/typography": "^0.5.15", "@types/fs-extra": "^11.0.4", @@ -84,7 +84,7 @@ "@types/react-dom": "catalog:", "drizzle-kit": "^0.24.2", "eslint": "catalog:", - "eslint-config-next": "14.2.5", + "eslint-config-next": "15.0.2", "fs-extra": "^11.2.0", "jiti": "^1.21.6", "postcss": "catalog:", diff --git a/apps/engine/src/app/(home)/layout.tsx b/apps/engine/src/app/(home)/layout.tsx index 5d77bdaa..d36f7d22 100644 --- a/apps/engine/src/app/(home)/layout.tsx +++ b/apps/engine/src/app/(home)/layout.tsx @@ -13,7 +13,7 @@ export default function Layout({ return ( <>
-