Merge branch 'main' into preview-enabled

Author: robdecker

.eslintignore

@@ -5,3 +5,4 @@ node_modules
 *.esm.js
 /drupal
 /drupal-*
+/local-next-drupal

.github/workflows/next.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   phpunit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         # Supported PHP versions: https://www.drupal.org/docs/getting-started/system-requirements/php-requirements
@@ -22,15 +22,21 @@ jobs:
           - "10.0.x"
           - "10.1.x"
           - "10.2.x"
+          - "10.3.x"
+          - "11.0.x"
         exclude:
           - drupal: "10.0.x"
             php: "8.3"
           - drupal: "10.1.x"
             php: "8.3"
+          - drupal: "11.0.x"
+            php: "8.1"
+          - drupal: "11.0.x"
+            php: "8.2"
     name: Drupal ${{ matrix.drupal }} - PHP ${{ matrix.php }}
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:8.0
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_DATABASE: db

.gitignore

@@ -42,3 +42,4 @@ yarn-error.log*
 /drupal/web/phpunit.xml
 /drupal/web/sites/default/settings.local.php
 /drupal-*
+/local-next-drupal

CONTRIBUTING.md

@@ -50,6 +50,15 @@ yarn workspace next-drupal dev
 
 You can run all the tests from the root of the repository.
 
+Due to the current CI/CD setup it is not possible to run the tests locally.
+A running Drupal instance with a secret configuration is required to run the tests.
+
+To add the required env vars to Jest run:
+
+```
+cp packages/next-drupal/.env.example packages/next-drupal/.env
+```
+
 ### `next-drupal`
 
 We use `jest` for testing the `next-drupal` package.

modules/next/.gitlab-ci.yml

@@ -52,9 +52,11 @@ include:
 #
 # Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/1.0.x/includes/include.drupalci.variables.yml
 ################
-# variables:
-#   SKIP_ESLINT: '1'
-
+variables:
+  # SKIP_ESLINT: '1'
+  OPT_IN_TEST_PREVIOUS_MINOR: 1
+  OPT_IN_TEST_NEXT_MINOR: 1
+  OPT_IN_TEST_NEXT_MAJOR: 1
 ###################################################################################
 #
 #                                        *

modules/next/composer.json

@@ -17,6 +17,6 @@
     "drupal/subrequests": "^3.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0"
+    "phpunit/phpunit": "^9 || ^10"
   }
 }

modules/next/modules/next_extras/next_extras.info.yml

@@ -1,7 +1,7 @@
 name: Next.js Extras (Experimental)
 description: Adds extra (mostly experiemental) functionality to Next.js module
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 package: Web services
 dependencies:
   - next:next

modules/next/modules/next_extras/src/NextCacheInvalidator.php

@@ -143,7 +143,8 @@ public function invalidatePath(string $path, array $sites): void {
         }
       }
       catch (RequestException $exception) {
-        watchdog_exception('next_extras', $exception);
+        // Using logger service to log the exception.
+        $this->logger->error($exception->getMessage());
       }
     }
   }

modules/next/modules/next_graphql/next_graphql.info.yml

@@ -1,7 +1,7 @@
 name: 'Next.js GraphQL'
 type: module
 description: 'GraphQL for Next.js'
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 package: Web services
 dependencies:
   - graphql:graphql

modules/next/modules/next_jsonapi/next_jsonapi.info.yml

@@ -1,7 +1,7 @@
 name: 'Next.js JSON:API'
 type: module
 description: 'JSON:API Helpers for Next.js'
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 package: Web services
 dependencies:
   - decoupled_router:decoupled_router