chore: reverted merge

apps/marketing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@documenso/marketing",
-  "version": "1.7.0-rc.4",
+  "version": "1.7.0-rc.2",
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {
@@ -20,8 +20,7 @@
     "@documenso/trpc": "*",
     "@documenso/ui": "*",
     "@hookform/resolvers": "^3.1.0",
-    "@lingui/macro": "^4.11.3",
-    "@lingui/react": "^4.11.3",
+    "@lingui/react": "^4.11.1",
     "@openstatus/react": "^0.0.3",
     "cmdk": "^0.2.1",
     "contentlayer": "^0.3.4",
@@ -32,16 +31,16 @@
     "lucide-react": "^0.279.0",
     "luxon": "^3.4.0",
     "micro": "^10.0.1",
-    "next": "14.2.6",
+    "next": "14.0.3",
     "next-auth": "4.24.5",
     "next-axiom": "^1.1.1",
     "next-contentlayer": "^0.3.4",
     "next-plausible": "^3.10.1",
     "perfect-freehand": "^1.2.0",
     "posthog-js": "^1.77.3",
-    "react": "^18",
+    "react": "18.2.0",
     "react-confetti": "^6.1.0",
-    "react-dom": "^18",
+    "react-dom": "18.2.0",
     "react-hook-form": "^7.43.9",
     "react-icons": "^4.11.0",
     "recharts": "^2.7.2",
@@ -50,10 +49,18 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@lingui/loader": "^4.11.3",
-    "@lingui/swc-plugin": "4.0.8",
+    "@lingui/loader": "^4.11.1",
+    "@lingui/swc-plugin": "4.0.6",
     "@types/node": "20.1.0",
-    "@types/react": "^18",
-    "@types/react-dom": "^18"
+    "@types/react": "18.2.18",
+    "@types/react-dom": "18.2.7"
+  },
+  "overrides": {
+    "next-auth": {
+      "next": "$next"
+    },
+    "next-contentlayer": {
+      "next": "$next"
+    }
   }
 }

apps/marketing/src/app/(marketing)/[content]/page.tsx

@@ -5,8 +5,6 @@ import { allDocuments } from 'contentlayer/generated';
 import type { MDXComponents } from 'mdx/types';
 import { useMDXComponent } from 'next-contentlayer/hooks';
 
-import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
-
 export const dynamic = 'force-dynamic';
 
 export const generateMetadata = ({ params }: { params: { content: string } }) => {
@@ -31,8 +29,6 @@ const mdxComponents: MDXComponents = {
  * Will render the document if it exists, otherwise will return a 404.
  */
 export default function ContentPage({ params }: { params: { content: string } }) {
-  setupI18nSSR();
-
   const post = allDocuments.find((post) => post._raw.flattenedPath === params.content);
 
   if (!post) {

apps/marketing/src/app/(marketing)/blog/[post]/page.tsx

@@ -7,8 +7,6 @@ import { ChevronLeft } from 'lucide-react';
 import type { MDXComponents } from 'mdx/types';
 import { useMDXComponent } from 'next-contentlayer/hooks';
 
-import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
-
 import { CallToAction } from '~/components/(marketing)/call-to-action';
 
 export const dynamic = 'force-dynamic';
@@ -49,8 +47,6 @@ const mdxComponents: MDXComponents = {
 };
 
 export default function BlogPostPage({ params }: { params: { post: string } }) {
-  setupI18nSSR();
-
   const post = allBlogPosts.find((post) => post._raw.flattenedPath === `blog/${params.post}`);
 
   if (!post) {

apps/marketing/src/app/(marketing)/singleplayer/page.tsx

@@ -1,7 +1,5 @@
 import type { Metadata } from 'next';
 
-import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
-
 import { SinglePlayerClient } from './client';
 
 export const metadata: Metadata = {
@@ -15,7 +13,5 @@ export const dynamic = 'force-dynamic';
 // !: the Single Player Mode page. This regression was introduced during
 // !: the upgrade of Next.js to v13.5.x.
 export default function SingleplayerPage() {
-  setupI18nSSR();
-
   return <SinglePlayerClient />;
 }