From 86c7a2962b75b8f9c8feef3a56da17aab61c07e7 Mon Sep 17 00:00:00 2001 From: Joe Karow <58997957+JoeKarow@users.noreply.github.com> Date: Fri, 30 Dec 2022 13:06:46 -0500 Subject: [PATCH] use Mantine as a peerDep This will have a benefit when it comes to Next.js code splitting on build --- apps/app/package.json | 21 ++++++++++++++++++++ apps/app/src/pages/_app.tsx | 7 ++++--- apps/app/src/pages/_document.tsx | 3 ++- packages/ui/iconify/index.ts | 1 - packages/ui/mantine/carousel.ts | 1 - packages/ui/mantine/core.ts | 1 - packages/ui/mantine/dates.ts | 1 - packages/ui/mantine/dropzone.ts | 1 - packages/ui/mantine/form.ts | 1 - packages/ui/mantine/hooks.ts | 1 - packages/ui/mantine/modals.ts | 1 - packages/ui/mantine/next.ts | 1 - packages/ui/mantine/notifications.ts | 1 - packages/ui/mantine/nprogress.ts | 1 - packages/ui/mantine/spotlight.ts | 1 - packages/ui/mantine/tiptap-extension-link.ts | 1 - packages/ui/mantine/tiptap-react.ts | 1 - packages/ui/mantine/tiptap-starter-kit.ts | 1 - packages/ui/mantine/tiptap.ts | 1 - 19 files changed, 27 insertions(+), 20 deletions(-) delete mode 100644 packages/ui/iconify/index.ts delete mode 100644 packages/ui/mantine/carousel.ts delete mode 100644 packages/ui/mantine/core.ts delete mode 100644 packages/ui/mantine/dates.ts delete mode 100644 packages/ui/mantine/dropzone.ts delete mode 100644 packages/ui/mantine/form.ts delete mode 100644 packages/ui/mantine/hooks.ts delete mode 100644 packages/ui/mantine/modals.ts delete mode 100644 packages/ui/mantine/next.ts delete mode 100644 packages/ui/mantine/notifications.ts delete mode 100644 packages/ui/mantine/nprogress.ts delete mode 100644 packages/ui/mantine/spotlight.ts delete mode 100644 packages/ui/mantine/tiptap-extension-link.ts delete mode 100644 packages/ui/mantine/tiptap-react.ts delete mode 100644 packages/ui/mantine/tiptap-starter-kit.ts delete mode 100644 packages/ui/mantine/tiptap.ts diff --git a/apps/app/package.json b/apps/app/package.json index 574478ff39..37529ea804 100644 --- a/apps/app/package.json +++ b/apps/app/package.json @@ -19,8 +19,26 @@ }, "dependencies": { "@crowdin/ota-client": "0.7.0", + "@emotion/react": "11.10.5", + "@emotion/server": "11.10.0", + "@mantine/carousel": "5.9.5", + "@mantine/core": "5.9.5", + "@mantine/dates": "5.9.5", + "@mantine/dropzone": "5.9.5", + "@mantine/form": "5.9.5", + "@mantine/hooks": "5.9.5", + "@mantine/modals": "5.9.5", + "@mantine/next": "5.9.5", + "@mantine/notifications": "5.9.5", + "@mantine/nprogress": "5.9.5", + "@mantine/prism": "5.9.5", + "@mantine/spotlight": "5.9.5", + "@mantine/tiptap": "5.9.5", "@next/bundle-analyzer": "13.1.1", "@tanstack/react-query": "4.20.4", + "@tiptap/extension-link": "2.0.0-beta.209", + "@tiptap/react": "2.0.0-beta.209", + "@tiptap/starter-kit": "2.0.0-beta.209", "@trpc/client": "10.7.0", "@trpc/next": "10.7.0", "@trpc/react-query": "10.7.0", @@ -30,6 +48,9 @@ "@weareinreach/db": "0.100.0", "@weareinreach/ui": "0.100.0", "axios": "1.2.2", + "dayjs": "1.11.7", + "embla-carousel-react": "7.0.5", + "feather-icons-react": "0.6.2", "i18next": "22.4.6", "next": "13.1.1", "next-auth": "4.18.7", diff --git a/apps/app/src/pages/_app.tsx b/apps/app/src/pages/_app.tsx index b591dee7f6..278c08ff83 100644 --- a/apps/app/src/pages/_app.tsx +++ b/apps/app/src/pages/_app.tsx @@ -7,10 +7,11 @@ import { appWithTranslation } from 'next-i18next' // import { GetServerSidePropsContext } from 'next' import type { AppProps } from 'next/app' +import { MantineProvider } from '@mantine/core' +import { ModalsProvider } from '@mantine/modals' +import { NotificationsProvider } from '@mantine/notifications' + import { AppLayout } from '@weareinreach/ui/layout' -import { MantineProvider } from '@weareinreach/ui/mantine/core' -import { ModalsProvider } from '@weareinreach/ui/mantine/modals' -import { NotificationsProvider } from '@weareinreach/ui/mantine/notifications' import { appCache, appTheme } from '@weareinreach/ui/theme' import { default as navItems } from '~/data/nav.json' diff --git a/apps/app/src/pages/_document.tsx b/apps/app/src/pages/_document.tsx index 39effbfec9..e408a4a7d7 100644 --- a/apps/app/src/pages/_document.tsx +++ b/apps/app/src/pages/_document.tsx @@ -1,6 +1,7 @@ import Document, { DocumentContext, Head, Html, Main, NextScript } from 'next/document' -import { ServerStyles, createStylesServer } from '@weareinreach/ui/mantine/next' +import { ServerStyles, createStylesServer } from '@mantine/next' + import { appCache } from '@weareinreach/ui/theme' const stylesServer = createStylesServer(appCache) diff --git a/packages/ui/iconify/index.ts b/packages/ui/iconify/index.ts deleted file mode 100644 index 3d4224b288..0000000000 --- a/packages/ui/iconify/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@iconify/react' diff --git a/packages/ui/mantine/carousel.ts b/packages/ui/mantine/carousel.ts deleted file mode 100644 index a2874afde8..0000000000 --- a/packages/ui/mantine/carousel.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@mantine/carousel' diff --git a/packages/ui/mantine/core.ts b/packages/ui/mantine/core.ts deleted file mode 100644 index c9d22e5b01..0000000000 --- a/packages/ui/mantine/core.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@mantine/core' diff --git a/packages/ui/mantine/dates.ts b/packages/ui/mantine/dates.ts deleted file mode 100644 index d4cbae98d2..0000000000 --- a/packages/ui/mantine/dates.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@mantine/dates' diff --git a/packages/ui/mantine/dropzone.ts b/packages/ui/mantine/dropzone.ts deleted file mode 100644 index 586adbb260..0000000000 --- a/packages/ui/mantine/dropzone.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@mantine/dropzone' diff --git a/packages/ui/mantine/form.ts b/packages/ui/mantine/form.ts deleted file mode 100644 index f8984105a3..0000000000 --- a/packages/ui/mantine/form.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@mantine/form' diff --git a/packages/ui/mantine/hooks.ts b/packages/ui/mantine/hooks.ts deleted file mode 100644 index 88565f78c8..0000000000 --- a/packages/ui/mantine/hooks.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@mantine/hooks' diff --git a/packages/ui/mantine/modals.ts b/packages/ui/mantine/modals.ts deleted file mode 100644 index 231e89428e..0000000000 --- a/packages/ui/mantine/modals.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@mantine/modals' diff --git a/packages/ui/mantine/next.ts b/packages/ui/mantine/next.ts deleted file mode 100644 index c5a039b36a..0000000000 --- a/packages/ui/mantine/next.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@mantine/next' diff --git a/packages/ui/mantine/notifications.ts b/packages/ui/mantine/notifications.ts deleted file mode 100644 index 48d0d63364..0000000000 --- a/packages/ui/mantine/notifications.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@mantine/notifications' diff --git a/packages/ui/mantine/nprogress.ts b/packages/ui/mantine/nprogress.ts deleted file mode 100644 index 5909c84d37..0000000000 --- a/packages/ui/mantine/nprogress.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@mantine/nprogress' diff --git a/packages/ui/mantine/spotlight.ts b/packages/ui/mantine/spotlight.ts deleted file mode 100644 index 0f943421dd..0000000000 --- a/packages/ui/mantine/spotlight.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@mantine/spotlight' diff --git a/packages/ui/mantine/tiptap-extension-link.ts b/packages/ui/mantine/tiptap-extension-link.ts deleted file mode 100644 index d7119d35fa..0000000000 --- a/packages/ui/mantine/tiptap-extension-link.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@tiptap/extension-link' diff --git a/packages/ui/mantine/tiptap-react.ts b/packages/ui/mantine/tiptap-react.ts deleted file mode 100644 index c25d936f72..0000000000 --- a/packages/ui/mantine/tiptap-react.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@tiptap/react' diff --git a/packages/ui/mantine/tiptap-starter-kit.ts b/packages/ui/mantine/tiptap-starter-kit.ts deleted file mode 100644 index a9f42b1d70..0000000000 --- a/packages/ui/mantine/tiptap-starter-kit.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@tiptap/starter-kit' diff --git a/packages/ui/mantine/tiptap.ts b/packages/ui/mantine/tiptap.ts deleted file mode 100644 index 576ba7f530..0000000000 --- a/packages/ui/mantine/tiptap.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@mantine/tiptap'