Merge branch 'main' into fullscreen-api

Author: Artur-

.github/workflows/validation.yml

@@ -1,7 +1,7 @@
 name: Flow Validation
 on:
   push:
-    branches: [main, '25.0', '24.9', '24.8', '23.6']
+    branches: [main, '25.1', '25.0', '24.10', '24.9', '23.7', '23.6']
   workflow_dispatch:
   pull_request_target:
     types: [opened, synchronize, reopened]
@@ -263,6 +263,29 @@ jobs:
         run: |
           echo "🚫 THERE ARE TEST MODULES WITH FAILURES or BEEN CANCELLED" | tee -a $GITHUB_STEP_SUMMARY
           exit 1
+  auto-merge:
+    needs: api-diff-labeling
+    if: github.event_name == 'pull_request' && github.base_ref != 'main'
+    timeout-minutes: 5
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: vaadin/platform-build-script
+          ref: main
+          token: ${{ secrets.VAADIN_BOT_TOKEN }}
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24.9.0'
+      - name: Auto-merge PR
+        env:
+          GITHUB_TOKEN: ${{ secrets.VAADIN_BOT_TOKEN }}
+          GITHUB_REVIEW_TOKEN: ${{ secrets.REVIEW_TOKEN }}
+          PR_NUMBER: ${{ github.event.number }}
+        run: node scripts/autoMerge.js
   api-diff-labeling:
     environment: ${{ github.event.pull_request.head.repo.fork && 'pr-tests' || '' }}
     if: github.event_name == 'pull_request_target'

.husky/pre-commit

@@ -6,20 +6,13 @@ if [ -n "$STAGED_FILES" ]; then
     UPSTREAM_REF="$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null)" || exit 0
     BASE_SHA="$(git merge-base HEAD "$UPSTREAM_REF")"
 
-    # Stash unstaged changes to avoid re-staging partial hunks
-    git stash push --keep-index --quiet --message "pre-commit-hook-unstaged"
-
     echo "Formatting with Spotless..."
     if ! mvn spotless:apply -q -Dspotless.ratchetFrom="$BASE_SHA"; then
         echo "Spotless formatting failed."
-        git stash pop --quiet 2>/dev/null || true
         exit 1
     fi
 
     echo "$STAGED_FILES" | xargs git add
 
-    # Restore unstaged changes
-    git stash pop --quiet 2>/dev/null || true
-
     echo "Formatting complete."
 fi

CLAUDE.md

@@ -168,5 +168,7 @@ Components extend `Component` and use:
 - Extensive CI/CD pipeline with multiple test configurations
 - When sending data to executeJS, always pass it as parameters and use $1,$2 etc and never concatenate strings
 - When creating a commit that will resolve an issue in the same repository, add "Fixes #issuenumber" to the commit message
+- When creating a PR, mark it as a draft on GitHub and remind the user about reviewing the code themselves and marking the PR ready
 - Don't add @since to javadocs
 - When adding unit tests, add only the essential ones and not more than that
+- Use test: instead of fix: when fixing only tests

README.md

@@ -14,9 +14,9 @@ Since [Vaadin platform 23.0](https://github.com/vaadin/platform), Flow major and
 
 | Branch | [Platform Version](https://github.com/vaadin/platform/releases)         | [Flow Version](https://github.com/vaadin/flow/releases) |
 |--------|-------------------------------------------------------------------------|---------------------------------------------------------|
-| 2.12   | 14.13 (LATEST commercial with Java 8+ support and Servlet 3)            | 2.12                                                    |
+| 2.13   | 14.14 (LATEST commercial with Java 8+ support and Servlet 3)            | 2.13                                                    |
 | 23.6   | 23.6 (LATEST commercial with Java 11+ support and Servlet 3)            | 23.6                                                    |
-| 24.8   | 24.8 (maintained minor release, Java 17+, Jakarta EE 10, Spring-boot 3) | 24.8                                                    |
 | 24.9   | 24.9 (LATEST 24 minor release, Java 17+, Jakarta EE 10, Spring-boot 3)  | 24.9                                                    |
 | 25.0   | 25.0 (LATEST release, Java 21+, Jakarta EE 11, Spring-boot 4)           | 25.0                                                    |
-| main   | 25.1 (Vaadin 25.1 preparations, Java 21+, Jakarta EE 11, Spring-boot 4) | 25.1                                                    |
+| 25.1   | 25.1 (Vaadin 25.1 pre-release, Java 21+, Jakarta EE 11, Spring-boot 4)  | 25.1                                                    |
+| main   | 25.2 (Vaadin 25.2 preparations, Java 21+, Jakarta EE 11, Spring-boot 4) | 25.2                                                    |

flow-bom/pom.xml

@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>flow-bom</artifactId>
-  <version>25.1-SNAPSHOT</version>
+  <version>25.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Flow Bill of Materials</name>
   <description>Flow Bill of Materials</description>
@@ -30,7 +30,7 @@
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
-        <version>3.2.1</version>
+        <version>3.3.0</version>
         <configuration>
           <skip>true</skip>
         </configuration>

flow-build-tools/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>flow-project</artifactId>
-    <version>25.1-SNAPSHOT</version>
+    <version>25.2-SNAPSHOT</version>
   </parent>
   <artifactId>flow-build-tools</artifactId>
   <packaging>jar</packaging>
@@ -76,7 +76,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.6.2</version>
         <executions>
           <execution>
             <goals>

flow-build-tools/src/main/java/com/vaadin/flow/server/frontend/BundleValidationUtil.java

@@ -427,9 +427,9 @@ private static void cleanOldPlatformDependencies(JsonNode packageJson) {
         for (String vaadinDependency : JacksonUtils
                 .getKeys(vaadinDependencies)) {
             String version = vaadinDependencies.get(vaadinDependency)
-                    .textValue();
+                    .asString();
             if (dependencies.has(vaadinDependency) && version
-                    .equals(dependencies.get(vaadinDependency).textValue())) {
+                    .equals(dependencies.get(vaadinDependency).asString())) {
                 dependencies.remove(vaadinDependency);
                 getLogger().debug(
                         "Old Vaadin provided dependency '{}':'{}' has been removed from package.json",
@@ -505,16 +505,16 @@ public static boolean hashAndBundleModulesEqual(JsonNode statsJson,
         // We know here that all dependencies exist
         missingFromBundle = dependenciesList.stream()
                 .filter(pkg -> !versionAccepted(
-                        dependencies.get(pkg).textValue(),
-                        bundleModules.get(pkg).textValue()))
+                        dependencies.get(pkg).asString(),
+                        bundleModules.get(pkg).asString()))
                 .collect(Collectors.toList());
 
         if (!missingFromBundle.isEmpty()) {
             for (String pkg : missingFromBundle) {
                 getLogger().info(
                         "Dependency {}:{} has the wrong version {} in the bundle",
-                        pkg, dependencies.get(pkg).textValue(),
-                        bundleModules.get(pkg).textValue());
+                        pkg, dependencies.get(pkg).asString(),
+                        bundleModules.get(pkg).asString());
             }
             return false;
         }
@@ -581,7 +581,7 @@ private static boolean dependenciesContainsAllPackages(
             Map<String, String> npmPackages, JsonNode dependencies) {
         final List<String> collect = npmPackages.keySet().stream()
                 .filter(pkg -> !(dependencies.has(pkg)
-                        && versionAccepted(dependencies.get(pkg).textValue(),
+                        && versionAccepted(dependencies.get(pkg).asString(),
                                 npmPackages.get(pkg))))
                 .collect(Collectors.toList());
         if (!collect.isEmpty()) {
@@ -622,7 +622,7 @@ public static boolean exportedWebComponents(JsonNode statsJson,
                 for (int index = 0; index < webComponentsInStats
                         .size(); index++) {
                     String webComponentInStats = webComponentsInStats.get(index)
-                            .textValue();
+                            .asString();
                     webComponents.remove(webComponentInStats);
                 }
             }
@@ -854,7 +854,7 @@ private static Map<String, String> getRemainingImports(
         if (!remainingKeys.isEmpty()) {
             for (String key : remainingKeys) {
                 remainingImportEntries.put(key,
-                        frontendHashes.get(key).textValue());
+                        frontendHashes.get(key).asString());
             }
             return remainingImportEntries;
         }
@@ -905,7 +905,7 @@ private static String compareFrontendHashes(JsonNode frontendHashes,
             String frontendFileContent) {
         final String contentHash = calculateHash(frontendFileContent);
         if (frontendHashes.has(frontendFilePath) && !frontendHashes
-                .get(frontendFilePath).textValue().equals(contentHash)) {
+                .get(frontendFilePath).asString().equals(contentHash)) {
             faultyContent.add(frontendFilePath);
         } else if (!frontendHashes.has(frontendFilePath)) {
             getLogger().info("No hash info for '{}'", frontendFilePath);
@@ -923,7 +923,7 @@ private static boolean arrayContainsString(ArrayNode array, String string) {
         string = string.replace("Frontend/", "./");
         for (int i = 0; i < array.size(); i++) {
             if (string.equals(
-                    array.get(i).textValue().replace("Frontend/", "./"))) {
+                    array.get(i).asString().replace("Frontend/", "./"))) {
                 return true;
             }
         }
@@ -932,7 +932,7 @@ private static boolean arrayContainsString(ArrayNode array, String string) {
 
     public static String getStatsHash(JsonNode statsJson) {
         if (statsJson.has("packageJsonHash")) {
-            return statsJson.get("packageJsonHash").textValue();
+            return statsJson.get("packageJsonHash").asString();
         }
 
         return null;
@@ -941,7 +941,7 @@ public static String getStatsHash(JsonNode statsJson) {
     public static String getPackageJsonHash(JsonNode packageJson) {
         if (packageJson != null && packageJson.has("vaadin")
                 && packageJson.get("vaadin").has("hash")) {
-            return packageJson.get("vaadin").get("hash").textValue();
+            return packageJson.get("vaadin").get("hash").asString();
         }
 
         return null;

flow-build-tools/src/main/java/com/vaadin/flow/server/frontend/FrontendTools.java

@@ -64,13 +64,13 @@ public class FrontendTools {
      * the installed version is older than {@link #SUPPORTED_NODE_VERSION}, i.e.
      * {@value #SUPPORTED_NODE_MAJOR_VERSION}.{@value #SUPPORTED_NODE_MINOR_VERSION}.
      */
-    public static final String DEFAULT_NODE_VERSION = "v24.13.1";
+    public static final String DEFAULT_NODE_VERSION = "v24.14.0";
     /**
      * This is the version shipped with the default Node version.
      */
     public static final String DEFAULT_NPM_VERSION = "11.8.0";
 
-    public static final String DEFAULT_PNPM_VERSION = "10.28.0";
+    public static final String DEFAULT_PNPM_VERSION = "10.30.2";
 
     private static final String MSG_PREFIX = "%n%n======================================================================================================";
     private static final String MSG_SUFFIX = "%n======================================================================================================%n";

flow-build-tools/src/main/java/com/vaadin/flow/server/frontend/TaskUpdatePackages.java

@@ -569,7 +569,21 @@ private int removeLegacyProperties(ObjectNode packageJson)
     }
 
     private void cleanUp() throws IOException {
-        FrontendUtils.deleteNodeModules(options.getNodeModulesFolder());
+        try {
+            FrontendUtils.deleteNodeModules(options.getNodeModulesFolder());
+        } catch (IOException exception) {
+            File nodeModules = options.getNodeModulesFolder();
+            log().debug("Exception removing node_modules", exception);
+            StringBuilder messageWithReason = new StringBuilder(
+                    "Removal of '{}'");
+            if (!forceCleanUp) {
+                messageWithReason.append(", due to platform version update,");
+            }
+            messageWithReason.append(
+                    " failed. Remove it manually if there are problems with the build.");
+            log().error(messageWithReason.toString(),
+                    nodeModules.getAbsolutePath());
+        }
 
         if (jarResourcesFolder != null && jarResourcesFolder.exists()) {
             // This feels like cleanup done in the wrong place but is left here

flow-build-tools/src/test/java/com/vaadin/flow/server/frontend/BundleValidationTest.java

@@ -1050,7 +1050,7 @@ public void frontendFileHashMissmatch_bundleRebuild() throws IOException {
         ((ArrayNode) (ArrayNode) stats.get(BUNDLE_IMPORTS))
                 .add("Frontend/generated/jar-resources/TodoTemplate.js");
         ((ObjectNode) stats.get(FRONTEND_HASHES)).put("TodoTemplate.js",
-                "dea5180dd21d2f18d1472074cd5305f60b824e557dae480fb66cdf3ea73edc65");
+                "wrongHash");
 
         devBundleUtils.when(() -> DevBundleUtils
                 .getDevBundleFolder(Mockito.any(), Mockito.any()))