upgrade: upgrade to next 14.1 and remove redirect from marketing

flsilva · Jan 20, 2024 · 1ed0dac · 1ed0dac
1 parent 69a8d73
commit 1ed0dac
Show file tree

Hide file tree

Showing 6 changed files with 132 additions and 89 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "date-fns": "2.30.0",
     "date-fns-tz": "2.0.0",
     "isomorphic-dompurify": "2.2.0",
-    "next": "14.0.3",
+    "next": "14.1.0",
     "react": "18.2.0",
     "react-contenteditable": "3.3.7",
     "react-day-picker": "8.10.0",
@@ -44,12 +44,12 @@
   "devDependencies": {
     "@mdx-js/loader": "3.0.0",
     "@mdx-js/react": "3.0.0",
-    "@next/mdx": "14.0.3",
+    "@next/mdx": "14.1.0",
     "@tailwindcss/forms": "0.5.7",
     "@tailwindcss/typography": "0.5.10",
     "autoprefixer": "10.4.17",
     "eslint": "8.56.0",
-    "eslint-config-next": "14.0.3",
+    "eslint-config-next": "14.1.0",
     "eslint-config-prettier": "9.1.0",
     "postcss": "8.4.33",
     "prettier": "3.2.4",

diff --git a/src/app/(marketing)/layout.tsx b/src/app/(marketing)/layout.tsx
@@ -1,17 +1,8 @@
 import '../globals.css';
-import { redirect } from 'next/navigation';
 import { Header } from '@/features/marketing/shared/ui/Header';
 import { Footer } from '@/features/marketing/shared/ui/Footer';
-import { isUserAuthenticated } from '@/features/app/users/data-access/UsersDataAccess';
 
 export default async function MarketingLayout({ children }: { children: React.ReactNode }) {
-  /*
-   * Redirect authenticated users to the app.
-   */
-  const isAuthenticated = await isUserAuthenticated();
-  if (isAuthenticated) redirect('/app/onboarding');
-  /**/
-
   return (
     <>
       <div className="flex flex-1 flex-col bg-white">

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,4 +1,5 @@
 import './globals.css';
+import { Suspense } from 'react';
 import type { Metadata, Viewport } from 'next';
 import { Inter } from 'next/font/google';
 import { GaNextScriptNavigation } from '@/features/shared/routing/GoogleAnalytics';
@@ -148,7 +149,9 @@ export default function RootLayout({ children }: { children: React.ReactNode })
     <html lang="en" className="h-full antialiased">
       <body className={`${inter.className} flex flex-col h-full`}>
         <InstallPwaProvider>{children}</InstallPwaProvider>
-        <GaNextScriptNavigation gaId="G-C6TYTB01NE" />
+        <Suspense>
+          <GaNextScriptNavigation gaId="G-C6TYTB01NE" />
+        </Suspense>
       </body>
     </html>
   );

diff --git a/src/features/app/tasks/ui/TaskForm.tsx b/src/features/app/tasks/ui/TaskForm.tsx
@@ -1,4 +1,5 @@
 import 'server-only';
+import { Suspense } from 'react';
 import { notFound } from 'next/navigation';
 import { twMerge } from 'tailwind-merge';
 import { ClassNamePropsOptional } from '@/features/shared/ui/ClassNameProps';
@@ -55,21 +56,23 @@ export const TaskForm = async ({
       className={twMerge('flex flex-col w-full', className)}
     >
       {task && <input type="hidden" name="id" value={task.id} />}
-      <TaskFormFields
-        defaultDueDate={defaultDueDate}
-        projectsSelect={
-          <ProjectsSelect
-            ariaLabel="Projects"
-            defaultValue={projectId ?? task?.projectId}
-            name="projectId"
-            onValueChange={updateTaskProject}
-            placeholder="Select a Project"
-          />
-        }
-        startOnEditingMode={startOnEditingMode}
-        task={task}
-        taskNameClassName={taskNameClassName}
-      />
+      <Suspense>
+        <TaskFormFields
+          defaultDueDate={defaultDueDate}
+          projectsSelect={
+            <ProjectsSelect
+              ariaLabel="Projects"
+              defaultValue={projectId ?? task?.projectId}
+              name="projectId"
+              onValueChange={updateTaskProject}
+              placeholder="Select a Project"
+            />
+          }
+          startOnEditingMode={startOnEditingMode}
+          task={task}
+          taskNameClassName={taskNameClassName}
+        />
+      </Suspense>
       <FormErrorList />
     </Form>
   );