Merge branch 'main' into fix/move-blocking-calls-outside-session-lock

flow-client/src/main/frontend/Flow.ts

@@ -351,7 +351,7 @@ export class Flow {
       script.onload = () => resolve();
       script.onerror = reject;
       script.src = url;
-      const nonce = $wnd.Vaadin.Flow.nonce;
+      const { nonce } = $wnd.Vaadin.Flow;
       if (nonce !== undefined) {
         script.setAttribute('nonce', nonce);
       }
@@ -376,7 +376,7 @@ export class Flow {
     const scriptAppId = document.createElement('script');
     scriptAppId.type = 'module';
     scriptAppId.setAttribute('data-app-id', appIdWithoutHashCode);
-    const nonce = $wnd.Vaadin.Flow.nonce;
+    const { nonce } = $wnd.Vaadin.Flow;
     if (nonce !== undefined) {
       scriptAppId.setAttribute('nonce', nonce);
     }

flow-plugins/flow-gradle-plugin/src/main/kotlin/com/vaadin/gradle/VaadinFlowPluginExtension.kt

@@ -290,7 +290,7 @@ public abstract class VaadinFlowPluginExtension @Inject constructor(private val
     public abstract val frontendExtraFileExtensions: ListProperty<String>
 
     /**
-     * Whether to include web component npm packages in packages.json
+     * Whether to exclude Vaadin web component npm packages in packages.json
      */
     public abstract val npmExcludeWebComponents: Property<Boolean>
 

flow-plugins/flow-plugin-base/src/main/java/com/vaadin/flow/plugin/base/PluginAdapterBase.java

@@ -349,9 +349,9 @@ default Lookup createLookup(ClassFinder classFinder) {
     List<String> frontendExtraFileExtensions();
 
     /**
-     * Whether to include web component npm packages in packages.json.
+     * Whether to exclude Vaadin web component npm packages in packages.json.
      *
-     * @return {@code true} to include web component npm packages.
+     * @return {@code true} to exclude Vaadin web component npm packages.
      */
     boolean isNpmExcludeWebComponents();
 }

flow-server/src/main/java/com/vaadin/experimental/FeatureFlags.java

@@ -67,11 +67,6 @@ public class FeatureFlags implements Serializable {
             "collaborationEngineBackend",
             "https://github.com/vaadin/platform/issues/1988", true, null);
 
-    public static final Feature WEB_PUSH = new Feature(
-            "Server side WebPush API", "webPush",
-            "https://vaadin.com/docs/latest/configuration/setting-up-webpush",
-            true, "com.vaadin.flow.server.webpush.WebPush");
-
     public static final Feature FORM_FILLER_ADDON = new Feature(
             "Form Filler Add-on", "formFillerAddon",
             "https://github.com/vaadin/form-filler-addon", true,
@@ -112,7 +107,6 @@ public FeatureFlags(Lookup lookup) {
         this.lookup = lookup;
         features.add(new Feature(EXAMPLE));
         features.add(new Feature(COLLABORATION_ENGINE_BACKEND));
-        features.add(new Feature(WEB_PUSH));
         features.add(new Feature(FORM_FILLER_ADDON));
         features.add(new Feature(HILLA_I18N));
         features.add(new Feature(HILLA_FULLSTACK_SIGNALS));

flow-server/src/main/java/com/vaadin/flow/component/internal/ComponentTracker.java

@@ -294,20 +294,47 @@ public static void trackAttach(Component component) {
      */
     public static void refreshLocation(Location location, int offset) {
         refreshLocation(createLocation, location, offset);
+        refreshLocations(createLocations, location, offset);
         refreshLocation(attachLocation, location, offset);
+        refreshLocations(attachLocations, location, offset);
+    }
+
+    private static boolean needsUpdate(Location l, Location referenceLocation) {
+        return Objects.equals(l.className, referenceLocation.className)
+                && l.lineNumber > referenceLocation.lineNumber;
+    }
+
+    private static Location updateLocation(Location l, int offset) {
+        return new Location(l.className, l.filename, l.methodName,
+                l.lineNumber + offset);
     }
 
     private static void refreshLocation(Map<Component, Location> targetRef,
-            Location location, int offset) {
+            Location referenceLocation, int offset) {
         Map<Component, Location> updatedLocations = new HashMap<>();
-        targetRef.entrySet().stream().filter(
-                e -> Objects.equals(e.getValue().className, location.className))
-                .filter(e -> e.getValue().lineNumber > location.lineNumber)
-                .forEach(e -> {
-                    Location l = e.getValue();
-                    updatedLocations.put(e.getKey(), new Location(l.className,
-                            l.filename, l.methodName, l.lineNumber + offset));
-                });
+        for (Component c : targetRef.keySet()) {
+            Location l = targetRef.get(c);
+            if (needsUpdate(l, referenceLocation)) {
+                updatedLocations.put(c, updateLocation(l, offset));
+            }
+        }
+
+        targetRef.putAll(updatedLocations);
+    }
+
+    private static void refreshLocations(Map<Component, Location[]> targetRef,
+            Location referenceLocation, int offset) {
+        Map<Component, Location[]> updatedLocations = new HashMap<>();
+        for (Component c : targetRef.keySet()) {
+            Location[] locations = targetRef.get(c);
+
+            for (int i = 0; i < locations.length; i++) {
+                if (needsUpdate(locations[i], referenceLocation)) {
+                    locations[i] = updateLocation(locations[i], offset);
+                }
+            }
+        }
+
         targetRef.putAll(updatedLocations);
     }
 

flow-server/src/test/java/com/vaadin/flow/ComponentTrackerTest.java

@@ -19,6 +19,8 @@
 import com.vaadin.flow.component.HasComponents;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.internal.ComponentTracker;
+import com.vaadin.flow.component.internal.ComponentTracker.Location;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -69,13 +71,8 @@ public void createLocationTracked() {
         Component c2;
         c2 = new Component1();
 
-        ComponentTracker.Location c1Location = ComponentTracker.findCreate(c1);
-        Assert.assertEquals(68, c1Location.lineNumber());
-        Assert.assertEquals(getClass().getName(), c1Location.className());
-
-        ComponentTracker.Location c2Location = ComponentTracker.findCreate(c2);
-        Assert.assertEquals(70, c2Location.lineNumber());
-        Assert.assertEquals(getClass().getName(), c2Location.className());
+        assertCreateLocation(c1, 70, getClass().getName());
+        assertCreateLocation(c2, 72, getClass().getName());
     }
 
     @Test
@@ -86,24 +83,18 @@ public void attachLocationTracked() {
 
         Layout layout = new Layout(c1);
 
-        ComponentTracker.Location c1Location = ComponentTracker.findAttach(c1);
-        Assert.assertEquals(87, c1Location.lineNumber());
-        Assert.assertEquals(getClass().getName(), c1Location.className());
+        assertCreateLocation(c1, 80, getClass().getName());
 
         layout.add(c2);
 
-        ComponentTracker.Location c2Location = ComponentTracker.findAttach(c2);
-        Assert.assertEquals(93, c2Location.lineNumber());
-        Assert.assertEquals(getClass().getName(), c2Location.className());
+        assertAttachLocation(c2, 88, getClass().getName());
 
         // Last attach is tracked
         layout.add(c3);
         layout.remove(c3);
         layout.add(c3);
 
-        ComponentTracker.Location c3Location = ComponentTracker.findAttach(c3);
-        Assert.assertEquals(102, c3Location.lineNumber());
-        Assert.assertEquals(getClass().getName(), c3Location.className());
+        assertAttachLocation(c3, 95, getClass().getName());
     }
 
     @Test
@@ -112,45 +103,54 @@ public void offsetApplied() {
         Component c2 = new Component1();
         Component c3 = new Component1();
 
-        ComponentTracker.Location c1Location = ComponentTracker.findCreate(c1);
-        Assert.assertEquals(111, c1Location.lineNumber());
-        Assert.assertEquals(getClass().getName(), c1Location.className());
+        assertCreateLocation(c1, 102, getClass().getName());
 
-        ComponentTracker.refreshLocation(c1Location, 3);
+        ComponentTracker.refreshLocation(ComponentTracker.findCreate(c1), 3);
 
-        ComponentTracker.Location c2Location = ComponentTracker.findCreate(c2);
-        Assert.assertEquals(112 + 3, c2Location.lineNumber());
-        Assert.assertEquals(getClass().getName(), c2Location.className());
+        assertCreateLocation(c2, 103 + 3, getClass().getName());
 
-        ComponentTracker.refreshLocation(c2Location, 1);
+        ComponentTracker.refreshLocation(ComponentTracker.findCreate(c2), 1);
 
-        ComponentTracker.Location c3Location = ComponentTracker.findCreate(c3);
-        Assert.assertEquals(113 + 3 + 1, c3Location.lineNumber());
-        Assert.assertEquals(getClass().getName(), c3Location.className());
+        assertCreateLocation(c3, 104 + 3 + 1, getClass().getName());
     }
 
     @Test
     public void memoryIsReleased() throws Exception {
         Field createLocationField = ComponentTracker.class
                 .getDeclaredField("createLocation");
+        Field createLocationsField = ComponentTracker.class
+                .getDeclaredField("createLocations");
         Field attachLocationField = ComponentTracker.class
                 .getDeclaredField("attachLocation");
+        Field attachLocationsField = ComponentTracker.class
+                .getDeclaredField("attachLocations");
         createLocationField.setAccessible(true);
+        createLocationsField.setAccessible(true);
         attachLocationField.setAccessible(true);
-        Map<Component, StackTraceElement> createMap = (Map<Component, StackTraceElement>) createLocationField
+        attachLocationsField.setAccessible(true);
+
+        Map<?, ?> createMap = (Map<?, ?>) createLocationField.get(null);
+        Map<?, ?> attachMap = (Map<?, ?>) attachLocationField.get(null);
+        Map<?, ?> createLocationsMap = (Map<?, ?>) createLocationsField
                 .get(null);
-        Map<Component, StackTraceElement> attachMap = (Map<Component, StackTraceElement>) attachLocationField
+        Map<?, ?> attachLocationsMap = (Map<?, ?>) attachLocationsField
                 .get(null);
         createMap.clear();
+        createLocationsMap.clear();
         attachMap.clear();
+        attachLocationsMap.clear();
 
         new Layout(new Component1());
 
         Assert.assertEquals(2, createMap.size());
+        Assert.assertEquals(2, createLocationsMap.size());
         Assert.assertEquals(1, attachMap.size());
+        Assert.assertEquals(1, attachLocationsMap.size());
 
         Assert.assertTrue(isCleared(createMap));
+        Assert.assertTrue(isCleared(createLocationsMap));
         Assert.assertTrue(isCleared(attachMap));
+        Assert.assertTrue(isCleared(attachLocationsMap));
     }
 
     private boolean isCleared(Map<?, ?> map) throws InterruptedException {
@@ -164,4 +164,26 @@ private boolean isCleared(Map<?, ?> map) throws InterruptedException {
         return false;
     }
 
+    private void assertCreateLocation(Component c, int lineNumber,
+            String name) {
+        ComponentTracker.Location location = ComponentTracker.findCreate(c);
+        Assert.assertEquals(lineNumber, location.lineNumber());
+        Assert.assertEquals(name, location.className());
+
+        Location[] locations = ComponentTracker.findCreateLocations(c);
+        Assert.assertEquals(lineNumber, locations[1].lineNumber());
+        Assert.assertEquals(name, locations[1].className());
+    }
+
+    private void assertAttachLocation(Component c, int lineNumber,
+            String name) {
+        ComponentTracker.Location location = ComponentTracker.findAttach(c);
+        Assert.assertEquals(lineNumber, location.lineNumber());
+        Assert.assertEquals(name, location.className());
+
+        Location[] locations = ComponentTracker.findAttachLocations(c);
+        Assert.assertEquals(lineNumber, locations[0].lineNumber());
+        Assert.assertEquals(name, locations[0].className());
+    }
+
 }

flow-tests/pom.xml

@@ -430,6 +430,23 @@
                 <excludedGroups></excludedGroups>
             </properties>
         </profile>
+        <profile>
+            <!-- To be removed after chrome used by CI gets upgraded to 128 or later -->
+            <id>ci-devtools</id>
+            <activation>
+                <property>
+                    <name>teamcity.build.id</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-devtools-v127</artifactId>
+                    <version>4.25.0</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
         <profile>
             <id>deepClean</id>
             <build>

flow-tests/test-pwa/pom-production.xml

@@ -27,13 +27,6 @@
             <version>0.1.2</version>
             <scope>test</scope>
         </dependency>
-        <!-- To be removed after chrome used by CI gets upgraded to 124 or later -->
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-devtools-v123</artifactId>
-            <version>4.21.0</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

flow-tests/test-pwa/pom.xml

@@ -31,13 +31,6 @@
             <version>0.1.2</version>
             <scope>test</scope>
         </dependency>
-        <!-- To be removed after chrome used by CI gets upgraded to 124 or later -->
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-devtools-v123</artifactId>
-            <version>4.21.0</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

flow-tests/test-webpush/src/main/java/com/vaadin/flow/webpush/WebPushView.java

@@ -18,14 +18,13 @@
 
 import java.util.List;
 
-import nl.martijndwars.webpush.Subscription;
-
 import com.vaadin.flow.component.Text;
 import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.html.NativeButton;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.server.webpush.WebPush;
 import com.vaadin.flow.server.webpush.WebPushMessage;
+import com.vaadin.flow.server.webpush.WebPushSubscription;
 
 @Route("")
 public class WebPushView extends Div {
@@ -52,7 +51,7 @@ public class WebPushView extends Div {
             "https://upload.wikimedia.org/wikipedia/commons/0/0e/Message-icon-blue-symbol-double.png"
     );
 
-    private Subscription subscription;
+    private WebPushSubscription subscription;
 
     public WebPushView() {
         webPush = new WebPush(PUBLIC_KEY, PRIVATE_KEY, "test");

flow-tests/vaadin-spring-tests/pom.xml

@@ -16,8 +16,8 @@
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <component.version>24.5.4</component.version>
-        <nimbus-jose-jwt.version>9.46</nimbus-jose-jwt.version>
+        <component.version>24.5.5</component.version>
+        <nimbus-jose-jwt.version>9.47</nimbus-jose-jwt.version>
     </properties>
 
     <dependencyManagement>