Merge pull request #277 from wunderio/feature/NEX-185

NEX-185: Update to next-drupal 2.0

Author: vermario

drupal/composer.json

@@ -33,7 +33,7 @@
         "drupal/migrate_source_csv": "^3.5",
         "drupal/migrate_tools": "^6.0",
         "drupal/monolog": "^3.0@beta",
-        "drupal/next": "^2.0@beta",
+        "drupal/next": "^2.0",
         "drupal/paragraphs": "^1.18",
         "drupal/pathauto": "^1.13",
         "drupal/redirect": "^1.10",

drupal/composer.lock

@@ -45,7 +45,7 @@
     "lucide-react": "^0.469.0",
     "next": "^14.2.22",
     "next-auth": "^5.0.0-beta.25",
-    "next-drupal": "^2.0.0-beta.1",
+    "next-drupal": "^2.0.0",
     "next-intl": "^3.26.3",
     "next-themes": "^0.4.4",
     "p-retry": "^6.2.1",
@@ -100,10 +100,5 @@
     "tailwindcss": "^3.4.17",
     "ts-node": "^10.9.2",
     "typescript": "^5.6.2"
-  },
-  "overrides": {
-    "next-drupal": {
-      "next": "$next"
-    }
   }
 }

next/package-lock.json

@@ -86,7 +86,7 @@ export default async function NodePage({
   // In this case, the draftData will contain the resourceVersion property,
   // which we can use to fetch the correct revision:
   if (isDraftMode) {
-    const draftData = getDraftData();
+    const draftData = await getDraftData();
 
     if (
       draftData &&

next/package.json

@@ -8,6 +8,6 @@ export async function GET(request: NextRequest) {
   const { searchParams } = new URL(request.url);
   const callbackPath = searchParams.get("callbackPath");
 
-  disableDraftMode();
+  await disableDraftMode();
   redirect(callbackPath ?? "/");
 }