Options should correct the reactEnable flag

The reactEnable flag should be automatically corrected to false if vaadin router is used instead of react router.
vaadin · Aug 30, 2024 · fea7c64 · fea7c64
1 parent c8ff229
commit fea7c64
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/Options.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/Options.java
@@ -8,6 +8,8 @@
 import java.util.Objects;
 import java.util.Set;
 
+import org.slf4j.LoggerFactory;
+
 import com.vaadin.experimental.FeatureFlags;
 import com.vaadin.flow.di.Lookup;
 import com.vaadin.flow.server.Constants;
@@ -928,6 +930,12 @@ public boolean isReactEnabled() {
 
     public Options withReact(boolean reactEnable) {
         this.reactEnable = reactEnable;
+        if (reactEnable && !FrontendUtils
+                .isReactRouterRequired(getFrontendDirectory())) {
+            LoggerFactory.getLogger(Options.class).debug(
+                    "Setting reactEnable to false as Vaadin Router is used!");
+            this.reactEnable = false;
+        }
         return this;
     }
 

diff --git a/flow-server/src/test/java/com/vaadin/flow/server/frontend/NodeUpdaterTest.java b/flow-server/src/test/java/com/vaadin/flow/server/frontend/NodeUpdaterTest.java
@@ -568,6 +568,9 @@ public void getDefaultDependencies_reactIsUsed_addsHillaReactComponents() {
                 .mockStatic(FrontendUtils.class)) {
             mock.when(() -> FrontendUtils.isHillaUsed(Mockito.any(File.class),
                     Mockito.any(ClassFinder.class))).thenReturn(true);
+            mock.when(() -> FrontendUtils
+                    .isReactRouterRequired(Mockito.any(File.class)))
+                    .thenReturn(true);
             options.withReact(true);
             Map<String, String> defaultDeps = nodeUpdater
                     .getDefaultDependencies();